CATEGORIES is defined in bsd.squirrelmail.mk which is always loaded after .mk inclusion leading to PKGORIGIN not being set when needed.

Nothing requires bsd.squirrelmail to be loaded after bsd.port.pre.mk but the PORTDIR.
Convert "${PORTDIR}/mail" to ${.CURDIR}/.. and remove all the pre.mk/post.mk dancine

Reported by:	erwin

25 files changed, 74 insertions, 187 deletions

diff --git a/mail/squirrelmail-abook_import_export-plugin/Makefile b/mail/squirrelmail-abook_import_export-plugin/Makefile
index 36c7e9a01fcc..f5684b739e74 100644
--- a/mail/squirrelmail-abook_import_export-plugin/Makefile
+++ b/mail/squirrelmail-abook_import_export-plugin/Makefile
@@ -1,10 +1,5 @@
-# New ports collection makefile for:	squirrelmail-abook_import-export-plugin
-# Date created:				2010-01-27
-# Whom:					Scott Lambert <lambert@lambertfam.org>
-# Modified from: 			squirrelmail-check_quota-plugin
-#
+# Created by: Scott Lambert <lambert@lambertfam.org>
 # $FreeBSD$
-#
 
 PORTNAME=	abook_import_export
 PORTVERSION=	1.1
@@ -16,8 +11,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 "${PORTSDIR}/mail/squirrelmail/bsd.squirrelmail.mk"
-
-.include <bsd.port.post.mk>
+.include "${.CURDIR}/../squirrelmail/bsd.squirrelmail.mk"
+.include <bsd.port.mk>
diff --git a/mail/squirrelmail-askuserinfo-plugin/Makefile b/mail/squirrelmail-askuserinfo-plugin/Makefile
index d0c4401b032f..f2d7dcf4ddc4 100644
--- a/mail/squirrelmail-askuserinfo-plugin/Makefile
+++ b/mail/squirrelmail-askuserinfo-plugin/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	squirrelmail-askuserinfo-plugin
-# Date created:		2010-05-25
-# Whom:			Thomas Abthorpe <tabthorpe@FreeBSD.org>
-#
+# Created by: Thomas Abthorpe <tabthorpe@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	askuserinfo
 PORTVERSION=	1.1
@@ -13,6 +9,5 @@ DIST_SUBDIR=	squirrelmail
 MAINTAINER=	tabthorpe@FreeBSD.org
 COMMENT=	Ask user to enter Full name and Email address at initial logon
 
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/mail/squirrelmail/bsd.squirrelmail.mk"
-.include <bsd.port.post.mk>
+.include "${.CURDIR}/../squirrelmail/bsd.squirrelmail.mk"
+.include <bsd.port.mk>
diff --git a/mail/squirrelmail-avelsieve-plugin/Makefile b/mail/squirrelmail-avelsieve-plugin/Makefile
index ffe5eea5c92b..d5031a954eb3 100644
--- a/mail/squirrelmail-avelsieve-plugin/Makefile
+++ b/mail/squirrelmail-avelsieve-plugin/Makefile
@@ -1,7 +1,4 @@
-# New ports collection makefile for:	squirrelmail-avelsieve-plugin
-# Date created:		28 Jun 2007
-# Whom:			Neil Darlow <neil@darlow.co.uk>
-#
+# Created by: Neil Darlow <neil@darlow.co.uk>
 # $FreeBSD$
 
 PORTNAME=	avelsieve
@@ -14,12 +11,11 @@ COMMENT=	SquirrelMail plugin for Server-Side Mail Filtering management
 
 USE_PERL5_RUN=	yes
 
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/mail/squirrelmail/bsd.squirrelmail.mk"
+.include "${.CURSIR}/../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.post.mk>
+.include <bsd.port.mk>
diff --git a/mail/squirrelmail-calendar_file_backend-plugin/Makefile b/mail/squirrelmail-calendar_file_backend-plugin/Makefile
index d31904a004bf..2e5cdd943e6b 100644
--- a/mail/squirrelmail-calendar_file_backend-plugin/Makefile
+++ b/mail/squirrelmail-calendar_file_backend-plugin/Makefile
@@ -12,7 +12,5 @@ COMMENT=		File backend for SquirrelMail Calendar plugin
 
 SQUIRREL_PLUGIN_NAME=	${PORTNAME}
 
