Convert remaining squirrelmail plugins to bsd.squirrelmail.mk. Because they

were duplicating the content there, php version mismatches were created and
package building broke. Also includes a few whitespace and header fixes due
to OCD.

Feature safe:	yes

7 files changed, 32 insertions, 252 deletions

diff --git a/mail/squirrelmail-calendar_file_backend-plugin/Makefile b/mail/squirrelmail-calendar_file_backend-plugin/Makefile
index 6698b6e63e20..d31904a004bf 100644
--- a/mail/squirrelmail-calendar_file_backend-plugin/Makefile
+++ b/mail/squirrelmail-calendar_file_backend-plugin/Makefile
@@ -1,73 +1,18 @@
-# New ports collection makefile for:		squirrelmail-calendar_file_backend-plugin
-# Date created:		02 Jan 2008
-# Whom:		Gerrit Beine <gerrit.beine@gmx.de>
-#
+# Created by:		Gerrit Beine <gerrit.beine@gmx.de>
 # $FreeBSD$
 
 PORTNAME=		calendar_file_backend
 PORTVERSION=		1.0
 PORTREVISION=	1
-CATEGORIES=		mail www
-MASTER_SITES=		http://www.squirrelmail.org/plugins/
-PKGNAMEPREFIX=		squirrelmail-
-PKGNAMESUFFIX=		-plugin
 DISTNAME=		${PORTNAME}-${PORTVERSION}-2.0
 DIST_SUBDIR=		squirrelmail
 
 MAINTAINER=		ports@FreeBSD.org
 COMMENT=		File backend for SquirrelMail Calendar plugin
 
-RUN_DEPENDS=		${SQUIRRELDIR}/index.php:${PORTSDIR}/mail/squirrelmail
-
 SQUIRREL_PLUGIN_NAME=	${PORTNAME}
 
-.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
-
-NO_BUILD=		yes
-NO_WRKSUBDIR=		yes
-USE_PERL5_BUILD=	yes
-USE_PHP=		yes
-WANT_PHP_WEB=		yes
-
-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} -rp ${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
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+.include "${PORTSDIR}/mail/squirrelmail/bsd.squirrelmail.mk"
+.include <bsd.port.post.mk>
diff --git a/mail/squirrelmail-calendar_sql_backend-plugin/Makefile b/mail/squirrelmail-calendar_sql_backend-plugin/Makefile
index 883122b76afb..bfb3f58e50ca 100644
--- a/mail/squirrelmail-calendar_sql_backend-plugin/Makefile
+++ b/mail/squirrelmail-calendar_sql_backend-plugin/Makefile
@@ -1,80 +1,21 @@
-# New ports collection makefile for:		squirrelmail-calendar_sql_backend-plugin
-# Date created:		02 Jan 2008
-# Whom:		Gerrit Beine <gerrit.beine@gmx.de>
-#
+# Created by:		Gerrit Beine <gerrit.beine@gmx.de>
 # $FreeBSD$
 
 PORTNAME=		calendar_sql_backend
-PORTVERSION=		1.1
+PORTVERSION=	1.1
 PORTREVISION=	1
-CATEGORIES=		mail www
-MASTER_SITES=		http://www.squirrelmail.org/plugins/
-PKGNAMEPREFIX=		squirrelmail-
-PKGNAMESUFFIX=		-plugin
 DISTNAME=		${PORTNAME}-${PORTVERSION}-2.0
-DIST_SUBDIR=		squirrelmail
+DIST_SUBDIR=	squirrelmail
 
 MAINTAINER=		ports@FreeBSD.org
 COMMENT=		SQL backend for SquirrelMail Calendar plugin
 
-RUN_DEPENDS=		${SQUIRRELDIR}/index.php:${PORTSDIR}/mail/squirrelmail \
-			${PEARDIR}/DB.php:${PORTSDIR}/databases/pear-DB
-
-SQUIRREL_PLUGIN_NAME=	${PORTNAME}
-
-.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
-
-SUB_FILES=		pkg-message
-
-NO_BUILD=		yes
-NO_WRKSUBDIR=		yes
-USE_PERL5_BUILD=	yes
-USE_PHP=		yes
-WANT_PHP_WEB=		yes
-
+RUN_DEPENDS=	${PEARDIR}/DB.php:${PORTSDIR}/databases/pear-DB
 PEARDIR=		${PREFIX}/share/pear
 
-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} -rp ${WRKSRC}/${SQUIRREL_PLUGIN_NAME} ${SQUIRRELDIR}/plugins
-	${CHOWN} -R ${WWWOWN}:${WWWGRP} ${SQUIRRELDIR}/plugins/${SQUIRREL_PLUGIN_NAME}
+SQUIRREL_PLUGIN_NAME=	${PORTNAME}
 
-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 <bsd.port.mk>
+.include <bsd.port.pre.mk>
+.include "${PORTSDIR}/mail/squirrelmail/bsd.squirrelmail.mk"
+.include <bsd.port.post.mk>
diff --git a/mail/squirrelmail-calendar_sql_backend-plugin/files/pkg-message.in b/mail/squirrelmail-calendar_sql_backend-plugin/files/pkg-message.in
index 640a3dce5e14..ec62c0a078e5 100644
--- a/mail/squirrelmail-calendar_sql_backend-plugin/files/pkg-message.in
+++ b/mail/squirrelmail-calendar_sql_backend-plugin/files/pkg-message.in
@@ -1,5 +1,5 @@
 For the port to work properly you must copy the file
