- Use COPYTREE_* macro instead of our own

- Use -s from test(1) to remove nested shell if
- Do not touch modification time of config.php as in Makefile

Suggested by:	sat
Submitted by:	Razor <bg1tpt at gmail.com>

2 files changed, 4 insertions, 4 deletions

diff --git a/www/phpbb-devel/Makefile b/www/phpbb-devel/Makefile
index 0f840b3ffcfc..a2fb7e0de916 100644
--- a/www/phpbb-devel/Makefile
+++ b/www/phpbb-devel/Makefile
@@ -55,14 +55,14 @@ pre-everything::
 
 do-install:
 	@ ${MKDIR} -m 0775 ${PREFIX}/${PHPBBDIR}
-	@ cd ${WRKSRC} && ${FIND} . ! -name config.php ! -name . -print | ${TAR} cTf - - | ${TAR} xUCf ${PREFIX}/${PHPBBDIR} -
-	@ ${TOUCH} ${PREFIX}/${PHPBBDIR}/config.php
+	@ cd ${WRKSRC} && ${COPYTREE_SHARE} . ${PREFIX}/${PHPBBDIR} "! -name config.php"
+	@ [ -f ${PREFIX}/${PHPBBDIR}/config.php ] || ${TOUCH} ${PREFIX}/${PHPBBDIR}/config.php
 	@ ${CHOWN} -R ${WWWOWN}:${WWWGRP} ${PREFIX}/${PHPBBDIR}
 
 post-install:
 .if !defined(NOPORTDOCS)
 	@ ${MKDIR} ${DOCSDIR}
-	@ cd ${WRKSRC}/docs && ${FIND} . -print | ${TAR} cTf - - | ${TAR} xUCf ${DOCSDIR} -
+	@ cd ${WRKSRC}/docs && ${COPYTREE_SHARE} . ${DOCSDIR}
 
 .if !defined(BATCH)
 	@ ${CAT} ${PKGMESSAGE}
diff --git a/www/phpbb-devel/pkg-plist b/www/phpbb-devel/pkg-plist
index cbcbc44971a0..e30be145efed 100644
--- a/www/phpbb-devel/pkg-plist
+++ b/www/phpbb-devel/pkg-plist
@@ -910,7 +910,7 @@
 %%PHPBBDIR%%/viewtopic.php
 @exec [ -f %D/%%PHPBBDIR%%/config.php ] || touch %D/%%PHPBBDIR%%/config.php
 @exec chown -R %%WWWOWN%%:%%WWWGRP%% %B
-@unexec if [ -f %D/%%PHPBBDIR%%/config.php ]; then if [ `stat -f %%z %D/%%PHPBBDIR%%/config.php` = "0" ] ; then rm -f %D/%%PHPBBDIR%%/config.php; fi; fi
+@unexec [ -s %D/%%PHPBBDIR%%/config.php ] || rm -f %D/%%PHPBBDIR%%/config.php
 @dirrm %%PHPBBDIR%%/styles/subsilver2/theme/images
 @dirrm %%PHPBBDIR%%/styles/subsilver2/theme
 @dirrm %%PHPBBDIR%%/styles/subsilver2/template