From owner-svn-ports-all@FreeBSD.ORG Sun Sep 28 13:15:50 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 97CC4D3A; Sun, 28 Sep 2014 13:15:50 +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 7830F9D; Sun, 28 Sep 2014 13:15:50 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s8SDFoDb036689; Sun, 28 Sep 2014 13:15:50 GMT (envelope-from antoine@FreeBSD.org) Received: (from antoine@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s8SDFo4W036686; Sun, 28 Sep 2014 13:15:50 GMT (envelope-from antoine@FreeBSD.org) Message-Id: <201409281315.s8SDFo4W036686@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: antoine set sender to antoine@FreeBSD.org using -f From: Antoine Brodin Date: Sun, 28 Sep 2014 13:15:50 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r369453 - head/www/dotclear X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 28 Sep 2014 13:15:50 -0000 Author: antoine Date: Sun Sep 28 13:15:49 2014 New Revision: 369453 URL: http://svnweb.freebsd.org/changeset/ports/369453 QAT: https://qat.redports.org/buildarchive/r369453/ Log: Allow staging as a regular user Modified: head/www/dotclear/Makefile head/www/dotclear/pkg-plist Modified: head/www/dotclear/Makefile ============================================================================== --- head/www/dotclear/Makefile Sun Sep 28 12:58:27 2014 (r369452) +++ head/www/dotclear/Makefile Sun Sep 28 13:15:49 2014 (r369453) @@ -3,6 +3,7 @@ PORTNAME= dotclear PORTVERSION= 2.1.6 +PORTREVISION= 1 CATEGORIES= www MASTER_SITES= http://freebsd.unixfreunde.de/sources/ @@ -14,22 +15,17 @@ USE_PHP= mysql xml simplexml mbstring ic USE_MYSQL= yes WRKSRC= ${WRKDIR}/${PORTNAME} SUB_FILES= pkg-message -WWWDIR?= ${PREFIX}/www/${PORTNAME} - -.include do-install: @${MKDIR} ${STAGEDIR}${WWWDIR} ${CP} -R ${WRKSRC}/ ${STAGEDIR}${WWWDIR} - ${TOUCH} ${STAGEDIR}${WWWDIR}/inc/config.php - @${CHOWN} ${WWWOWN} ${STAGEDIR}${WWWDIR}/inc/config.php + ${TOUCH} ${STAGEDIR}${WWWDIR}/inc/config.php.sample create-plist: - @${FIND} -s ${WRKSRC}/${file} -not -type d \ + @${FIND} -s ${WRKSRC}/ -not -type d \ | ${SED} -e 's,^${WRKSRC},%%WWWDIR%%,' > ${PLIST} - @${ECHO_CMD} '@exec touch %D/%%WWWDIR%%/inc/config.php;chown ${WWWOWN} %D/%%WWWDIR%%/inc/config.php' >> ${PLIST} - @${ECHO_CMD} '@unexec if [ ! -s %D/%%WWWDIR%%/inc/config.php ];then rm -f %D/%%WWWDIR%%/inc/config.php;fi' >> ${PLIST} - @${FIND} -ds ${WRKSRC}/${file} -type d \ - | ${SED} -e 's,^${WRKSRC},@dirrm %%WWWDIR%%,' >> ${PLIST} + @${ECHO_CMD} '@sample(${WWWOWN},,) %%WWWDIR%%/inc/config.php.sample' >> ${PLIST} + @${FIND} -ds ${WRKSRC}/ -type d -empty \ + | ${SED} -e 's,^${WRKSRC},@dir %%WWWDIR%%,' >> ${PLIST} -.include +.include Modified: head/www/dotclear/pkg-plist ============================================================================== --- head/www/dotclear/pkg-plist Sun Sep 28 12:58:27 2014 (r369452) +++ head/www/dotclear/pkg-plist Sun Sep 28 13:15:49 2014 (r369453) @@ -533,92 +533,5 @@ %%WWWDIR%%/themes/default/tpl/tag.html %%WWWDIR%%/themes/default/tpl/tags.html %%WWWDIR%%/themes/default/tpl/user_head.html -@exec touch %D/%%WWWDIR%%/inc/config.php;chown www %D/%%WWWDIR%%/inc/config.php -@unexec if [ ! -s %D/%%WWWDIR%%/inc/config.php ];then rm -f %D/%%WWWDIR%%/inc/config.php;fi -@dirrm %%WWWDIR%%/admin/images/media -@dirrm %%WWWDIR%%/admin/images/menu -@dirrm %%WWWDIR%%/admin/images -@dirrm %%WWWDIR%%/admin/install -@dirrm %%WWWDIR%%/admin/js/ie7 -@dirrm %%WWWDIR%%/admin/js/jquery -@dirrm %%WWWDIR%%/admin/js/jsToolBar -@dirrm %%WWWDIR%%/admin/js/tool-man -@dirrm %%WWWDIR%%/admin/js -@dirrm %%WWWDIR%%/admin/style/candyUpload -@dirrm %%WWWDIR%%/admin/style/farbtastic -@dirrm %%WWWDIR%%/admin/style/jsToolBar -@dirrm %%WWWDIR%%/admin/style/modal -@dirrm %%WWWDIR%%/admin/style -@dirrm %%WWWDIR%%/admin -@dirrm %%WWWDIR%%/cache -@dirrm %%WWWDIR%%/db -@dirrm %%WWWDIR%%/inc/admin -@dirrm %%WWWDIR%%/inc/clearbricks/common -@dirrm %%WWWDIR%%/inc/clearbricks/dblayer -@dirrm %%WWWDIR%%/inc/clearbricks/dbschema -@dirrm %%WWWDIR%%/inc/clearbricks/filemanager -@dirrm %%WWWDIR%%/inc/clearbricks/html.filter -@dirrm %%WWWDIR%%/inc/clearbricks/html.validator -@dirrm %%WWWDIR%%/inc/clearbricks/image -@dirrm %%WWWDIR%%/inc/clearbricks/mail -@dirrm %%WWWDIR%%/inc/clearbricks/net -@dirrm %%WWWDIR%%/inc/clearbricks/net.http -@dirrm %%WWWDIR%%/inc/clearbricks/net.http.feed -@dirrm %%WWWDIR%%/inc/clearbricks/net.xmlrpc -@dirrm %%WWWDIR%%/inc/clearbricks/pager -@dirrm %%WWWDIR%%/inc/clearbricks/rest -@dirrm %%WWWDIR%%/inc/clearbricks/session.db -@dirrm %%WWWDIR%%/inc/clearbricks/template -@dirrm %%WWWDIR%%/inc/clearbricks/text.wiki2xhtml -@dirrm %%WWWDIR%%/inc/clearbricks/url.handler -@dirrm %%WWWDIR%%/inc/clearbricks/zip -@dirrm %%WWWDIR%%/inc/clearbricks -@dirrm %%WWWDIR%%/inc/core -@dirrm %%WWWDIR%%/inc/dbschema -@dirrm %%WWWDIR%%/inc/public/default-templates -@dirrm %%WWWDIR%%/inc/public -@dirrm %%WWWDIR%%/inc/swf -@dirrm %%WWWDIR%%/inc -@dirrm %%WWWDIR%%/locales/en/help -@dirrm %%WWWDIR%%/locales/en -@dirrm %%WWWDIR%%/locales/fr/help -@dirrm %%WWWDIR%%/locales/fr -@dirrm %%WWWDIR%%/locales -@dirrm %%WWWDIR%%/plugins/aboutConfig -@dirrm %%WWWDIR%%/plugins/akismet -@dirrm %%WWWDIR%%/plugins/antispam/filters -@dirrm %%WWWDIR%%/plugins/antispam/inc -@dirrm %%WWWDIR%%/plugins/antispam -@dirrm %%WWWDIR%%/plugins/blogroll/locales/en -@dirrm %%WWWDIR%%/plugins/blogroll/locales -@dirrm %%WWWDIR%%/plugins/blogroll -@dirrm %%WWWDIR%%/plugins/blowupConfig/alpha-img/page-t -@dirrm %%WWWDIR%%/plugins/blowupConfig/alpha-img -@dirrm %%WWWDIR%%/plugins/blowupConfig/lib -@dirrm %%WWWDIR%%/plugins/blowupConfig -@dirrm %%WWWDIR%%/plugins/externalMedia -@dirrm %%WWWDIR%%/plugins/fairTrackbacks -@dirrm %%WWWDIR%%/plugins/importExport/inc/flat -@dirrm %%WWWDIR%%/plugins/importExport/inc -@dirrm %%WWWDIR%%/plugins/importExport -@dirrm %%WWWDIR%%/plugins/maintenance -@dirrm %%WWWDIR%%/plugins/metadata -@dirrm %%WWWDIR%%/plugins/pages/default-templates -@dirrm %%WWWDIR%%/plugins/pages -@dirrm %%WWWDIR%%/plugins/pings -@dirrm %%WWWDIR%%/plugins/themeEditor -@dirrm %%WWWDIR%%/plugins/widgets -@dirrm %%WWWDIR%%/plugins -@dirrm %%WWWDIR%%/public -@dirrm %%WWWDIR%%/themes/blueSilence/img -@dirrm %%WWWDIR%%/themes/blueSilence -@dirrm %%WWWDIR%%/themes/customCSS/locales/fr -@dirrm %%WWWDIR%%/themes/customCSS/locales -@dirrm %%WWWDIR%%/themes/customCSS -@dirrm %%WWWDIR%%/themes/default/img -@dirrm %%WWWDIR%%/themes/default/js -@dirrm %%WWWDIR%%/themes/default/smilies -@dirrm %%WWWDIR%%/themes/default/tpl -@dirrm %%WWWDIR%%/themes/default -@dirrm %%WWWDIR%%/themes -@dirrm %%WWWDIR%%/ +@sample(www,,) %%WWWDIR%%/inc/config.php.sample +@dir %%WWWDIR%%/public