-
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/mail/squirrelmail/bsd.squirrelmail.mk"
-.include <bsd.port.post.mk>
+.include "${.CURDIR}/../squirrelmail/bsd.squirrelmail.mk"
+.include <bsd.port.mk>
diff --git a/mail/squirrelmail-calendar_sql_backend-plugin/Makefile b/mail/squirrelmail-calendar_sql_backend-plugin/Makefile
index c31920f55e7c..9c185ac5bed8 100644
--- a/mail/squirrelmail-calendar_sql_backend-plugin/Makefile
+++ b/mail/squirrelmail-calendar_sql_backend-plugin/Makefile
@@ -1,4 +1,4 @@
-# Created by:		Gerrit Beine <gerrit.beine@gmx.de>
+# Created by: Gerrit Beine <gerrit.beine@gmx.de>
 # $FreeBSD$
 
 PORTNAME=		calendar_sql_backend
@@ -17,7 +17,5 @@ PEARDIR=		${PREFIX}/share/pear
 
 SQUIRREL_PLUGIN_NAME=	${PORTNAME}
 
-
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/mail/squirrelmail/bsd.squirrelmail.mk"
-.include <bsd.port.post.mk>
+.include "${.CURDIR}/../squirrelmail/bsd.squirrelmail.mk"
+.include <bsd.port.mk>
diff --git a/mail/squirrelmail-change_ldappass-plugin/Makefile b/mail/squirrelmail-change_ldappass-plugin/Makefile
index 9b5d7c14ceed..a8521c4e9d34 100644
--- a/mail/squirrelmail-change_ldappass-plugin/Makefile
+++ b/mail/squirrelmail-change_ldappass-plugin/Makefile
@@ -1,7 +1,4 @@
-# New ports collection makefile for:	squirrelmail-change_ldappass-plugin
-# Date created:		3 Jul 2005
-# Whom:			Alexander Wittig <alexander@wittig.name>
-#
+# Created by: Alexander Wittig <alexander@wittig.name>
 # $FreeBSD$
 
 PORTNAME=	change_ldappass
@@ -18,6 +15,5 @@ LICENSE=	GPLv2
 USE_PHP+=	ldap
 USES=		gettext
 
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/mail/squirrelmail/bsd.squirrelmail.mk"
-.include <bsd.port.post.mk>
+.include "${.CURDIR}/../squirrelmail/bsd.squirrelmail.mk"
+.include <bsd.port.mk>
diff --git a/mail/squirrelmail-change_sqlpass-plugin/Makefile b/mail/squirrelmail-change_sqlpass-plugin/Makefile
index 38b535903941..5ba19d8e75ed 100644
--- a/mail/squirrelmail-change_sqlpass-plugin/Makefile
+++ b/mail/squirrelmail-change_sqlpass-plugin/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	squirrelmail-spam-buttons-plugin
-# Date created:				2008-02-16
-# Whom:					Ion-Mihai "IOnut" Tetcu <itetcu@FreeBSD.org>
-#
+# Created by: Ion-Mihai "IOnut" Tetcu <itetcu@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	change-sqlpass
 PORTVERSION=	3.3
@@ -20,9 +16,5 @@ RUN_DEPENDS=	${LOCALBASE}/share/pear/DB.php:${PORTSDIR}/databases/pear-DB
 
 SQUIRREL_PLUGIN_NAME=	${PORTNAME:S/-/_/}
 
