- Update to 3.3.3

- Avoid warnings in Perms::getPermissionId with PostgreSQL.
- Fix parsing of LABEL attributes in the vCard viewer.

6 files changed, 12 insertions, 14 deletions

diff --git a/www/horde-base/Makefile b/www/horde-base/Makefile
index 1d63ef897aba..daa216fde98e 100644
--- a/www/horde-base/Makefile
+++ b/www/horde-base/Makefile
@@ -6,9 +6,8 @@
 #
 
 PORTNAME=	horde
-PORTVERSION=	3.3.2
+PORTVERSION=	3.3.3
 DISTVERSIONPREFIX=
-PORTREVISION=	1
 CATEGORIES=	www
 PKGNAMEPREFIX=
 PKGNAMESUFFIX=	-base
@@ -76,7 +75,7 @@ RUN_DEPENDS+=	${PEARDIR}/Date.php:${PORTSDIR}/devel/pear-Date			\
 		${PEARDIR}/Mail/mimeDecode.php:${PORTSDIR}/mail/pear-Mail_mimeDecode	\
 		${PEARDIR}/DB.php:${PORTSDIR}/databases/pear-DB			\
 		${PEARDIR}/File.php:${PORTSDIR}/sysutils/pear-File		\
-		${PEARDIR}/Net/SMTP.php:${PORTSDIR}/net/pear-Net_SMTP	\
+		${PEARDIR}/Net/SMTP.php:${PORTSDIR}/net/pear-Net_SMTP   \
 		${PEARDIR}/MDB2/Schema/Validate.php:${PORTSDIR}/databases/pear-MDB2_Schema
 
 CONFLICTS=	horde-2.*
diff --git a/www/horde-base/distinfo b/www/horde-base/distinfo
index ae165c38ae3c..751b0549ea04 100644
--- a/www/horde-base/distinfo
+++ b/www/horde-base/distinfo
@@ -1,3 +1,3 @@
-MD5 (horde-3.3.2.tar.gz) = 4dd4388870c0ccc10f0b021365541c50
-SHA256 (horde-3.3.2.tar.gz) = e080b22f2c183012c9c0db8f8b0dbfcc434cc692aa8fdb8c42f84a30b3d75a1a
-SIZE (horde-3.3.2.tar.gz) = 8462747
+MD5 (horde-3.3.3.tar.gz) = d1d70771992bb3413d84d0dad67bb794
+SHA256 (horde-3.3.3.tar.gz) = b8c8c766fa1501e18947a74732e7210e978114b9dceec73445e1d0a5d8f0110c
+SIZE (horde-3.3.3.tar.gz) = 8472775
diff --git a/www/horde-base/pkg-plist b/www/horde-base/pkg-plist
index 2cd8d7b9697d..22485ca3012c 100644
--- a/www/horde-base/pkg-plist
+++ b/www/horde-base/pkg-plist
@@ -228,7 +228,6 @@
 %%HORDIR%%/lib/Horde/Editor/fckeditor.php
 %%HORDIR%%/lib/Horde/Editor/tinymce.php
 %%HORDIR%%/lib/Horde/Editor/xinha.php
-%%HORDIR%%/lib/Horde/Exception.php
 %%HORDIR%%/lib/Horde/Feed.php
 %%HORDIR%%/lib/Horde/Feed/Atom.php
 %%HORDIR%%/lib/Horde/Feed/Base.php
@@ -282,6 +281,7 @@
 %%HORDIR%%/lib/Horde/Image/Effect/gd/text_watermark.php
 %%HORDIR%%/lib/Horde/Image/Effect/gd/unsharp_mask.php
 %%HORDIR%%/lib/Horde/Image/Effect/im/border.php
+%%HORDIR%%/lib/Horde/Image/Effect/im/composite.php
 %%HORDIR%%/lib/Horde/Image/Effect/im/drop_shadow.php
 %%HORDIR%%/lib/Horde/Image/Effect/im/photo_stack.php
 %%HORDIR%%/lib/Horde/Image/Effect/im/polaroid_image.php
