Fix permissions [1]

Update to 2.0.2 [2]

PR:		87606
Submitted by:	Goran Lowkrantz <goran.lowkrantz@ismobile.com> [1], maintainer [2]
Approved by:	maintainer

6 files changed, 84 insertions, 76 deletions

diff --git a/mail/squirrelmail-compatibility-plugin/Makefile b/mail/squirrelmail-compatibility-plugin/Makefile
index df4e4482cf9b..8d8aa97378fc 100644
--- a/mail/squirrelmail-compatibility-plugin/Makefile
+++ b/mail/squirrelmail-compatibility-plugin/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=		squirrelmail-${SQUIRREL_PLUGIN_NAME}-plugin
-PORTVERSION=		2.0
+PORTVERSION=		2.0.2
 CATEGORIES=		mail www
 MASTER_SITES=		http://www.squirrelmail.org/plugins/
 DISTNAME=		${SQUIRREL_PLUGIN_NAME}-${PORTVERSION}
@@ -50,12 +50,11 @@ 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 < ${SQUIRRELDIR}/plugins/compatibility/patches/compatibility_patch-1.4.4.diff
+	${PATCH} -sN -p0 -d ${SQUIRRELDIR}/plugins < ${SQUIRRELDIR}/plugins/compatibility/patches/compatibility_patch-1.4.5.diff
 	@${ECHO} ""
 
 .ifndef WITHOUT_ACTIVATE
diff --git a/mail/squirrelmail-compatibility-plugin/distinfo b/mail/squirrelmail-compatibility-plugin/distinfo
index 92169787266b..eb3b55b6e1b0 100644
--- a/mail/squirrelmail-compatibility-plugin/distinfo
+++ b/mail/squirrelmail-compatibility-plugin/distinfo
@@ -1,2 +1,3 @@
-MD5 (squirrelmail/compatibility-2.0.tar.gz) = 8e3c8fc99a6669a1d9de911c2194dc31
-SIZE (squirrelmail/compatibility-2.0.tar.gz) = 15306
+MD5 (squirrelmail/compatibility-2.0.2.tar.gz) = b6f8e5e62f304f4b68974158aeabb22d
+SHA256 (squirrelmail/compatibility-2.0.2.tar.gz) = c425631951de4693a3e094667c567dc3d3b309c05940cec5a2c1cd13924ef2a7
+SIZE (squirrelmail/compatibility-2.0.2.tar.gz) = 18130
diff --git a/mail/squirrelmail-compatibility-plugin/pkg-plist b/mail/squirrelmail-compatibility-plugin/pkg-plist
index a0c2c6b6e25a..55c5e7d73665 100644
--- a/mail/squirrelmail-compatibility-plugin/pkg-plist
+++ b/mail/squirrelmail-compatibility-plugin/pkg-plist
@@ -1,45 +1,49 @@
 @unexec %D/%%SQUIRRELDIR%%/config/conf.pl --remove-plugin compatibility
 @unexec mv -f %D/%%SQUIRRELDIR%%/include/validate.php.orig %D/%%SQUIRRELDIR%%/include/validate.php
-@exec mkdir -p %D/%%SQUIRRELDIR%%/plugins/compatibility/includes/1.4.1
 @exec mkdir -p %D/%%SQUIRRELDIR%%/plugins/compatibility/includes/1.5.1
-@exec mkdir -p %D/%%SQUIRRELDIR%%/plugins/compatibility/includes/1.4.5
-@exec mkdir -p %D/%%SQUIRRELDIR%%/plugins/compatibility/includes/1.4.4
-@exec mkdir -p %D/%%SQUIRRELDIR%%/plugins/compatibility/includes/1.4.3
-@exec mkdir -p %D/%%SQUIRRELDIR%%/plugins/compatibility/includes/1.4.2
-@exec mkdir -p %D/%%SQUIRRELDIR%%/plugins/compatibility/includes/1.5.2
-@exec mkdir -p %D/%%SQUIRRELDIR%%/plugins/compatibility/includes/1.4.0
-%%SQUIRRELDIR%%/plugins/compatibility/includes/1.2.11/global.php
-%%SQUIRRELDIR%%/plugins/compatibility/includes/1.2.10/global.php
-%%SQUIRRELDIR%%/plugins/compatibility/includes/1.2.9/global.php
-%%SQUIRRELDIR%%/plugins/compatibility/includes/1.2.8/global.php
-%%SQUIRRELDIR%%/plugins/compatibility/includes/1.2.7/global.php
-%%SQUIRRELDIR%%/plugins/compatibility/patches/compatibility_patch-1.4.4.diff
-%%SQUIRRELDIR%%/plugins/compatibility/patches/compatibility_patch-1.2.11.diff
-%%SQUIRRELDIR%%/plugins/compatibility/README
-%%SQUIRRELDIR%%/plugins/compatibility/index.php
-%%SQUIRRELDIR%%/plugins/compatibility/version
-%%SQUIRRELDIR%%/plugins/compatibility/setup.php
+%%SQUIRRELDIR%%/plugins/compatibility/compatibility.pot
 %%SQUIRRELDIR%%/plugins/compatibility/COPYING
