- Update to 2.0.10

* Note that SquirrelMail 1.4.13+ (as well as 1.5.1+) no longer requires a
  source patch
* Added sq_call_function_suppress_errors()
* Added get_secured_config_value()
* Added get_smtp_user()
* Added sq_send_mail()

3 files changed, 57 insertions, 52 deletions

diff --git a/mail/squirrelmail-compatibility-plugin/Makefile b/mail/squirrelmail-compatibility-plugin/Makefile
index 1ccf369952be..8a4f3a0b708d 100644
--- a/mail/squirrelmail-compatibility-plugin/Makefile
+++ b/mail/squirrelmail-compatibility-plugin/Makefile
@@ -5,8 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	compatibility
-PORTVERSION=	2.0.9
-PORTREVISION=	1
+PORTVERSION=	2.0.10
 CATEGORIES=	mail www
 MASTER_SITES=	http://www.squirrelmail.org/plugins/
 PKGNAMEPREFIX=	squirrelmail-
@@ -64,10 +63,6 @@ do-install:
 	${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.11.diff
-	@${ECHO} ""
 
 .ifndef WITHOUT_ACTIVATE
 .if exists( ${SQUIRRELDIR}/config/config.php )
diff --git a/mail/squirrelmail-compatibility-plugin/distinfo b/mail/squirrelmail-compatibility-plugin/distinfo
index 844419b3a28a..1277c33f7528 100644
--- a/mail/squirrelmail-compatibility-plugin/distinfo
+++ b/mail/squirrelmail-compatibility-plugin/distinfo
@@ -1,3 +1,3 @@
-MD5 (squirrelmail/compatibility-2.0.9-1.0.tar.gz) = 53e89f4ad52a93909a8c7d66ba5b2b1b
-SHA256 (squirrelmail/compatibility-2.0.9-1.0.tar.gz) = 49c8dce4ee257fb36a97396c7cdd445d2b862659dc76c17048d96d2634d64019
-SIZE (squirrelmail/compatibility-2.0.9-1.0.tar.gz) = 31763
+MD5 (squirrelmail/compatibility-2.0.10-1.0.tar.gz) = 70b54b2df031726405a141db6a5eae8b
+SHA256 (squirrelmail/compatibility-2.0.10-1.0.tar.gz) = 174aed28e7d9fa09c0f758828af14798a1aad75d18bdf6d9aa9c8b8aa7199d86
+SIZE (squirrelmail/compatibility-2.0.10-1.0.tar.gz) = 35265
diff --git a/mail/squirrelmail-compatibility-plugin/pkg-plist b/mail/squirrelmail-compatibility-plugin/pkg-plist
index 7853a00a721e..cd4f17c253db 100644
--- a/mail/squirrelmail-compatibility-plugin/pkg-plist
+++ b/mail/squirrelmail-compatibility-plugin/pkg-plist
@@ -1,54 +1,62 @@
 @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
-@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.4.11
-@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
-%%SQUIRRELDIR%%/plugins/compatibility/getpot
 %%SQUIRRELDIR%%/plugins/compatibility/index.php
-%%SQUIRRELDIR%%/plugins/compatibility/INSTALL
-%%SQUIRRELDIR%%/plugins/compatibility/make_release.sh
-%%SQUIRRELDIR%%/plugins/compatibility/README
-%%SQUIRRELDIR%%/plugins/compatibility/setup.php
+%%SQUIRRELDIR%%/plugins/compatibility/compatibility.pot
 %%SQUIRRELDIR%%/plugins/compatibility/version
-%%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/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/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/compatibility_patch-1.4.1.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.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.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.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
-%%SQUIRRELDIR%%/plugins/compatibility/patches.old/compatibility_patch-1.4.6.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.9.diff
+%%SQUIRRELDIR%%/plugins/compatibility/getpot
+%%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
@@ -66,6 +74,9 @@
 @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.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
@@ -73,5 +84,4 @@
 @dirrm %%SQUIRRELDIR%%/plugins/compatibility/patches
 @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.11.diff
 @exec if [ -f %D/%%SQUIRRELDIR%%/config/config.php ]; then %D/%%SQUIRRELDIR%%/config/conf.pl --install-plugin %%SQUIRREL_PLUGIN_NAME%%; fi