Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 19 Sep 2014 21:29:40 +0000 (UTC)
From:      Antoine Brodin <antoine@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r368601 - head/www/chems
Message-ID:  <201409192129.s8JLTeai051640@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: antoine
Date: Fri Sep 19 21:29:40 2014
New Revision: 368601
URL: http://svnweb.freebsd.org/changeset/ports/368601
QAT: https://qat.redports.org/buildarchive/r368601/

Log:
  Allow staging as a regular user
  Use @sample for config.php as it seems more appropriate

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

Modified: head/www/chems/Makefile
==============================================================================
--- head/www/chems/Makefile	Fri Sep 19 21:24:53 2014	(r368600)
+++ head/www/chems/Makefile	Fri Sep 19 21:29:40 2014	(r368601)
@@ -3,6 +3,7 @@
 
 PORTNAME=	chems
 DISTVERSION=	0x04
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/0x04
 
@@ -12,21 +13,12 @@ COMMENT=	The geekest content helper mana
 NO_BUILD=	yes
 USES=		zip
 USE_PHP=	xml iconv gd
+PLIST_SUB=	WWWOWN="${WWWOWN}"
 SUB_FILES=	pkg-message
-WWWDIR?=	${PREFIX}/www/${PORTNAME}
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${WWWDIR}
 	${CP} -R ${WRKSRC}/ ${STAGEDIR}${WWWDIR}
-	${TOUCH} ${STAGEDIR}${WWWDIR}/usr/config.php
-	@${CHOWN} ${WWWOWN} ${STAGEDIR}${WWWDIR}/usr/config.php
-
-create-plist:
-	@${FIND} -s ${WRKSRC}/${file} -not -type d \
-		| ${SED} -e 's,^${WRKSRC},%%WWWDIR%%,' > ${PLIST}
-	@${ECHO_CMD} '@exec touch %D/%%WWWDIR%%/usr/config.php;chown ${WWWOWN} %D/%%WWWDIR%%/usr/config.php' >> ${PLIST}
-	@${ECHO_CMD} '@unexec if [ ! -s %D/%%WWWDIR%%/usr/config.php ];then rm -f %D/%%WWWDIR%%/usr/config.php;fi' >> ${PLIST}
-	@${FIND} -ds ${WRKSRC}/${file} -type d \
-	| ${SED} -e 's,^${WRKSRC},@dirrm %%WWWDIR%%,' >> ${PLIST}
+	${MV} ${STAGEDIR}${WWWDIR}/usr/config.php ${STAGEDIR}${WWWDIR}/usr/config.php.sample
 
 .include <bsd.port.mk>

Modified: head/www/chems/pkg-plist
==============================================================================
--- head/www/chems/pkg-plist	Fri Sep 19 21:24:53 2014	(r368600)
+++ head/www/chems/pkg-plist	Fri Sep 19 21:29:40 2014	(r368601)
@@ -43,7 +43,7 @@
 %%WWWDIR%%/themes/monochrome/favicon.ico
 %%WWWDIR%%/themes/monochrome/monochrome.css
 %%WWWDIR%%/themes/monochrome/monochrome.theme
-%%WWWDIR%%/usr/config.php
+@sample(%%WWWOWN%%,,) %%WWWDIR%%/usr/config.php.sample
 %%WWWDIR%%/usr/images/feed.png
 %%WWWDIR%%/usr/images/header.png
 %%WWWDIR%%/usr/images/logo.png
@@ -57,8 +57,6 @@
 %%WWWDIR%%/usr/modconf.php
 %%WWWDIR%%/usr/pages.inc
 %%WWWDIR%%/usr/posts.inc
-@exec touch %D/%%WWWDIR%%/usr/config.php;chown www %D/%%WWWDIR%%/usr/config.php
-@unexec if [ ! -s %D/%%WWWDIR%%/usr/config.php ];then rm -f %D/%%WWWDIR%%/usr/config.php;fi
 @dirrm %%WWWDIR%%/docs
 @dirrm %%WWWDIR%%/modules/blogroll
 @dirrm %%WWWDIR%%/modules/categories
@@ -80,4 +78,4 @@
 @dirrm %%WWWDIR%%/usr/images/meta
 @dirrm %%WWWDIR%%/usr/images
 @dirrm %%WWWDIR%%/usr
-@dirrm %%WWWDIR%%/
+@dirrm %%WWWDIR%%



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