-%%SQUIRRELDIR%%/plugins/compatibility/make_release.sh
+%%SQUIRRELDIR%%/plugins/compatibility/functions.php
 %%SQUIRRELDIR%%/plugins/compatibility/getpot
+%%SQUIRRELDIR%%/plugins/compatibility/index.php
 %%SQUIRRELDIR%%/plugins/compatibility/INSTALL
-%%SQUIRRELDIR%%/plugins/compatibility/compatibility.pot
-%%SQUIRRELDIR%%/plugins/compatibility/functions.php
+%%SQUIRRELDIR%%/plugins/compatibility/make_release.sh
+%%SQUIRRELDIR%%/plugins/compatibility/README
+%%SQUIRRELDIR%%/plugins/compatibility/setup.php
+%%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/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.4.diff
+%%SQUIRRELDIR%%/plugins/compatibility/patches/compatibility_patch-1.2.11.diff
+@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.5.1
-@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.5.2
-@dirrm %%SQUIRRELDIR%%/plugins/compatibility/includes/1.4.0
-@dirrm %%SQUIRRELDIR%%/plugins/compatibility/includes/1.2.11
-@dirrm %%SQUIRRELDIR%%/plugins/compatibility/includes/1.2.10
-@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.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.5.0
+@dirrm %%SQUIRRELDIR%%/plugins/compatibility/includes/1.5.1
 @dirrm %%SQUIRRELDIR%%/plugins/compatibility/includes
 @dirrm %%SQUIRRELDIR%%/plugins/compatibility/patches
 @dirrm %%SQUIRRELDIR%%/plugins/compatibility
-@exec patch -sN -p0 -d %D/%%SQUIRRELDIR%%/plugins < %D/%%SQUIRRELDIR%%/plugins/compatibility/patches/compatibility_patch-1.4.4.diff
+@exec patch -sN -p0 -d %D/%%SQUIRRELDIR%%/plugins < %D/%%SQUIRRELDIR%%/plugins/compatibility/patches/compatibility_patch-1.4.5.diff
 @exec %D/%%SQUIRRELDIR%%/config/conf.pl --install-plugin compatibility
diff --git a/mail/squirrelmail-compatibility-plugin1/Makefile b/mail/squirrelmail-compatibility-plugin1/Makefile
index df4e4482cf9b..8d8aa97378fc 100644
--- a/mail/squirrelmail-compatibility-plugin1/Makefile
+++ b/mail/squirrelmail-compatibility-plugin1/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=		squirrelmail-${SQUIRREL_PLUGIN_NAME}-plugin
-PORTVERSION=		2.0
+PORTVERSION=		2.0.2
 CATEGORIES=		mail www
 MASTER_SITES=		http://www.squirrelmail.org/plugins/
 DISTNAME=		${SQUIRREL_PLUGIN_NAME}-${PORTVERSION}
@@ -50,12 +50,11 @@ 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 < ${SQUIRRELDIR}/plugins/compatibility/patches/compatibility_patch-1.4.4.diff
+	${PATCH} -sN -p0 -d ${SQUIRRELDIR}/plugins < ${SQUIRRELDIR}/plugins/compatibility/patches/compatibility_patch-1.4.5.diff
 	@${ECHO} ""
 
 .ifndef WITHOUT_ACTIVATE
diff --git a/mail/squirrelmail-compatibility-plugin1/distinfo b/mail/squirrelmail-compatibility-plugin1/distinfo
index 92169787266b..eb3b55b6e1b0 100644
--- a/mail/squirrelmail-compatibility-plugin1/distinfo
+++ b/mail/squirrelmail-compatibility-plugin1/distinfo
@@ -1,2 +1,3 @@
-MD5 (squirrelmail/compatibility-2.0.tar.gz) = 8e3c8fc99a6669a1d9de911c2194dc31
-SIZE (squirrelmail/compatibility-2.0.tar.gz) = 15306
+MD5 (squirrelmail/compatibility-2.0.2.tar.gz) = b6f8e5e62f304f4b68974158aeabb22d
+SHA256 (squirrelmail/compatibility-2.0.2.tar.gz) = c425631951de4693a3e094667c567dc3d3b309c05940cec5a2c1cd13924ef2a7
+SIZE (squirrelmail/compatibility-2.0.2.tar.gz) = 18130
diff --git a/mail/squirrelmail-compatibility-plugin1/pkg-plist b/mail/squirrelmail-compatibility-plugin1/pkg-plist
index a0c2c6b6e25a..55c5e7d73665 100644
--- a/mail/squirrelmail-compatibility-plugin1/pkg-plist
+++ b/mail/squirrelmail-compatibility-plugin1/pkg-plist
@@ -1,45 +1,49 @@
 @unexec %D/%%SQUIRRELDIR%%/config/conf.pl --remove-plugin compatibility
 @unexec mv -f %D/%%SQUIRRELDIR%%/include/validate.php.orig %D/%%SQUIRRELDIR%%/include/validate.php
