From owner-svn-ports-head@FreeBSD.ORG Tue Jun 3 05:08:00 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 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 2F5CAE6D; Tue, 3 Jun 2014 05:08:00 +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 1DA972B97; Tue, 3 Jun 2014 05:08:00 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s5357xUi045509; Tue, 3 Jun 2014 05:07:59 GMT (envelope-from miwi@svn.freebsd.org) Received: (from miwi@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s5357xki045507; Tue, 3 Jun 2014 05:07:59 GMT (envelope-from miwi@svn.freebsd.org) Message-Id: <201406030507.s5357xki045507@svn.freebsd.org> From: Martin Wilke Date: Tue, 3 Jun 2014 05:07:59 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r356287 - 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 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: Tue, 03 Jun 2014 05:08:00 -0000 Author: miwi Date: Tue Jun 3 05:07:59 2014 New Revision: 356287 URL: http://svnweb.freebsd.org/changeset/ports/356287 QAT: https://qat.redports.org/buildarchive/r356287/ Log: - Stage support PR: 90394 Modified: head/www/rnews/Makefile head/www/rnews/pkg-plist Modified: head/www/rnews/Makefile ============================================================================== --- head/www/rnews/Makefile Tue Jun 3 05:06:59 2014 (r356286) +++ head/www/rnews/Makefile Tue Jun 3 05:07:59 2014 (r356287) @@ -18,7 +18,6 @@ OPTIONS_DEFINE= GD MYSQLSERVER DOCS OPTIONS_DEFAULT= GD MYSQLSERVER_DESC= Use MySQL-Server on localhost -NO_STAGE= yes .include USE_PHP= mysql mbstring pcre xml iconv @@ -41,42 +40,35 @@ PORTDOCS= CHANGELOG INSTALL LICENSE READ CONFIGS= inc/config.php inc/config_user.php do-install: - @${FIND} -s ${WRKSRC} -type d | ${SED} -e 's,^${WRKSRC},${WWWDIR},' \ + @${FIND} -s ${WRKSRC} -type d | ${SED} -e 's,^${WRKSRC},${STAGEDIR}${WWWDIR},' \ | ${XARGS} ${MKDIR} - ${INSTALL_DATA} -v ${WRKSRC}/*.php ${WWWDIR} - ${INSTALL_DATA} -v ${WRKSRC}/*.css ${WWWDIR} - ${INSTALL_DATA} -v ${WRKSRC}/*.js ${WWWDIR} - ${INSTALL_DATA} ${WRKSRC}/.htaccess ${WWWDIR} - ${INSTALL_DATA} ${WRKSRC}/tmp/.htaccess ${WWWDIR}/tmp - ${INSTALL_DATA} ${WRKSRC}/favicon.ico ${WWWDIR} - ${INSTALL_DATA} ${WRKSRC}/help.html ${WWWDIR} - ${INSTALL_DATA} -v ${WRKSRC}/img/*.gif ${WWWDIR}/img - ${INSTALL_DATA} -v ${WRKSRC}/img/*.png ${WWWDIR}/img - ${INSTALL_DATA} -v ${WRKSRC}/img/*.jpg ${WWWDIR}/img - ( ${FIND} ${WRKSRC}/inc -type f -not -name config_user.php -a -not -name config.php; ${ECHO} ${WWWDIR}/inc ) \ + ${INSTALL_DATA} -v ${WRKSRC}/*.php ${STAGEDIR}${WWWDIR} + ${INSTALL_DATA} -v ${WRKSRC}/*.css ${STAGEDIR}${WWWDIR} + ${INSTALL_DATA} -v ${WRKSRC}/*.js ${STAGEDIR}${WWWDIR} + ${INSTALL_DATA} ${WRKSRC}/.htaccess ${STAGEDIR}${WWWDIR} + ${INSTALL_DATA} ${WRKSRC}/tmp/.htaccess ${STAGEDIR}${WWWDIR}/tmp + ${INSTALL_DATA} ${WRKSRC}/favicon.ico ${STAGEDIR}${WWWDIR} + ${INSTALL_DATA} ${WRKSRC}/help.html ${STAGEDIR}${WWWDIR} + ${INSTALL_DATA} -v ${WRKSRC}/img/*.gif ${STAGEDIR}${WWWDIR}/img + ${INSTALL_DATA} -v ${WRKSRC}/img/*.png ${STAGEDIR}${WWWDIR}/img + ${INSTALL_DATA} -v ${WRKSRC}/img/*.jpg ${STAGEDIR}${WWWDIR}/img + ( ${FIND} ${WRKSRC}/inc -type f -not -name config_user.php -a -not -name config.php; ${ECHO} ${STAGEDIR}${WWWDIR}/inc ) \ | ${XARGS} ${INSTALL_DATA} -v - ${INSTALL_DATA} -v ${WRKSRC}/magpierss/*.inc ${WWWDIR}/magpierss - ${INSTALL_DATA} ${WRKSRC}/magpierss/extlib/Snoopy.class.inc ${WWWDIR}/magpierss/extlib - ${INSTALL_DATA} -v ${WRKSRC}/opml/*.opml ${WWWDIR}/opml - @${CHOWN} ${WWWOWN} ${WWWDIR}/magpierss/cache - @${CHOWN} ${WWWOWN} ${WWWDIR}/img/feeds - @${CHOWN} ${WWWOWN} ${WWWDIR}/tmp + ${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} ${WWWDIR}/${FILE}.sample + ${INSTALL_DATA} ${WRKSRC}/${FILE} ${STAGEDIR}${WWWDIR}/${FILE}.sample .endfor post-install: -.for FILE in ${CONFIGS} -. if !exists(${WWWDIR}/${FILE}) - ${INSTALL_DATA} ${WWWDIR}/${FILE}.sample ${WWWDIR}/${FILE} - @${CHOWN} ${WWWOWN} ${WWWDIR}/${FILE} - @${CHMOD} u+w ${WWWDIR}/${FILE} -. endif -.endfor .if ${PORT_OPTIONS:MDOCS} - ${MKDIR} ${DOCSDIR} + ${MKDIR} ${STAGEDIR}${DOCSDIR} . for FILE in ${PORTDOCS} - ${INSTALL_DATA} ${WRKSRC}/${FILE} ${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/${FILE} ${STAGEDIR}${DOCSDIR} . endfor .endif @${CAT} ${PKGMESSAGE} Modified: head/www/rnews/pkg-plist ============================================================================== --- head/www/rnews/pkg-plist Tue Jun 3 05:06:59 2014 (r356286) +++ head/www/rnews/pkg-plist Tue Jun 3 05:07:59 2014 (r356287) @@ -115,6 +115,7 @@ @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