3 files changed, 50 insertions, 34 deletions

diff --git a/mail/squirrelmail-compatibility-plugin/Makefile b/mail/squirrelmail-compatibility-plugin/Makefile
index 0a6c036d07f1..343ca851e76a 100644
--- a/mail/squirrelmail-compatibility-plugin/Makefile
+++ b/mail/squirrelmail-compatibility-plugin/Makefile
@@ -1,39 +1,40 @@
 # New ports collection makefile for:	squirrelmail-compatibility-plugin
-# Date created:		3 Jul 2005
-# Whom:		Alexander Wittig <alexander@wittig.name>
+# Date created:				3 Jul 2005
+# Whom:					Alexander Wittig <alexander@wittig.name>
 #
 # $FreeBSD$
 
-PORTNAME=		squirrelmail-${SQUIRREL_PLUGIN_NAME}-plugin
-PORTVERSION=		2.0.4
-CATEGORIES=		mail www
-MASTER_SITES=		http://www.squirrelmail.org/plugins/
-DISTNAME=		${SQUIRREL_PLUGIN_NAME}-${PORTVERSION}
-DIST_SUBDIR=		squirrelmail
+PORTNAME=	squirrelmail
+PORTVERSION=	2.0.6
+CATEGORIES=	mail www
+MASTER_SITES=	http://www.squirrelmail.org/plugins/
+PKGNAMESUFFIX=	-${SQUIRREL_PLUGIN_NAME}-plugin
+DISTNAME=	${SQUIRREL_PLUGIN_NAME}-${PORTVERSION}
+DIST_SUBDIR=	squirrelmail
 
-MAINTAINER=		alexander@wittig.name
-COMMENT=		Required by many plugins for compatibility with SquirrelMail
+MAINTAINER=	alexander@wittig.name
+COMMENT=	Required by many plugins for compatibility with SquirrelMail
 
-RUN_DEPENDS=		${SQUIRRELDIR}/index.php:${PORTSDIR}/mail/squirrelmail
+RUN_DEPENDS=	squirrelmail>=1.4.9:${PORTSDIR}/mail/squirrelmail
 
-SQUIRREL_PLUGIN_NAME=		compatibility
+SQUIRREL_PLUGIN_NAME=	compatibility
 
 .ifdef SQUIRRELDIR
-PLIST_SUB+=		SQUIRRELDIR=${SQUIRRELDIR}
+PLIST_SUB+=	SQUIRRELDIR=${SQUIRRELDIR}
 .else
 .	ifndef WITHOUT_WWWDIR
-SQUIRRELDIR=		${PREFIX}/www/squirrelmail
-PLIST_SUB+=		SQUIRRELDIR=www/squirrelmail
+SQUIRRELDIR=	${PREFIX}/www/squirrelmail
+PLIST_SUB+=	SQUIRRELDIR=www/squirrelmail
 .	else
-SQUIRRELDIR=		${PREFIX}/squirrelmail
-PLIST_SUB+=		SQUIRRELDIR=squirrelmail
+SQUIRRELDIR=	${PREFIX}/squirrelmail
+PLIST_SUB+=	SQUIRRELDIR=squirrelmail
 .	endif
 .endif
 
-NO_BUILD=		yes
-NO_WRKSUBDIR=		yes
-USE_PERL5_BUILD=		yes
-WANT_PHP_WEB=		yes
+NO_BUILD=	yes
+NO_WRKSUBDIR=	yes
+USE_PERL5_BUILD=	yes
+WANT_PHP_WEB=	yes
 
 pre-everything::
 	@${ECHO} ""
@@ -54,7 +55,7 @@ do-install:
 post-install:
 	@${ECHO} "Patching SquirrelMail for compatibility plugin"
 	@${ECHO} ""
-	${PATCH} -sN -p0 -d ${SQUIRRELDIR}/plugins < ${SQUIRRELDIR}/plugins/compatibility/patches/compatibility_patch-1.4.5.diff
+	${PATCH} -sN -p0 -d ${SQUIRRELDIR}/plugins/compatibility < ${SQUIRRELDIR}/plugins/compatibility/patches/compatibility_patch-1.4.9.diff
 	@${ECHO} ""
 
 .ifndef WITHOUT_ACTIVATE
diff --git a/mail/squirrelmail-compatibility-plugin/distinfo b/mail/squirrelmail-compatibility-plugin/distinfo
index fb8976f4828d..2dc353e0dc3d 100644
--- a/mail/squirrelmail-compatibility-plugin/distinfo
+++ b/mail/squirrelmail-compatibility-plugin/distinfo
@@ -1,3 +1,3 @@
-MD5 (squirrelmail/compatibility-2.0.4.tar.gz) = cfc3279a613b917fcba8200c596dadb0
-SHA256 (squirrelmail/compatibility-2.0.4.tar.gz) = 5aa1bbf871a131eeb3d64e9c89b239231927ebc9aee81a272a31d014ccae667e
-SIZE (squirrelmail/compatibility-2.0.4.tar.gz) = 18703
+MD5 (squirrelmail/compatibility-2.0.6.tar.gz) = a0cd6c1e2d307184033b35ee34fd2364
+SHA256 (squirrelmail/compatibility-2.0.6.tar.gz) = 3f2c27390bf715d98220849b2445332683daa23a0e05d2a037b17e497f3d114c
+SIZE (squirrelmail/compatibility-2.0.6.tar.gz) = 25079
diff --git a/mail/squirrelmail-compatibility-plugin/pkg-plist b/mail/squirrelmail-compatibility-plugin/pkg-plist
index 5d56a75f1a22..18935e8bd529 100644
--- a/mail/squirrelmail-compatibility-plugin/pkg-plist
+++ b/mail/squirrelmail-compatibility-plugin/pkg-plist
@@ -1,6 +1,17 @@
 @unexec if [ -f %D/%%SQUIRRELDIR%%/config/config.php ]; then %D/%%SQUIRRELDIR%%/config/conf.pl --remove-plugin compatibility; fi
 @unexec mv -f %D/%%SQUIRRELDIR%%/functions/strings.php.orig %D/%%SQUIRRELDIR%%/functions/strings.php
