Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 12 Jun 2014 13:28:42 +0000 (UTC)
From:      Philippe Audeoud <jadawin@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r357596 - head/www/usermanager
Message-ID:  <201406121328.s5CDSg2A046563@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: jadawin
Date: Thu Jun 12 13:28:42 2014
New Revision: 357596
URL: http://svnweb.freebsd.org/changeset/ports/357596
QAT: https://qat.redports.org/buildarchive/r357596/

Log:
  - Add stage support

Modified:
  head/www/usermanager/Makefile
  head/www/usermanager/pkg-plist

Modified: head/www/usermanager/Makefile
==============================================================================
--- head/www/usermanager/Makefile	Thu Jun 12 12:58:17 2014	(r357595)
+++ head/www/usermanager/Makefile	Thu Jun 12 13:28:42 2014	(r357596)
@@ -22,7 +22,6 @@ PLIST_SUB+=	INSTALLDIR=${INSTALLDIR}
 _INSTDIR=	www/data/UserManager
 INSTALLDIR?=	${_INSTDIR}
 
-NO_STAGE=	yes
 pre-fetch:
 .if ${INSTALLDIR} == ${_INSTDIR}
 	@${ECHO_MSG} ""
@@ -35,14 +34,10 @@ post-patch:
 	 -e 's|%%INSTALLDIR%%|${INSTALLDIR}|g' ${FILESDIR}/pkg-message.in > ${PKGMESSAGE}
 
 do-install:
-	@${MKDIR} ${PREFIX}/${INSTALLDIR}
-	@${CP} -Rp ${WRKSRC}/* ${PREFIX}/${INSTALLDIR}
-	@${CHMOD} 666 ${PREFIX}/${INSTALLDIR}/config.php
-	@${ECHO_CMD} ""
-
-post-install:
-.if !defined(BATCH)
-	@${CAT} ${PKGMESSAGE}
-.endif
+	@${MKDIR} ${STAGEDIR}${PREFIX}/${INSTALLDIR}
+	@${CP} -Rp ${WRKSRC}/* ${STAGEDIR}${PREFIX}/${INSTALLDIR}
+	@${CHMOD} 666 ${STAGEDIR}${PREFIX}/${INSTALLDIR}/config.php
+	@${MV} ${STAGEDIR}${PREFIX}/${INSTALLDIR}/config.php \
+		${STAGEDIR}${PREFIX}/${INSTALLDIR}/config.php.sample
 
 .include <bsd.port.mk>

Modified: head/www/usermanager/pkg-plist
==============================================================================
--- head/www/usermanager/pkg-plist	Thu Jun 12 12:58:17 2014	(r357595)
+++ head/www/usermanager/pkg-plist	Thu Jun 12 13:28:42 2014	(r357596)
@@ -1,5 +1,5 @@
 %%INSTALLDIR%%/CHANGELOG
-%%INSTALLDIR%%/config.php
+@sample %%INSTALLDIR%%/config.php.sample
 %%INSTALLDIR%%/index.php
 %%INSTALLDIR%%/install.php
 %%INSTALLDIR%%/readme.txt



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