svn commit: r369453 - head/www/dotclear

[Antoine Brodin]

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 <bsd.port.pre.mk>
 
 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}, at dirrm %%WWWDIR%%,' >> ${PLIST}
+	@${ECHO_CMD} '@sample(${WWWOWN},,) %%WWWDIR%%/inc/config.php.sample' >> ${PLIST}
+	@${FIND} -ds ${WRKSRC}/ -type d -empty \
+		| ${SED} -e 's,^${WRKSRC}, at dir %%WWWDIR%%,' >> ${PLIST}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

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
- at exec touch %D/%%WWWDIR%%/inc/config.php;chown www %D/%%WWWDIR%%/inc/config.php
- at unexec if [ ! -s %D/%%WWWDIR%%/inc/config.php ];then rm -f %D/%%WWWDIR%%/inc/config.php;fi
- at dirrm %%WWWDIR%%/admin/images/media
- at dirrm %%WWWDIR%%/admin/images/menu
- at dirrm %%WWWDIR%%/admin/images
- at dirrm %%WWWDIR%%/admin/install
- at dirrm %%WWWDIR%%/admin/js/ie7
- at dirrm %%WWWDIR%%/admin/js/jquery
- at dirrm %%WWWDIR%%/admin/js/jsToolBar
- at dirrm %%WWWDIR%%/admin/js/tool-man
- at dirrm %%WWWDIR%%/admin/js
- at dirrm %%WWWDIR%%/admin/style/candyUpload
- at dirrm %%WWWDIR%%/admin/style/farbtastic
- at dirrm %%WWWDIR%%/admin/style/jsToolBar
- at dirrm %%WWWDIR%%/admin/style/modal
- at dirrm %%WWWDIR%%/admin/style
- at dirrm %%WWWDIR%%/admin
- at dirrm %%WWWDIR%%/cache
- at dirrm %%WWWDIR%%/db
- at dirrm %%WWWDIR%%/inc/admin
- at dirrm %%WWWDIR%%/inc/clearbricks/common
- at dirrm %%WWWDIR%%/inc/clearbricks/dblayer
- at dirrm %%WWWDIR%%/inc/clearbricks/dbschema
- at dirrm %%WWWDIR%%/inc/clearbricks/filemanager
- at dirrm %%WWWDIR%%/inc/clearbricks/html.filter
- at dirrm %%WWWDIR%%/inc/clearbricks/html.validator
- at dirrm %%WWWDIR%%/inc/clearbricks/image
- at dirrm %%WWWDIR%%/inc/clearbricks/mail
- at dirrm %%WWWDIR%%/inc/clearbricks/net
- at dirrm %%WWWDIR%%/inc/clearbricks/net.http
- at dirrm %%WWWDIR%%/inc/clearbricks/net.http.feed
- at dirrm %%WWWDIR%%/inc/clearbricks/net.xmlrpc
- at dirrm %%WWWDIR%%/inc/clearbricks/pager
- at dirrm %%WWWDIR%%/inc/clearbricks/rest
- at dirrm %%WWWDIR%%/inc/clearbricks/session.db
- at dirrm %%WWWDIR%%/inc/clearbricks/template
- at dirrm %%WWWDIR%%/inc/clearbricks/text.wiki2xhtml
- at dirrm %%WWWDIR%%/inc/clearbricks/url.handler
- at dirrm %%WWWDIR%%/inc/clearbricks/zip
- at dirrm %%WWWDIR%%/inc/clearbricks
- at dirrm %%WWWDIR%%/inc/core
- at dirrm %%WWWDIR%%/inc/dbschema
- at dirrm %%WWWDIR%%/inc/public/default-templates
- at dirrm %%WWWDIR%%/inc/public
- at dirrm %%WWWDIR%%/inc/swf
- at dirrm %%WWWDIR%%/inc
- at dirrm %%WWWDIR%%/locales/en/help
- at dirrm %%WWWDIR%%/locales/en
- at dirrm %%WWWDIR%%/locales/fr/help
- at dirrm %%WWWDIR%%/locales/fr
- at dirrm %%WWWDIR%%/locales
- at dirrm %%WWWDIR%%/plugins/aboutConfig
- at dirrm %%WWWDIR%%/plugins/akismet
- at dirrm %%WWWDIR%%/plugins/antispam/filters
- at dirrm %%WWWDIR%%/plugins/antispam/inc
- at dirrm %%WWWDIR%%/plugins/antispam
- at dirrm %%WWWDIR%%/plugins/blogroll/locales/en
- at dirrm %%WWWDIR%%/plugins/blogroll/locales
- at dirrm %%WWWDIR%%/plugins/blogroll
- at dirrm %%WWWDIR%%/plugins/blowupConfig/alpha-img/page-t
- at dirrm %%WWWDIR%%/plugins/blowupConfig/alpha-img
- at dirrm %%WWWDIR%%/plugins/blowupConfig/lib
- at dirrm %%WWWDIR%%/plugins/blowupConfig
- at dirrm %%WWWDIR%%/plugins/externalMedia
- at dirrm %%WWWDIR%%/plugins/fairTrackbacks
- at dirrm %%WWWDIR%%/plugins/importExport/inc/flat
- at dirrm %%WWWDIR%%/plugins/importExport/inc
- at dirrm %%WWWDIR%%/plugins/importExport
- at dirrm %%WWWDIR%%/plugins/maintenance
- at dirrm %%WWWDIR%%/plugins/metadata
- at dirrm %%WWWDIR%%/plugins/pages/default-templates
- at dirrm %%WWWDIR%%/plugins/pages
- at dirrm %%WWWDIR%%/plugins/pings
- at dirrm %%WWWDIR%%/plugins/themeEditor
- at dirrm %%WWWDIR%%/plugins/widgets
- at dirrm %%WWWDIR%%/plugins
- at dirrm %%WWWDIR%%/public
- at dirrm %%WWWDIR%%/themes/blueSilence/img
- at dirrm %%WWWDIR%%/themes/blueSilence
- at dirrm %%WWWDIR%%/themes/customCSS/locales/fr
- at dirrm %%WWWDIR%%/themes/customCSS/locales
- at dirrm %%WWWDIR%%/themes/customCSS
- at dirrm %%WWWDIR%%/themes/default/img
- at dirrm %%WWWDIR%%/themes/default/js
- at dirrm %%WWWDIR%%/themes/default/smilies
- at dirrm %%WWWDIR%%/themes/default/tpl
- at dirrm %%WWWDIR%%/themes/default
- at dirrm %%WWWDIR%%/themes
- at dirrm %%WWWDIR%%/
+ at sample(www,,) %%WWWDIR%%/inc/config.php.sample
+ at dir %%WWWDIR%%/public