4 files changed, 36 insertions, 30 deletions

diff --git a/mail/squirrelmail-compatibility-plugin/Makefile b/mail/squirrelmail-compatibility-plugin/Makefile
index 7af909523510..0c30915ca3de 100644
--- a/mail/squirrelmail-compatibility-plugin/Makefile
+++ b/mail/squirrelmail-compatibility-plugin/Makefile
@@ -4,35 +4,39 @@
 #
 # $FreeBSD$
 
-PORTNAME=	squirrelmail
-PORTVERSION=	2.0.6
-PORTREVISION=	1
+PORTNAME=	compatibility
+PORTVERSION=	2.0.8
 CATEGORIES=	mail www
 MASTER_SITES=	http://www.squirrelmail.org/plugins/
-PKGNAMESUFFIX=	-${SQUIRREL_PLUGIN_NAME}-plugin
-DISTNAME=	${SQUIRREL_PLUGIN_NAME}-${PORTVERSION}
+PKGNAMEPREFIX=	squirrelmail-
+PKGNAMESUFFIX=	-plugin
+DISTNAME=	${PORTNAME}-${PORTVERSION}-1.0
 DIST_SUBDIR=	squirrelmail
 
-MAINTAINER=	alexander@wittig.name
+MAINTAINER=	thomas@goodking.ca
 COMMENT=	Required by many plugins for compatibility with SquirrelMail
 
-RUN_DEPENDS=	squirrelmail>=1.4.9:${PORTSDIR}/mail/squirrelmail
+RUN_DEPENDS=	squirrelmail>=1.4.10:${PORTSDIR}/mail/squirrelmail
 
 CONFLICTS=	squirrelmail-compatibility-plugin-1.*
 
-SQUIRREL_PLUGIN_NAME=	compatibility
+SQUIRREL_PLUGIN_NAME=	${PORTNAME}
 
 .ifdef SQUIRRELDIR
 PLIST_SUB+=	SQUIRRELDIR=${SQUIRRELDIR}
+SUB_LIST+=	"SQUIRRELDIR=${SQUIRRELDIR}"
 .else
-.	ifndef WITHOUT_WWWDIR
+.ifndef WITHOUT_WWWDIR
 SQUIRRELDIR=	${PREFIX}/www/squirrelmail
 PLIST_SUB+=	SQUIRRELDIR=www/squirrelmail
-.	else
+SUB_LIST+=	"SQUIRRELDIR=www/squirrelmail"
+.else
 SQUIRRELDIR=	${PREFIX}/squirrelmail
 PLIST_SUB+=	SQUIRRELDIR=squirrelmail
-.	endif
+SUB_LIST+=	"SQUIRRELDIR=squirrelmail"
+.endif
 .endif
+PLIST_SUB+=	SQUIRREL_PLUGIN_NAME=${SQUIRREL_PLUGIN_NAME}
 
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
@@ -56,11 +60,12 @@ pre-everything::
 
 do-install:
 	${CP} -rp ${WRKSRC}/${SQUIRREL_PLUGIN_NAME} ${SQUIRRELDIR}/plugins
+	${CHOWN} -R ${WWWOWN}:${WWWGRP} ${SQUIRRELDIR}/plugins/${SQUIRREL_PLUGIN_NAME}
 
 post-install:
 	@${ECHO} "Patching SquirrelMail for compatibility plugin"
 	@${ECHO} ""
-	${PATCH} -sN -p0 -d ${SQUIRRELDIR}/plugins/compatibility < ${SQUIRRELDIR}/plugins/compatibility/patches/compatibility_patch-1.4.9.diff
+	${PATCH} -sN -p0 -d ${SQUIRRELDIR}/plugins/compatibility < ${SQUIRRELDIR}/plugins/compatibility/patches/compatibility_patch-1.4.10.diff
 	@${ECHO} ""
 
 .ifndef WITHOUT_ACTIVATE