-%%PREFIX%%/%%SQUIRRELDIR%%/plugins/calendar_sql_backend/config.sample.php
+%%SQUIRRELDIR%%/plugins/calendar_sql_backend/config.sample.php
 to
-%%PREFIX%%/%%SQUIRRELDIR%%/plugins/calendar_sql_backend/config.php
+%%SQUIRRELDIR%%/plugins/calendar_sql_backend/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 f851fd1c21d0..2fa25c0e0725 100644
--- a/mail/squirrelmail-login_auth-plugin/Makefile
+++ b/mail/squirrelmail-login_auth-plugin/Makefile
@@ -4,70 +4,20 @@
 #
 # $FreeBSD$
 
-PORTNAME=		squirrelmail-${SQUIRREL_PLUGIN_NAME}-plugin
+PORTNAME=		login_auth
 PORTVERSION=		2.0
 PORTREVISION=	1
-CATEGORIES=		mail www
 MASTER_SITES=		http://www.squirrelmail.org/plugins/ \
 					http://alkoholix.tallence.de/www.squirrelmail.org/plugins/
-DISTNAME=		${SQUIRREL_PLUGIN_NAME}-${PORTVERSION}-1.4.0
+DISTNAME=		${PORTNAME}-${PORTVERSION}-1.4.0
 DIST_SUBDIR=		squirrelmail
 
 MAINTAINER=		stb@lassitu.de
 COMMENT=		Automatically log in user based on HTTP authentication
 
-RUN_DEPENDS=		${SQUIRRELDIR}/index.php:${PORTSDIR}/mail/squirrelmail
+SQUIRREL_PLUGIN_NAME=	${PORTNAME}
 
-SQUIRREL_PLUGIN_NAME=	login_auth
 
-.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
-
-NO_BUILD=		yes
-NO_WRKSUBDIR=		yes
-USE_PERL5_BUILD=	yes
-USE_PHP=		yes
-WANT_PHP_WEB=		yes
-
-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} -rp ${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} ""
-
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+.include "${PORTSDIR}/mail/squirrelmail/bsd.squirrelmail.mk"
+.include <bsd.port.post.mk>
diff --git a/mail/squirrelmail-postfixadmin-plugin/Makefile b/mail/squirrelmail-postfixadmin-plugin/Makefile
index 56ec0f410bb8..ecc83049a5a2 100644
--- a/mail/squirrelmail-postfixadmin-plugin/Makefile
+++ b/mail/squirrelmail-postfixadmin-plugin/Makefile
@@ -20,6 +20,7 @@ COMMENT=	Lets users change password, vacation, and forwarding
 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"
diff --git a/mail/squirrelmail-qmailadmin_login-plugin/Makefile b/mail/squirrelmail-qmailadmin_login-plugin/Makefile
index 383ec961b5a5..4dcc62a08453 100644
--- a/mail/squirrelmail-qmailadmin_login-plugin/Makefile
+++ b/mail/squirrelmail-qmailadmin_login-plugin/Makefile
@@ -1,75 +1,18 @@
-# New ports collection makefile for:		squirrelmail-qmailadmin_login-plugin
-# Date created:		9 Dec 2006
-# Whom:			Gerrit Beine <gerrit.beine@gmx.de>
-#
+# Created by:			Gerrit Beine <gerrit.beine@gmx.de>
 # $FreeBSD$
 
-PORTNAME=		squirrelmail-${SQUIRREL_PLUGIN_NAME}-plugin
-PORTVERSION=		1.1
+PORTNAME=		qmailadmin_login
+PORTVERSION=	1.1
 PORTREVISION=	2
-CATEGORIES=		mail www
-MASTER_SITES=		http://www.squirrelmail.org/plugins/
-DISTNAME=		${SQUIRREL_PLUGIN_NAME}-${PORTVERSION}-1.4.3
-DIST_SUBDIR=		squirrelmail
+DISTNAME=		${PORTNAME}-${PORTVERSION}-1.4.3
+DIST_SUBDIR=	squirrelmail
 
 MAINTAINER=		ports@FreeBSD.org
 COMMENT=		Using the QmailAdmin cgi interface from SquirrelMail
 
-RUN_DEPENDS=		${SQUIRRELDIR}/index.php:${PORTSDIR}/mail/squirrelmail
+SQUIRREL_PLUGIN_NAME=	${PORTNAME}
 
-SQUIRREL_PLUGIN_NAME=	qmailadmin_login
 
-.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
-
-SUB_FILES=		pkg-message
-
-NO_BUILD=		yes
-NO_WRKSUBDIR=		yes
-USE_PERL5_BUILD=	yes
-USE_PHP=		yes
-WANT_PHP_WEB=		yes
-
-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} -rp ${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 <bsd.port.mk>
+.include <bsd.port.pre.mk>
+.include "${PORTSDIR}/mail/squirrelmail/bsd.squirrelmail.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
index d2f34e38e113..e34a820fe51e 100644
--- a/mail/squirrelmail-qmailadmin_login-plugin/files/pkg-message.in
+++ b/mail/squirrelmail-qmailadmin_login-plugin/files/pkg-message.in
@@ -1,5 +1,5 @@
 For the port to work properly you must copy the file
-%%PREFIX%%/%%SQUIRRELDIR%%/plugins/qmailadmin_login/config_default.php
+%%SQUIRRELDIR%%/plugins/qmailadmin_login/config_default.php
 to
-%%PREFIX%%/%%SQUIRRELDIR%%/plugins/qmailadmin_login/config.php
+%%SQUIRRELDIR%%/plugins/qmailadmin_login/config.php
 and edit the configuration to meet your needs.