- Update to 2.0.12

Notified by:	portscout

3 files changed, 80 insertions, 131 deletions

diff --git a/mail/squirrelmail-compatibility-plugin/Makefile b/mail/squirrelmail-compatibility-plugin/Makefile
index 07f6923d634d..6e5996d53201 100644
--- a/mail/squirrelmail-compatibility-plugin/Makefile
+++ b/mail/squirrelmail-compatibility-plugin/Makefile
@@ -5,8 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	compatibility
-PORTVERSION=	2.0.11
-PORTREVISION=	2
+PORTVERSION=	2.0.12
 CATEGORIES=	mail www
 MASTER_SITES=	http://www.squirrelmail.org/plugins/
 PKGNAMEPREFIX=	squirrelmail-
@@ -17,62 +16,8 @@ DIST_SUBDIR=	squirrelmail
 MAINTAINER=	tabthorpe@FreeBSD.org
 COMMENT=	Required by many plugins for compatibility with SquirrelMail
 
-RUN_DEPENDS=	squirrelmail>=1.4.11:${PORTSDIR}/mail/squirrelmail
-
 CONFLICTS=	squirrelmail-compatibility-plugin-1.*
 
-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
-PLIST_SUB+=	SQUIRREL_PLUGIN_NAME=${SQUIRREL_PLUGIN_NAME}
-
-NO_BUILD=	yes
-NO_WRKSUBDIR=	yes
-USE_PERL5_BUILD=	yes
-WANT_PHP_WEB=	yes
-
 .include <bsd.port.pre.mk>
-
-pre-everything::
-	@${ECHO} ""
-.ifndef WITHOUT_ACTIVATE
-	@${ECHO} "Activating plug-in in SquirrelMail after installation."
-	@${ECHO} "If you don't want to automatically activate the plug-in set"
-	@${ECHO} "WITHOUT_ACTIVATE=yes"
-.else
-	@${ECHO} "NOT Activating plug-in in SquirrelMail after installation."
-	@${ECHO} "If you want to automatically activate the plug-in unset"
-	@${ECHO} "WITHOUT_ACTIVATE"
-.endif
-	@${ECHO} ""
-
-do-install:
-	${CP} -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 "../squirrelmail/bsd.squirrelmail.mk"
 .include <bsd.port.post.mk>
diff --git a/mail/squirrelmail-compatibility-plugin/distinfo b/mail/squirrelmail-compatibility-plugin/distinfo
index 7bfbb5bba61d..d2e98fb80654 100644
--- a/mail/squirrelmail-compatibility-plugin/distinfo
+++ b/mail/squirrelmail-compatibility-plugin/distinfo
@@ -1,3 +1,3 @@
-MD5 (squirrelmail/compatibility-2.0.11-1.0.tar.gz) = fc8dc9337709798143d91f7c951e00b6
-SHA256 (squirrelmail/compatibility-2.0.11-1.0.tar.gz) = ece311a04ab4677b19f334147be7595003154dbf25ea49ed475177901c1bd403
-SIZE (squirrelmail/compatibility-2.0.11-1.0.tar.gz) = 35085
+MD5 (squirrelmail/compatibility-2.0.12-1.0.tar.gz) = ceafcd88a9b3d032a7dc47d7ff5628a4
+SHA256 (squirrelmail/compatibility-2.0.12-1.0.tar.gz) = e6420dc9e9939df048e2b9ba0ac575649843b64d27b447ece313900fb6d031c5
+SIZE (squirrelmail/compatibility-2.0.12-1.0.tar.gz) = 37523
diff --git a/mail/squirrelmail-compatibility-plugin/pkg-plist b/mail/squirrelmail-compatibility-plugin/pkg-plist
index cd4f17c253db..80c8e59a1fd3 100644
--- a/mail/squirrelmail-compatibility-plugin/pkg-plist
+++ b/mail/squirrelmail-compatibility-plugin/pkg-plist
@@ -1,87 +1,91 @@
 @unexec if [ -f %D/%%SQUIRRELDIR%%/config/config.php ]; then %D/%%SQUIRRELDIR%%/config/conf.pl --remove-plugin %%SQUIRREL_PLUGIN_NAME%%; fi