-
-.include <bsd.port.pre.mk>
-
-.include "${PORTSDIR}/mail/squirrelmail/bsd.squirrelmail.mk"
-
-.include <bsd.port.post.mk>
+.include "${.CURDIR}/../squirrelmail/bsd.squirrelmail.mk"
+.include <bsd.port.mk>
diff --git a/mail/squirrelmail-check_quota-plugin/Makefile b/mail/squirrelmail-check_quota-plugin/Makefile
index 73d5d7e158d4..ed09dc53316e 100644
--- a/mail/squirrelmail-check_quota-plugin/Makefile
+++ b/mail/squirrelmail-check_quota-plugin/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	squirrelmail-check_quota-plugin
-# Date created:				2008-02-16
-# Whom:					Ion-Mihai "IOnut" Tetcu <itetcu@FreeBSD.org>
-#
+# Created by: Ion-Mihai "IOnut" Tetcu <itetcu@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	check-quota
 PORTVERSION=	2.2
@@ -18,8 +14,6 @@ USE_SM_COMPAT=	YES
 
 SQUIRREL_PLUGIN_NAME=	${PORTNAME:S/-/_/}
 
-.include <bsd.port.pre.mk>
+.include "${.CURDIR}/../squirrelmail/bsd.squirrelmail.mk"
 
-.include "${PORTSDIR}/mail/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 2ab9f74f6855..675778102b9a 100644
--- a/mail/squirrelmail-compatibility-plugin/Makefile
+++ b/mail/squirrelmail-compatibility-plugin/Makefile
@@ -1,7 +1,4 @@
-# New ports collection makefile for:	squirrelmail-compatibility-plugin
-# Date created:				3 Jul 2005
-# Whom:					Alexander Wittig <alexander@wittig.name>
-#
+# Created by: Alexander Wittig <alexander@wittig.name>
 # $FreeBSD$
 
 PORTNAME=	compatibility
@@ -20,6 +17,5 @@ USE_PERL5_RUN=	yes
 
 CONFLICTS=	squirrelmail-compatibility-plugin-1.*
 
-.include <bsd.port.pre.mk>
-.include "../squirrelmail/bsd.squirrelmail.mk"
-.include <bsd.port.post.mk>
+.include "${.CURDIR}/../squirrelmail/bsd.squirrelmail.mk"
+.include <bsd.port.mk>
diff --git a/mail/squirrelmail-email_footer-plugin/Makefile b/mail/squirrelmail-email_footer-plugin/Makefile
index 2fed4a9a3f8b..3214eb7376ba 100644
--- a/mail/squirrelmail-email_footer-plugin/Makefile
+++ b/mail/squirrelmail-email_footer-plugin/Makefile
@@ -1,7 +1,4 @@
-# New ports collection makefile for:		squirrelmail-email_footer-plugin
-# Date created:		10 Feb 2006
-# Whom:		Gerrit Beine <gerrit.beine@gmx.de>
-#
+# Created by: Gerrit Beine <gerrit.beine@gmx.de>
 # $FreeBSD$
 
 PORTNAME=	email_footer
@@ -16,6 +13,5 @@ RUN_DEPENDS+=	${SQUIRRELDIR}/plugins/compatibility:${PORTSDIR}/mail/squirrelmail
 
 LICENSE=	GPLv2
 
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/mail/squirrelmail/bsd.squirrelmail.mk"
-.include <bsd.port.post.mk>
+.include "${.CURDIR}/../squirrelmail/bsd.squirrelmail.mk"
+.include <bsd.port.mk>
diff --git a/mail/squirrelmail-login_auth-plugin/Makefile b/mail/squirrelmail-login_auth-plugin/Makefile
index 631198509ad0..c05d421893eb 100644
--- a/mail/squirrelmail-login_auth-plugin/Makefile
+++ b/mail/squirrelmail-login_auth-plugin/Makefile
@@ -13,6 +13,5 @@ COMMENT=		Automatically log in user based on HTTP authentication
 
 SQUIRREL_PLUGIN_NAME=	${PORTNAME}
 
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/mail/squirrelmail/bsd.squirrelmail.mk"
-.include <bsd.port.post.mk>
+.include "${.CURDIR}/../squirrelmail/bsd.squirrelmail.mk"
+.include <bsd.port.mk>
diff --git a/mail/squirrelmail-login_notes-plugin/Makefile b/mail/squirrelmail-login_notes-plugin/Makefile
index 870cb626e276..9a2e3d6ee0a3 100644
--- a/mail/squirrelmail-login_notes-plugin/Makefile
+++ b/mail/squirrelmail-login_notes-plugin/Makefile
@@ -1,7 +1,4 @@
-# New ports collection makefile for:		squirrelmail-login_notes-plugin
-# Date created:		10 Feb 2006
-# Whom:		Gerrit Beine <gerrit.beine@gmx.de>
-#
+# Created by: Gerrit Beine <gerrit.beine@gmx.de>
 # $FreeBSD$
 
 PORTNAME=	login_notes
