2 files changed, 9 insertions, 100 deletions

diff --git a/www/dotclear/Makefile b/www/dotclear/Makefile
index 0b0c3df1d42f..ac941b17b0a8 100644
--- a/www/dotclear/Makefile
+++ b/www/dotclear/Makefile
@@ -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 iconv gd
 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},@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 <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/www/dotclear/pkg-plist b/www/dotclear/pkg-plist
index 688188a48cdb..c578f286f7fb 100644
--- a/www/dotclear/pkg-plist
+++ b/www/dotclear/pkg-plist
@@ -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