+%%SQUIRRELDIR%%/plugins/compatibility/COPYING
+%%SQUIRRELDIR%%/plugins/compatibility/INSTALL
+%%SQUIRRELDIR%%/plugins/compatibility/README
+%%SQUIRRELDIR%%/plugins/compatibility/compatibility.pot
 %%SQUIRRELDIR%%/plugins/compatibility/functions.php
+%%SQUIRRELDIR%%/plugins/compatibility/getpot
+%%SQUIRRELDIR%%/plugins/compatibility/includes/1.2.10/index.php
+%%SQUIRRELDIR%%/plugins/compatibility/includes/1.2.11/index.php
+%%SQUIRRELDIR%%/plugins/compatibility/includes/1.2.7/index.php
+%%SQUIRRELDIR%%/plugins/compatibility/includes/1.2.8/index.php
+%%SQUIRRELDIR%%/plugins/compatibility/includes/1.2.9/index.php
+%%SQUIRRELDIR%%/plugins/compatibility/includes/1.4.0/global.php
+%%SQUIRRELDIR%%/plugins/compatibility/includes/1.4.0/index.php
+%%SQUIRRELDIR%%/plugins/compatibility/includes/1.4.1/index.php
+%%SQUIRRELDIR%%/plugins/compatibility/includes/1.4.10/index.php
+%%SQUIRRELDIR%%/plugins/compatibility/includes/1.4.11/global.php
+%%SQUIRRELDIR%%/plugins/compatibility/includes/1.4.11/index.php
+%%SQUIRRELDIR%%/plugins/compatibility/includes/1.4.12/index.php
+%%SQUIRRELDIR%%/plugins/compatibility/includes/1.4.13/index.php
+%%SQUIRRELDIR%%/plugins/compatibility/includes/1.4.14/index.php
+%%SQUIRRELDIR%%/plugins/compatibility/includes/1.4.15/index.php
+%%SQUIRRELDIR%%/plugins/compatibility/includes/1.4.16/index.php
+%%SQUIRRELDIR%%/plugins/compatibility/includes/1.4.2/index.php
+%%SQUIRRELDIR%%/plugins/compatibility/includes/1.4.3/index.php
+%%SQUIRRELDIR%%/plugins/compatibility/includes/1.4.4/index.php
+%%SQUIRRELDIR%%/plugins/compatibility/includes/1.4.5/index.php
+%%SQUIRRELDIR%%/plugins/compatibility/includes/1.4.6/index.php
+%%SQUIRRELDIR%%/plugins/compatibility/includes/1.4.7/index.php
+%%SQUIRRELDIR%%/plugins/compatibility/includes/1.4.8/index.php
+%%SQUIRRELDIR%%/plugins/compatibility/includes/1.4.9/index.php
+%%SQUIRRELDIR%%/plugins/compatibility/includes/1.5.0/global.php
+%%SQUIRRELDIR%%/plugins/compatibility/includes/1.5.0/index.php
+%%SQUIRRELDIR%%/plugins/compatibility/includes/1.5.1/global.php
+%%SQUIRRELDIR%%/plugins/compatibility/includes/1.5.1/index.php
+%%SQUIRRELDIR%%/plugins/compatibility/includes/1.5.2/global.php
+%%SQUIRRELDIR%%/plugins/compatibility/includes/1.5.2/index.php
+%%SQUIRRELDIR%%/plugins/compatibility/includes/index.php
 %%SQUIRRELDIR%%/plugins/compatibility/index.php