@@ -18,6 +15,5 @@ RUN_DEPENDS+=	${SQUIRRELDIR}/plugins/compatibility:${PORTSDIR}/mail/squirrelmail
 
 USE_PERL5_RUN=	yes
 
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/mail/squirrelmail/bsd.squirrelmail.mk"
-.include <bsd.port.post.mk>
+.include "${.CURDIR}/../squirrelmail/bsd.squirrelmail.mk"
+.include <bsd.port.mk>
diff --git a/mail/squirrelmail-mark_read-plugin/Makefile b/mail/squirrelmail-mark_read-plugin/Makefile
index efbde0c8703b..74192cdb0c26 100644
--- a/mail/squirrelmail-mark_read-plugin/Makefile
+++ b/mail/squirrelmail-mark_read-plugin/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	squirrelmail-mark_read-plugin
-# Date created:				2008-02-16
-# Whom:					Ion-Mihai "IOnut" Tetcu <itetcu@FreeBSD.org>
-#
+# Created by: Ion-Mihai "IOnut" Tetcu <itetcu@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	mark_read
 PORTVERSION=	1.4.2
@@ -22,8 +18,5 @@ SQUIRREL_PLUGIN_NAME=	${PORTNAME:S/-/_/}
 post-patch:
 	@${RM} ${WRKSRC}/${SQUIRREL_PLUGIN_NAME}/mark_read.php.orig
 
-.include <bsd.port.pre.mk>
-
-.include "${PORTSDIR}/mail/squirrelmail/bsd.squirrelmail.mk"
-
-.include <bsd.port.post.mk>
+.include "${.CURDIR}/../squirrelmail/bsd.squirrelmail.mk"
+.include <bsd.port.mk>
diff --git a/mail/squirrelmail-password_forget-plugin/Makefile b/mail/squirrelmail-password_forget-plugin/Makefile
index bd7e740a56fa..645d4a03f426 100644
--- a/mail/squirrelmail-password_forget-plugin/Makefile
+++ b/mail/squirrelmail-password_forget-plugin/Makefile
@@ -1,7 +1,4 @@
-# New ports collection makefile for:	squirrelmail-password_forget-plugin
-# Date created:		4 Dec 2006
-# Whom:			Neil Darlow <neil@darlow.co.uk>
-#
+# Created by: Neil Darlow <neil@darlow.co.uk>
 # $FreeBSD$
 
 PORTNAME=	password_forget
@@ -20,6 +17,5 @@ RUN_DEPENDS=	${SQUIRRELDIR}/plugins/compatibility:${PORTSDIR}/mail/squirrelmail-
 
 USE_PERL5_RUN=	yes
 
