54 files changed, 157 insertions, 263 deletions

diff --git a/mail/squirrelmail-abook_import_export-plugin/Makefile b/mail/squirrelmail-abook_import_export-plugin/Makefile
index 4688cc38f067..d9f9a824aecf 100644
--- a/mail/squirrelmail-abook_import_export-plugin/Makefile
+++ b/mail/squirrelmail-abook_import_export-plugin/Makefile
@@ -12,5 +12,7 @@ COMMENT=	Allows for the importing of addressbooks from a CSV (comma separated va
 SQUIRREL_PLUGIN_NAME=	${PORTNAME:S/-/_/}
 
 NO_STAGE=	yes
+
+.include <bsd.port.pre.mk>
 .include "${.CURDIR}/../squirrelmail/bsd.squirrelmail.mk"
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/mail/squirrelmail-abook_import_export-plugin/files/pkg-message.in b/mail/squirrelmail-abook_import_export-plugin/files/pkg-message.in
index f973030e458b..96bae130e442 100644
--- a/mail/squirrelmail-abook_import_export-plugin/files/pkg-message.in
+++ b/mail/squirrelmail-abook_import_export-plugin/files/pkg-message.in
@@ -1,7 +1,7 @@
 ================================================================
 You may want to copy the file
-%%PREFIX%%/%%SQUIRRELDIR%%/plugins/%%SQUIRREL_PLUGIN_NAME%%/config_default.php
+%%SQUIRRELDIR%%/plugins/%%SQUIRREL_PLUGIN_NAME%%/config_default.php
 to
-%%PREFIX%%/%%SQUIRRELDIR%%/plugins/%%SQUIRREL_PLUGIN_NAME%%/config.php
+%%SQUIRRELDIR%%/plugins/%%SQUIRREL_PLUGIN_NAME%%/config.php
 and edit the configuration to meet your needs.
 ================================================================
diff --git a/mail/squirrelmail-askuserinfo-plugin/Makefile b/mail/squirrelmail-askuserinfo-plugin/Makefile
index bc65555e643b..01e1fa3fa3cb 100644
--- a/mail/squirrelmail-askuserinfo-plugin/Makefile
+++ b/mail/squirrelmail-askuserinfo-plugin/Makefile
@@ -3,11 +3,12 @@
 PORTNAME=	askuserinfo
 PORTVERSION=	1.1
 DISTNAME=	${PORTNAME}.${PORTVERSION}-1.4.0
-DIST_SUBDIR=	squirrelmail
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Ask user to enter Full name and Email address at initial logon
 
 NO_STAGE=	yes
+
+.include <bsd.port.pre.mk>
 .include "${.CURDIR}/../squirrelmail/bsd.squirrelmail.mk"
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/mail/squirrelmail-avelsieve-plugin/Makefile b/mail/squirrelmail-avelsieve-plugin/Makefile
index 1ccecbc11cea..8532af9a34e7 100644
--- a/mail/squirrelmail-avelsieve-plugin/Makefile
+++ b/mail/squirrelmail-avelsieve-plugin/Makefile
@@ -4,20 +4,17 @@
 PORTNAME=	avelsieve
 PORTVERSION=	1.9.7
 PORTREVISION=	2
-DIST_SUBDIR=	squirrelmail
 
 MAINTAINER=	neil@darlow.co.uk
 COMMENT=	SquirrelMail plugin for Server-Side Mail Filtering management
 
-USES=		perl5
-USE_PERL5=	run
-
 NO_STAGE=	yes
-.include "${.CURDIR}/../squirrelmail/bsd.squirrelmail.mk"
 
 pre-install:
 	${RM} -Rf ${WRKSRC}/${SQUIRREL_PLUGIN_NAME}/po
 	${FIND} ${WRKSRC}/${SQUIRREL_PLUGIN_NAME} -type f \
 		\( -name '.cvsignore' -o -name '*.bak' -o -name '*.orig' \) -exec ${RM} {} \;
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+.include "${.CURDIR}/../squirrelmail/bsd.squirrelmail.mk"
+.include <bsd.port.post.mk>
diff --git a/mail/squirrelmail-avelsieve-plugin/files/pkg-message.in b/mail/squirrelmail-avelsieve-plugin/files/pkg-message.in
index 69bee7653088..c50c81cd3389 100644
--- a/mail/squirrelmail-avelsieve-plugin/files/pkg-message.in
+++ b/mail/squirrelmail-avelsieve-plugin/files/pkg-message.in
@@ -1,8 +1,8 @@
 *** IMPORTANT *** IMPORTANT *** IMPORTANT ***
 
 To configure the plugin, please copy
-    %%PREFIX%%/%%SQUIRRELDIR%%/plugins/%%SQUIRREL_PLUGIN_NAME%%/config/config_sample.php to
-    %%PREFIX%%/%%SQUIRRELDIR%%/plugins/%%SQUIRREL_PLUGIN_NAME%%/config/config.php
+    %%SQUIRRELDIR%%/plugins/%%SQUIRREL_PLUGIN_NAME%%/config/config_sample.php to
+    %%SQUIRRELDIR%%/plugins/%%SQUIRREL_PLUGIN_NAME%%/config/config.php
 then review, and modify, its content for your environment.
 
 *** IMPORTANT *** IMPORTANT *** IMPORTANT ***
diff --git a/mail/squirrelmail-calendar_file_backend-plugin/Makefile b/mail/squirrelmail-calendar_file_backend-plugin/Makefile
index 67548d31b4b4..88171c00ebb0 100644
--- a/mail/squirrelmail-calendar_file_backend-plugin/Makefile
+++ b/mail/squirrelmail-calendar_file_backend-plugin/Makefile
@@ -2,16 +2,15 @@
 # $FreeBSD$
 
 PORTNAME=		calendar_file_backend
-PORTVERSION=		1.0
+PORTVERSION=	1.0
 PORTREVISION=	1
 DISTNAME=		${PORTNAME}-${PORTVERSION}-2.0
-DIST_SUBDIR=		squirrelmail
 
 MAINTAINER=		ports@FreeBSD.org
 COMMENT=		File backend for SquirrelMail Calendar plugin
 
-SQUIRREL_PLUGIN_NAME=	${PORTNAME}
+NO_STAGE=		yes
 
-NO_STAGE=	yes
+.include <bsd.port.pre.mk>
 .include "${.CURDIR}/../squirrelmail/bsd.squirrelmail.mk"
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/mail/squirrelmail-change_ldappass-plugin/Makefile b/mail/squirrelmail-change_ldappass-plugin/Makefile
index 4215c7089a81..dd6f6dcde0ac 100644
--- a/mail/squirrelmail-change_ldappass-plugin/Makefile
+++ b/mail/squirrelmail-change_ldappass-plugin/Makefile
@@ -5,7 +5,6 @@ PORTNAME=	change_ldappass
 PORTVERSION=	2.2
 PORTREVISION=	4
 DISTNAME=	${PORTNAME}-${PORTVERSION}-1.4.0
-DIST_SUBDIR=	squirrelmail
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Allows users to change their passwords stored in LDAP Tree
@@ -15,6 +14,10 @@ LICENSE=	GPLv2
 USE_PHP+=	ldap
 USES=		gettext
 
+USE_GENERIC_PKGMESSAGE=	yes
+
 NO_STAGE=	yes
+
+.include <bsd.port.pre.mk>
 .include "${.CURDIR}/../squirrelmail/bsd.squirrelmail.mk"
 .include <bsd.port.mk>
diff --git a/mail/squirrelmail-change_ldappass-plugin/files/pkg-message.in b/mail/squirrelmail-change_ldappass-plugin/files/pkg-message.in
deleted file mode 100644
index 9806275ff224..000000000000
--- a/mail/squirrelmail-change_ldappass-plugin/files/pkg-message.in
+++ /dev/null
@@ -1,5 +0,0 @@
-For the port to work properly you must copy the file 
-%%PREFIX%%/%%SQUIRRELDIR%%/plugins/change_ldappass/config_sample.php
-to
-%%PREFIX%%/%%SQUIRRELDIR%%/plugins/change_ldappass/config.php
-and edit the configuration to meet your needs.
diff --git a/mail/squirrelmail-change_sqlpass-plugin/Makefile b/mail/squirrelmail-change_sqlpass-plugin/Makefile
index 0d37b0840e1e..df085a50dbf8 100644
--- a/mail/squirrelmail-change_sqlpass-plugin/Makefile
+++ b/mail/squirrelmail-change_sqlpass-plugin/Makefile
@@ -5,7 +5,6 @@ PORTNAME=	change-sqlpass
 PORTVERSION=	3.3
 PORTREVISION=	1
 DISTNAME=	${PORTNAME:S/-/_/}-${PORTVERSION}-1.2
-DIST_SUBDIR=	squirrelmail
 
 MAINTAINER=	itetcu@FreeBSD.org
 COMMENT=	Allows users to change their passwords stored in a SQL database
@@ -17,5 +16,7 @@ RUN_DEPENDS=	${LOCALBASE}/share/pear/DB.php:${PORTSDIR}/databases/pear-DB
 SQUIRREL_PLUGIN_NAME=	${PORTNAME:S/-/_/}
 
 NO_STAGE=	yes
+
+.include <bsd.port.pre.mk>
 .include "${.CURDIR}/../squirrelmail/bsd.squirrelmail.mk"
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/mail/squirrelmail-change_sqlpass-plugin/files/pkg-message.in b/mail/squirrelmail-change_sqlpass-plugin/files/pkg-message.in
index 902c57f01aa9..4541f495bff2 100644
--- a/mail/squirrelmail-change_sqlpass-plugin/files/pkg-message.in
+++ b/mail/squirrelmail-change_sqlpass-plugin/files/pkg-message.in
@@ -1,7 +1,7 @@
 ================================================================
 For the port to work properly you must copy the file
-%%PREFIX%%/%%SQUIRRELDIR%%/plugins/%%SQUIRREL_PLUGIN_NAME%%/config.php.sample
+%%SQUIRRELDIR%%/plugins/%%SQUIRREL_PLUGIN_NAME%%/config.php.sample
 to
-%%PREFIX%%/%%SQUIRRELDIR%%/plugins/%%SQUIRREL_PLUGIN_NAME%%/config.php
+%%SQUIRRELDIR%%/plugins/%%SQUIRREL_PLUGIN_NAME%%/config.php
 and edit the configuration to meet your needs.
 ================================================================
diff --git a/mail/squirrelmail-check_quota-plugin/Makefile b/mail/squirrelmail-check_quota-plugin/Makefile
index 41639a8ab9a0..cb4efedb943f 100644
--- a/mail/squirrelmail-check_quota-plugin/Makefile
+++ b/mail/squirrelmail-check_quota-plugin/Makefile
@@ -5,7 +5,6 @@ PORTNAME=	check-quota
 PORTVERSION=	2.2
 PORTREVISION=	1
 DISTNAME=	${PORTNAME:S/-/_/}-${PORTVERSION}-1.4.0
-DIST_SUBDIR=	squirrelmail
 
 MAINTAINER=	itetcu@FreeBSD.org
 COMMENT=	Check/display users' mail quota (filesystem, IMAP-based, and cPanel)
@@ -15,6 +14,7 @@ USE_SM_COMPAT=	YES
 SQUIRREL_PLUGIN_NAME=	${PORTNAME:S/-/_/}
 
 NO_STAGE=	yes
-.include "${.CURDIR}/../squirrelmail/bsd.squirrelmail.mk"
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+.include "${.CURDIR}/../squirrelmail/bsd.squirrelmail.mk"
+.include <bsd.port.post.mk>
diff --git a/mail/squirrelmail-check_quota-plugin/files/pkg-message.in b/mail/squirrelmail-check_quota-plugin/files/pkg-message.in
index 1a5735477804..392a18e2d32d 100644
--- a/mail/squirrelmail-check_quota-plugin/files/pkg-message.in
+++ b/mail/squirrelmail-check_quota-plugin/files/pkg-message.in
@@ -1,7 +1,7 @@
 ================================================================
 For the port to work properly you must copy the file
-%%PREFIX%%/%%SQUIRRELDIR%%/plugins/%%SQUIRREL_PLUGIN_NAME%%/config.sample.php
+%%SQUIRRELDIR%%/plugins/%%SQUIRREL_PLUGIN_NAME%%/config.sample.php
 to
-%%PREFIX%%/%%SQUIRRELDIR%%/plugins/%%SQUIRREL_PLUGIN_NAME%%/config.php
+%%SQUIRRELDIR%%/plugins/%%SQUIRREL_PLUGIN_NAME%%/config.php
 and edit the configuration to meet your needs.
 ================================================================
diff --git a/mail/squirrelmail-compatibility-plugin/Makefile b/mail/squirrelmail-compatibility-plugin/Makefile
index f68d21f844c9..77f13d24660f 100644
--- a/mail/squirrelmail-compatibility-plugin/Makefile
+++ b/mail/squirrelmail-compatibility-plugin/Makefile
@@ -4,18 +4,11 @@
 PORTNAME=	compatibility
 PORTVERSION=	2.0.16
 CATEGORIES=	mail www
-MASTER_SITES=	http://www.squirrelmail.org/plugins/
-PKGNAMEPREFIX=	squirrelmail-
-PKGNAMESUFFIX=	-plugin
 DISTNAME=	${PORTNAME}-${PORTVERSION}-1.0
-DIST_SUBDIR=	squirrelmail
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Required by many plugins for compatibility with SquirrelMail
 
-USES=		perl5
-USE_PERL5=	install
-
 NO_STAGE=	yes
 
 .include <bsd.port.pre.mk>
diff --git a/mail/squirrelmail-email_footer-plugin/Makefile b/mail/squirrelmail-email_footer-plugin/Makefile
index 3a85d76179bf..514fc3c91c1f 100644
--- a/mail/squirrelmail-email_footer-plugin/Makefile
+++ b/mail/squirrelmail-email_footer-plugin/Makefile
@@ -2,17 +2,19 @@
 # $FreeBSD$
 
 PORTNAME=	email_footer
-PORTVERSION=	0.6
+PORTVERSION=0.6
 DISTNAME=	${PORTNAME}-${PORTVERSION}-1.4.2
-DIST_SUBDIR=	squirrelmail
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Automatically appends footer to SquirrelMail-generated emails
 
-RUN_DEPENDS+=	${SQUIRRELDIR}/plugins/compatibility:${PORTSDIR}/mail/squirrelmail-compatibility-plugin
+USE_SM_COMPAT=	yes
+USE_GENERIC_PKGMESSAGE=	yes
 
 LICENSE=	GPLv2
 
 NO_STAGE=	yes
+
+.include <bsd.port.pre.mk>
 .include "${.CURDIR}/../squirrelmail/bsd.squirrelmail.mk"
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/mail/squirrelmail-email_footer-plugin/files/pkg-message.in b/mail/squirrelmail-email_footer-plugin/files/pkg-message.in
deleted file mode 100644
index 8feecfb8f70d..000000000000
--- a/mail/squirrelmail-email_footer-plugin/files/pkg-message.in
+++ /dev/null
@@ -1,5 +0,0 @@
-For the port to work properly you must copy the file
-%%PREFIX%%/%%SQUIRRELDIR%%/plugins/email_footer/config.php.sample
-to
-%%PREFIX%%/%%SQUIRRELDIR%%/plugins/email_footer/config.php
-and edit the configuration to meet your needs.
diff --git a/mail/squirrelmail-login_auth-plugin/Makefile b/mail/squirrelmail-login_auth-plugin/Makefile
index e4695255ebbb..ac246f84cf44 100644
--- a/mail/squirrelmail-login_auth-plugin/Makefile
+++ b/mail/squirrelmail-login_auth-plugin/Makefile
@@ -6,7 +6,6 @@ PORTVERSION=		3.0
 MASTER_SITES=		http://www.squirrelmail.org/plugins/ \
 			http://www.transit.hanse.de/mirror/www.squirrelmail.org/plugins/
 DISTNAME=		${PORTNAME}-${PORTVERSION}-1.4.0
-DIST_SUBDIR=		squirrelmail
 
 MAINTAINER=		stb@lassitu.de
 COMMENT=		Automatically log in user based on HTTP authentication
@@ -14,5 +13,7 @@ COMMENT=		Automatically log in user based on HTTP authentication
 SQUIRREL_PLUGIN_NAME=	${PORTNAME}
 
 NO_STAGE=	yes
+
+.include <bsd.port.pre.mk>
 .include "${.CURDIR}/../squirrelmail/bsd.squirrelmail.mk"
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/mail/squirrelmail-login_notes-plugin/Makefile b/mail/squirrelmail-login_notes-plugin/Makefile
index e103bcd81497..7cca9f313a64 100644
--- a/mail/squirrelmail-login_notes-plugin/Makefile
+++ b/mail/squirrelmail-login_notes-plugin/Makefile
@@ -2,20 +2,19 @@
 # $FreeBSD$
 
 PORTNAME=	login_notes
-PORTVERSION=	1.2
+PORTVERSION=1.2
 DISTNAME=	${SQUIRREL_PLUGIN_NAME}-${PORTVERSION}-1.4.0
-DIST_SUBDIR=	squirrelmail
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Place notes on the login screen
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS+=	${SQUIRRELDIR}/plugins/compatibility:${PORTSDIR}/mail/squirrelmail-compatibility-plugin
-
-USES=		perl5
-USE_PERL5=	run
+USE_SM_COMPAT=	yes
+USE_GENERIC_PKGMESSAGE=	yes
 
 NO_STAGE=	yes
+
+.include <bsd.port.pre.mk>
 .include "${.CURDIR}/../squirrelmail/bsd.squirrelmail.mk"
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/mail/squirrelmail-login_notes-plugin/files/pkg-message.in b/mail/squirrelmail-login_notes-plugin/files/pkg-message.in
deleted file mode 100644
index c3309b9090ed..000000000000
--- a/mail/squirrelmail-login_notes-plugin/files/pkg-message.in
+++ /dev/null
@@ -1,5 +0,0 @@
-For the port to work properly you must copy the file
-%%PREFIX%%/%%SQUIRRELDIR%%/plugins/login_notes/config.sample.php
-to
-%%PREFIX%%/%%SQUIRRELDIR%%/plugins/login_notes/config.php
-and edit the configuration to meet your needs.
diff --git a/mail/squirrelmail-mark_read-plugin/Makefile b/mail/squirrelmail-mark_read-plugin/Makefile
index 43c3c7a3293d..29240ff99040 100644
--- a/mail/squirrelmail-mark_read-plugin/Makefile
+++ b/mail/squirrelmail-mark_read-plugin/Makefile
@@ -5,14 +5,11 @@ PORTNAME=	mark_read
 PORTVERSION=	1.4.2
 PORTREVISION=	2
 DISTNAME=	${PORTNAME:S/-/_/}-${PORTVERSION}-1.2
-DIST_SUBDIR=	squirrelmail
 
 MAINTAINER=	itetcu@FreeBSD.org
 COMMENT=	Provides one-click link to mark read/unread all mails in a folder
 
 USE_SM_COMPAT=	YES
-USES=		perl5
-USE_PERL5=	run
 
 SQUIRREL_PLUGIN_NAME=	${PORTNAME:S/-/_/}
 
@@ -20,5 +17,6 @@ NO_STAGE=	yes
 post-patch:
 	@${RM} ${WRKSRC}/${SQUIRREL_PLUGIN_NAME}/mark_read.php.orig
 
+.include <bsd.port.pre.mk>
 .include "${.CURDIR}/../squirrelmail/bsd.squirrelmail.mk"
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/mail/squirrelmail-mark_read-plugin/files/pkg-message.in b/mail/squirrelmail-mark_read-plugin/files/pkg-message.in
index 1a5735477804..392a18e2d32d 100644
--- a/mail/squirrelmail-mark_read-plugin/files/pkg-message.in
+++ b/mail/squirrelmail-mark_read-plugin/files/pkg-message.in
@@ -1,7 +1,7 @@
 ================================================================
 For the port to work properly you must copy the file
-%%PREFIX%%/%%SQUIRRELDIR%%/plugins/%%SQUIRREL_PLUGIN_NAME%%/config.sample.php
+%%SQUIRRELDIR%%/plugins/%%SQUIRREL_PLUGIN_NAME%%/config.sample.php
 to
-%%PREFIX%%/%%SQUIRRELDIR%%/plugins/%%SQUIRREL_PLUGIN_NAME%%/config.php
+%%SQUIRRELDIR%%/plugins/%%SQUIRREL_PLUGIN_NAME%%/config.php
 and edit the configuration to meet your needs.
 ================================================================
diff --git a/mail/squirrelmail-multilogin-plugin/Makefile b/mail/squirrelmail-multilogin-plugin/Makefile
index 24232f0d1aaf..a001fda11bc4 100644
--- a/mail/squirrelmail-multilogin-plugin/Makefile
+++ b/mail/squirrelmail-multilogin-plugin/Makefile
@@ -1,21 +1,15 @@
 # Created by: Gerrit Beine <gerrit.beine@gmx.de>
 # $FreeBSD$
 
-PORTNAME=	multilogin
+PORTNAME=		multilogin
 PORTVERSION=	2.4
-CATEGORIES=	mail www
-MASTER_SITES=	http://www.squirrelmail.org/plugins/
-PKGNAMEPREFIX=	squirrelmail-
-PKGNAMESUFFIX=	-plugin
 DISTNAME=	${PORTNAME}-${PORTVERSION}-1.2.9
-DIST_SUBDIR=	squirrelmail
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Allows manual selection of login server on login page
 
-USES=		perl5
-USE_PERL5=	install
 USE_SM_COMPAT=	yes
+USE_GENERIC_PKGMESSAGE=	yes
 
 NO_STAGE=	yes
 
diff --git a/mail/squirrelmail-multilogin-plugin/files/pkg-message.in b/mail/squirrelmail-multilogin-plugin/files/pkg-message.in
deleted file mode 100644
index d9df0612aba0..000000000000
--- a/mail/squirrelmail-multilogin-plugin/files/pkg-message.in
+++ /dev/null
@@ -1,5 +0,0 @@
-For the port to work properly you must copy the file
-%%SQUIRRELDIR%%/plugins/multilogin/config.sample.php
-to
-%%SQUIRRELDIR%%/plugins/multilogin/config.php
-and edit the configuration to meet your needs.
diff --git a/mail/squirrelmail-notes-plugin/Makefile b/mail/squirrelmail-notes-plugin/Makefile
index 8a83bd989e7b..4eda975e9366 100644
--- a/mail/squirrelmail-notes-plugin/Makefile
+++ b/mail/squirrelmail-notes-plugin/Makefile
@@ -4,19 +4,13 @@
 PORTNAME=		notes
 PORTVERSION=	1.2
 PORTREVISION=	1
-CATEGORIES=		mail www
-MASTER_SITES=	http://www.squirrelmail.org/plugins/
-PKGNAMEPREFIX=	squirrelmail-
-PKGNAMESUFFIX=	-plugin
 DISTNAME=		${PORTNAME}.${PORTVERSION}-1.4.0
-DIST_SUBDIR=	squirrelmail
 
 MAINTAINER=		ports@FreeBSD.org
 COMMENT=		Allows you to create notes
 
-USES=		perl5
-USE_PERL5=	install
 USE_SM_COMPAT=	yes
+USE_GENERIC_PKGMESSAGE=	yes
 
 NO_STAGE=	yes
 
diff --git a/mail/squirrelmail-notes-plugin/files/pkg-message.in b/mail/squirrelmail-notes-plugin/files/pkg-message.in
deleted file mode 100644
index 651dbb4c1c81..000000000000
--- a/mail/squirrelmail-notes-plugin/files/pkg-message.in
+++ /dev/null
@@ -1,5 +0,0 @@
-For the port to work properly you must copy the file
-%%SQUIRRELDIR%%/plugins/notes/config.php.sample
-to
-%%SQUIRRELDIR%%/plugins/notes/config.php
-and edit the configuration to meet your needs.
diff --git a/mail/squirrelmail-notify-plugin/Makefile b/mail/squirrelmail-notify-plugin/Makefile
index 162d64999126..467d3e34c1bc 100644
--- a/mail/squirrelmail-notify-plugin/Makefile
+++ b/mail/squirrelmail-notify-plugin/Makefile
@@ -4,18 +4,11 @@
 PORTNAME=		notify
 PORTVERSION=	1.3
 PORTREVISION=	1
-CATEGORIES=		mail www
-MASTER_SITES=	http://www.squirrelmail.org/plugins/
-PKGNAMEPREFIX=	squirrelmail-
-PKGNAMESUFFIX=	-plugin
 DISTNAME=		${PORTNAME}_${PORTVERSION:S/./_/g}
-DIST_SUBDIR=	squirrelmail
 
 MAINTAINER=		ports@FreeBSD.org
 COMMENT=		Notify when new mail arrives
 
-USES=		perl5
-USE_PERL5=	install
 USE_SM_COMPAT=	yes
 
 NO_STAGE=	yes
diff --git a/mail/squirrelmail-password_forget-plugin/Makefile b/mail/squirrelmail-password_forget-plugin/Makefile
index 7c7729008afc..8830cdf1d761 100644
--- a/mail/squirrelmail-password_forget-plugin/Makefile
+++ b/mail/squirrelmail-password_forget-plugin/Makefile
@@ -3,21 +3,15 @@
 
 PORTNAME=	password_forget
 PORTVERSION=	2.2
-CATEGORIES=	mail www
-MASTER_SITES=	http://www.squirrelmail.org/plugins/
-PKGNAMEPREFIX=	squirrelmail-
-PKGNAMESUFFIX=	-plugin
 DISTNAME=	${SQUIRREL_PLUGIN_NAME}-${PORTVERSION}-1.0.1
-DIST_SUBDIR=	squirrelmail
 
 MAINTAINER=	neil@darlow.co.uk
 COMMENT=	Prevent reuse of login details by browsers at public terminals
 
-RUN_DEPENDS=	${SQUIRRELDIR}/plugins/compatibility:${PORTSDIR}/mail/squirrelmail-compatibility-plugin
-
-USES=		perl5
-USE_PERL5=	run
+USE_SM_COMPAT=	yes
 
 NO_STAGE=	yes
+
+.include <bsd.port.pre.mk>
 .include "${.CURDIR}/../squirrelmail/bsd.squirrelmail.mk"
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/mail/squirrelmail-pupdate-plugin/Makefile b/mail/squirrelmail-pupdate-plugin/Makefile
index 6c1c7c10a6bf..151a74fddf47 100644
--- a/mail/squirrelmail-pupdate-plugin/Makefile
+++ b/mail/squirrelmail-pupdate-plugin/Makefile
@@ -5,13 +5,16 @@ PORTNAME=	pupdate
 PORTVERSION=	0.7
 PORTREVISION=	2
 DISTNAME=	${PORTNAME}.${PORTVERSION}-1.4.2
-DIST_SUBDIR=	squirrelmail
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Checks for plugin updates by parsing the SM site
 
 LICENSE=	GPLv2
 
+USE_GENERIC_PKGMESSAGE=	yes
+
 NO_STAGE=	yes
+
+.include <bsd.port.pre.mk>
 .include "${.CURDIR}/../squirrelmail/bsd.squirrelmail.mk"
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/mail/squirrelmail-pupdate-plugin/files/pkg-message.in b/mail/squirrelmail-pupdate-plugin/files/pkg-message.in
deleted file mode 100644
index a1274c89c101..000000000000
--- a/mail/squirrelmail-pupdate-plugin/files/pkg-message.in
+++ /dev/null
@@ -1,5 +0,0 @@
-For the port to work properly you must copy the file
-%%PREFIX%%/%%SQUIRRELDIR%%/plugins/pupdate/config.php.sample
-to
-%%PREFIX%%/%%SQUIRRELDIR%%/plugins/pupdate/config.php
-and edit the configuration to meet your needs.
diff --git a/mail/squirrelmail-qmailadmin_login-plugin/Makefile b/mail/squirrelmail-qmailadmin_login-plugin/Makefile
index 6f0824cfc778..822f7d8380f8 100644
--- a/mail/squirrelmail-qmailadmin_login-plugin/Makefile
+++ b/mail/squirrelmail-qmailadmin_login-plugin/Makefile
@@ -4,15 +4,17 @@
 PORTNAME=		qmailadmin_login
 PORTVERSION=	1.1
 PORTREVISION=	2
-DISTNAME=	${PORTNAME}-${PORTVERSION}-1.4.3
-DIST_SUBDIR=	squirrelmail
+DISTNAME=		${PORTNAME}-${PORTVERSION}-1.4.3
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Using the QmailAdmin cgi interface from SquirrelMail
 
-SQUIRREL_PLUGIN_NAME=	${PORTNAME}
+RUN_DEPENDS=	${PREFIX}/www/cgi-bin.default/qmailadmin/qmailadmin:${PORTSDIR}/mail/qmailadmin
 
+USE_GENERIC_PKGMESSAGE=	yes
 
 NO_STAGE=	yes
+
+.include <bsd.port.pre.mk>
 .include "${.CURDIR}/../squirrelmail/bsd.squirrelmail.mk"
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/mail/squirrelmail-qmailadmin_login-plugin/files/pkg-message.in b/mail/squirrelmail-qmailadmin_login-plugin/files/pkg-message.in
deleted file mode 100644
index e34a820fe51e..000000000000
--- a/mail/squirrelmail-qmailadmin_login-plugin/files/pkg-message.in
+++ /dev/null
@@ -1,5 +0,0 @@
-For the port to work properly you must copy the file
-%%SQUIRRELDIR%%/plugins/qmailadmin_login/config_default.php
-to
-%%SQUIRRELDIR%%/plugins/qmailadmin_login/config.php
-and edit the configuration to meet your needs.
diff --git a/mail/squirrelmail-quota_usage-plugin/Makefile b/mail/squirrelmail-quota_usage-plugin/Makefile
index 6e5ea6ff29a0..215a776da0f0 100644
--- a/mail/squirrelmail-quota_usage-plugin/Makefile
+++ b/mail/squirrelmail-quota_usage-plugin/Makefile
@@ -4,19 +4,13 @@
 PORTNAME=		quota_usage
 PORTVERSION=	1.3.1
 PORTREVISION=	1
-CATEGORIES=		mail www
-MASTER_SITES=	http://www.squirrelmail.org/plugins/
-PKGNAMEPREFIX=	squirrelmail-
-PKGNAMESUFFIX=	-plugin
 DISTNAME=		${PORTNAME}-${PORTVERSION}-1.2.7
-DIST_SUBDIR=		squirrelmail
 
 MAINTAINER=		ports@FreeBSD.org
 COMMENT=		View quota and current usage
 
-USES=		perl5
-USE_PERL5=	install
 USE_SM_COMPAT=	yes
+USE_GENERIC_PKGMESSAGE=	yes
 
 NO_STAGE=	yes
 
diff --git a/mail/squirrelmail-quota_usage-plugin/files/pkg-message.in b/mail/squirrelmail-quota_usage-plugin/files/pkg-message.in
deleted file mode 100644
index d81edeec73d1..000000000000
--- a/mail/squirrelmail-quota_usage-plugin/files/pkg-message.in
+++ /dev/null
@@ -1,5 +0,0 @@
-For the port to work properly you must copy the file
-%%SQUIRRELDIR%%/plugins/quota_usage/config.php.sample
-to
-%%SQUIRRELDIR%%/plugins/quota_usage/config.php
-and edit the configuration to meet your needs.
diff --git a/mail/squirrelmail-sasql-plugin/Makefile b/mail/squirrelmail-sasql-plugin/Makefile
index 438ba1cb6142..777750e08cde 100644
--- a/mail/squirrelmail-sasql-plugin/Makefile
+++ b/mail/squirrelmail-sasql-plugin/Makefile
@@ -4,25 +4,22 @@
 PORTNAME=		sasql
 PORTVERSION=	3.2.0
 PORTREVISION=	1
-CATEGORIES=	mail www
-MASTER_SITES=	http://www.squirrelmail.org/plugins/
-PKGNAMEPREFIX=	squirrelmail-
-PKGNAMESUFFIX=	-plugin
-DIST_SUBDIR=	squirrelmail
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Edit SpamAssassin settings stored in an SQL DB
 
 RUN_DEPENDS=	${LOCALBASE}/share/pear/DB.php:${PORTSDIR}/databases/pear-DB
 
-USES=		perl5
-USE_PERL5=	install
 USE_SM_COMPAT=	yes
+USE_GENERIC_PKGMESSAGE=	yes
 
 NO_STAGE=	yes
 
 post-patch:
-	@${RM} ${WRKSRC}/${SQUIRREL_PLUGIN_NAME}/*.orig ${WRKSRC}/${SQUIRREL_PLUGIN_NAME}/.cvsignore
+	@${REINPLACE_CMD} -e "s/\(\$$imap_server_type == \'cyrus\'\)/\1 || \$$imap_server_type == \'courier\'/g" \
+		-e 's/session_register/sqsession_register/g' \
+		${WRKSRC}/${SQUIRREL_PLUGIN_NAME}/sasql_hooks.php
+	-@${RM} ${WRKSRC}/${SQUIRREL_PLUGIN_NAME}/*.bak ${WRKSRC}/${SQUIRREL_PLUGIN_NAME}/.cvsignore
 
 .include <bsd.port.pre.mk>
 .include "${.CURDIR}/../squirrelmail/bsd.squirrelmail.mk"
diff --git a/mail/squirrelmail-sasql-plugin/files/patch-sasql_hooks.php b/mail/squirrelmail-sasql-plugin/files/patch-sasql_hooks.php
deleted file mode 100644
index 3867c8b945ce..000000000000
--- a/mail/squirrelmail-sasql-plugin/files/patch-sasql_hooks.php
+++ /dev/null
@@ -1,31 +0,0 @@
-diff -Nur sasql.orig/sasql_hooks.php sasql/sasql_hooks.php
---- sasql.orig/sasql_hooks.php	2006-11-09 21:29:21.000000000 +0100
-+++ sasql/sasql_hooks.php	2006-12-10 12:13:12.000000000 +0100
-@@ -74,23 +74,23 @@
- 
-     if (!sqimap_mailbox_exists($imap_stream, $mailbox)) {
-       sqimap_mailbox_create($imap_stream, $mailbox, '');
--      if ($imap_server_type == 'cyrus') {
-+      if ($imap_server_type == 'cyrus' || $imap_server_type == 'courier') {
- 	$boxes = sqimap_mailbox_list($imap_stream);
-       } else {
- 	$boxes = sqimap_mailbox_list($imap_stream, true);
-       }
--      session_register($boxes, 'boxesnew');
-+      sqsession_register($boxes, 'boxesnew');
-       // echo "<foo sasql created: $box />";
-     }
- 
-     if (!sqimap_mailbox_is_subscribed($imap_stream, $mailbox)) {
-       sqimap_subscribe($imap_stream, $mailbox);
--      if ($imap_server_type == 'cyrus') {
-+      if ($imap_server_type == 'cyrus' || $imap_server_type == 'courier') {
- 	$boxes = sqimap_mailbox_list($imap_stream);
-       } else {
- 	$boxes = sqimap_mailbox_list($imap_stream, true);
-       }
--      session_register($boxes, 'boxesnew');
-+      sqsession_register($boxes, 'boxesnew');
-       // echo "<foo sasql subscried: $box />";
-     }
-   }
diff --git a/mail/squirrelmail-sasql-plugin/files/pkg-message.in b/mail/squirrelmail-sasql-plugin/files/pkg-message.in
deleted file mode 100644
index d7c91e1439a2..000000000000
--- a/mail/squirrelmail-sasql-plugin/files/pkg-message.in
+++ /dev/null
@@ -1,5 +0,0 @@
-For the port to work properly you must copy the file
-%%SQUIRRELDIR%%/plugins/sasql/sasql_conf.php.dist
-to
-%%SQUIRRELDIR%%/plugins/sasql/sasql_conf.php
-and edit the configuration to meet your needs.
diff --git a/mail/squirrelmail-secure_login-plugin/Makefile b/mail/squirrelmail-secure_login-plugin/Makefile
index 83a1f82095df..0e9dfa6e1ce4 100644
--- a/mail/squirrelmail-secure_login-plugin/Makefile
+++ b/mail/squirrelmail-secure_login-plugin/Makefile
@@ -4,16 +4,16 @@ PORTNAME=	secure_login
 PORTVERSION=	1.4
 PORTREVISION=	1
 DISTNAME=	${PORTNAME}-${PORTVERSION}-1.2.8
-DIST_SUBDIR=	squirrelmail
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	This plugin will automatically turn on SSL security during login
 
 LICENSE=	GPLv2
 
-USES=		perl5
-USE_PERL5=	run
+USE_GENERIC_PKGMESSAGE=	yes
 
 NO_STAGE=	yes
+
+.include <bsd.port.pre.mk>
 .include "${.CURDIR}/../squirrelmail/bsd.squirrelmail.mk"
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/mail/squirrelmail-secure_login-plugin/files/pkg-message.in b/mail/squirrelmail-secure_login-plugin/files/pkg-message.in
deleted file mode 100644
index 425455401587..000000000000
--- a/mail/squirrelmail-secure_login-plugin/files/pkg-message.in
+++ /dev/null
@@ -1,5 +0,0 @@
-For the port to work properly you must copy the file
-%%PREFIX%%/%%SQUIRRELDIR%%/plugins/secure_login/config.sample.php
-to
-%%PREFIX%%/%%SQUIRRELDIR%%/plugins/secure_login/config.php
-and edit the configuration to meet your needs.
diff --git a/mail/squirrelmail-shared_calendars-plugin/Makefile b/mail/squirrelmail-shared_calendars-plugin/Makefile
index 316ef0e83384..34efbed2d5e7 100644
--- a/mail/squirrelmail-shared_calendars-plugin/Makefile
+++ b/mail/squirrelmail-shared_calendars-plugin/Makefile
@@ -4,31 +4,19 @@
 PORTNAME=		shared_calendars
 PORTVERSION=	2.0.1
 PORTREVISION=	1
-CATEGORIES=		mail www
-MASTER_SITES=	http://www.squirrelmail.org/plugins/
-PKGNAMEPREFIX=	squirrelmail-
-PKGNAMESUFFIX=	-plugin
 DISTNAME=		${PORTNAME}-${PORTVERSION}-1.4.0
-DIST_SUBDIR=	squirrelmail
 
 MAINTAINER=		ports@FreeBSD.org
 COMMENT=		iCal-compliant calendaring for SquirrelMail
 
-USES=		perl5
-USE_PERL5=	install
+RUN_DEPENDS=	${SQUIRRELDIR}/plugins/calendar_file_backend:${PORTSDIR}/mail/squirrelmail-calendar_file_backend-plugin
+
 USE_SM_COMPAT=	yes
+USE_GENERIC_PKGMESSAGE=	yes
 _SMSRCDIR=	calendar
 
-OPTIONS_DEFINE=	SQL
-
 NO_STAGE=	yes
 
 .include <bsd.port.pre.mk>
-.if ${PORT_OPTIONS:MSQL}
-RUN_DEPENDS+=		${SQUIRRELDIR}/plugins/calendar_sql_backend:${PORTSDIR}/mail/squirrelmail-calendar_sql_backend-plugin
-.else
-RUN_DEPENDS+=		${SQUIRRELDIR}/plugins/calendar_file_backend:${PORTSDIR}/mail/squirrelmail-calendar_file_backend-plugin
-.endif
-
 .include "${.CURDIR}/../squirrelmail/bsd.squirrelmail.mk"
 .include <bsd.port.mk>
diff --git a/mail/squirrelmail-spam-buttons-plugin/Makefile b/mail/squirrelmail-spam-buttons-plugin/Makefile
index a1f9a71cba6b..4c20da284d1b 100644
--- a/mail/squirrelmail-spam-buttons-plugin/Makefile
+++ b/mail/squirrelmail-spam-buttons-plugin/Makefile
@@ -10,12 +10,11 @@ MAINTAINER=	itetcu@FreeBSD.org
 COMMENT=	Provides buttons with customizable action (for reporting spam, etc.)
 
 USE_SM_COMPAT=	yes
-USES=		perl5
-USE_PERL5=	run
 
 SQUIRREL_PLUGIN_NAME=	${PORTNAME:S/-/_/}
 
 NO_STAGE=	yes
+.include <bsd.port.pre.mk>
 .include "${.CURDIR}/../squirrelmail/bsd.squirrelmail.mk"
 
 post-extract:
@@ -27,4 +26,4 @@ post-extract:
 	@${MV} ${WRKSRC}/${_SMSRCDIR}/docs ${WRKSRC}/${_SMSRCDIR}/doc
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/mail/squirrelmail-spam-buttons-plugin/files/pkg-message.in b/mail/squirrelmail-spam-buttons-plugin/files/pkg-message.in
index 1a5735477804..392a18e2d32d 100644
--- a/mail/squirrelmail-spam-buttons-plugin/files/pkg-message.in
+++ b/mail/squirrelmail-spam-buttons-plugin/files/pkg-message.in
@@ -1,7 +1,7 @@
 ================================================================
 For the port to work properly you must copy the file
-%%PREFIX%%/%%SQUIRRELDIR%%/plugins/%%SQUIRREL_PLUGIN_NAME%%/config.sample.php
+%%SQUIRRELDIR%%/plugins/%%SQUIRREL_PLUGIN_NAME%%/config.sample.php
 to
-%%PREFIX%%/%%SQUIRRELDIR%%/plugins/%%SQUIRREL_PLUGIN_NAME%%/config.php
+%%SQUIRRELDIR%%/plugins/%%SQUIRREL_PLUGIN_NAME%%/config.php
 and edit the configuration to meet your needs.
 ================================================================
diff --git a/mail/squirrelmail-squirrel_logger-plugin/Makefile b/mail/squirrelmail-squirrel_logger-plugin/Makefile
index 53260e15fdc7..94cf0c91f367 100644
--- a/mail/squirrelmail-squirrel_logger-plugin/Makefile
+++ b/mail/squirrelmail-squirrel_logger-plugin/Makefile
@@ -3,12 +3,7 @@
 
 PORTNAME=	squirrel_logger
 PORTVERSION=	2.3
-CATEGORIES=	mail www
-MASTER_SITES=	http://www.squirrelmail.org/plugins/
-PKGNAMEPREFIX=  squirrelmail-
-PKGNAMESUFFIX=  -plugin
 DISTNAME=	${PORTNAME}-${PORTVERSION}-1.2.7
-DIST_SUBDIR=	squirrelmail
 
 MAINTAINER=	morinaga@riken.jp
 COMMENT=	Logging functionality for your webmail interface
@@ -16,6 +11,7 @@ COMMENT=	Logging functionality for your webmail interface
 USE_SM_COMPAT=	yes
 
 NO_STAGE=	yes
-.include "${.CURDIR}/../squirrelmail/bsd.squirrelmail.mk"
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+.include "${.CURDIR}/../squirrelmail/bsd.squirrelmail.mk"
+.include <bsd.port.post.mk>
diff --git a/mail/squirrelmail-squirrel_logger-plugin/files/pkg-message.in b/mail/squirrelmail-squirrel_logger-plugin/files/pkg-message.in
index 9e45ad70bb2e..269a08e758f6 100644
--- a/mail/squirrelmail-squirrel_logger-plugin/files/pkg-message.in
+++ b/mail/squirrelmail-squirrel_logger-plugin/files/pkg-message.in
@@ -1,7 +1,7 @@
 ================================================================
 For the port to work properly you must copy the file
-%%PREFIX%%/%%SQUIRRELDIR%%/plugins/%%SQUIRREL_PLUGIN_NAME%%/config_example.php
+%%SQUIRRELDIR%%/plugins/%%SQUIRREL_PLUGIN_NAME%%/config_example.php
 to
-%%PREFIX%%/%%SQUIRRELDIR%%/plugins/%%SQUIRREL_PLUGIN_NAME%%/config.php
+%%SQUIRRELDIR%%/plugins/%%SQUIRREL_PLUGIN_NAME%%/config.php
 and edit the configuration to meet your needs.
 ================================================================
diff --git a/mail/squirrelmail-timeout_user-plugin/Makefile b/mail/squirrelmail-timeout_user-plugin/Makefile
index 502336defe73..383de456671e 100644
--- a/mail/squirrelmail-timeout_user-plugin/Makefile
+++ b/mail/squirrelmail-timeout_user-plugin/Makefile
@@ -4,15 +4,20 @@ PORTNAME=	timeout_user
 PORTVERSION=	1.1.1
 PORTREVISION=	2
 DISTNAME=	${PORTNAME}-${PORTVERSION}-0.5
-DIST_SUBDIR=	squirrelmail
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Automatically logs a user out if they're idle for a set amount of time
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS+=	${SQUIRRELDIR}/plugins/compatibility:${PORTSDIR}/mail/squirrelmail-compatibility-plugin
+USE_SM_COMPAT=	yes
+USE_GENERIC_PKGMESSAGE=	yes
 
 NO_STAGE=	yes
+
+post-patch:
+	@${MV} ${WRKSRC}/${SQUIRREL_PLUGIN_NAME}/config.php ${WRKSRC}/${SQUIRREL_PLUGIN_NAME}/config.php.sample
+
+.include <bsd.port.pre.mk>
 .include "${.CURDIR}/../squirrelmail/bsd.squirrelmail.mk"
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/mail/squirrelmail-timeout_user-plugin/pkg-plist b/mail/squirrelmail-timeout_user-plugin/pkg-plist
index 8b4aee35b7b7..4ebe501d3e59 100644
--- a/mail/squirrelmail-timeout_user-plugin/pkg-plist
+++ b/mail/squirrelmail-timeout_user-plugin/pkg-plist
@@ -5,6 +5,6 @@
 %%SQUIRRELDIR%%/plugins/timeout_user/setup.php
 %%SQUIRRELDIR%%/plugins/timeout_user/INSTALL
 %%SQUIRRELDIR%%/plugins/timeout_user/functions.php
-%%SQUIRRELDIR%%/plugins/timeout_user/config.php
+%%SQUIRRELDIR%%/plugins/timeout_user/config.php.sample
 @dirrm %%SQUIRRELDIR%%/plugins/timeout_user
 @exec if [ -f %D/%%SQUIRRELDIR%%/config/config.php ]; then %D/%%SQUIRRELDIR%%/config/conf.pl --install-plugin %%SQUIRREL_PLUGIN_NAME%%; fi
diff --git a/mail/squirrelmail-unsafe_image_rules-plugin/Makefile b/mail/squirrelmail-unsafe_image_rules-plugin/Makefile
index 36ab75de81b2..32e618ae959e 100644
--- a/mail/squirrelmail-unsafe_image_rules-plugin/Makefile
+++ b/mail/squirrelmail-unsafe_image_rules-plugin/Makefile
@@ -5,18 +5,16 @@ PORTNAME=	unsafe_image_rules
 PORTVERSION=	0.8
 PORTREVISION=	1
 DISTNAME=	${PORTNAME:S/-/_/}.${PORTVERSION}-1.4
-DIST_SUBDIR=	squirrelmail
 
 MAINTAINER=	itetcu@FreeBSD.org
 COMMENT=	Determines what unsafe (web) images will be shown
 
 USE_SM_COMPAT=	yes
-USES=		perl5
-USE_PERL5=	run
 
 SQUIRREL_PLUGIN_NAME=	${PORTNAME:S/-/_/}
 
 NO_STAGE=	yes
-.include "${.CURDIR}/../squirrelmail/bsd.squirrelmail.mk"
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+.include "${.CURDIR}/../squirrelmail/bsd.squirrelmail.mk"
+.include <bsd.port.post.mk>
diff --git a/mail/squirrelmail-unsafe_image_rules-plugin/files/pkg-message.in b/mail/squirrelmail-unsafe_image_rules-plugin/files/pkg-message.in
index 902c57f01aa9..4541f495bff2 100644
--- a/mail/squirrelmail-unsafe_image_rules-plugin/files/pkg-message.in
+++ b/mail/squirrelmail-unsafe_image_rules-plugin/files/pkg-message.in
@@ -1,7 +1,7 @@
 ================================================================
 For the port to work properly you must copy the file
-%%PREFIX%%/%%SQUIRRELDIR%%/plugins/%%SQUIRREL_PLUGIN_NAME%%/config.php.sample
+%%SQUIRRELDIR%%/plugins/%%SQUIRREL_PLUGIN_NAME%%/config.php.sample
 to
-%%PREFIX%%/%%SQUIRRELDIR%%/plugins/%%SQUIRREL_PLUGIN_NAME%%/config.php
+%%SQUIRRELDIR%%/plugins/%%SQUIRREL_PLUGIN_NAME%%/config.php
 and edit the configuration to meet your needs.
 ================================================================
diff --git a/mail/squirrelmail-user_special_mailboxes-plugin/Makefile b/mail/squirrelmail-user_special_mailboxes-plugin/Makefile
index 41b2449bd5ba..fd339e8b1505 100644
--- a/mail/squirrelmail-user_special_mailboxes-plugin/Makefile
+++ b/mail/squirrelmail-user_special_mailboxes-plugin/Makefile
@@ -5,17 +5,16 @@ PORTNAME=	user_special_mailboxes
 PORTVERSION=	0.1
 PORTREVISION=	1
 DISTNAME=	${PORTNAME:S/-/_/}.${PORTVERSION}-1.4
-DIST_SUBDIR=	squirrelmail
 
 MAINTAINER=	itetcu@FreeBSD.org
 COMMENT=	Lets define folders to be displayed at the top of the folders list
 
 USE_SM_COMPAT=	yes
-USES=		perl5
-USE_PERL5=	run
 
 SQUIRREL_PLUGIN_NAME=	${PORTNAME:S/-/_/}
 
 NO_STAGE=	yes
+
+.include <bsd.port.pre.mk>
 .include "${.CURDIR}/../squirrelmail/bsd.squirrelmail.mk"
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/mail/squirrelmail-vlogin-plugin/Makefile b/mail/squirrelmail-vlogin-plugin/Makefile
index 6395b879bbf9..b9360dc0ed21 100644
--- a/mail/squirrelmail-vlogin-plugin/Makefile
+++ b/mail/squirrelmail-vlogin-plugin/Makefile
@@ -3,23 +3,17 @@
 
 PORTNAME=	vlogin
 PORTVERSION=	3.10.2
-CATEGORIES=	mail www
-MASTER_SITES=	http://www.squirrelmail.org/plugins/
-PKGNAMEPREFIX=	squirrelmail-
-PKGNAMESUFFIX=	-plugin
 DISTNAME=	${PORTNAME}-${PORTVERSION}-1.2.7
-DIST_SUBDIR=	squirrelmail
 
 MAINTAINER=	neil@darlow.co.uk
 COMMENT=	Adds multi-site-hosting capabilities to SquirrelMail
 
-USES=		perl5
-USE_PERL5=	run
 USE_SM_COMPAT=	yes
 
 DOCSDIR=	${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}
 
 NO_STAGE=	yes
+.include <bsd.port.pre.mk>
 .include "${.CURDIR}/../squirrelmail/bsd.squirrelmail.mk"
 
 # We need to rearrange, install and cleanup documentation pre-install
diff --git a/mail/squirrelmail-websearch-plugin/Makefile b/mail/squirrelmail-websearch-plugin/Makefile
index 80d13cf5c92a..82f2f25a5af9 100644
--- a/mail/squirrelmail-websearch-plugin/Makefile
+++ b/mail/squirrelmail-websearch-plugin/Makefile
@@ -5,17 +5,23 @@ PORTNAME=	websearch
 PORTVERSION=	0.1.6
 PORTREVISION=	1
 DISTNAME=	${SQUIRREL_PLUGIN_NAME}-${PORTVERSION}
-DIST_SUBDIR=	squirrelmail
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Plugin for Websearch
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS+=	${SQUIRRELDIR}/plugins/compatibility:${PORTSDIR}/mail/squirrelmail-compatibility-plugin
+USE_SM_COMPAT=	yes
+USE_GENERIC_PKGMESSAGE=	yes
 
 SQUIRREL_PLUGIN_NAME=	web_search
+SQUIRREL_PLUGIN_CONFIG=	${SQUIRREL_PLUGIN_NAME}.conf.php
 
 NO_STAGE=	yes
+
+post-patch:
+	@${MV} ${WRKSRC}/${_SMSRCDIR}/${SQUIRREL_PLUGIN_CONFIG}.dist ${WRKSRC}/${_SMSRCDIR}/${SQUIRREL_PLUGIN_CONFIG}.sample
+
+.include <bsd.port.pre.mk>
 .include "${.CURDIR}/../squirrelmail/bsd.squirrelmail.mk"
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/mail/squirrelmail-websearch-plugin/files/pkg-message.in b/mail/squirrelmail-websearch-plugin/files/pkg-message.in
deleted file mode 100644
index fa109fa20163..000000000000
--- a/mail/squirrelmail-websearch-plugin/files/pkg-message.in
+++ /dev/null
@@ -1,5 +0,0 @@
-For the port to work properly you must copy the file
-%%PREFIX%%/%%SQUIRRELDIR%%/plugins/web_search/web_search.conf.php.dist
-to
-%%PREFIX%%/%%SQUIRRELDIR%%/plugins/web_search/config.php
-and edit the configuration to meet your needs.
diff --git a/mail/squirrelmail-websearch-plugin/pkg-plist b/mail/squirrelmail-websearch-plugin/pkg-plist
index 1ae0dd952326..80fa64ab3fb1 100644
--- a/mail/squirrelmail-websearch-plugin/pkg-plist
+++ b/mail/squirrelmail-websearch-plugin/pkg-plist
@@ -4,6 +4,6 @@
 %%SQUIRRELDIR%%/plugins/web_search/hooks.php
 %%SQUIRRELDIR%%/plugins/web_search/setup.php
 %%SQUIRRELDIR%%/plugins/web_search/version
-%%SQUIRRELDIR%%/plugins/web_search/web_search.conf.php.dist
+%%SQUIRRELDIR%%/plugins/web_search/web_search.conf.php.sample
 @dirrm %%SQUIRRELDIR%%/plugins/web_search/
 @exec if [ -f %D/%%SQUIRRELDIR%%/config/config.php ]; then %D/%%SQUIRRELDIR%%/config/conf.pl --install-plugin web_search; fi
diff --git a/mail/squirrelmail-wetteronline-plugin/Makefile b/mail/squirrelmail-wetteronline-plugin/Makefile
index 3c7fc059b961..0383d338f054 100644
--- a/mail/squirrelmail-wetteronline-plugin/Makefile
+++ b/mail/squirrelmail-wetteronline-plugin/Makefile
@@ -4,17 +4,10 @@
 PORTNAME=		wetteronline
 PORTVERSION=	0.1
 PORTREVISION=	1
-CATEGORIES=		mail www
-MASTER_SITES=	http://www.squirrelmail.org/plugins/
-PKGNAMEPREFIX=	squirrelmail-
-PKGNAMESUFFIX=	-plugin
-DIST_SUBDIR=	squirrelmail
 
 MAINTAINER=		ports@FreeBSD.org
 COMMENT=		Plugin for the weather in Germany
 
-USES=		perl5
-USE_PERL5=	install
 USE_SM_COMPAT=	yes
 
 NO_STAGE=	yes
diff --git a/mail/squirrelmail/bsd.squirrelmail.mk b/mail/squirrelmail/bsd.squirrelmail.mk
index e8c566ee875f..27a3b2555049 100644
--- a/mail/squirrelmail/bsd.squirrelmail.mk
+++ b/mail/squirrelmail/bsd.squirrelmail.mk
@@ -2,7 +2,20 @@
 #
 # $LastChangedDate: 2010-02-01 22:21:34 -0500 (Mon, 01 Feb 2010) $
 #
-# Common code for squirrelmail plugins.
+# To create a plugin, put the following at the bottom of your makefile:
+#
+# .include <bsd.port.pre.mk>
+# .include "${.CURDIR}/../squirrelmail/bsd.squirrelmail.mk"
+# .include <bsd.port.post.mk>
+#
+# Variables you can set:
+# USE_SM_COMPAT = creates a dependency on mail/squirrelmail-compatibility-plugin
+# USE_GENERIC_PKGMESSAGE = to use a default message about editing config.php
+# 	*****NOTE this clobbers FILESDIR, so you cannot use this if you have any files/patch-*
+# SQUIRREL_PLUGIN_NAME = defaults to PORTNAME
+# SQUIRREL_PLUGIN_CONFIG = the config file name (for the PKGMESSAGE)
+# _SMSRCDIR = WRKSRC=${WRKDIR}/${_SMSRCDIR}
+#
 #
 # Created & tested by 
 # Thomas Abthorpe <tabthorpe@FreeBSD.org>
@@ -19,6 +32,7 @@ CATEGORIES?=	mail www
 MASTER_SITES?=	http://www.squirrelmail.org/plugins/
 PKGNAMEPREFIX?=	squirrelmail-
 PKGNAMESUFFIX?=	-plugin
+DIST_SUBDIR?=	squirrelmail
 
 RUN_DEPENDS+=	${SQUIRRELDIR}/index.php:${PORTSDIR}/mail/squirrelmail
 
@@ -26,6 +40,11 @@ RUN_DEPENDS+=	${SQUIRRELDIR}/index.php:${PORTSDIR}/mail/squirrelmail
 RUN_DEPENDS+=	${SQUIRRELDIR}/plugins/compatibility:${PORTSDIR}/mail/squirrelmail-compatibility-plugin
 .endif
 
+.ifndef WITHOUT_ACTIVATE
+USES+=		perl5
+USE_PERL5+=	install
+.endif
+
 NO_BUILD=		yes
 NO_WRKSUBDIR=	yes
 USE_PHP?=		yes
@@ -41,8 +60,17 @@ SQUIRRELDIR?=	${PREFIX}/www/squirrelmail
 PLIST_SUB+=		SQUIRRELDIR=${SQUIRRELDIR:S,${PREFIX}/,,}
 SUB_LIST+=		SQUIRRELDIR=${SQUIRRELDIR}
 
-.if exists(${FILESDIR}/pkg-message.in)
-SUB_FILES=	pkg-message
+SQUIRREL_PLUGIN_CONFIG?=	config.php
+PLIST_SUB+=		SQUIRREL_PLUGIN_CONFIG=${SQUIRREL_PLUGIN_CONFIG}
+SUB_LIST+=		SQUIRREL_PLUGIN_CONFIG=${SQUIRREL_PLUGIN_CONFIG}
+
+.if defined(USE_GENERIC_PKGMESSAGE)
+# NOTE: we have to change FILESDIR to make this work...
+FILESDIR=	${.CURDIR}/../squirrelmail/files
+SUB_FILES+=	plugin-pkg-message
+PKGMESSAGE=	${WRKDIR}/plugin-pkg-message
+.elif exists(${FILESDIR}/pkg-message.in)
+SUB_FILES+=	pkg-message
 .endif
 
 .if !target(pre-everything)
@@ -85,7 +113,7 @@ post-install:
 .endif
 	@${ECHO_CMD} ""
 
-.if exists(${FILESDIR}/pkg-message.in)
+.if exists(${FILESDIR}/pkg-message.in) || exists(${FILESDIR}/plugin-pkg-message.in)
 	@${CAT} ${PKGMESSAGE}
 	@${ECHO_CMD} ""
 .endif
diff --git a/mail/squirrelmail/files/plugin-pkg-message.in b/mail/squirrelmail/files/plugin-pkg-message.in
new file mode 100644
index 000000000000..68806702dae8
--- /dev/null
+++ b/mail/squirrelmail/files/plugin-pkg-message.in
@@ -0,0 +1,7 @@
+=============================================================
+Before using the %%SQUIRREL_PLUGIN_NAME%% plugin, you must copy the file
+%%SQUIRRELDIR%%/plugins/%%SQUIRREL_PLUGIN_NAME%%/%%SQUIRREL_PLUGIN_CONFIG%%.sample
+to
+%%SQUIRRELDIR%%/plugins/%%SQUIRREL_PLUGIN_NAME%%/%%SQUIRREL_PLUGIN_CONFIG%%
+and edit the configuration to meet your needs.
+=============================================================