-%%SQUIRRELDIR%%/plugins/compatibility/compatibility.pot
-%%SQUIRRELDIR%%/plugins/compatibility/version
-%%SQUIRRELDIR%%/plugins/compatibility/INSTALL
-%%SQUIRRELDIR%%/plugins/compatibility/patches.old/index.php
-%%SQUIRRELDIR%%/plugins/compatibility/patches.old/compatibility_patch-1.4.6.diff
-%%SQUIRRELDIR%%/plugins/compatibility/patches.old/compatibility_patch-1.4.5.diff
+%%SQUIRRELDIR%%/plugins/compatibility/make_release.sh
 %%SQUIRRELDIR%%/plugins/compatibility/patches.old/compatibility_patch-1.2.11.diff
 %%SQUIRRELDIR%%/plugins/compatibility/patches.old/compatibility_patch-1.4.4.diff
-%%SQUIRRELDIR%%/plugins/compatibility/COPYING
-%%SQUIRRELDIR%%/plugins/compatibility/patches/compatibility_patch-1.5.0.diff
-%%SQUIRRELDIR%%/plugins/compatibility/patches/index.php
+%%SQUIRRELDIR%%/plugins/compatibility/patches.old/compatibility_patch-1.4.5.diff
+%%SQUIRRELDIR%%/plugins/compatibility/patches.old/compatibility_patch-1.4.6.diff
+%%SQUIRRELDIR%%/plugins/compatibility/patches.old/index.php
+%%SQUIRRELDIR%%/plugins/compatibility/patches/compatibility_patch-1.4.0.diff
 %%SQUIRRELDIR%%/plugins/compatibility/patches/compatibility_patch-1.4.1.diff
-%%SQUIRRELDIR%%/plugins/compatibility/patches/compatibility_patch-1.4.3.diff
-%%SQUIRRELDIR%%/plugins/compatibility/patches/compatibility_patch-1.4.7.diff
 %%SQUIRRELDIR%%/plugins/compatibility/patches/compatibility_patch-1.4.10.diff
-%%SQUIRRELDIR%%/plugins/compatibility/patches/compatibility_patch-1.4.8.diff
-%%SQUIRRELDIR%%/plugins/compatibility/patches/compatibility_patch-1.4.6.diff
-%%SQUIRRELDIR%%/plugins/compatibility/patches/compatibility_patch-1.4.5.diff
-%%SQUIRRELDIR%%/plugins/compatibility/patches/compatibility_patch-1.4.2.diff
 %%SQUIRRELDIR%%/plugins/compatibility/patches/compatibility_patch-1.4.11.diff
+%%SQUIRRELDIR%%/plugins/compatibility/patches/compatibility_patch-1.4.2.diff
+%%SQUIRRELDIR%%/plugins/compatibility/patches/compatibility_patch-1.4.3.diff
 %%SQUIRRELDIR%%/plugins/compatibility/patches/compatibility_patch-1.4.4.diff
-%%SQUIRRELDIR%%/plugins/compatibility/patches/compatibility_patch-1.4.0.diff
+%%SQUIRRELDIR%%/plugins/compatibility/patches/compatibility_patch-1.4.5.diff
+%%SQUIRRELDIR%%/plugins/compatibility/patches/compatibility_patch-1.4.6.diff
+%%SQUIRRELDIR%%/plugins/compatibility/patches/compatibility_patch-1.4.7.diff
+%%SQUIRRELDIR%%/plugins/compatibility/patches/compatibility_patch-1.4.8.diff
 %%SQUIRRELDIR%%/plugins/compatibility/patches/compatibility_patch-1.4.9.diff
-%%SQUIRRELDIR%%/plugins/compatibility/getpot
+%%SQUIRRELDIR%%/plugins/compatibility/patches/compatibility_patch-1.5.0.diff
+%%SQUIRRELDIR%%/plugins/compatibility/patches/index.php
 %%SQUIRRELDIR%%/plugins/compatibility/setup.php