diff --git a/mail/squirrelmail-compatibility-plugin/distinfo b/mail/squirrelmail-compatibility-plugin/distinfo
index 2dc353e0dc3d..abb87dbaa9a4 100644
--- a/mail/squirrelmail-compatibility-plugin/distinfo
+++ b/mail/squirrelmail-compatibility-plugin/distinfo
@@ -1,3 +1,3 @@
-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
+MD5 (squirrelmail/compatibility-2.0.8-1.0.tar.gz) = b7a19451b104480fc01f75f39d056cd0
+SHA256 (squirrelmail/compatibility-2.0.8-1.0.tar.gz) = d3cde09dee0470091d651fdc907f80ff16f3189482beed822e421f2b3283d4f6
+SIZE (squirrelmail/compatibility-2.0.8-1.0.tar.gz) = 32254
diff --git a/mail/squirrelmail-compatibility-plugin/pkg-descr b/mail/squirrelmail-compatibility-plugin/pkg-descr
index 729d8cec22ac..b148cf3b4d49 100644
--- a/mail/squirrelmail-compatibility-plugin/pkg-descr
+++ b/mail/squirrelmail-compatibility-plugin/pkg-descr
@@ -1,10 +1,7 @@
-SquirrelMail Plug-in that provides a standard API for plugin authors who need
-certain functionalities that may not be available in older versions of
-SquirrelMail. SquirrelMail administrators only need to download this plugin if
-any of the plugins they have require it.
+SquirrelMail Plug-in that provides a standard API for plugin authors
+who need certain functionalities that may not be available in older
+versions of SquirrelMail. SquirrelMail administrators only need to
+download this plugin if any of the plugins they have require it.
 This plugin has no functionality in and of itself.
 
 WWW: http://www.squirrelmail.org
-
-- Alexander Wittig
-alexander@wittig.name
diff --git a/mail/squirrelmail-compatibility-plugin/pkg-plist b/mail/squirrelmail-compatibility-plugin/pkg-plist
index 18935e8bd529..e103ae386e1a 100644
--- a/mail/squirrelmail-compatibility-plugin/pkg-plist
+++ b/mail/squirrelmail-compatibility-plugin/pkg-plist
@@ -1,5 +1,10 @@
-@unexec if [ -f %D/%%SQUIRRELDIR%%/config/config.php ]; then %D/%%SQUIRRELDIR%%/config/conf.pl --remove-plugin compatibility; fi
+@unexec if [ -f %D/%%SQUIRRELDIR%%/config/config.php ]; then %D/%%SQUIRRELDIR%%/config/conf.pl --remove-plugin %%SQUIRREL_PLUGIN_NAME%%; fi
 @unexec mv -f %D/%%SQUIRRELDIR%%/functions/strings.php.orig %D/%%SQUIRRELDIR%%/functions/strings.php
+@exec mkdir -p %D/%%SQUIRRELDIR%%/plugins/compatibility/includes/1.2.7
+@exec mkdir -p %D/%%SQUIRRELDIR%%/plugins/compatibility/includes/1.2.8
+@exec mkdir -p %D/%%SQUIRRELDIR%%/plugins/compatibility/includes/1.2.9
+@exec mkdir -p %D/%%SQUIRRELDIR%%/plugins/compatibility/includes/1.2.10
+@exec mkdir -p %D/%%SQUIRRELDIR%%/plugins/compatibility/includes/1.2.11
 @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
@@ -11,6 +16,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.4.11
 @exec mkdir -p %D/%%SQUIRRELDIR%%/plugins/compatibility/includes/1.5.2
 %%SQUIRRELDIR%%/plugins/compatibility/compatibility.pot
 %%SQUIRRELDIR%%/plugins/compatibility/COPYING
@@ -21,15 +27,11 @@
 %%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.5.0/global.php
 %%SQUIRRELDIR%%/plugins/compatibility/includes/1.5.1/global.php
+%%SQUIRRELDIR%%/plugins/compatibility/includes/1.5.2/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
@@ -40,6 +42,7 @@
 %%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.4.10.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
@@ -61,6 +64,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.4.11
 @dirrm %%SQUIRRELDIR%%/plugins/compatibility/includes/1.5.0
 @dirrm %%SQUIRRELDIR%%/plugins/compatibility/includes/1.5.1
 @dirrm %%SQUIRRELDIR%%/plugins/compatibility/includes/1.5.2
@@ -69,4 +73,4 @@
 @dirrm %%SQUIRRELDIR%%/plugins/compatibility/patches.old
 @dirrm %%SQUIRRELDIR%%/plugins/compatibility
 @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
+@exec if [ -f %D/%%SQUIRRELDIR%%/config/config.php ]; then %D/%%SQUIRRELDIR%%/config/conf.pl --install-plugin %%SQUIRREL_PLUGIN_NAME%%; fi