-.include <bsd.port.pre.mk>
-.include "../squirrelmail/bsd.squirrelmail.mk"
-.include <bsd.port.post.mk>
+.include "${.CURDIR}/../squirrelmail/bsd.squirrelmail.mk"
+.include <bsd.port.mk>
diff --git a/mail/squirrelmail-postfixadmin-plugin/Makefile b/mail/squirrelmail-postfixadmin-plugin/Makefile
index 6c94cc8d550a..5fac051b6768 100644
--- a/mail/squirrelmail-postfixadmin-plugin/Makefile
+++ b/mail/squirrelmail-postfixadmin-plugin/Makefile
@@ -19,10 +19,9 @@ RUN_DEPENDS=	ZendFramework>=1.9.0:${PORTSDIR}/www/zend-framework
 USE_BZIP2=	yes
 DEFAULT_PHP_VER=	53
 
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/mail/squirrelmail/bsd.squirrelmail.mk"
+.include "${.CURDIR}/../squirrelmail/bsd.squirrelmail.mk"
 
 pre-install:
 	${RM} -rf ${WRKSRC}/${_SMSRCDIR}/debian
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/mail/squirrelmail-pupdate-plugin/Makefile b/mail/squirrelmail-pupdate-plugin/Makefile
index 60c4fb113fc5..40251a562a15 100644
--- a/mail/squirrelmail-pupdate-plugin/Makefile
+++ b/mail/squirrelmail-pupdate-plugin/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	squirrelmail-pupdate-plugin
-# Date created:		2006-06-27
-# Whom:			Thomas Abthorpe <thomas@goodking.ca>
-#
+# Created by: Thomas Abthorpe <thomas@goodking.ca>
 # $FreeBSD$
-#
 
 PORTNAME=	pupdate
 PORTVERSION=	0.7
@@ -16,6 +12,5 @@ COMMENT=	Checks for plugin updates by parsing the SM site
 
 LICENSE=	GPLv2
 
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/mail/squirrelmail/bsd.squirrelmail.mk"
-.include <bsd.port.post.mk>
+.include "${.CURDIR}/../squirrelmail/bsd.squirrelmail.mk"
+.include <bsd.port.mk>
diff --git a/mail/squirrelmail-qmailadmin_login-plugin/Makefile b/mail/squirrelmail-qmailadmin_login-plugin/Makefile
index 4dcc62a08453..4e5e020e62ce 100644
--- a/mail/squirrelmail-qmailadmin_login-plugin/Makefile
+++ b/mail/squirrelmail-qmailadmin_login-plugin/Makefile
@@ -4,15 +4,14 @@
 PORTNAME=		qmailadmin_login
 PORTVERSION=	1.1
 PORTREVISION=	2
-DISTNAME=		${PORTNAME}-${PORTVERSION}-1.4.3
+DISTNAME=	${PORTNAME}-${PORTVERSION}-1.4.3
 DIST_SUBDIR=	squirrelmail
 
-MAINTAINER=		ports@FreeBSD.org
-COMMENT=		Using the QmailAdmin cgi interface from SquirrelMail
+MAINTAINER=	ports@FreeBSD.org
+COMMENT=	Using the QmailAdmin cgi interface from SquirrelMail
 
 SQUIRREL_PLUGIN_NAME=	${PORTNAME}
 
 
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/mail/squirrelmail/bsd.squirrelmail.mk"
-.include <bsd.port.post.mk>
+.include "${.CURDIR}/../squirrelmail/bsd.squirrelmail.mk"
+.include <bsd.port.mk>
diff --git a/mail/squirrelmail-secure_login-plugin/Makefile b/mail/squirrelmail-secure_login-plugin/Makefile
index cef2b1e55d22..bccf6f18e4a9 100644
--- a/mail/squirrelmail-secure_login-plugin/Makefile
+++ b/mail/squirrelmail-secure_login-plugin/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	squirrelmail-secure_login-plugin
-# Date created:		2006-06-20
-# Whom:			Thomas Abthorpe <thomas@goodking.ca>
-#
+# Created by: Thomas Abthorpe <thomas@goodking.ca>
 # $FreeBSD$
-#
 
 PORTNAME=	secure_login
 PORTVERSION=	1.4