-@exec mkdir -p %D/%%SQUIRRELDIR%%/plugins/compatibility/includes/1.5.1
+@exec mkdir -p %D/%%SQUIRRELDIR%%/plugins/compatibility/includes/1.4.0
+@exec mkdir -p %D/%%SQUIRRELDIR%%/plugins/compatibility/includes/1.4.1
+@exec mkdir -p %D/%%SQUIRRELDIR%%/plugins/compatibility/includes/1.4.2
+@exec mkdir -p %D/%%SQUIRRELDIR%%/plugins/compatibility/includes/1.4.3
+@exec mkdir -p %D/%%SQUIRRELDIR%%/plugins/compatibility/includes/1.4.4
+@exec mkdir -p %D/%%SQUIRRELDIR%%/plugins/compatibility/includes/1.4.5
+@exec mkdir -p %D/%%SQUIRRELDIR%%/plugins/compatibility/includes/1.4.6
+@exec mkdir -p %D/%%SQUIRRELDIR%%/plugins/compatibility/includes/1.4.7
+@exec mkdir -p %D/%%SQUIRRELDIR%%/plugins/compatibility/includes/1.4.8
+@exec mkdir -p %D/%%SQUIRRELDIR%%/plugins/compatibility/includes/1.4.9
+@exec mkdir -p %D/%%SQUIRRELDIR%%/plugins/compatibility/includes/1.4.10
+@exec mkdir -p %D/%%SQUIRRELDIR%%/plugins/compatibility/includes/1.5.2
 %%SQUIRRELDIR%%/plugins/compatibility/compatibility.pot
 %%SQUIRRELDIR%%/plugins/compatibility/COPYING
 %%SQUIRRELDIR%%/plugins/compatibility/functions.php
@@ -10,20 +21,15 @@
 %%SQUIRRELDIR%%/plugins/compatibility/make_release.sh
 %%SQUIRRELDIR%%/plugins/compatibility/README
 %%SQUIRRELDIR%%/plugins/compatibility/setup.php
+%%SQUIRRELDIR%%/plugins/compatibility/TODO
 %%SQUIRRELDIR%%/plugins/compatibility/version
 %%SQUIRRELDIR%%/plugins/compatibility/includes/1.2.7/global.php
 %%SQUIRRELDIR%%/plugins/compatibility/includes/1.2.8/global.php
 %%SQUIRRELDIR%%/plugins/compatibility/includes/1.2.9/global.php
 %%SQUIRRELDIR%%/plugins/compatibility/includes/1.2.10/global.php
 %%SQUIRRELDIR%%/plugins/compatibility/includes/1.2.11/global.php
-%%SQUIRRELDIR%%/plugins/compatibility/includes/1.4.0/global.php
-%%SQUIRRELDIR%%/plugins/compatibility/includes/1.4.1/global.php
-%%SQUIRRELDIR%%/plugins/compatibility/includes/1.4.2/global.php
-%%SQUIRRELDIR%%/plugins/compatibility/includes/1.4.3/global.php
-%%SQUIRRELDIR%%/plugins/compatibility/includes/1.4.4/global.php
-%%SQUIRRELDIR%%/plugins/compatibility/includes/1.4.5/global.php
-%%SQUIRRELDIR%%/plugins/compatibility/includes/1.4.6/global.php
 %%SQUIRRELDIR%%/plugins/compatibility/includes/1.5.0/global.php
+%%SQUIRRELDIR%%/plugins/compatibility/includes/1.5.1/global.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.2.diff
@@ -31,6 +37,10 @@
 %%SQUIRRELDIR%%/plugins/compatibility/patches/compatibility_patch-1.4.4.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/patches/compatibility_patch-1.5.0.diff
 %%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/patches.old/compatibility_patch-1.4.5.diff
@@ -47,11 +57,16 @@
 @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
+@dirrm %%SQUIRRELDIR%%/plugins/compatibility/includes/1.4.9
+@dirrm %%SQUIRRELDIR%%/plugins/compatibility/includes/1.4.10
 @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
 @dirrm %%SQUIRRELDIR%%/plugins/compatibility/patches
 @dirrm %%SQUIRRELDIR%%/plugins/compatibility/patches.old
 @dirrm %%SQUIRRELDIR%%/plugins/compatibility
-@exec patch -sN -p0 -d %D/%%SQUIRRELDIR%%/plugins < %D/%%SQUIRRELDIR%%/plugins/compatibility/patches/compatibility_patch-1.4.5.diff
+@exec patch -sN -p0 -d %D/%%SQUIRRELDIR%%/plugins/compatibility < %D/%%SQUIRRELDIR%%/plugins/compatibility/patches/compatibility_patch-1.4.5.diff
 @exec if [ -f %D/%%SQUIRRELDIR%%/config/config.php ]; then %D/%%SQUIRRELDIR%%/config/conf.pl --install-plugin compatibility; fi