Date: Tue, 24 Mar 2015 19:16:36 +0000 (UTC) From: Adam Weinberger <adamw@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r382161 - in head/mail: squirrelmail squirrelmail-decode squirrelmail-translations Message-ID: <201503241916.t2OJGaBm045346@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: adamw Date: Tue Mar 24 19:16:35 2015 New Revision: 382161 URL: https://svnweb.freebsd.org/changeset/ports/382161 QAT: https://qat.redports.org/buildarchive/r382161/ Log: Update squirrelmail* to 20150324, and clean up permission/owner handling in the plists. Also, avoid registering plugins during package build. It only makes sense to run the registration on end-user machines, and running it during package building leads to a stagedir violation, as noted in [1]. PR: 198044 [1] Submitted by: amdmi3 Modified: head/mail/squirrelmail-decode/pkg-plist head/mail/squirrelmail-translations/Makefile head/mail/squirrelmail-translations/distinfo head/mail/squirrelmail-translations/pkg-plist head/mail/squirrelmail/Makefile head/mail/squirrelmail/bsd.squirrelmail.mk head/mail/squirrelmail/distinfo head/mail/squirrelmail/pkg-plist Modified: head/mail/squirrelmail-decode/pkg-plist ============================================================================== --- head/mail/squirrelmail-decode/pkg-plist Tue Mar 24 18:47:52 2015 (r382160) +++ head/mail/squirrelmail-decode/pkg-plist Tue Mar 24 19:16:35 2015 (r382161) @@ -35,4 +35,3 @@ %%PORTDOCS%%%%DOCSDIR%%/ChangeLog.decode %%PORTDOCS%%%%DOCSDIR%%/README.decode %%PORTDOCS%%%%DOCSDIR%%/ReleaseNotes.decode -%%PORTDOCS%%@dirrm %%DOCSDIR%% Modified: head/mail/squirrelmail-translations/Makefile ============================================================================== --- head/mail/squirrelmail-translations/Makefile Tue Mar 24 18:47:52 2015 (r382160) +++ head/mail/squirrelmail-translations/Makefile Tue Mar 24 19:16:35 2015 (r382161) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= squirrelmail-translations -PORTVERSION= 20140717 +PORTVERSION= 20150324 CATEGORIES= mail www MASTER_SITES= ${MASTER_SITE_LOCAL} MASTER_SITE_SUBDIR= adamw/squirrelmail @@ -30,5 +30,6 @@ do-build: do-install: @${MKDIR} ${STAGEDIR}${SQUIRRELDIR} (cd ${WRKSRC} && ${COPYTREE_SHARE} "help images locale" ${STAGEDIR}${SQUIRRELDIR}) + ${FIND} ${STAGEDIR}${SQUIRRELDIR} -type d -empty -delete .include <bsd.port.mk> Modified: head/mail/squirrelmail-translations/distinfo ============================================================================== --- head/mail/squirrelmail-translations/distinfo Tue Mar 24 18:47:52 2015 (r382160) +++ head/mail/squirrelmail-translations/distinfo Tue Mar 24 19:16:35 2015 (r382161) @@ -1,2 +1,2 @@ -SHA256 (squirrelmail/squirrelmail-20140717_0200-SVN.locales.tar.bz2) = 5c6c254e4865a52fd8606229932f1c1aab9ac5f6efc450327035fa689fb7c27b -SIZE (squirrelmail/squirrelmail-20140717_0200-SVN.locales.tar.bz2) = 5253895 +SHA256 (squirrelmail/squirrelmail-20150324_0200-SVN.locales.tar.bz2) = 84431f13ac9cb2647ed3efbffe00c38cf2583fc21f2a8510ec34c947a33fc329 +SIZE (squirrelmail/squirrelmail-20150324_0200-SVN.locales.tar.bz2) = 5253697 Modified: head/mail/squirrelmail-translations/pkg-plist ============================================================================== --- head/mail/squirrelmail-translations/pkg-plist Tue Mar 24 18:47:52 2015 (r382160) +++ head/mail/squirrelmail-translations/pkg-plist Tue Mar 24 19:16:35 2015 (r382161) @@ -2785,6 +2785,3 @@ %%SQUIRRELDIR%%/locale/zh_TW/LC_MESSAGES/squirrelmail.mo %%SQUIRRELDIR%%/locale/zh_TW/LC_MESSAGES/squirrelmail.po %%SQUIRRELDIR%%/locale/zh_TW/setup.php -@dir %%SQUIRRELDIR%%/locale/el_GR/LC_MESSAGES/extra -@dir %%SQUIRRELDIR%%/locale/tl_PH/LC_MESSAGES/plugins -@dir %%SQUIRRELDIR%%/locale/uk_UA/LC_MESSAGES/extra Modified: head/mail/squirrelmail/Makefile ============================================================================== --- head/mail/squirrelmail/Makefile Tue Mar 24 18:47:52 2015 (r382160) +++ head/mail/squirrelmail/Makefile Tue Mar 24 19:16:35 2015 (r382161) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= squirrelmail -PORTVERSION= 20141107 +PORTVERSION= 20150324 CATEGORIES= mail www MASTER_SITES= ${MASTER_SITE_LOCAL} MASTER_SITE_SUBDIR= adamw/squirrelmail Modified: head/mail/squirrelmail/bsd.squirrelmail.mk ============================================================================== --- head/mail/squirrelmail/bsd.squirrelmail.mk Tue Mar 24 18:47:52 2015 (r382160) +++ head/mail/squirrelmail/bsd.squirrelmail.mk Tue Mar 24 19:16:35 2015 (r382161) @@ -104,10 +104,10 @@ do-install: post-install: .ifndef WITHOUT_ACTIVATE @${ECHO_CMD} \ - '@exec if [ -f %D/${SQUIRRELDIR_REL}/config/conf.pl ]; then %D/${SQUIRRELDIR_REL}/config/conf.pl --install-plugin ${SQUIRREL_PLUGIN_NAME}; fi' \ + '@exec if [ -f %D/${SQUIRRELDIR_REL}/config/conf.pl -a -z "$$PACKAGE_BUILDING" ]; then %D/${SQUIRRELDIR_REL}/config/conf.pl --install-plugin ${SQUIRREL_PLUGIN_NAME}; fi' \ >> ${TMPPLIST} @${ECHO_CMD} \ - '@unexec if [ -f %D/${SQUIRRELDIR_REL}/config/conf.pl ]; then %D/${SQUIRRELDIR_REL}/config/conf.pl --remove-plugin ${SQUIRREL_PLUGIN_NAME}; fi' \ + '@unexec if [ -f %D/${SQUIRRELDIR_REL}/config/conf.pl -a -z "$$PACKAGE_BUILDING" ]; then %D/${SQUIRRELDIR_REL}/config/conf.pl --remove-plugin ${SQUIRREL_PLUGIN_NAME}; fi' \ >> ${TMPPLIST} .else @${ECHO_CMD} \ Modified: head/mail/squirrelmail/distinfo ============================================================================== --- head/mail/squirrelmail/distinfo Tue Mar 24 18:47:52 2015 (r382160) +++ head/mail/squirrelmail/distinfo Tue Mar 24 19:16:35 2015 (r382161) @@ -1,2 +1,2 @@ -SHA256 (squirrelmail/squirrelmail-20141107_0200-SVN.stable.tar.bz2) = 8cda2d1f1793706ac783a8f344d65e2d5fd12d2877cb20259dd2360d7ef55b9b -SIZE (squirrelmail/squirrelmail-20141107_0200-SVN.stable.tar.bz2) = 553770 +SHA256 (squirrelmail/squirrelmail-20150324_0200-SVN.stable.tar.bz2) = 1890b323d24b91e16f4603300fb734747ae806a595234ad6668ee18751fd66e4 +SIZE (squirrelmail/squirrelmail-20150324_0200-SVN.stable.tar.bz2) = 553138 Modified: head/mail/squirrelmail/pkg-plist ============================================================================== --- head/mail/squirrelmail/pkg-plist Tue Mar 24 18:47:52 2015 (r382160) +++ head/mail/squirrelmail/pkg-plist Tue Mar 24 19:16:35 2015 (r382161) @@ -21,9 +21,7 @@ etc/periodic/daily/111.clean-squirrelmai %%SQUIRRELDIR%%/class/mime/SMimeMessage.class.php %%SQUIRRELDIR%%/class/mime/index.php %%SQUIRRELDIR%%/config/.htaccess -@mode 755 -%%SQUIRRELDIR%%/config/conf.pl -@mode +@(,,755) %%SQUIRRELDIR%%/config/conf.pl %%SQUIRRELDIR%%/config/config_default.php @sample %%SQUIRRELDIR%%/config/config_local.php.sample %%SQUIRRELDIR%%/config/index.php @@ -464,22 +462,5 @@ etc/periodic/daily/111.clean-squirrelmai %%PORTDOCS%%%%DOCSDIR%%/security.txt %%PORTDOCS%%%%DOCSDIR%%/translating.txt %%PORTDOCS%%%%DOCSDIR%%/translating_help.txt -@owner %%SMUSER%% -@group %%SMGROUP%% -@mode 0750 -@dir %%SQUIRRELDIR%%/data -@group -@owner -@mode 0755 -@dir %%SQUIRRELDIR%%/config -@dir %%SQUIRRELDIR%%/class/mime -@dir %%SQUIRRELDIR%%/class/helper -@dir %%SQUIRRELDIR%%/class/deliver -@dir %%SQUIRRELDIR%%/class -@owner %%SMUSER%% -@group %%SMGROUP%% -@mode 0730 -@dir %%SQUIRRELDIR%%/attach -@mode -@group -@owner +@dir(%%SMUSER%%,%%SMGROUP%%,0750) %%SQUIRRELDIR%%/data +@dir(%%SMUSER%%,%%SMGROUP%%,0730) %%SQUIRRELDIR%%/attach
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201503241916.t2OJGaBm045346>