31 files changed, 134 insertions, 161 deletions

diff --git a/mail/squirrelmail-abook_import_export-plugin/Makefile b/mail/squirrelmail-abook_import_export-plugin/Makefile
index 872e7ce49949..854f11fbc74d 100644
--- a/mail/squirrelmail-abook_import_export-plugin/Makefile
+++ b/mail/squirrelmail-abook_import_export-plugin/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	abook_import_export
 PORTVERSION=	1.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	mail www
 DISTNAME=	${PORTNAME:S/-/_/}-${PORTVERSION}-1.4.4
 DIST_SUBDIR=	squirrelmail
@@ -13,6 +13,5 @@ COMMENT=	Allows for the importing of addressbooks from a CSV (comma separated va
 
 SQUIRREL_PLUGIN_NAME=	${PORTNAME:S/-/_/}
 
-.include <bsd.port.pre.mk>
 .include "${.CURDIR}/../squirrelmail/bsd.squirrelmail.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/mail/squirrelmail-askuserinfo-plugin/Makefile b/mail/squirrelmail-askuserinfo-plugin/Makefile
index ebbdde06677a..1f2d25c55f37 100644
--- a/mail/squirrelmail-askuserinfo-plugin/Makefile
+++ b/mail/squirrelmail-askuserinfo-plugin/Makefile
@@ -2,13 +2,12 @@
 
 PORTNAME=	askuserinfo
 PORTVERSION=	1.1
-PORTREVISION=	1
-CATEGORIES=		mail www
+PORTREVISION=	2
+CATEGORIES=	mail www
 DISTNAME=	${PORTNAME}.${PORTVERSION}-1.4.0
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Ask user to enter Full name and Email address at initial logon
 
-.include <bsd.port.pre.mk>
 .include "${.CURDIR}/../squirrelmail/bsd.squirrelmail.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/mail/squirrelmail-avelsieve-plugin/Makefile b/mail/squirrelmail-avelsieve-plugin/Makefile
index 8b1c182aa9cf..9666b477fed2 100644
--- a/mail/squirrelmail-avelsieve-plugin/Makefile
+++ b/mail/squirrelmail-avelsieve-plugin/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	avelsieve
 PORTVERSION=	1.9.7
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	mail www
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/mail/squirrelmail-calendar_file_backend-plugin/Makefile b/mail/squirrelmail-calendar_file_backend-plugin/Makefile
index 94b011c79c0f..41edaa73f912 100644
--- a/mail/squirrelmail-calendar_file_backend-plugin/Makefile
+++ b/mail/squirrelmail-calendar_file_backend-plugin/Makefile
@@ -1,15 +1,14 @@
 # Created by: Gerrit Beine <gerrit.beine@gmx.de>
 # $FreeBSD$
 
-PORTNAME=		calendar_file_backend
+PORTNAME=	calendar_file_backend
 PORTVERSION=	1.0
-PORTREVISION=	2
-CATEGORIES=		mail www
-DISTNAME=		${PORTNAME}-${PORTVERSION}-2.0
+PORTREVISION=	3
+CATEGORIES=	mail www
+DISTNAME=	${PORTNAME}-${PORTVERSION}-2.0
 
-MAINTAINER=		ports@FreeBSD.org
-COMMENT=		File backend for SquirrelMail Calendar plugin
+MAINTAINER=	ports@FreeBSD.org
+COMMENT=	File backend for SquirrelMail Calendar plugin
 
-.include <bsd.port.pre.mk>
 .include "${.CURDIR}/../squirrelmail/bsd.squirrelmail.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/mail/squirrelmail-change_ldappass-plugin/Makefile b/mail/squirrelmail-change_ldappass-plugin/Makefile
index 5f7a99879db0..a4545d203fa3 100644
--- a/mail/squirrelmail-change_ldappass-plugin/Makefile
+++ b/mail/squirrelmail-change_ldappass-plugin/Makefile
@@ -1,10 +1,10 @@
 # Created by: Alexander Wittig <alexander@wittig.name>
 # $FreeBSD$
 
-PORTNAME=		change_ldappass
+PORTNAME=	change_ldappass
 PORTVERSION=	2.2
-PORTREVISION=	5
-CATEGORIES=		mail www
+PORTREVISION=	6
+CATEGORIES=	mail www
 DISTNAME=	${PORTNAME}-${PORTVERSION}-1.4.0
 
 MAINTAINER=	ports@FreeBSD.org
@@ -17,6 +17,5 @@ USES=		gettext
 
 USE_GENERIC_PKGMESSAGE=	yes
 
-.include <bsd.port.pre.mk>
 .include "${.CURDIR}/../squirrelmail/bsd.squirrelmail.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/mail/squirrelmail-change_sqlpass-plugin/Makefile b/mail/squirrelmail-change_sqlpass-plugin/Makefile
index 687e8e413050..86d3c58b49ee 100644
--- a/mail/squirrelmail-change_sqlpass-plugin/Makefile
+++ b/mail/squirrelmail-change_sqlpass-plugin/Makefile
@@ -3,8 +3,8 @@
 
 PORTNAME=	change-sqlpass
 PORTVERSION=	3.3
-PORTREVISION=	2
-CATEGORIES=		mail www
+PORTREVISION=	3
+CATEGORIES=	mail www
 DISTNAME=	${PORTNAME:S/-/_/}-${PORTVERSION}-1.2
 
 MAINTAINER=	itetcu@FreeBSD.org
@@ -16,6 +16,5 @@ RUN_DEPENDS=	${LOCALBASE}/share/pear/DB.php:${PORTSDIR}/databases/pear-DB
 
 SQUIRREL_PLUGIN_NAME=	${PORTNAME:S/-/_/}
 
-.include <bsd.port.pre.mk>
 .include "${.CURDIR}/../squirrelmail/bsd.squirrelmail.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/mail/squirrelmail-check_quota-plugin/Makefile b/mail/squirrelmail-check_quota-plugin/Makefile
index 5ca480c3ed35..3d11b6236e7e 100644
--- a/mail/squirrelmail-check_quota-plugin/Makefile
+++ b/mail/squirrelmail-check_quota-plugin/Makefile
@@ -3,8 +3,8 @@
 
 PORTNAME=	check-quota
 PORTVERSION=	2.2
-PORTREVISION=	2
-CATEGORIES=		mail www
+PORTREVISION=	3
+CATEGORIES=	mail www
 DISTNAME=	${PORTNAME:S/-/_/}-${PORTVERSION}-1.4.0
 
 MAINTAINER=	itetcu@FreeBSD.org
@@ -14,6 +14,5 @@ USE_SM_COMPAT=	YES
 
 SQUIRREL_PLUGIN_NAME=	${PORTNAME:S/-/_/}
 
-.include <bsd.port.pre.mk>
 .include "${.CURDIR}/../squirrelmail/bsd.squirrelmail.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/mail/squirrelmail-compatibility-plugin/Makefile b/mail/squirrelmail-compatibility-plugin/Makefile
index 44216716e656..52f44c0f52cc 100644
--- a/mail/squirrelmail-compatibility-plugin/Makefile
+++ b/mail/squirrelmail-compatibility-plugin/Makefile
@@ -2,13 +2,13 @@
 # $FreeBSD$
 
 PORTNAME=	compatibility
-PORTVERSION=2.0.16
+PORTVERSION=	2.0.16
+PORTREVISION=	1
 CATEGORIES=	mail www
 DISTNAME=	${PORTNAME}-${PORTVERSION}-1.0
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Required by many plugins for compatibility with SquirrelMail
 
-.include <bsd.port.pre.mk>
 .include "${.CURDIR}/../squirrelmail/bsd.squirrelmail.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/mail/squirrelmail-email_footer-plugin/Makefile b/mail/squirrelmail-email_footer-plugin/Makefile
index 16b9d630655c..f3e24529e541 100644
--- a/mail/squirrelmail-email_footer-plugin/Makefile
+++ b/mail/squirrelmail-email_footer-plugin/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	email_footer
-PORTVERSION=0.6
+PORTVERSION=	0.6
 PORTREVISION=	1
 CATEGORIES=	mail www
 DISTNAME=	${PORTNAME}-${PORTVERSION}-1.4.2
@@ -15,6 +15,5 @@ USE_GENERIC_PKGMESSAGE=	yes
 
 LICENSE=	GPLv2
 
-.include <bsd.port.pre.mk>
 .include "${.CURDIR}/../squirrelmail/bsd.squirrelmail.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/mail/squirrelmail-login_auth-plugin/Makefile b/mail/squirrelmail-login_auth-plugin/Makefile
index 6319feafadf2..83dcf6b23f1b 100644
--- a/mail/squirrelmail-login_auth-plugin/Makefile
+++ b/mail/squirrelmail-login_auth-plugin/Makefile
@@ -1,19 +1,18 @@
 # Created by: Stefan Bethke <stb@lassitu.de>
 # $FreeBSD$
 
-PORTNAME=		login_auth
-PORTVERSION=		3.0
-PORTREVISION=	1
-CATEGORIES=		mail www
-MASTER_SITES=		http://www.squirrelmail.org/plugins/ \
-			http://www.transit.hanse.de/mirror/www.squirrelmail.org/plugins/
-DISTNAME=		${PORTNAME}-${PORTVERSION}-1.4.0
+PORTNAME=	login_auth
+PORTVERSION=	3.0
+PORTREVISION=	2
+CATEGORIES=	mail www
+MASTER_SITES=	http://www.squirrelmail.org/plugins/ \
+		http://www.transit.hanse.de/mirror/www.squirrelmail.org/plugins/
+DISTNAME=	${PORTNAME}-${PORTVERSION}-1.4.0
 
-MAINTAINER=		stb@lassitu.de
-COMMENT=		Automatically log in user based on HTTP authentication
+MAINTAINER=	stb@lassitu.de
+COMMENT=	Automatically log in user based on HTTP authentication
 
 SQUIRREL_PLUGIN_NAME=	${PORTNAME}
 
-.include <bsd.port.pre.mk>
 .include "${.CURDIR}/../squirrelmail/bsd.squirrelmail.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/mail/squirrelmail-login_notes-plugin/Makefile b/mail/squirrelmail-login_notes-plugin/Makefile
index 74bbda25e19f..be0407aad4bf 100644
--- a/mail/squirrelmail-login_notes-plugin/Makefile
+++ b/mail/squirrelmail-login_notes-plugin/Makefile
@@ -2,8 +2,8 @@
 # $FreeBSD$
 
 PORTNAME=	login_notes
-PORTVERSION=1.2
-PORTREVISION=	1
+PORTVERSION=	1.2
+PORTREVISION=	2
 CATEGORIES=	mail www
 DISTNAME=	${SQUIRREL_PLUGIN_NAME}-${PORTVERSION}-1.4.0
 
@@ -15,6 +15,5 @@ LICENSE=	GPLv2
 USE_SM_COMPAT=	yes
 USE_GENERIC_PKGMESSAGE=	yes
 
-.include <bsd.port.pre.mk>
 .include "${.CURDIR}/../squirrelmail/bsd.squirrelmail.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/mail/squirrelmail-mark_read-plugin/Makefile b/mail/squirrelmail-mark_read-plugin/Makefile
index c1b30f04ce31..7cb86b341c4e 100644
--- a/mail/squirrelmail-mark_read-plugin/Makefile
+++ b/mail/squirrelmail-mark_read-plugin/Makefile
@@ -3,8 +3,8 @@
 
 PORTNAME=	mark_read
 PORTVERSION=	1.4.2
-PORTREVISION=	3
-CATEGORIES=		mail www
+PORTREVISION=	4
+CATEGORIES=	mail www
 DISTNAME=	${PORTNAME:S/-/_/}-${PORTVERSION}-1.2
 
 MAINTAINER=	itetcu@FreeBSD.org
@@ -17,6 +17,5 @@ SQUIRREL_PLUGIN_NAME=	${PORTNAME:S/-/_/}
 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.post.mk>
+.include <bsd.port.mk>
diff --git a/mail/squirrelmail-multilogin-plugin/Makefile b/mail/squirrelmail-multilogin-plugin/Makefile
index 4a8563322753..c3d0d0029c1b 100644
--- a/mail/squirrelmail-multilogin-plugin/Makefile
+++ b/mail/squirrelmail-multilogin-plugin/Makefile
@@ -1,10 +1,10 @@
 # Created by: Gerrit Beine <gerrit.beine@gmx.de>
 # $FreeBSD$
 
-PORTNAME=		multilogin
+PORTNAME=	multilogin
 PORTVERSION=	2.4
-PORTREVISION=	2
-CATEGORIES=		mail www
+PORTREVISION=	3
+CATEGORIES=	mail www
 DISTNAME=	${PORTNAME}-${PORTVERSION}-1.2.9
 
 MAINTAINER=	ports@FreeBSD.org
@@ -13,6 +13,5 @@ COMMENT=	Allows manual selection of login server on login page
 USE_SM_COMPAT=	yes
 USE_GENERIC_PKGMESSAGE=	yes
 
-.include <bsd.port.pre.mk>
 .include "${.CURDIR}/../squirrelmail/bsd.squirrelmail.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/mail/squirrelmail-notes-plugin/Makefile b/mail/squirrelmail-notes-plugin/Makefile
index 63b9c0e6e6f7..60f2d775cb8a 100644
--- a/mail/squirrelmail-notes-plugin/Makefile
+++ b/mail/squirrelmail-notes-plugin/Makefile
@@ -1,18 +1,17 @@
 # Created by: Gerrit Beine <gerrit.beine@gmx.de>
 # $FreeBSD$
 
-PORTNAME=		notes
+PORTNAME=	notes
 PORTVERSION=	1.2
-PORTREVISION=	2
-CATEGORIES=		mail www
-DISTNAME=		${PORTNAME}.${PORTVERSION}-1.4.0
+PORTREVISION=	3
+CATEGORIES=	mail www
+DISTNAME=	${PORTNAME}.${PORTVERSION}-1.4.0
 
-MAINTAINER=		ports@FreeBSD.org
-COMMENT=		Allows you to create notes
+MAINTAINER=	ports@FreeBSD.org
+COMMENT=	Allows you to create notes
 
 USE_SM_COMPAT=	yes
 USE_GENERIC_PKGMESSAGE=	yes
 
-.include <bsd.port.pre.mk>
 .include "${.CURDIR}/../squirrelmail/bsd.squirrelmail.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/mail/squirrelmail-notify-plugin/Makefile b/mail/squirrelmail-notify-plugin/Makefile
index 7290f198dc6b..f8944e80aa1a 100644
--- a/mail/squirrelmail-notify-plugin/Makefile
+++ b/mail/squirrelmail-notify-plugin/Makefile
@@ -1,17 +1,16 @@
 # Created by: Gerrit Beine <gerrit.beine@gmx.de>
 # $FreeBSD$
 
-PORTNAME=		notify
+PORTNAME=	notify
 PORTVERSION=	1.3
-PORTREVISION=	2
-CATEGORIES=		mail www
-DISTNAME=		${PORTNAME}_${PORTVERSION:S/./_/g}
+PORTREVISION=	3
+CATEGORIES=	mail www
+DISTNAME=	${PORTNAME}_${PORTVERSION:S/./_/g}
 
-MAINTAINER=		ports@FreeBSD.org
-COMMENT=		Notify when new mail arrives
+MAINTAINER=	ports@FreeBSD.org
+COMMENT=	Notify when new mail arrives
 
 USE_SM_COMPAT=	yes
 
-.include <bsd.port.pre.mk>
 .include "${.CURDIR}/../squirrelmail/bsd.squirrelmail.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/mail/squirrelmail-password_forget-plugin/Makefile b/mail/squirrelmail-password_forget-plugin/Makefile
index ad12a4bb01b9..75f549a86df2 100644
--- a/mail/squirrelmail-password_forget-plugin/Makefile
+++ b/mail/squirrelmail-password_forget-plugin/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	password_forget
 PORTVERSION=	2.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	mail www
 DISTNAME=	${SQUIRREL_PLUGIN_NAME}-${PORTVERSION}-1.0.1
 
diff --git a/mail/squirrelmail-pupdate-plugin/Makefile b/mail/squirrelmail-pupdate-plugin/Makefile
index 5dbe812efa39..b6da44d3d57c 100644
--- a/mail/squirrelmail-pupdate-plugin/Makefile
+++ b/mail/squirrelmail-pupdate-plugin/Makefile
@@ -3,8 +3,8 @@
 
 PORTNAME=	pupdate
 PORTVERSION=	0.7
-PORTREVISION=	3
-CATEGORIES=		mail www
+PORTREVISION=	4
+CATEGORIES=	mail www
 DISTNAME=	${PORTNAME}.${PORTVERSION}-1.4.2
 
 MAINTAINER=	ports@FreeBSD.org
@@ -14,6 +14,5 @@ LICENSE=	GPLv2
 
 USE_GENERIC_PKGMESSAGE=	yes
 
-.include <bsd.port.pre.mk>
 .include "${.CURDIR}/../squirrelmail/bsd.squirrelmail.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/mail/squirrelmail-qmailadmin_login-plugin/Makefile b/mail/squirrelmail-qmailadmin_login-plugin/Makefile
index f76e1fe48622..b5c7f0b148eb 100644
--- a/mail/squirrelmail-qmailadmin_login-plugin/Makefile
+++ b/mail/squirrelmail-qmailadmin_login-plugin/Makefile
@@ -1,11 +1,11 @@
 # Created by: Gerrit Beine <gerrit.beine@gmx.de>
 # $FreeBSD$
 
-PORTNAME=		qmailadmin_login
+PORTNAME=	qmailadmin_login
 PORTVERSION=	1.1
-PORTREVISION=	3
-CATEGORIES=		mail www
-DISTNAME=		${PORTNAME}-${PORTVERSION}-1.4.3
+PORTREVISION=	4
+CATEGORIES=	mail www
+DISTNAME=	${PORTNAME}-${PORTVERSION}-1.4.3
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Using the QmailAdmin cgi interface from SquirrelMail
@@ -14,6 +14,5 @@ RUN_DEPENDS=	${PREFIX}/www/cgi-bin.default/qmailadmin/qmailadmin:${PORTSDIR}/mai
 
 USE_GENERIC_PKGMESSAGE=	yes
 
-.include <bsd.port.pre.mk>
 .include "${.CURDIR}/../squirrelmail/bsd.squirrelmail.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/mail/squirrelmail-quota_usage-plugin/Makefile b/mail/squirrelmail-quota_usage-plugin/Makefile
index 1acbf0f8aacc..e540a0b9fac5 100644
--- a/mail/squirrelmail-quota_usage-plugin/Makefile
+++ b/mail/squirrelmail-quota_usage-plugin/Makefile
@@ -1,18 +1,17 @@
 # Created by: Gerrit Beine <gerrit.beine@gmx.de>
 # $FreeBSD$
 
-PORTNAME=		quota_usage
+PORTNAME=	quota_usage
 PORTVERSION=	1.3.1
-PORTREVISION=	2
-CATEGORIES=		mail www
-DISTNAME=		${PORTNAME}-${PORTVERSION}-1.2.7
+PORTREVISION=	3
+CATEGORIES=	mail www
+DISTNAME=	${PORTNAME}-${PORTVERSION}-1.2.7
 
-MAINTAINER=		ports@FreeBSD.org
-COMMENT=		View quota and current usage
+MAINTAINER=	ports@FreeBSD.org
+COMMENT=	View quota and current usage
 
 USE_SM_COMPAT=	yes
 USE_GENERIC_PKGMESSAGE=	yes
 
-.include <bsd.port.pre.mk>
 .include "${.CURDIR}/../squirrelmail/bsd.squirrelmail.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/mail/squirrelmail-sasql-plugin/Makefile b/mail/squirrelmail-sasql-plugin/Makefile
index b7c93c6b0a63..c3e8dfee23e2 100644
--- a/mail/squirrelmail-sasql-plugin/Makefile
+++ b/mail/squirrelmail-sasql-plugin/Makefile
@@ -1,10 +1,10 @@
 # Created by: Gerrit Beine <gerrit.beine@gmx.de>
 # $FreeBSD$
 
-PORTNAME=		sasql
+PORTNAME=	sasql
 PORTVERSION=	3.2.0
-PORTREVISION=	2
-CATEGORIES=		mail www
+PORTREVISION=	3
+CATEGORIES=	mail www
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Edit SpamAssassin settings stored in an SQL DB
@@ -20,6 +20,5 @@ post-patch:
 		${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"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/mail/squirrelmail-secure_login-plugin/Makefile b/mail/squirrelmail-secure_login-plugin/Makefile
index 7a48b87dd6c6..0fe6c0ac85c9 100644
--- a/mail/squirrelmail-secure_login-plugin/Makefile
+++ b/mail/squirrelmail-secure_login-plugin/Makefile
@@ -2,8 +2,8 @@
 
 PORTNAME=	secure_login
 PORTVERSION=	1.4
-PORTREVISION=	2
-CATEGORIES=		mail www
+PORTREVISION=	3
+CATEGORIES=	mail www
 DISTNAME=	${PORTNAME}-${PORTVERSION}-1.2.8
 
 MAINTAINER=	ports@FreeBSD.org
@@ -13,6 +13,5 @@ LICENSE=	GPLv2
 
 USE_GENERIC_PKGMESSAGE=	yes
 
-.include <bsd.port.pre.mk>
 .include "${.CURDIR}/../squirrelmail/bsd.squirrelmail.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/mail/squirrelmail-shared_calendars-plugin/Makefile b/mail/squirrelmail-shared_calendars-plugin/Makefile
index 7648bb66eec5..2640d231eaa1 100644
--- a/mail/squirrelmail-shared_calendars-plugin/Makefile
+++ b/mail/squirrelmail-shared_calendars-plugin/Makefile
@@ -1,14 +1,14 @@
 # Created by: Gerrit Beine <gerrit.beine@gmx.de>
 # $FreeBSD$
 
-PORTNAME=		shared_calendars
+PORTNAME=	shared_calendars
 PORTVERSION=	2.0.1
-PORTREVISION=	2
-CATEGORIES=		mail www
-DISTNAME=		${PORTNAME}-${PORTVERSION}-1.4.0
+PORTREVISION=	3
+CATEGORIES=	mail www
+DISTNAME=	${PORTNAME}-${PORTVERSION}-1.4.0
 
-MAINTAINER=		ports@FreeBSD.org
-COMMENT=		iCal-compliant calendaring for SquirrelMail
+MAINTAINER=	ports@FreeBSD.org
+COMMENT=	iCal-compliant calendaring for SquirrelMail
 
 RUN_DEPENDS=	${SQUIRRELDIR}/plugins/calendar_file_backend:${PORTSDIR}/mail/squirrelmail-calendar_file_backend-plugin
 
@@ -16,6 +16,5 @@ USE_SM_COMPAT=	yes
 USE_GENERIC_PKGMESSAGE=	yes
 _SMSRCDIR=	calendar
 
-.include <bsd.port.pre.mk>
 .include "${.CURDIR}/../squirrelmail/bsd.squirrelmail.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/mail/squirrelmail-spam-buttons-plugin/Makefile b/mail/squirrelmail-spam-buttons-plugin/Makefile
index c158cb270a3a..81704f158500 100644
--- a/mail/squirrelmail-spam-buttons-plugin/Makefile
+++ b/mail/squirrelmail-spam-buttons-plugin/Makefile
@@ -3,8 +3,8 @@
 
 PORTNAME=	spam-buttons
 PORTVERSION=	2.3.1
-PORTREVISION=	1
-CATEGORIES=		mail www
+PORTREVISION=	2
+CATEGORIES=	mail www
 DISTNAME=	${SQUIRREL_PLUGIN_NAME}-${PORTVERSION}-1.4.0
 DIST_SUBDIR=	squirrelmail
 
@@ -17,7 +17,6 @@ SQUIRREL_PLUGIN_NAME=	${PORTNAME:S/-/_/}
 
 OPTIONS_DEFINE=	DOCS
 
-.include <bsd.port.pre.mk>
 .include "${.CURDIR}/../squirrelmail/bsd.squirrelmail.mk"
 
 post-extract:
@@ -25,4 +24,4 @@ post-extract:
 	@${RM} ${WRKSRC}/${_SMSRCDIR}/README
 	@${MV} ${WRKSRC}/${_SMSRCDIR}/docs ${WRKSRC}/${_SMSRCDIR}/doc
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/mail/squirrelmail-squirrel_logger-plugin/Makefile b/mail/squirrelmail-squirrel_logger-plugin/Makefile
index 18e30e5d960a..0ad6f2a983c0 100644
--- a/mail/squirrelmail-squirrel_logger-plugin/Makefile
+++ b/mail/squirrelmail-squirrel_logger-plugin/Makefile
@@ -3,8 +3,8 @@
 
 PORTNAME=	squirrel_logger
 PORTVERSION=	2.3
-PORTREVISION=	1
-CATEGORIES=		mail www
+PORTREVISION=	2
+CATEGORIES=	mail www
 DISTNAME=	${PORTNAME}-${PORTVERSION}-1.2.7
 
 MAINTAINER=	ports@FreeBSD.org
@@ -12,6 +12,5 @@ COMMENT=	Logging functionality for your webmail interface
 
 USE_SM_COMPAT=	yes
 
-.include <bsd.port.pre.mk>
 .include "${.CURDIR}/../squirrelmail/bsd.squirrelmail.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/mail/squirrelmail-timeout_user-plugin/Makefile b/mail/squirrelmail-timeout_user-plugin/Makefile
index fd5aaefac5e0..bf012ca21217 100644
--- a/mail/squirrelmail-timeout_user-plugin/Makefile
+++ b/mail/squirrelmail-timeout_user-plugin/Makefile
@@ -2,8 +2,8 @@
 
 PORTNAME=	timeout_user
 PORTVERSION=	1.1.1
-PORTREVISION=	4
-CATEGORIES=		mail www
+PORTREVISION=	5
+CATEGORIES=	mail www
 DISTNAME=	${PORTNAME}-${PORTVERSION}-0.5
 
 MAINTAINER=	ports@FreeBSD.org
@@ -18,6 +18,5 @@ USE_GENERIC_PKGMESSAGE=	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.post.mk>
+.include <bsd.port.mk>
diff --git a/mail/squirrelmail-unsafe_image_rules-plugin/Makefile b/mail/squirrelmail-unsafe_image_rules-plugin/Makefile
index 864a1e9ca3d7..37915b174477 100644
--- a/mail/squirrelmail-unsafe_image_rules-plugin/Makefile
+++ b/mail/squirrelmail-unsafe_image_rules-plugin/Makefile
@@ -3,8 +3,8 @@
 
 PORTNAME=	unsafe_image_rules
 PORTVERSION=	0.8
-PORTREVISION=	2
-CATEGORIES=		mail www
+PORTREVISION=	3
+CATEGORIES=	mail www
 DISTNAME=	${PORTNAME:S/-/_/}.${PORTVERSION}-1.4
 
 MAINTAINER=	itetcu@FreeBSD.org
@@ -14,6 +14,5 @@ USE_SM_COMPAT=	yes
 
 SQUIRREL_PLUGIN_NAME=	${PORTNAME:S/-/_/}
 
-.include <bsd.port.pre.mk>
 .include "${.CURDIR}/../squirrelmail/bsd.squirrelmail.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/mail/squirrelmail-user_special_mailboxes-plugin/Makefile b/mail/squirrelmail-user_special_mailboxes-plugin/Makefile
index 2131a49045c2..6c16be0025e8 100644
--- a/mail/squirrelmail-user_special_mailboxes-plugin/Makefile
+++ b/mail/squirrelmail-user_special_mailboxes-plugin/Makefile
@@ -3,8 +3,8 @@
 
 PORTNAME=	user_special_mailboxes
 PORTVERSION=	0.1
-PORTREVISION=	2
-CATEGORIES=		mail www
+PORTREVISION=	3
+CATEGORIES=	mail www
 DISTNAME=	${PORTNAME:S/-/_/}.${PORTVERSION}-1.4
 
 MAINTAINER=	itetcu@FreeBSD.org
@@ -14,6 +14,5 @@ USE_SM_COMPAT=	yes
 
 SQUIRREL_PLUGIN_NAME=	${PORTNAME:S/-/_/}
 
-.include <bsd.port.pre.mk>
 .include "${.CURDIR}/../squirrelmail/bsd.squirrelmail.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/mail/squirrelmail-vlogin-plugin/Makefile b/mail/squirrelmail-vlogin-plugin/Makefile
index 55dc09ac40b2..2966e48bc661 100644
--- a/mail/squirrelmail-vlogin-plugin/Makefile
+++ b/mail/squirrelmail-vlogin-plugin/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	vlogin
 PORTVERSION=	3.10.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	mail www
 DISTNAME=	${PORTNAME}-${PORTVERSION}-1.2.7
 
@@ -19,12 +19,12 @@ OPTIONS_DEFINE=	DOCS
 # We need to rearrange, install and cleanup documentation pre-install
 # because bsd.squirrelmail.mk installs everything under ${WRKSRC}/${PORTNAME}.
 pre-install::
-	cd ${WRKSRC}/${PORTNAME}/docs \
-	&& ${RM} .htaccess index.php \
-	&& ${MKDIR} ${STAGEDIR}${DOCSDIR} \
-	&& ${COPYTREE_SHARE} \* ${STAGEDIR}${DOCSDIR} \
-	&& cd ${WRKSRC}/${PORTNAME} \
-	&& ${RM} -rf README docs
+	${RM} ${WRKSRC}/${PORTNAME}/docs/.htaccess
+	${RM} ${WRKSRC}/${PORTNAME}/docs/index.php
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	(cd ${WRKSRC}/${PORTNAME}/docs && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR})
+	${RM} -rf ${WRKSRC}/${PORTNAME}/README
+	${RM} -rf ${WRKSRC}/${PORTNAME}/docs
 
 .include "${.CURDIR}/../squirrelmail/bsd.squirrelmail.mk"
 .include <bsd.port.mk>
diff --git a/mail/squirrelmail-websearch-plugin/Makefile b/mail/squirrelmail-websearch-plugin/Makefile
index ca4558f3c13e..01705b8aaafc 100644
--- a/mail/squirrelmail-websearch-plugin/Makefile
+++ b/mail/squirrelmail-websearch-plugin/Makefile
@@ -3,8 +3,8 @@
 
 PORTNAME=	web_search
 PORTVERSION=	0.1.6
-PORTREVISION=	3
-CATEGORIES=		mail www
+PORTREVISION=	4
+CATEGORIES=	mail www
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Plugin for Websearch
@@ -19,6 +19,5 @@ SQUIRREL_PLUGIN_CONFIG=	${SQUIRREL_PLUGIN_NAME}.conf.php
 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.post.mk>
+.include <bsd.port.mk>
diff --git a/mail/squirrelmail-wetteronline-plugin/Makefile b/mail/squirrelmail-wetteronline-plugin/Makefile
index ac13c96ab7ed..41a1fe4f0cf2 100644
--- a/mail/squirrelmail-wetteronline-plugin/Makefile
+++ b/mail/squirrelmail-wetteronline-plugin/Makefile
@@ -1,16 +1,15 @@
 # Created by: Gerrit Beine <gerrit.beine@gmx.de>
 # $FreeBSD$
 
-PORTNAME=		wetteronline
+PORTNAME=	wetteronline
 PORTVERSION=	0.1
-PORTREVISION=	2
-CATEGORIES=		mail www
+PORTREVISION=	3
+CATEGORIES=	mail www
 
-MAINTAINER=		ports@FreeBSD.org
-COMMENT=		Plugin for the weather in Germany
+MAINTAINER=	ports@FreeBSD.org
+COMMENT=	Plugin for the weather in Germany
 
 USE_SM_COMPAT=	yes
 
-.include <bsd.port.pre.mk>
 .include "${.CURDIR}/../squirrelmail/bsd.squirrelmail.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/mail/squirrelmail/bsd.squirrelmail.mk b/mail/squirrelmail/bsd.squirrelmail.mk
index 6cb3222bb4f2..903e70b886a2 100644
--- a/mail/squirrelmail/bsd.squirrelmail.mk
+++ b/mail/squirrelmail/bsd.squirrelmail.mk
@@ -56,7 +56,8 @@ SUB_LIST+=	SQUIRREL_PLUGIN_NAME=${SQUIRREL_PLUGIN_NAME}
 # As with mail/squirreldir, if you were using WITHOUT_WWWDIR=yes,
 # set SQUIRRELDIR=${PREFIX}/squirrelmail
 SQUIRRELDIR?=	${PREFIX}/www/squirrelmail
-PLIST_SUB+=	SQUIRRELDIR=${SQUIRRELDIR:S,${PREFIX}/,,}
+SQUIRRELDIR_REL=${SQUIRRELDIR:S,${PREFIX}/,,}
+PLIST_SUB+=	SQUIRRELDIR=${SQUIRRELDIR_REL}
 SUB_LIST+=	SQUIRRELDIR=${SQUIRRELDIR}
 
 SQUIRREL_PLUGIN_CONFIG?=	config.php
@@ -102,18 +103,16 @@ do-install:
 .if !target(post-install)
 post-install:
 .ifndef WITHOUT_ACTIVATE
-.if exists(${SQUIRRELDIR}/config/config.php)
-	@${ECHO_CMD} "Activating plug-in in SquirrelMail"
-	${SQUIRRELDIR}/config/conf.pl --install-plugin ${SQUIRREL_PLUGIN_NAME}
-.endif
+	@${ECHO_CMD} \
+		'@exec if [ -f %D/${SQUIRRELDIR_REL}/config/conf.pl ]; 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' \
+		>> ${TMPPLIST}
 .else
-	@${ECHO_CMD} "To activate the plug-in in SquirrelMail use"
-	@${ECHO_CMD} "${SQUIRRELDIR}/config/conf.pl --install-plugin ${SQUIRREL_PLUGIN_NAME}"
+	@${ECHO_CMD} \
+		'@exec echo "To activate the plug-in in SquirrelMail use" && echo ""%D/${SQUIRRELDIR_REL}/config/conf.pl --install-plugin ${SQUIRREL_PLUGIN_NAME}"' \
+		>> ${TMPPLIST}
 .endif
-	@${ECHO_CMD} ""
 
-.if exists(${FILESDIR}/pkg-message.in) || exists(${FILESDIR}/plugin-pkg-message.in)
-	@${CAT} ${PKGMESSAGE}
-	@${ECHO_CMD} ""
-.endif
 .endif