2 files changed, 83 insertions, 81 deletions

diff --git a/www/coppermine/Makefile b/www/coppermine/Makefile
index 0632d5456a12..00135a35328a 100644
--- a/www/coppermine/Makefile
+++ b/www/coppermine/Makefile
@@ -20,6 +20,7 @@ USE_PHP=	mysql pcre ctype
 USES=		zip
 
 NO_BUILD=	yes
+NO_ARCH=	yes
 WRKSRC=		${WRKDIR}/cpg${PORTVERSION:R:R}${PORTVERSION:R:E}x
 DOCFILES=	CHANGELOG.txt COPYING.txt README.txt
 
@@ -40,9 +41,11 @@ pre-everything::
 post-extract:
 	@${CHMOD} -R o-w ${WRKSRC}/
 
-do-install:
+pre-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}/
 	cd ${WRKSRC} && ${INSTALL_DATA} ${DOCFILES} ${STAGEDIR}${DOCSDIR}
+
+do-install:
 	cd ${WRKSRC}/ && ${RM} ${DOCFILES}
 	cd ${WRKSRC}/ && ${COPYTREE_SHARE} . ${STAGEDIR}${WWWDIR}/
 
diff --git a/www/coppermine/pkg-plist b/www/coppermine/pkg-plist
index 237a4ab3a021..47c060ad5f5c 100644
--- a/www/coppermine/pkg-plist
+++ b/www/coppermine/pkg-plist
@@ -2174,85 +2174,84 @@
 %%WWWDIR%%/viewlog.php
 %%WWWDIR%%/xp_publish.php
 %%WWWDIR%%/zipdownload.php
