From owner-svn-ports-head@FreeBSD.ORG Fri Sep 19 21:29:41 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 82CCF312; Fri, 19 Sep 2014 21:29:41 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4DDC6CE6; Fri, 19 Sep 2014 21:29:41 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s8JLTf2S051642; Fri, 19 Sep 2014 21:29:41 GMT (envelope-from antoine@FreeBSD.org) Received: (from antoine@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s8JLTeai051640; Fri, 19 Sep 2014 21:29:40 GMT (envelope-from antoine@FreeBSD.org) Message-Id: <201409192129.s8JLTeai051640@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: antoine set sender to antoine@FreeBSD.org using -f From: Antoine Brodin Date: Fri, 19 Sep 2014 21:29:40 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r368601 - head/www/chems X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 19 Sep 2014 21:29:41 -0000 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 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%%