@@ -18,6 +14,5 @@ LICENSE=	GPLv2
 
 USE_PERL5_RUN=	yes
 
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/mail/squirrelmail/bsd.squirrelmail.mk"
-.include <bsd.port.post.mk>
+.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 f0c5caa20d38..400f40878989 100644
--- a/mail/squirrelmail-spam-buttons-plugin/Makefile
+++ b/mail/squirrelmail-spam-buttons-plugin/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	squirrelmail-spam-buttons-plugin
-# Date created:				2008-02-16
-# Whom:					Ion-Mihai "IOnut" Tetcu <itetcu@FreeBSD.org>
-#
+# Created by: Ion-Mihai "IOnut" Tetcu <itetcu@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	spam-buttons
 PORTVERSION=	2.3.1
@@ -18,9 +14,7 @@ USE_PERL5_RUN=	yes
 
 SQUIRREL_PLUGIN_NAME=	${PORTNAME:S/-/_/}
 
-.include <bsd.port.pre.mk>
-
-.include "${PORTSDIR}/mail/squirrelmail/bsd.squirrelmail.mk"
+.include "${.CURDIR}/../squirrelmail/bsd.squirrelmail.mk"
 
 post-extract:
 	@${MV} ${WRKSRC}/${_SMSRCDIR}/config_example.php ${WRKSRC}/${_SMSRCDIR}/config.sample.php
@@ -31,4 +25,4 @@ post-extract:
 	@${MV} ${WRKSRC}/${_SMSRCDIR}/docs ${WRKSRC}/${_SMSRCDIR}/doc
 .endif
 
-.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 fbc5665cd0dd..31f987d1d3ee 100644
--- a/mail/squirrelmail-squirrel_logger-plugin/Makefile
+++ b/mail/squirrelmail-squirrel_logger-plugin/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:    squirrelmail-squirrel_logger-plugin
-# Date created:         2010-07-13
-# Whom:                 Satoru Suzuki <xsuzu@yokohama.riken.jp>
-#
+# Created by: Satoru Suzuki <xsuzu@yokohama.riken.jp>
 # $FreeBSD$
-#
 
 PORTNAME=	squirrel_logger
 PORTVERSION=	2.3
@@ -19,8 +15,6 @@ COMMENT=	Logging functionality for your webmail interface
 
 USE_SM_COMPAT=	yes
 
-.include <bsd.port.pre.mk>
+.include "${.CURDIR}/../squirrelmail/bsd.squirrelmail.mk"
 
-.include "${PORTSDIR}/mail/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 1ef19231ace7..7a1b970e1eb8 100644
--- a/mail/squirrelmail-timeout_user-plugin/Makefile
+++ b/mail/squirrelmail-timeout_user-plugin/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	squirrelmail-timeout_user-plugin
-# Date created:		2006-07-07
-# Whom:			Thomas Abthorpe <thomas@goodking.ca>
-#
+# Created by: Thomas Abthorpe <thomas@goodking.ca>
 # $FreeBSD$
-#
 
 PORTNAME=	timeout_user
 PORTVERSION=	1.1.1
@@ -18,6 +14,5 @@ LICENSE=	GPLv2
 
 RUN_DEPENDS+=	${SQUIRRELDIR}/plugins/compatibility:${PORTSDIR}/mail/squirrelmail-compatibility-plugin
 
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/mail/squirrelmail/bsd.squirrelmail.mk"
-.include <bsd.port.post.mk>
+.include "${.CURDIR}/../squirrelmail/bsd.squirrelmail.mk"
+.include <bsd.port.mk>
diff --git a/mail/squirrelmail-unsafe_image_rules-plugin/Makefile b/mail/squirrelmail-unsafe_image_rules-plugin/Makefile
index e6501348599c..3ac62f970884 100644
--- a/mail/squirrelmail-unsafe_image_rules-plugin/Makefile
+++ b/mail/squirrelmail-unsafe_image_rules-plugin/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	squirrelmail-unsafe_image_rules-plugin
-# Date created:				2008-02-16
-# Whom:					Ion-Mihai "IOnut" Tetcu <itetcu@FreeBSD.org>
-#
+# Created by: Ion-Mihai "IOnut" Tetcu <itetcu@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	unsafe_image_rules
 PORTVERSION=	0.8