-@dirrm %%WWWDIR%%/themes/water_drop/images
-@dirrm %%WWWDIR%%/themes/water_drop
-@dirrm %%WWWDIR%%/themes/sample/images
-@dirrm %%WWWDIR%%/themes/sample
-@dirrm %%WWWDIR%%/themes/rainy_day/images
-@dirrm %%WWWDIR%%/themes/rainy_day
-@dirrm %%WWWDIR%%/themes/hardwired/images/navbar
-@dirrm %%WWWDIR%%/themes/hardwired/images
-@dirrm %%WWWDIR%%/themes/hardwired
-@dirrm %%WWWDIR%%/themes/eyeball/images/navbar
-@dirrm %%WWWDIR%%/themes/eyeball/images
-@dirrm %%WWWDIR%%/themes/eyeball
-@dirrm %%WWWDIR%%/themes/curve/images
-@dirrm %%WWWDIR%%/themes/curve
-@dirrm %%WWWDIR%%/themes
-@dirrm %%WWWDIR%%/sql
-@dirrm %%WWWDIR%%/plugins/visiblehookpoints/js
-@dirrm %%WWWDIR%%/plugins/visiblehookpoints/css
-@dirrm %%WWWDIR%%/plugins/visiblehookpoints
-@dirrm %%WWWDIR%%/plugins/usergal_alphatabs
-@dirrm %%WWWDIR%%/plugins/sample
-@dirrm %%WWWDIR%%/plugins/opensearch
-@dirrm %%WWWDIR%%/plugins/onlinestats
-@dirrm %%WWWDIR%%/plugins/link_target
-@dirrm %%WWWDIR%%/plugins
-@dirrm %%WWWDIR%%/logs
-@dirrm %%WWWDIR%%/lang
-@dirrm %%WWWDIR%%/js/swfupload
-@dirrm %%WWWDIR%%/js
-@dirrm %%WWWDIR%%/include/transliteration
-@dirrm %%WWWDIR%%/include/makers
-@dirrm %%WWWDIR%%/include/inspekt/validator
-@dirrm %%WWWDIR%%/include/inspekt/filter
-@dirrm %%WWWDIR%%/include/inspekt/error
-@dirrm %%WWWDIR%%/include/inspekt
-@dirrm %%WWWDIR%%/include
-@dirrm %%WWWDIR%%/images/vanity
-@dirrm %%WWWDIR%%/images/tree
-@dirrm %%WWWDIR%%/images/thumbs
-@dirrm %%WWWDIR%%/images/smiles
-@dirrm %%WWWDIR%%/images/os
-@dirrm %%WWWDIR%%/images/navbar
-@dirrm %%WWWDIR%%/images/message
-@dirrm %%WWWDIR%%/images/install
-@dirrm %%WWWDIR%%/images/icons
-@dirrm %%WWWDIR%%/images/fonts
-@dirrm %%WWWDIR%%/images/flags
-@dirrm %%WWWDIR%%/images/extensions
-@dirrm %%WWWDIR%%/images/browser
-@dirrm %%WWWDIR%%/images/batch
-@dirrm %%WWWDIR%%/images
-@dirrm %%WWWDIR%%/docs/tutorial
-@dirrm %%WWWDIR%%/docs/style
-@dirrm %%WWWDIR%%/docs/se/images
-@dirrm %%WWWDIR%%/docs/se
-@dirrm %%WWWDIR%%/docs/nl/images
-@dirrm %%WWWDIR%%/docs/nl
-@dirrm %%WWWDIR%%/docs/js/fullsize
-@dirrm %%WWWDIR%%/docs/js
-@dirrm %%WWWDIR%%/docs/images/themes
-@dirrm %%WWWDIR%%/docs/images/message
-@dirrm %%WWWDIR%%/docs/images/license
-@dirrm %%WWWDIR%%/docs/images/icons
-@dirrm %%WWWDIR%%/docs/images
-@dirrm %%WWWDIR%%/docs/fr/images
-@dirrm %%WWWDIR%%/docs/fr
-@dirrm %%WWWDIR%%/docs/es/images
-@dirrm %%WWWDIR%%/docs/es
-@dirrm %%WWWDIR%%/docs/en/images
-@dirrm %%WWWDIR%%/docs/en
-@dirrm %%WWWDIR%%/docs/de/images
-@dirrm %%WWWDIR%%/docs/de
-@dirrm %%WWWDIR%%/docs
-@dirrm %%WWWDIR%%/css
-@dirrm %%WWWDIR%%/bridge
-@dirrm %%WWWDIR%%/albums/userpics
-@dirrm %%WWWDIR%%/albums/edit
-@dirrm %%WWWDIR%%/albums
-@dirrmtry %%WWWDIR%%
+@dir %%WWWDIR%%/themes/water_drop/images
+@dir %%WWWDIR%%/themes/water_drop
+@dir %%WWWDIR%%/themes/sample/images
+@dir %%WWWDIR%%/themes/sample
+@dir %%WWWDIR%%/themes/rainy_day/images
+@dir %%WWWDIR%%/themes/rainy_day
+@dir %%WWWDIR%%/themes/hardwired/images/navbar
+@dir %%WWWDIR%%/themes/hardwired/images
+@dir %%WWWDIR%%/themes/hardwired
+@dir %%WWWDIR%%/themes/eyeball/images/navbar
+@dir %%WWWDIR%%/themes/eyeball/images
+@dir %%WWWDIR%%/themes/eyeball
+@dir %%WWWDIR%%/themes/curve/images
+@dir %%WWWDIR%%/themes/curve
+@dir %%WWWDIR%%/themes
+@dir %%WWWDIR%%/sql
+@dir %%WWWDIR%%/plugins/visiblehookpoints/js
+@dir %%WWWDIR%%/plugins/visiblehookpoints/css
+@dir %%WWWDIR%%/plugins/visiblehookpoints
+@dir %%WWWDIR%%/plugins/usergal_alphatabs
+@dir %%WWWDIR%%/plugins/sample
+@dir %%WWWDIR%%/plugins/opensearch
+@dir %%WWWDIR%%/plugins/onlinestats
+@dir %%WWWDIR%%/plugins/link_target
+@dir %%WWWDIR%%/plugins
+@dir %%WWWDIR%%/logs
+@dir %%WWWDIR%%/lang
+@dir %%WWWDIR%%/js/swfupload
+@dir %%WWWDIR%%/js
+@dir %%WWWDIR%%/include/transliteration
+@dir %%WWWDIR%%/include/makers
+@dir %%WWWDIR%%/include/inspekt/validator
+@dir %%WWWDIR%%/include/inspekt/filter
+@dir %%WWWDIR%%/include/inspekt/error
+@dir %%WWWDIR%%/include/inspekt
+@dir %%WWWDIR%%/include
+@dir %%WWWDIR%%/images/vanity
+@dir %%WWWDIR%%/images/tree
+@dir %%WWWDIR%%/images/thumbs
+@dir %%WWWDIR%%/images/smiles
+@dir %%WWWDIR%%/images/os
+@dir %%WWWDIR%%/images/navbar
+@dir %%WWWDIR%%/images/message
+@dir %%WWWDIR%%/images/install
+@dir %%WWWDIR%%/images/icons
+@dir %%WWWDIR%%/images/fonts
+@dir %%WWWDIR%%/images/flags
+@dir %%WWWDIR%%/images/extensions
+@dir %%WWWDIR%%/images/browser
+@dir %%WWWDIR%%/images/batch
+@dir %%WWWDIR%%/images
+@dir %%WWWDIR%%/docs/tutorial
+@dir %%WWWDIR%%/docs/style
+@dir %%WWWDIR%%/docs/se/images
+@dir %%WWWDIR%%/docs/se
+@dir %%WWWDIR%%/docs/nl/images
+@dir %%WWWDIR%%/docs/nl
+@dir %%WWWDIR%%/docs/js/fullsize
+@dir %%WWWDIR%%/docs/js
+@dir %%WWWDIR%%/docs/images/themes
+@dir %%WWWDIR%%/docs/images/message
+@dir %%WWWDIR%%/docs/images/license
+@dir %%WWWDIR%%/docs/images/icons
+@dir %%WWWDIR%%/docs/images
+@dir %%WWWDIR%%/docs/fr/images
+@dir %%WWWDIR%%/docs/fr
+@dir %%WWWDIR%%/docs/es/images
+@dir %%WWWDIR%%/docs/es
+@dir %%WWWDIR%%/docs/en/images
+@dir %%WWWDIR%%/docs/en
+@dir %%WWWDIR%%/docs/de/images
+@dir %%WWWDIR%%/docs/de
+@dir %%WWWDIR%%/docs
+@dir %%WWWDIR%%/css
+@dir %%WWWDIR%%/bridge
+@dir %%WWWDIR%%/albums/userpics
+@dir %%WWWDIR%%/albums/edit
+@dir %%WWWDIR%%/albums
+@dir %%WWWDIR%%
 @group
 @owner
-%%PORTDOCS%%@dirrm %%DOCSDIR%%