svn commit: r352759 - head/mail/squirrelmail

[Adam Weinberger]

Author: adamw
Date: Thu May  1 16:36:47 2014
New Revision: 352759
URL: http://svnweb.freebsd.org/changeset/ports/352759
QAT: https://qat.redports.org/buildarchive/r352759/

Log:
  Small cleanups, let pkg-create do permissions and ownerships its own
  way rather than invoking chown and chmod ourselves.

Modified:
  head/mail/squirrelmail/Makefile
  head/mail/squirrelmail/pkg-plist

Modified: head/mail/squirrelmail/Makefile
==============================================================================
--- head/mail/squirrelmail/Makefile	Thu May  1 16:28:52 2014	(r352758)
+++ head/mail/squirrelmail/Makefile	Thu May  1 16:36:47 2014	(r352759)
@@ -97,13 +97,11 @@ do-install:
 	@${MKDIR} ${STAGEDIR}${SQUIRRELDIR}
 	${INSTALL_DATA} ${WRKSRC}/index.php ${STAGEDIR}${SQUIRRELDIR}
 	${INSTALL_SCRIPT} ${WRKSRC}/configure ${STAGEDIR}${SQUIRRELDIR}
-	cd ${WRKSRC} && \
+	(cd ${WRKSRC} && \
 		${FIND} attach class config data functions help images include locale plugins po scripts src themes \
-		| ${CPIO} -pdmu --quiet ${STAGEDIR}${SQUIRRELDIR}
-	${CHMOD} 730 ${STAGEDIR}${SQUIRRELDIR}/attach
-	${CHMOD} 750 ${STAGEDIR}${SQUIRRELDIR}/data
+		| ${CPIO} -pdmu --quiet ${STAGEDIR}${SQUIRRELDIR})
 
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	cd ${WRKSRC}/doc && ${FIND} . | ${CPIO} -pdmu --quiet ${STAGEDIR}${DOCSDIR}
+	(cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR})
 
 .include <bsd.port.mk>

Modified: head/mail/squirrelmail/pkg-plist
==============================================================================
--- head/mail/squirrelmail/pkg-plist	Thu May  1 16:28:52 2014	(r352758)
+++ head/mail/squirrelmail/pkg-plist	Thu May  1 16:36:47 2014	(r352759)
@@ -1,7 +1,5 @@
 etc/periodic/daily/111.clean-squirrelmail
 %%SQUIRRELDIR%%/attach/.htaccess
- at exec chown %%SMUSER%%:%%SMGROUP%% %B
- at exec chmod 730 %B
 %%SQUIRRELDIR%%/class/.htaccess
 %%SQUIRRELDIR%%/class/deliver/Deliver.class.php
 %%SQUIRRELDIR%%/class/deliver/Deliver_IMAP.class.php
@@ -31,8 +29,6 @@ etc/periodic/daily/111.clean-squirrelmai
 %%SQUIRRELDIR%%/data/.htaccess
 @sample %%SQUIRRELDIR%%/data/default_pref.sample
 %%SQUIRRELDIR%%/data/index.php
- at exec chown %%SMUSER%%:%%SMGROUP%% %B
- at exec chmod 750 %B
 %%SQUIRRELDIR%%/functions/.htaccess
 %%SQUIRRELDIR%%/functions/abook_database.php
 %%SQUIRRELDIR%%/functions/abook_ldap_server.php
@@ -502,13 +498,25 @@ etc/periodic/daily/111.clean-squirrelmai
 @dirrm %%SQUIRRELDIR%%/functions/encode
 @dirrm %%SQUIRRELDIR%%/functions/decode
 @dirrm %%SQUIRRELDIR%%/functions
+ at owner %%SMUSER%%
+ at group %%SMGROUP%%
+ at mode 0750
 @dirrm %%SQUIRRELDIR%%/data
+ at mode
+ at group
+ at owner
 @dirrmtry %%SQUIRRELDIR%%/config
 @dirrm %%SQUIRRELDIR%%/class/mime
 @dirrm %%SQUIRRELDIR%%/class/helper
 @dirrm %%SQUIRRELDIR%%/class/deliver
 @dirrm %%SQUIRRELDIR%%/class
+ at owner %%SMUSER%%
+ at group %%SMGROUP%%
+ at mode 0730
 @dirrmtry %%SQUIRRELDIR%%/attach
+ at mode
+ at group
+ at owner
 @dirrmtry %%SQUIRRELDIR%%
 @dirrmtry etc/periodic/daily
 @dirrmtry etc/periodic