From owner-svn-ports-head@FreeBSD.ORG Sun Oct 19 15:33:26 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 00D62752; Sun, 19 Oct 2014 15:33:25 +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 E016B1E8; Sun, 19 Oct 2014 15:33:25 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s9JFXPWE079439; Sun, 19 Oct 2014 15:33:25 GMT (envelope-from antoine@FreeBSD.org) Received: (from antoine@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s9JFXPVJ079436; Sun, 19 Oct 2014 15:33:25 GMT (envelope-from antoine@FreeBSD.org) Message-Id: <201410191533.s9JFXPVJ079436@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: antoine set sender to antoine@FreeBSD.org using -f From: Antoine Brodin Date: Sun, 19 Oct 2014 15:33:25 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r371185 - head/www/rnews 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: Sun, 19 Oct 2014 15:33:26 -0000 Author: antoine Date: Sun Oct 19 15:33:24 2014 New Revision: 371185 URL: https://svnweb.freebsd.org/changeset/ports/371185 QAT: https://qat.redports.org/buildarchive/r371185/ Log: - Allow staging as a regular user - Bump portversion as some directories were not packaged with intended owner Modified: head/www/rnews/Makefile head/www/rnews/pkg-plist Modified: head/www/rnews/Makefile ============================================================================== --- head/www/rnews/Makefile Sun Oct 19 15:18:29 2014 (r371184) +++ head/www/rnews/Makefile Sun Oct 19 15:33:24 2014 (r371185) @@ -3,7 +3,7 @@ PORTNAME= rnews PORTVERSION= 1.01 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION} @@ -57,21 +57,15 @@ do-install: ${INSTALL_DATA} -v ${WRKSRC}/magpierss/*.inc ${STAGEDIR}${WWWDIR}/magpierss ${INSTALL_DATA} ${WRKSRC}/magpierss/extlib/Snoopy.class.inc ${STAGEDIR}${WWWDIR}/magpierss/extlib ${INSTALL_DATA} -v ${WRKSRC}/opml/*.opml ${STAGEDIR}${WWWDIR}/opml - @${CHOWN} ${WWWOWN} ${STAGEDIR}${WWWDIR}/magpierss/cache - @${CHOWN} ${WWWOWN} ${STAGEDIR}${WWWDIR}/img/feeds - @${CHOWN} ${WWWOWN} ${STAGEDIR}${WWWDIR}/tmp .for FILE in ${CONFIGS} ${INSTALL_DATA} ${WRKSRC}/${FILE} ${STAGEDIR}${WWWDIR}/${FILE}.sample .endfor - -post-install: .if ${PORT_OPTIONS:MDOCS} ${MKDIR} ${STAGEDIR}${DOCSDIR} . for FILE in ${PORTDOCS} ${INSTALL_DATA} ${WRKSRC}/${FILE} ${STAGEDIR}${DOCSDIR} . endfor .endif - @${CAT} ${PKGMESSAGE} create-plist: @${FIND} -s ${WRKSRC} \( -name "*.php" -o -name "*.inc" -o -name "*.js" -o -name "*.css" -o -name "*.jpg" \ @@ -79,18 +73,10 @@ create-plist: -and -not -name config_user.php -and -not -name config.php \ | ${SED} -e 's,^${WRKSRC},%%WWWDIR%%,' > ${PLIST} .for FILE in ${CONFIGS} - @${ECHO_CMD} '@exec if [ ! -f %D/%%WWWDIR%%/${FILE} ]; then \ - ${INSTALL_DATA} %D/%%WWWDIR%%/${FILE}.sample %D/%%WWWDIR%%/${FILE}; \ - ${CHOWN} ${WWWOWN} %D/%%WWWDIR%%/${FILE}; \ - ${CHMOD} u+w %D/%%WWWDIR%%/${FILE}; fi' >> ${PLIST} + @${ECHO_CMD} '@sample(${WWWOWN},,) %%WWWDIR%%/${FILE}.sample' >> ${PLIST} .endfor -.for FILE in ${CONFIGS} - @${ECHO_CMD} '@unexec if cmp -s %D/%%WWWDIR%%/${FILE}.sample %D/%%WWWDIR%%/${FILE}; \ - then ${RM} -f %D/%%WWWDIR%%/${FILE}; fi' >> ${PLIST} - @${ECHO_CMD} '%%WWWDIR%%/${FILE}.sample' >> ${PLIST} +.for DIR in magpierss/cache img/feeds tmp + @${ECHO_CMD} '@dir(${WWWOWN},,) %%WWWDIR%%/${DIR}' >> ${PLIST} .endfor - @${ECHO_CMD} '@unexec if [ $$(ls %D/%%WWWDIR%%/img/feeds/|wc -w) -eq 0 ]; then ${RM} -rf %D/%%WWWDIR%%/img/feeds;fi' >> ${PLIST} - @${FIND} -ds ${WRKSRC} -type d -a -not -name feeds \ - | ${SED} -e 's,^${WRKSRC},@dirrm %%WWWDIR%%,' >> ${PLIST} .include Modified: head/www/rnews/pkg-plist ============================================================================== --- head/www/rnews/pkg-plist Sun Oct 19 15:18:29 2014 (r371184) +++ head/www/rnews/pkg-plist Sun Oct 19 15:33:24 2014 (r371185) @@ -108,19 +108,8 @@ %%WWWDIR%%/rollover.js %%WWWDIR%%/search.php %%WWWDIR%%/tmp/.htaccess -@exec if [ ! -f %D/%%WWWDIR%%/inc/config.php ]; then install -o root -g wheel -m 444 %D/%%WWWDIR%%/inc/config.php.sample %D/%%WWWDIR%%/inc/config.php; /usr/sbin/chown www %D/%%WWWDIR%%/inc/config.php; /bin/chmod u+w %D/%%WWWDIR%%/inc/config.php; fi -@exec if [ ! -f %D/%%WWWDIR%%/inc/config_user.php ]; then install -o root -g wheel -m 444 %D/%%WWWDIR%%/inc/config_user.php.sample %D/%%WWWDIR%%/inc/config_user.php; /usr/sbin/chown www %D/%%WWWDIR%%/inc/config_user.php; /bin/chmod u+w %D/%%WWWDIR%%/inc/config_user.php; fi -@unexec if cmp -s %D/%%WWWDIR%%/inc/config.php.sample %D/%%WWWDIR%%/inc/config.php; then /bin/rm -f %D/%%WWWDIR%%/inc/config.php; fi -%%WWWDIR%%/inc/config.php.sample -@unexec if cmp -s %D/%%WWWDIR%%/inc/config_user.php.sample %D/%%WWWDIR%%/inc/config_user.php; then /bin/rm -f %D/%%WWWDIR%%/inc/config_user.php; fi -%%WWWDIR%%/inc/config_user.php.sample -@unexec if [ $(ls %D/%%WWWDIR%%/img/feeds/|wc -w) -eq 0 ]; then /bin/rm -rf %D/%%WWWDIR%%/img/feeds;fi -@dirrmtry %%WWWDIR%%/img/feeds -@dirrm %%WWWDIR%%/img -@dirrm %%WWWDIR%%/inc -@dirrm %%WWWDIR%%/magpierss/cache -@dirrm %%WWWDIR%%/magpierss/extlib -@dirrm %%WWWDIR%%/magpierss -@dirrm %%WWWDIR%%/opml -@dirrm %%WWWDIR%%/tmp -@dirrm %%WWWDIR%% +@sample(www,,) %%WWWDIR%%/inc/config.php.sample +@sample(www,,) %%WWWDIR%%/inc/config_user.php.sample +@dir(www,,) %%WWWDIR%%/magpierss/cache +@dir(www,,) %%WWWDIR%%/img/feeds +@dir(www,,) %%WWWDIR%%/tmp