Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 15 Oct 2013 18:30:41 +0000 (UTC)
From:      Hajimu UMEMOTO <ume@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r330423 - head/japanese/tiarra
Message-ID:  <201310151830.r9FIUf4Q014986@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: ume
Date: Tue Oct 15 18:30:41 2013
New Revision: 330423
URL: http://svnweb.freebsd.org/changeset/ports/330423

Log:
  enable stage.

Modified:
  head/japanese/tiarra/Makefile
  head/japanese/tiarra/pkg-plist

Modified: head/japanese/tiarra/Makefile
==============================================================================
--- head/japanese/tiarra/Makefile	Tue Oct 15 18:15:21 2013	(r330422)
+++ head/japanese/tiarra/Makefile	Tue Oct 15 18:30:41 2013	(r330423)
@@ -17,6 +17,7 @@ USE_PERL5=	run
 USE_BZIP2=	yes
 USE_RC_SUBR=	tiarra
 NO_BUILD=	yes
+NEED_ROOT=	yes
 
 USERS=		${TIARRA_USER}
 GROUPS=		${TIARRA_GROUP}
@@ -24,24 +25,17 @@ GROUPS=		${TIARRA_GROUP}
 SUB_FILES=	pkg-message
 SUB_LIST=	TIARRA_USER=${TIARRA_USER}
 
-PLIST_SUB=	TIARRA_USER=${TIARRA_USER} \
-		TIARRA_GROUP=${TIARRA_GROUP}
-
 TIARRA_USER=	tiarra
 TIARRA_GROUP=	tiarra
 
-NO_STAGE=	yes
 do-install:
-	@${MKDIR} ${PREFIX}/tiarra
-	@${TAR} cfC - ${WRKSRC} . | ${TAR} xfC - ${PREFIX}/tiarra
-	@if [ ! -f ${PREFIX}/tiarra/tiarra.conf ]; then \
-		${CP} -p ${PREFIX}/tiarra/sample.conf \
-			${PREFIX}/tiarra/tiarra.conf; \
-	fi
-	@${CHOWN} -R ${BINOWN}:${BINGRP} ${PREFIX}/tiarra
-	@${MKDIR} ${PREFIX}/tiarra/log
-	@${CHOWN} -R ${TIARRA_USER}:${TIARRA_GROUP} ${PREFIX}/tiarra/log
-	@${CHMOD} o-rwx ${PREFIX}/tiarra/log
-	@${CAT} ${PKGMESSAGE}
+	@${MKDIR} ${STAGEDIR}${PREFIX}/tiarra
+	@${TAR} cfC - ${WRKSRC} . | \
+		${TAR} xfC - ${STAGEDIR}${PREFIX}/tiarra
+	@${CHOWN} -R ${BINOWN}:${BINGRP} ${STAGEDIR}${PREFIX}/tiarra
+	@${MKDIR} ${STAGEDIR}${PREFIX}/tiarra/log
+	@${CHOWN} -R ${TIARRA_USER}:${TIARRA_GROUP} \
+		${STAGEDIR}${PREFIX}/tiarra/log
+	@${CHMOD} o-rwx ${STAGEDIR}${PREFIX}/tiarra/log
 
 .include <bsd.port.mk>

Modified: head/japanese/tiarra/pkg-plist
==============================================================================
--- head/japanese/tiarra/pkg-plist	Tue Oct 15 18:15:21 2013	(r330422)
+++ head/japanese/tiarra/pkg-plist	Tue Oct 15 18:30:41 2013	(r330423)
@@ -255,8 +255,5 @@ tiarra/sample.conf
 tiarra/tiarra
 tiarra/tiarra-conf.el
 tiarra/tiarra-conf.l
-@dirrm tiarra/log
-@exec mkdir %D/tiarra/log
-@exec chown %%TIARRA_USER%%:%%TIARRA_GROUP%% %D/tiarra/log
-@exec chmod o-rwx %D/tiarra/log
-@dirrm tiarra
+@dirrmtry tiarra/log
+@dirrmtry tiarra



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201310151830.r9FIUf4Q014986>