diff --git a/www/horde4-base/Makefile b/www/horde4-base/Makefile
index 1d63ef897aba..daa216fde98e 100644
--- a/www/horde4-base/Makefile
+++ b/www/horde4-base/Makefile
@@ -6,9 +6,8 @@
 #
 
 PORTNAME=	horde
-PORTVERSION=	3.3.2
+PORTVERSION=	3.3.3
 DISTVERSIONPREFIX=
-PORTREVISION=	1
 CATEGORIES=	www
 PKGNAMEPREFIX=
 PKGNAMESUFFIX=	-base
@@ -76,7 +75,7 @@ RUN_DEPENDS+=	${PEARDIR}/Date.php:${PORTSDIR}/devel/pear-Date			\
 		${PEARDIR}/Mail/mimeDecode.php:${PORTSDIR}/mail/pear-Mail_mimeDecode	\
 		${PEARDIR}/DB.php:${PORTSDIR}/databases/pear-DB			\
 		${PEARDIR}/File.php:${PORTSDIR}/sysutils/pear-File		\
-		${PEARDIR}/Net/SMTP.php:${PORTSDIR}/net/pear-Net_SMTP	\
+		${PEARDIR}/Net/SMTP.php:${PORTSDIR}/net/pear-Net_SMTP   \
 		${PEARDIR}/MDB2/Schema/Validate.php:${PORTSDIR}/databases/pear-MDB2_Schema
 
 CONFLICTS=	horde-2.*
diff --git a/www/horde4-base/distinfo b/www/horde4-base/distinfo
index ae165c38ae3c..751b0549ea04 100644
--- a/www/horde4-base/distinfo
+++ b/www/horde4-base/distinfo
@@ -1,3 +1,3 @@
-MD5 (horde-3.3.2.tar.gz) = 4dd4388870c0ccc10f0b021365541c50
-SHA256 (horde-3.3.2.tar.gz) = e080b22f2c183012c9c0db8f8b0dbfcc434cc692aa8fdb8c42f84a30b3d75a1a
-SIZE (horde-3.3.2.tar.gz) = 8462747
+MD5 (horde-3.3.3.tar.gz) = d1d70771992bb3413d84d0dad67bb794
+SHA256 (horde-3.3.3.tar.gz) = b8c8c766fa1501e18947a74732e7210e978114b9dceec73445e1d0a5d8f0110c
+SIZE (horde-3.3.3.tar.gz) = 8472775
diff --git a/www/horde4-base/pkg-plist b/www/horde4-base/pkg-plist
index 2cd8d7b9697d..22485ca3012c 100644
--- a/www/horde4-base/pkg-plist
+++ b/www/horde4-base/pkg-plist
@@ -228,7 +228,6 @@
 %%HORDIR%%/lib/Horde/Editor/fckeditor.php
 %%HORDIR%%/lib/Horde/Editor/tinymce.php
 %%HORDIR%%/lib/Horde/Editor/xinha.php
-%%HORDIR%%/lib/Horde/Exception.php
 %%HORDIR%%/lib/Horde/Feed.php
 %%HORDIR%%/lib/Horde/Feed/Atom.php
 %%HORDIR%%/lib/Horde/Feed/Base.php
@@ -282,6 +281,7 @@
 %%HORDIR%%/lib/Horde/Image/Effect/gd/text_watermark.php
 %%HORDIR%%/lib/Horde/Image/Effect/gd/unsharp_mask.php
 %%HORDIR%%/lib/Horde/Image/Effect/im/border.php
+%%HORDIR%%/lib/Horde/Image/Effect/im/composite.php
 %%HORDIR%%/lib/Horde/Image/Effect/im/drop_shadow.php
 %%HORDIR%%/lib/Horde/Image/Effect/im/photo_stack.php
 %%HORDIR%%/lib/Horde/Image/Effect/im/polaroid_image.php