-%%SQUIRRELDIR%%/plugins/compatibility/README
-%%SQUIRRELDIR%%/plugins/compatibility/make_release.sh
-%%SQUIRRELDIR%%/plugins/compatibility/includes/1.2.11/index.php
-%%SQUIRRELDIR%%/plugins/compatibility/includes/1.4.1/index.php
-%%SQUIRRELDIR%%/plugins/compatibility/includes/index.php
-%%SQUIRRELDIR%%/plugins/compatibility/includes/1.4.8/index.php
-%%SQUIRRELDIR%%/plugins/compatibility/includes/1.2.7/index.php
-%%SQUIRRELDIR%%/plugins/compatibility/includes/1.4.3/index.php
-%%SQUIRRELDIR%%/plugins/compatibility/includes/1.4.14/index.php
-%%SQUIRRELDIR%%/plugins/compatibility/includes/1.5.2/index.php
-%%SQUIRRELDIR%%/plugins/compatibility/includes/1.5.2/global.php
-%%SQUIRRELDIR%%/plugins/compatibility/includes/1.5.1/index.php
-%%SQUIRRELDIR%%/plugins/compatibility/includes/1.5.1/global.php
-%%SQUIRRELDIR%%/plugins/compatibility/includes/1.4.9/index.php
-%%SQUIRRELDIR%%/plugins/compatibility/includes/1.2.9/index.php
-%%SQUIRRELDIR%%/plugins/compatibility/includes/1.4.12/index.php
-%%SQUIRRELDIR%%/plugins/compatibility/includes/1.2.10/index.php
-%%SQUIRRELDIR%%/plugins/compatibility/includes/1.4.11/index.php
-%%SQUIRRELDIR%%/plugins/compatibility/includes/1.4.11/global.php
-%%SQUIRRELDIR%%/plugins/compatibility/includes/1.2.8/index.php
-%%SQUIRRELDIR%%/plugins/compatibility/includes/1.4.13/index.php
-%%SQUIRRELDIR%%/plugins/compatibility/includes/1.5.0/index.php
-%%SQUIRRELDIR%%/plugins/compatibility/includes/1.5.0/global.php
-%%SQUIRRELDIR%%/plugins/compatibility/includes/1.4.7/index.php
-%%SQUIRRELDIR%%/plugins/compatibility/includes/1.4.5/index.php
-%%SQUIRRELDIR%%/plugins/compatibility/includes/1.4.6/index.php
-%%SQUIRRELDIR%%/plugins/compatibility/includes/1.4.4/index.php
-%%SQUIRRELDIR%%/plugins/compatibility/includes/1.4.2/index.php
-%%SQUIRRELDIR%%/plugins/compatibility/includes/1.4.0/index.php
-%%SQUIRRELDIR%%/plugins/compatibility/includes/1.4.0/global.php
-%%SQUIRRELDIR%%/plugins/compatibility/includes/1.4.10/index.php
-@dirrm %%SQUIRRELDIR%%/plugins/compatibility/includes/1.2.7
-@dirrm %%SQUIRRELDIR%%/plugins/compatibility/includes/1.2.8
-@dirrm %%SQUIRRELDIR%%/plugins/compatibility/includes/1.2.9
-@dirrm %%SQUIRRELDIR%%/plugins/compatibility/includes/1.2.10
-@dirrm %%SQUIRRELDIR%%/plugins/compatibility/includes/1.2.11
-@dirrm %%SQUIRRELDIR%%/plugins/compatibility/includes/1.4.0
-@dirrm %%SQUIRRELDIR%%/plugins/compatibility/includes/1.4.1
-@dirrm %%SQUIRRELDIR%%/plugins/compatibility/includes/1.4.2
-@dirrm %%SQUIRRELDIR%%/plugins/compatibility/includes/1.4.3
-@dirrm %%SQUIRRELDIR%%/plugins/compatibility/includes/1.4.4
-@dirrm %%SQUIRRELDIR%%/plugins/compatibility/includes/1.4.5
-@dirrm %%SQUIRRELDIR%%/plugins/compatibility/includes/1.4.6
-@dirrm %%SQUIRRELDIR%%/plugins/compatibility/includes/1.4.7
-@dirrm %%SQUIRRELDIR%%/plugins/compatibility/includes/1.4.8
+%%SQUIRRELDIR%%/plugins/compatibility/version
+@dirrm %%SQUIRRELDIR%%/plugins/compatibility/patches.old
+@dirrm %%SQUIRRELDIR%%/plugins/compatibility/patches
+@dirrm %%SQUIRRELDIR%%/plugins/compatibility/includes/1.5.2
+@dirrm %%SQUIRRELDIR%%/plugins/compatibility/includes/1.5.1
+@dirrm %%SQUIRRELDIR%%/plugins/compatibility/includes/1.5.0
 @dirrm %%SQUIRRELDIR%%/plugins/compatibility/includes/1.4.9
