Update to 2.2:

 Requires: SquirrelMail 1.4.0+, Compatibility 2.0.7+
 Description:
 - Added ability to add any number of extra custom buttons/links, such as
   whitelist or blacklist, etc. See configuration file for details
 - Added new report method: custom PHP callback - sample implementation is
   included, but is ultimately your reponsibility
 - Fixed possible PHP notices caused by unmigrated prefs (v2.0->v2.1+)
 - Fine-tuned some internal logic for when buttons are shown or not
 - Slightly better, more efficient header inspection
 - Fix bug in report-by-email-attachment functionality for 1.4.14+ and 1.5.2+
 - Added ability to decide if spam reports sent as email attachments should be
   stored in user's sent folder or not
 - Added ability to store configuration file in main SquirrelMail config
   directory (must be named "config_spam_buttons.php") (if you want this you
   must do it by hand, the port doens't install it there).

Use bsd.squirrelmail.mk.

Prompted by:	portscout (via miwi@)

3 files changed, 8 insertions, 66 deletions

diff --git a/mail/squirrelmail-spam-buttons-plugin/Makefile b/mail/squirrelmail-spam-buttons-plugin/Makefile
index 2bc5ae0207f5..504aabdb39cb 100644
--- a/mail/squirrelmail-spam-buttons-plugin/Makefile
+++ b/mail/squirrelmail-spam-buttons-plugin/Makefile
@@ -6,78 +6,19 @@
 #
 
 PORTNAME=	spam-buttons
-PORTVERSION=	2.1
-PORTREVISION=	1
-CATEGORIES=	mail www
-MASTER_SITES=	http://www.squirrelmail.org/plugins/
-PKGNAMEPREFIX=	squirrelmail-
-PKGNAMESUFFIX=	-plugin
-DISTNAME=	${PORTNAME:S/-/_/}-${PORTVERSION}-1.4.0
+PORTVERSION=	2.2
+DISTNAME=	${SQUIRREL_PLUGIN_NAME}-${PORTVERSION}-1.4.0
 DIST_SUBDIR=	squirrelmail
 
 MAINTAINER=	itetcu@FreeBSD.org
 COMMENT=	Provides buttons with customizable action (for reporting spam, etc.)
 
-RUN_DEPENDS=	${SQUIRRELDIR}/index.php:${PORTSDIR}/mail/squirrelmail \
-		${SQUIRRELDIR}/plugins/compatibility:${PORTSDIR}/mail/squirrelmail-compatibility-plugin
+USE_SM_COMPAT=	yes
 
 SQUIRREL_PLUGIN_NAME=	${PORTNAME:S/-/_/}
 
-.ifdef SQUIRRELDIR
-PLIST_SUB+=	SQUIRRELDIR=${SQUIRRELDIR}
-SUB_LIST+=	SQUIRRELDIR=${SQUIRRELDIR}
-.else
-.ifndef WITHOUT_WWWDIR
-SQUIRRELDIR=	${PREFIX}/www/squirrelmail
-PLIST_SUB+=	SQUIRRELDIR=www/squirrelmail
-SUB_LIST+=	SQUIRRELDIR=www/squirrelmail
-.else
-SQUIRRELDIR=	${PREFIX}/squirrelmail
-PLIST_SUB+=	SQUIRRELDIR=squirrelmail
-SUB_LIST+=	SQUIRRELDIR=squirrelmail
-.endif
-.endif
-PLIST_SUB+=	SQUIRREL_PLUGIN_NAME=${SQUIRREL_PLUGIN_NAME}
-
-SUB_FILES=	pkg-message
-SUB_LIST+=	SQUIRREL_PLUGIN_NAME=${SQUIRREL_PLUGIN_NAME}
-
-NO_BUILD=		yes
-NO_WRKSUBDIR=		yes
-USE_PERL5_BUILD=	yes
-USE_PHP=		yes
-WANT_PHP_WEB=		yes
-
 .include <bsd.port.pre.mk>
 
-pre-everything::
-	@${ECHO} ""
-.ifndef WITHOUT_ACTIVATE
-	@${ECHO} "Activating plug-in in SquirrelMail after installation."
-	@${ECHO} "If you don't want to automatically activate the plug-in set"
-	@${ECHO} "WITHOUT_ACTIVATE=yes"
-.else
-	@${ECHO} "NOT Activating plug-in in SquirrelMail after installation."
-	@${ECHO} "If you want to automatically activate the plug-in unset"
-	@${ECHO} "WITHOUT_ACTIVATE"
-.endif
-	@${ECHO} ""
-
-do-install:
-	${CP} -R ${WRKSRC}/${SQUIRREL_PLUGIN_NAME} ${SQUIRRELDIR}/plugins
-	${CHOWN} -R ${WWWOWN}:${WWWGRP} ${SQUIRRELDIR}/plugins/${SQUIRREL_PLUGIN_NAME}
-
-post-install:
-.ifndef WITHOUT_ACTIVATE
-.if exists( ${SQUIRRELDIR}/config/config.php )
-	@${ECHO} "Activating plug-in in SquirrelMail"
-	${SQUIRRELDIR}/config/conf.pl --install-plugin ${SQUIRREL_PLUGIN_NAME}
-.endif
-.else
-	@${ECHO} "To activate the plug-in in SquirrelMail use"
-	@${ECHO} "${SQUIRRELDIR}/config/conf.pl --install-plugin ${SQUIRREL_PLUGIN_NAME}"
-.endif
-	@${ECHO} ""
-	@${CAT} ${PKGMESSAGE}
+.include "${PORTSDIR}/mail/squirrelmail/bsd.squirrelmail.mk"
 
 .include <bsd.port.post.mk>
diff --git a/mail/squirrelmail-spam-buttons-plugin/distinfo b/mail/squirrelmail-spam-buttons-plugin/distinfo
index 643cf45513a8..ca3133a84ee4 100644
--- a/mail/squirrelmail-spam-buttons-plugin/distinfo
+++ b/mail/squirrelmail-spam-buttons-plugin/distinfo
@@ -1,3 +1,3 @@
-MD5 (squirrelmail/spam_buttons-2.1-1.4.0.tar.gz) = e9b1a72e6cc7426826e4e0b6c8723ec2
-SHA256 (squirrelmail/spam_buttons-2.1-1.4.0.tar.gz) = cf428f48542c15ea4ea74ddeaaaca9c4f12e8bd67e4dc68f74c825cc4bc58027
-SIZE (squirrelmail/spam_buttons-2.1-1.4.0.tar.gz) = 68534
+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
diff --git a/mail/squirrelmail-spam-buttons-plugin/pkg-plist b/mail/squirrelmail-spam-buttons-plugin/pkg-plist
index 711248f6f37c..627027b1fedf 100644
--- a/mail/squirrelmail-spam-buttons-plugin/pkg-plist
+++ b/mail/squirrelmail-spam-buttons-plugin/pkg-plist
@@ -11,6 +11,7 @@
 %%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/confirm_action.diff
 %%SQUIRRELDIR%%/plugins/%%SQUIRREL_PLUGIN_NAME%%/contrib/sa-postfix-en.html
 %%SQUIRRELDIR%%/plugins/%%SQUIRREL_PLUGIN_NAME%%/contrib/sa-wrapper.html
 %%SQUIRRELDIR%%/plugins/%%SQUIRREL_PLUGIN_NAME%%/functions.php