@@ -19,8 +15,6 @@ USE_PERL5_RUN=	yes
 
 SQUIRREL_PLUGIN_NAME=	${PORTNAME:S/-/_/}
 
-.include <bsd.port.pre.mk>
+.include "${.CURDIR}/../squirrelmail/bsd.squirrelmail.mk"
 
-.include "${PORTSDIR}/mail/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 64b0b156f1ef..d6b0e8e31ff1 100644
--- a/mail/squirrelmail-user_special_mailboxes-plugin/Makefile
+++ b/mail/squirrelmail-user_special_mailboxes-plugin/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	squirrelmail-user_special_mailboxes-plugin
-# Date created:				2008-02-16
-# Whom:					Ion-Mihai "IOnut" Tetcu <itetcu@FreeBSD.org>
-#
+# Created by: Ion-Mihai "IOnut" Tetcu <itetcu@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	user_special_mailboxes
 PORTVERSION=	0.1
@@ -19,8 +15,5 @@ USE_PERL5_RUN=	yes
 
 SQUIRREL_PLUGIN_NAME=	${PORTNAME:S/-/_/}
 
-.include <bsd.port.pre.mk>
-
-.include "${PORTSDIR}/mail/squirrelmail/bsd.squirrelmail.mk"
-
-.include <bsd.port.post.mk>
+.include "${.CURDIR}/../squirrelmail/bsd.squirrelmail.mk"
+.include <bsd.port.mk>
diff --git a/mail/squirrelmail-vlogin-plugin/Makefile b/mail/squirrelmail-vlogin-plugin/Makefile
index 8437812e9229..7089b4a6ade9 100644
--- a/mail/squirrelmail-vlogin-plugin/Makefile
+++ b/mail/squirrelmail-vlogin-plugin/Makefile
@@ -1,7 +1,4 @@
-# New ports collection makefile for:	squirrelmail-vlogin-plugin
-# Date created:		10 Oct 2005
-# Whom:		Matt Emmerton <matt@gsicomp.on.ca>
-#
+# Created by: Matt Emmerton <matt@gsicomp.on.ca>
 # $FreeBSD$
 
 PORTNAME=	vlogin
@@ -21,8 +18,7 @@ USE_SM_COMPAT=	yes
 
 DOCSDIR=	${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}
 
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/mail/squirrelmail/bsd.squirrelmail.mk"
+.include "${.CURDIR}/../squirrelmail/bsd.squirrelmail.mk"
 
 # We need to rearrange, install and cleanup documentation pre-install
 # because bsd.squirrelmail.mk installs everything under ${WRKSRC}/${PORTNAME}.
@@ -38,4 +34,4 @@ pre-install::
 	cd ${WRKSRC}/${PORTNAME} && ${RM} -rf README docs
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/mail/squirrelmail-websearch-plugin/Makefile b/mail/squirrelmail-websearch-plugin/Makefile
index 786e93ce2788..1356c6a9f484 100644
--- a/mail/squirrelmail-websearch-plugin/Makefile
+++ b/mail/squirrelmail-websearch-plugin/Makefile
@@ -1,7 +1,4 @@
-# New ports collection makefile for:		squirrelmail-websearch-plugin
-# Date created:		10 August
-# Whom:			Martin Wilke <miwi@FreeBSD.org>
-#
+# Created by: Martin Wilke <miwi@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	websearch
@@ -19,6 +16,5 @@ RUN_DEPENDS+=	${SQUIRRELDIR}/plugins/compatibility:${PORTSDIR}/mail/squirrelmail
 
 SQUIRREL_PLUGIN_NAME=	web_search
 
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/mail/squirrelmail/bsd.squirrelmail.mk"
-.include <bsd.port.post.mk>
+.include "${.CURDIR}/../squirrelmail/bsd.squirrelmail.mk"
+.include <bsd.port.mk>