-@dirrm %%SQUIRRELDIR%%/plugins/compatibility/includes/1.4.10
-@dirrm %%SQUIRRELDIR%%/plugins/compatibility/includes/1.4.11
-@dirrm %%SQUIRRELDIR%%/plugins/compatibility/includes/1.4.12
-@dirrm %%SQUIRRELDIR%%/plugins/compatibility/includes/1.4.13
+@dirrm %%SQUIRRELDIR%%/plugins/compatibility/includes/1.4.8
+@dirrm %%SQUIRRELDIR%%/plugins/compatibility/includes/1.4.7
+@dirrm %%SQUIRRELDIR%%/plugins/compatibility/includes/1.4.6
+@dirrm %%SQUIRRELDIR%%/plugins/compatibility/includes/1.4.5
+@dirrm %%SQUIRRELDIR%%/plugins/compatibility/includes/1.4.4
+@dirrm %%SQUIRRELDIR%%/plugins/compatibility/includes/1.4.3
+@dirrm %%SQUIRRELDIR%%/plugins/compatibility/includes/1.4.2
+@dirrm %%SQUIRRELDIR%%/plugins/compatibility/includes/1.4.16
+@dirrm %%SQUIRRELDIR%%/plugins/compatibility/includes/1.4.15
 @dirrm %%SQUIRRELDIR%%/plugins/compatibility/includes/1.4.14
-@dirrm %%SQUIRRELDIR%%/plugins/compatibility/includes/1.5.0
-@dirrm %%SQUIRRELDIR%%/plugins/compatibility/includes/1.5.1
-@dirrm %%SQUIRRELDIR%%/plugins/compatibility/includes/1.5.2
+@dirrm %%SQUIRRELDIR%%/plugins/compatibility/includes/1.4.13
+@dirrm %%SQUIRRELDIR%%/plugins/compatibility/includes/1.4.12
+@dirrm %%SQUIRRELDIR%%/plugins/compatibility/includes/1.4.11
+@dirrm %%SQUIRRELDIR%%/plugins/compatibility/includes/1.4.10
+@dirrm %%SQUIRRELDIR%%/plugins/compatibility/includes/1.4.1
+@dirrm %%SQUIRRELDIR%%/plugins/compatibility/includes/1.4.0
+@dirrm %%SQUIRRELDIR%%/plugins/compatibility/includes/1.2.9
+@dirrm %%SQUIRRELDIR%%/plugins/compatibility/includes/1.2.8
+@dirrm %%SQUIRRELDIR%%/plugins/compatibility/includes/1.2.7
+@dirrm %%SQUIRRELDIR%%/plugins/compatibility/includes/1.2.11
+@dirrm %%SQUIRRELDIR%%/plugins/compatibility/includes/1.2.10
 @dirrm %%SQUIRRELDIR%%/plugins/compatibility/includes
-@dirrm %%SQUIRRELDIR%%/plugins/compatibility/patches
-@dirrm %%SQUIRRELDIR%%/plugins/compatibility/patches.old
 @dirrm %%SQUIRRELDIR%%/plugins/compatibility
 @exec if [ -f %D/%%SQUIRRELDIR%%/config/config.php ]; then %D/%%SQUIRRELDIR%%/config/conf.pl --install-plugin %%SQUIRREL_PLUGIN_NAME%%; fi