From 47a5808b2d6c789de1e7d981c47c35a6ea6e647e Mon Sep 17 00:00:00 2001 From: itetcu Date: Sat, 22 May 2010 19:25:13 +0000 Subject: Upate to 2.3.1. Changes: - Updated for compatibility with SquirrelMail 1.4.18 - Added check for patch in configtest for SquirrelMail versions that require it - Added some documentation about error that occurs when Compatibility plugin is missing - Correctly handle plural forms of success message for custom reporting mechanism with ngettext - Minor fix to accomodate Dovecot issue with UIDs that can be bigger than normal integer values Obey NOPORTDOCS; but not DOCSDIR, it doesn't make much sense in this case. Poked by: portscout --- mail/squirrelmail-spam-buttons-plugin/Makefile | 11 ++++++++++- mail/squirrelmail-spam-buttons-plugin/distinfo | 6 +++--- mail/squirrelmail-spam-buttons-plugin/pkg-plist | 12 +++++++++--- 3 files changed, 22 insertions(+), 7 deletions(-) diff --git a/mail/squirrelmail-spam-buttons-plugin/Makefile b/mail/squirrelmail-spam-buttons-plugin/Makefile index ba9212dd35aa..f0c5caa20d38 100644 --- a/mail/squirrelmail-spam-buttons-plugin/Makefile +++ b/mail/squirrelmail-spam-buttons-plugin/Makefile @@ -6,7 +6,7 @@ # PORTNAME= spam-buttons -PORTVERSION= 2.2 +PORTVERSION= 2.3.1 DISTNAME= ${SQUIRREL_PLUGIN_NAME}-${PORTVERSION}-1.4.0 DIST_SUBDIR= squirrelmail @@ -22,4 +22,13 @@ SQUIRREL_PLUGIN_NAME= ${PORTNAME:S/-/_/} .include "${PORTSDIR}/mail/squirrelmail/bsd.squirrelmail.mk" +post-extract: + @${MV} ${WRKSRC}/${_SMSRCDIR}/config_example.php ${WRKSRC}/${_SMSRCDIR}/config.sample.php + @${RM} ${WRKSRC}/${_SMSRCDIR}/README +.ifdef NOPORTDOCS + @${RM} -R ${WRKSRC}/${_SMSRCDIR}/docs +.else + @${MV} ${WRKSRC}/${_SMSRCDIR}/docs ${WRKSRC}/${_SMSRCDIR}/doc +.endif + .include diff --git a/mail/squirrelmail-spam-buttons-plugin/distinfo b/mail/squirrelmail-spam-buttons-plugin/distinfo index ca3133a84ee4..1ee0753252d1 100644 --- a/mail/squirrelmail-spam-buttons-plugin/distinfo +++ b/mail/squirrelmail-spam-buttons-plugin/distinfo @@ -1,3 +1,3 @@ -MD5 (squirrelmail/spam_buttons-2.2-1.4.0.tar.gz) = ae1f28b873961b48c276a0a653e163ec -SHA256 (squirrelmail/spam_buttons-2.2-1.4.0.tar.gz) = ce09d57d92ab327df2492c1e3ffb28a70aa1c2bd3c95283544ab602b32ef359e -SIZE (squirrelmail/spam_buttons-2.2-1.4.0.tar.gz) = 80205 +MD5 (squirrelmail/spam_buttons-2.3.1-1.4.0.tar.gz) = 8b4b712f781b4aac9dec23e64173fab4 +SHA256 (squirrelmail/spam_buttons-2.3.1-1.4.0.tar.gz) = f666ac0ce480aacdf7b5bf647733258f55626ab146af1c26a3effca07ab362f5 +SIZE (squirrelmail/spam_buttons-2.3.1-1.4.0.tar.gz) = 83143 diff --git a/mail/squirrelmail-spam-buttons-plugin/pkg-plist b/mail/squirrelmail-spam-buttons-plugin/pkg-plist index 627027b1fedf..ac675f54d6c6 100644 --- a/mail/squirrelmail-spam-buttons-plugin/pkg-plist +++ b/mail/squirrelmail-spam-buttons-plugin/pkg-plist @@ -1,7 +1,4 @@ @unexec if [ -f %D/%%SQUIRRELDIR%%/config/config.php ]; then %D/%%SQUIRRELDIR%%/config/conf.pl --remove-plugin %%SQUIRREL_PLUGIN_NAME%%; fi -%%SQUIRRELDIR%%/plugins/%%SQUIRREL_PLUGIN_NAME%%/COPYING -%%SQUIRRELDIR%%/plugins/%%SQUIRREL_PLUGIN_NAME%%/INSTALL -%%SQUIRRELDIR%%/plugins/%%SQUIRREL_PLUGIN_NAME%%/README %%SQUIRRELDIR%%/plugins/%%SQUIRREL_PLUGIN_NAME%%/bounce_identity.php %%SQUIRRELDIR%%/plugins/%%SQUIRREL_PLUGIN_NAME%%/bounce_send.php %%SQUIRRELDIR%%/plugins/%%SQUIRREL_PLUGIN_NAME%%/buttons.php @@ -11,14 +8,22 @@ %%SQUIRRELDIR%%/plugins/%%SQUIRREL_PLUGIN_NAME%%/compose_functions-1.5.2.php %%SQUIRRELDIR%%/plugins/%%SQUIRREL_PLUGIN_NAME%%/config.sample.php %%SQUIRRELDIR%%/plugins/%%SQUIRREL_PLUGIN_NAME%%/configtest.php +%%SQUIRRELDIR%%/plugins/%%SQUIRREL_PLUGIN_NAME%%/contrib/index.php +%%SQUIRRELDIR%%/plugins/%%SQUIRREL_PLUGIN_NAME%%/contrib/.htaccess %%SQUIRRELDIR%%/plugins/%%SQUIRREL_PLUGIN_NAME%%/contrib/confirm_action.diff %%SQUIRRELDIR%%/plugins/%%SQUIRREL_PLUGIN_NAME%%/contrib/sa-postfix-en.html %%SQUIRRELDIR%%/plugins/%%SQUIRREL_PLUGIN_NAME%%/contrib/sa-wrapper.html +%%PORTDOCS%%%%SQUIRRELDIR%%/plugins/%%SQUIRREL_PLUGIN_NAME%%/doc/.htaccess +%%PORTDOCS%%%%SQUIRRELDIR%%/plugins/%%SQUIRREL_PLUGIN_NAME%%/doc/index.php +%%PORTDOCS%%%%SQUIRRELDIR%%/plugins/%%SQUIRREL_PLUGIN_NAME%%/doc/INSTALL +%%PORTDOCS%%%%SQUIRRELDIR%%/plugins/%%SQUIRREL_PLUGIN_NAME%%/doc/COPYING +%%PORTDOCS%%%%SQUIRRELDIR%%/plugins/%%SQUIRREL_PLUGIN_NAME%%/doc/README %%SQUIRRELDIR%%/plugins/%%SQUIRREL_PLUGIN_NAME%%/functions.php %%SQUIRRELDIR%%/plugins/%%SQUIRREL_PLUGIN_NAME%%/getpot %%SQUIRRELDIR%%/plugins/%%SQUIRREL_PLUGIN_NAME%%/index.php %%SQUIRRELDIR%%/plugins/%%SQUIRREL_PLUGIN_NAME%%/make_release.sh %%SQUIRRELDIR%%/plugins/%%SQUIRREL_PLUGIN_NAME%%/options.php +%%SQUIRRELDIR%%/plugins/%%SQUIRREL_PLUGIN_NAME%%/patches/.htaccess %%SQUIRRELDIR%%/plugins/%%SQUIRREL_PLUGIN_NAME%%/patches/index.php %%SQUIRRELDIR%%/plugins/%%SQUIRREL_PLUGIN_NAME%%/patches/spam_buttons-squirrelmail-1.4.10.diff %%SQUIRRELDIR%%/plugins/%%SQUIRREL_PLUGIN_NAME%%/patches/spam_buttons-squirrelmail-1.4.3.diff @@ -35,6 +40,7 @@ %%SQUIRRELDIR%%/plugins/%%SQUIRREL_PLUGIN_NAME%%/templates/index.php %%SQUIRRELDIR%%/plugins/%%SQUIRREL_PLUGIN_NAME%%/version @dirrm %%SQUIRRELDIR%%/plugins/%%SQUIRREL_PLUGIN_NAME%%/contrib +%%PORTDOCS%%@dirrm %%SQUIRRELDIR%%/plugins/%%SQUIRREL_PLUGIN_NAME%%/doc @dirrm %%SQUIRRELDIR%%/plugins/%%SQUIRREL_PLUGIN_NAME%%/patches @dirrm %%SQUIRRELDIR%%/plugins/%%SQUIRREL_PLUGIN_NAME%%/templates/default @dirrm %%SQUIRRELDIR%%/plugins/%%SQUIRREL_PLUGIN_NAME%%/templates -- cgit