3 files changed, 15 insertions, 7 deletions

diff --git a/mail/squirrelmail-compatibility-plugin/Makefile b/mail/squirrelmail-compatibility-plugin/Makefile
index 8d8aa97378fc..83b9ab258b70 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.2
+PORTVERSION=		2.0.4
 CATEGORIES=		mail www
 MASTER_SITES=		http://www.squirrelmail.org/plugins/
 DISTNAME=		${SQUIRREL_PLUGIN_NAME}-${PORTVERSION}
diff --git a/mail/squirrelmail-compatibility-plugin/distinfo b/mail/squirrelmail-compatibility-plugin/distinfo
index eb3b55b6e1b0..fb8976f4828d 100644
--- a/mail/squirrelmail-compatibility-plugin/distinfo
+++ b/mail/squirrelmail-compatibility-plugin/distinfo
@@ -1,3 +1,3 @@
-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
+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
diff --git a/mail/squirrelmail-compatibility-plugin/pkg-plist b/mail/squirrelmail-compatibility-plugin/pkg-plist
index 55c5e7d73665..73587d84dd40 100644
--- a/mail/squirrelmail-compatibility-plugin/pkg-plist
+++ b/mail/squirrelmail-compatibility-plugin/pkg-plist
@@ -1,5 +1,5 @@
 @unexec %D/%%SQUIRRELDIR%%/config/conf.pl --remove-plugin compatibility
-@unexec mv -f %D/%%SQUIRRELDIR%%/include/validate.php.orig %D/%%SQUIRRELDIR%%/include/validate.php
+@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
 %%SQUIRRELDIR%%/plugins/compatibility/compatibility.pot
 %%SQUIRRELDIR%%/plugins/compatibility/COPYING
@@ -24,10 +24,17 @@
 %%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.0.diff
+%%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.4.diff
-%%SQUIRRELDIR%%/plugins/compatibility/patches/compatibility_patch-1.2.11.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
 @dirrm %%SQUIRRELDIR%%/plugins/compatibility/includes/1.2.7
 @dirrm %%SQUIRRELDIR%%/plugins/compatibility/includes/1.2.8
 @dirrm %%SQUIRRELDIR%%/plugins/compatibility/includes/1.2.9
@@ -44,6 +51,7 @@
 @dirrm %%SQUIRRELDIR%%/plugins/compatibility/includes/1.5.1
 @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 %D/%%SQUIRRELDIR%%/config/conf.pl --install-plugin compatibility