-@exec mkdir -p %D/%%SQUIRRELDIR%%/plugins/compatibility/includes/1.4.1
 @exec mkdir -p %D/%%SQUIRRELDIR%%/plugins/compatibility/includes/1.5.1
-@exec mkdir -p %D/%%SQUIRRELDIR%%/plugins/compatibility/includes/1.4.5
-@exec mkdir -p %D/%%SQUIRRELDIR%%/plugins/compatibility/includes/1.4.4
-@exec mkdir -p %D/%%SQUIRRELDIR%%/plugins/compatibility/includes/1.4.3
-@exec mkdir -p %D/%%SQUIRRELDIR%%/plugins/compatibility/includes/1.4.2
-@exec mkdir -p %D/%%SQUIRRELDIR%%/plugins/compatibility/includes/1.5.2
-@exec mkdir -p %D/%%SQUIRRELDIR%%/plugins/compatibility/includes/1.4.0
-%%SQUIRRELDIR%%/plugins/compatibility/includes/1.2.11/global.php
-%%SQUIRRELDIR%%/plugins/compatibility/includes/1.2.10/global.php
-%%SQUIRRELDIR%%/plugins/compatibility/includes/1.2.9/global.php
-%%SQUIRRELDIR%%/plugins/compatibility/includes/1.2.8/global.php
-%%SQUIRRELDIR%%/plugins/compatibility/includes/1.2.7/global.php
-%%SQUIRRELDIR%%/plugins/compatibility/patches/compatibility_patch-1.4.4.diff
-%%SQUIRRELDIR%%/plugins/compatibility/patches/compatibility_patch-1.2.11.diff
-%%SQUIRRELDIR%%/plugins/compatibility/README
-%%SQUIRRELDIR%%/plugins/compatibility/index.php
-%%SQUIRRELDIR%%/plugins/compatibility/version
-%%SQUIRRELDIR%%/plugins/compatibility/setup.php
+%%SQUIRRELDIR%%/plugins/compatibility/compatibility.pot
 %%SQUIRRELDIR%%/plugins/compatibility/COPYING
-%%SQUIRRELDIR%%/plugins/compatibility/make_release.sh
+%%SQUIRRELDIR%%/plugins/compatibility/functions.php
 %%SQUIRRELDIR%%/plugins/compatibility/getpot
+%%SQUIRRELDIR%%/plugins/compatibility/index.php
 %%SQUIRRELDIR%%/plugins/compatibility/INSTALL
-%%SQUIRRELDIR%%/plugins/compatibility/compatibility.pot
-%%SQUIRRELDIR%%/plugins/compatibility/functions.php
+%%SQUIRRELDIR%%/plugins/compatibility/make_release.sh
+%%SQUIRRELDIR%%/plugins/compatibility/README
+%%SQUIRRELDIR%%/plugins/compatibility/setup.php
+%%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/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.4.diff
+%%SQUIRRELDIR%%/plugins/compatibility/patches/compatibility_patch-1.2.11.diff
+@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.5.1
-@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.5.2
-@dirrm %%SQUIRRELDIR%%/plugins/compatibility/includes/1.4.0
-@dirrm %%SQUIRRELDIR%%/plugins/compatibility/includes/1.2.11
-@dirrm %%SQUIRRELDIR%%/plugins/compatibility/includes/1.2.10
-@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.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.5.0
+@dirrm %%SQUIRRELDIR%%/plugins/compatibility/includes/1.5.1
 @dirrm %%SQUIRRELDIR%%/plugins/compatibility/includes
 @dirrm %%SQUIRRELDIR%%/plugins/compatibility/patches
 @dirrm %%SQUIRRELDIR%%/plugins/compatibility
-@exec patch -sN -p0 -d %D/%%SQUIRRELDIR%%/plugins < %D/%%SQUIRRELDIR%%/plugins/compatibility/patches/compatibility_patch-1.4.4.diff
+@exec patch -sN -p0 -d %D/%%SQUIRRELDIR%%/plugins < %D/%%SQUIRRELDIR%%/plugins/compatibility/patches/compatibility_patch-1.4.5.diff
 @exec %D/%%SQUIRRELDIR%%/config/conf.pl --install-plugin compatibility