Update SOPE and SOGo to 2.0.0b3 (bug fixes)

3 files changed, 77 insertions, 71 deletions

diff --git a/www/SOGo/Makefile b/www/SOGo/Makefile
index 4c11034bbb4..eaac27cc7f8 100644
--- a/www/SOGo/Makefile
+++ b/www/SOGo/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.1.1.1 2011/10/16 05:36:32 manu Exp $
+# $NetBSD: Makefile,v 1.2 2011/12/14 15:02:24 manu Exp $
 #
 
-DISTNAME=	SOGo-2.0.0b1
+DISTNAME=	SOGo-2.0.0b3
 CATEGORIES=	www
 MASTER_SITES=	http://www.sogo.nu/files/downloads/SOGo/Sources/
 
@@ -24,7 +24,9 @@ SOGOGROUP?=	sogo
 SOGOETCDIR?=	${PKG_SYSCONFDIR}/sogo
 SOGORUNDIR?=	${VARBASE}/sogo
 INSTALLATION_DIRS+=	share/examples/SOGo
-CONF_FILES=	${DESTDIR}${PREFIX}/share/examples/SOGo/SOGo.conf \
+CONF_FILES+=	${DESTDIR}${PREFIX}/share/examples/SOGo/sogo-conf.sh \
+		${PKG_SYSCONFDIR}/sogo-conf.sh
+CONF_FILES+=	${DESTDIR}${PREFIX}/share/examples/SOGo/SOGo.conf \
 		${PKG_SYSCONFDIR}/SOGo.conf
 OWN_DIRS+=	${SOGOETCDIR}
 OWN_DIRS+=	${SOGORUNDIR}
@@ -44,6 +46,8 @@ FILES_SUBST+=	SOGOUSER=${SOGOUSER}
 RCD_SCRIPTS=	sogod
 
 pre-install:
+	${SED} -e "s|@SOGOUSER@|${SOGOUSER}|" ${FILESDIR}/sogo-conf.sh > \
+	  ${DESTDIR}${PREFIX}/share/examples/SOGo/sogo-conf.sh
 	${SED} -e "s|/usr/GNUstep/System/Library|${PREFIX}/lib/GNUstep|" \
 	  ${WRKSRC}/Apache/SOGo.conf > \
 	  ${DESTDIR}${PREFIX}/share/examples/SOGo/SOGo.conf
@@ -58,5 +62,7 @@ pre-install:
 .include "../../devel/SOPE/buildlink3.mk"
 .include "../../devel/libmemcached/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
+DEPENDS+=	zip:../../archivers/zip
+
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/SOGo/PLIST b/www/SOGo/PLIST
index 1f03d75d2cc..7801350c31f 100644
--- a/www/SOGo/PLIST
+++ b/www/SOGo/PLIST
@@ -1,7 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2011/10/16 05:36:35 manu Exp $
-share/examples/SOGo/SOGo.conf
-share/examples/rc.d/sogod
-lib/GNUstep/Frameworks/SOGo.framework
+@comment $NetBSD: PLIST,v 1.2 2011/12/14 15:02:24 manu Exp $
 include/GDLContentStore/EOAdaptorChannel+GCS.h
 include/GDLContentStore/GCSAlarmsFolder.h
 include/GDLContentStore/GCSChannelManager.h
@@ -54,6 +51,64 @@ include/SOGo
 include/SOGoUI/SOGoAptFormatter.h
 include/SOGoUI/UIxComponent.h
 include/SOGoUI/UIxJSClose.h
+lib/GNUstep/Frameworks/SOGo.framework/Headers
+lib/GNUstep/Frameworks/SOGo.framework/Resources
+lib/GNUstep/Frameworks/SOGo.framework/SOGo
+lib/GNUstep/Frameworks/SOGo.framework/Versions/2/Headers/DOMNode+SOGo.h
+lib/GNUstep/Frameworks/SOGo.framework/Versions/2/Headers/LDAPSource.h
+lib/GNUstep/Frameworks/SOGo.framework/Versions/2/Headers/NSArray+DAV.h
+lib/GNUstep/Frameworks/SOGo.framework/Versions/2/Headers/NSArray+Utilities.h
+lib/GNUstep/Frameworks/SOGo.framework/Versions/2/Headers/NSCalendarDate+SOGo.h
+lib/GNUstep/Frameworks/SOGo.framework/Versions/2/Headers/NSDictionary+DAV.h
+lib/GNUstep/Frameworks/SOGo.framework/Versions/2/Headers/NSDictionary+URL.h
+lib/GNUstep/Frameworks/SOGo.framework/Versions/2/Headers/NSDictionary+Utilities.h
+lib/GNUstep/Frameworks/SOGo.framework/Versions/2/Headers/NSNull+Utilities.h
+lib/GNUstep/Frameworks/SOGo.framework/Versions/2/Headers/NSNumber+Utilities.h
+lib/GNUstep/Frameworks/SOGo.framework/Versions/2/Headers/NSObject+DAV.h
+lib/GNUstep/Frameworks/SOGo.framework/Versions/2/Headers/NSObject+Utilities.h
+lib/GNUstep/Frameworks/SOGo.framework/Versions/2/Headers/NSString+DAV.h
+lib/GNUstep/Frameworks/SOGo.framework/Versions/2/Headers/NSString+Utilities.h
+lib/GNUstep/Frameworks/SOGo.framework/Versions/2/Headers/NSURL+DAV.h
+lib/GNUstep/Frameworks/SOGo.framework/Versions/2/Headers/SOGoAuthenticator.h
+lib/GNUstep/Frameworks/SOGo.framework/Versions/2/Headers/SOGoBuild.h
+lib/GNUstep/Frameworks/SOGo.framework/Versions/2/Headers/SOGoCASSession.h
+lib/GNUstep/Frameworks/SOGo.framework/Versions/2/Headers/SOGoCache.h
+lib/GNUstep/Frameworks/SOGo.framework/Versions/2/Headers/SOGoConstants.h
+lib/GNUstep/Frameworks/SOGo.framework/Versions/2/Headers/SOGoContentObject.h
+lib/GNUstep/Frameworks/SOGo.framework/Versions/2/Headers/SOGoDAVAuthenticator.h
+lib/GNUstep/Frameworks/SOGo.framework/Versions/2/Headers/SOGoDateFormatter.h
+lib/GNUstep/Frameworks/SOGo.framework/Versions/2/Headers/SOGoFolder.h
+lib/GNUstep/Frameworks/SOGo.framework/Versions/2/Headers/SOGoGCSFolder.h
+lib/GNUstep/Frameworks/SOGo.framework/Versions/2/Headers/SOGoGroup.h
+lib/GNUstep/Frameworks/SOGo.framework/Versions/2/Headers/SOGoMailer.h
+lib/GNUstep/Frameworks/SOGo.framework/Versions/2/Headers/SOGoObject.h
+lib/GNUstep/Frameworks/SOGo.framework/Versions/2/Headers/SOGoParentFolder.h
+lib/GNUstep/Frameworks/SOGo.framework/Versions/2/Headers/SOGoPermissions.h
+lib/GNUstep/Frameworks/SOGo.framework/Versions/2/Headers/SOGoProductLoader.h
+lib/GNUstep/Frameworks/SOGo.framework/Versions/2/Headers/SOGoProxyAuthenticator.h
+lib/GNUstep/Frameworks/SOGo.framework/Versions/2/Headers/SOGoSession.h
+lib/GNUstep/Frameworks/SOGo.framework/Versions/2/Headers/SOGoSieveManager.h
+lib/GNUstep/Frameworks/SOGo.framework/Versions/2/Headers/SOGoStartupLogger.h
+lib/GNUstep/Frameworks/SOGo.framework/Versions/2/Headers/SOGoUser.h
+lib/GNUstep/Frameworks/SOGo.framework/Versions/2/Headers/SOGoUserFolder.h
+lib/GNUstep/Frameworks/SOGo.framework/Versions/2/Headers/SOGoUserManager.h
+lib/GNUstep/Frameworks/SOGo.framework/Versions/2/Headers/SOGoUserProfile.h
+lib/GNUstep/Frameworks/SOGo.framework/Versions/2/Headers/SOGoWebAuthenticator.h
+lib/GNUstep/Frameworks/SOGo.framework/Versions/2/Headers/SOGoWebDAVAclManager.h
+lib/GNUstep/Frameworks/SOGo.framework/Versions/2/Headers/SOGoWebDAVValue.h
+lib/GNUstep/Frameworks/SOGo.framework/Versions/2/Headers/SQLSource.h
+lib/GNUstep/Frameworks/SOGo.framework/Versions/2/Headers/WOContext+SOGo.h
+lib/GNUstep/Frameworks/SOGo.framework/Versions/2/Headers/WORequest+SOGo.h
+lib/GNUstep/Frameworks/SOGo.framework/Versions/2/Headers/WOResourceManager+SOGo.h
+lib/GNUstep/Frameworks/SOGo.framework/Versions/2/Headers/WOResponse+SOGo.h
+lib/GNUstep/Frameworks/SOGo.framework/Versions/2/Resources/DAVReportMap.plist
+lib/GNUstep/Frameworks/SOGo.framework/Versions/2/Resources/Info-gnustep.plist
+lib/GNUstep/Frameworks/SOGo.framework/Versions/2/Resources/SOGoDefaults.plist
+lib/GNUstep/Frameworks/SOGo.framework/Versions/2/SOGo
+lib/GNUstep/Frameworks/SOGo.framework/Versions/2/libSOGo.so
+lib/GNUstep/Frameworks/SOGo.framework/Versions/2/libSOGo.so.2.0.0
+lib/GNUstep/Frameworks/SOGo.framework/Versions/Current
+lib/GNUstep/Frameworks/SOGo.framework/libSOGo.so
 lib/GNUstep/Libraries/Resources/NGCards/TimeZones/Africa/Abidjan.ics
 lib/GNUstep/Libraries/Resources/NGCards/TimeZones/Africa/Accra.ics
 lib/GNUstep/Libraries/Resources/NGCards/TimeZones/Africa/Addis_Ababa.ics
@@ -750,64 +805,6 @@ lib/GNUstep/SOGo/PreferencesUI.SOGo/Resources/Ukrainian.lproj/Localizable.string
 lib/GNUstep/SOGo/PreferencesUI.SOGo/Resources/Welsh.lproj/Localizable.strings
 lib/GNUstep/SOGo/PreferencesUI.SOGo/Resources/product.plist
 lib/GNUstep/SOGo/PreferencesUI.SOGo/stamp.make
-lib/GNUstep/SOGo/SOGo.framework/Headers
-lib/GNUstep/SOGo/SOGo.framework/Resources
-lib/GNUstep/SOGo/SOGo.framework/SOGo
-lib/GNUstep/SOGo/SOGo.framework/Versions/2/Headers/DOMNode+SOGo.h
-lib/GNUstep/SOGo/SOGo.framework/Versions/2/Headers/LDAPSource.h
-lib/GNUstep/SOGo/SOGo.framework/Versions/2/Headers/NSArray+DAV.h
-lib/GNUstep/SOGo/SOGo.framework/Versions/2/Headers/NSArray+Utilities.h
-lib/GNUstep/SOGo/SOGo.framework/Versions/2/Headers/NSCalendarDate+SOGo.h
-lib/GNUstep/SOGo/SOGo.framework/Versions/2/Headers/NSDictionary+DAV.h
-lib/GNUstep/SOGo/SOGo.framework/Versions/2/Headers/NSDictionary+URL.h
-lib/GNUstep/SOGo/SOGo.framework/Versions/2/Headers/NSDictionary+Utilities.h
-lib/GNUstep/SOGo/SOGo.framework/Versions/2/Headers/NSNull+Utilities.h
-lib/GNUstep/SOGo/SOGo.framework/Versions/2/Headers/NSNumber+Utilities.h
-lib/GNUstep/SOGo/SOGo.framework/Versions/2/Headers/NSObject+DAV.h
-lib/GNUstep/SOGo/SOGo.framework/Versions/2/Headers/NSObject+Utilities.h
-lib/GNUstep/SOGo/SOGo.framework/Versions/2/Headers/NSString+DAV.h
-lib/GNUstep/SOGo/SOGo.framework/Versions/2/Headers/NSString+Utilities.h
-lib/GNUstep/SOGo/SOGo.framework/Versions/2/Headers/NSURL+DAV.h
-lib/GNUstep/SOGo/SOGo.framework/Versions/2/Headers/SOGoAuthenticator.h
-lib/GNUstep/SOGo/SOGo.framework/Versions/2/Headers/SOGoBuild.h
-lib/GNUstep/SOGo/SOGo.framework/Versions/2/Headers/SOGoCASSession.h
-lib/GNUstep/SOGo/SOGo.framework/Versions/2/Headers/SOGoCache.h
-lib/GNUstep/SOGo/SOGo.framework/Versions/2/Headers/SOGoConstants.h
-lib/GNUstep/SOGo/SOGo.framework/Versions/2/Headers/SOGoContentObject.h
-lib/GNUstep/SOGo/SOGo.framework/Versions/2/Headers/SOGoDAVAuthenticator.h
-lib/GNUstep/SOGo/SOGo.framework/Versions/2/Headers/SOGoDateFormatter.h
-lib/GNUstep/SOGo/SOGo.framework/Versions/2/Headers/SOGoFolder.h
-lib/GNUstep/SOGo/SOGo.framework/Versions/2/Headers/SOGoGCSFolder.h
-lib/GNUstep/SOGo/SOGo.framework/Versions/2/Headers/SOGoGroup.h
-lib/GNUstep/SOGo/SOGo.framework/Versions/2/Headers/SOGoMailer.h
-lib/GNUstep/SOGo/SOGo.framework/Versions/2/Headers/SOGoObject.h
-lib/GNUstep/SOGo/SOGo.framework/Versions/2/Headers/SOGoParentFolder.h
-lib/GNUstep/SOGo/SOGo.framework/Versions/2/Headers/SOGoPermissions.h
-lib/GNUstep/SOGo/SOGo.framework/Versions/2/Headers/SOGoProductLoader.h
-lib/GNUstep/SOGo/SOGo.framework/Versions/2/Headers/SOGoProxyAuthenticator.h
-lib/GNUstep/SOGo/SOGo.framework/Versions/2/Headers/SOGoSession.h
-lib/GNUstep/SOGo/SOGo.framework/Versions/2/Headers/SOGoSieveManager.h
-lib/GNUstep/SOGo/SOGo.framework/Versions/2/Headers/SOGoStartupLogger.h
-lib/GNUstep/SOGo/SOGo.framework/Versions/2/Headers/SOGoUser.h
-lib/GNUstep/SOGo/SOGo.framework/Versions/2/Headers/SOGoUserFolder.h
-lib/GNUstep/SOGo/SOGo.framework/Versions/2/Headers/SOGoUserManager.h
-lib/GNUstep/SOGo/SOGo.framework/Versions/2/Headers/SOGoUserProfile.h
-lib/GNUstep/SOGo/SOGo.framework/Versions/2/Headers/SOGoWebAuthenticator.h
-lib/GNUstep/SOGo/SOGo.framework/Versions/2/Headers/SOGoWebDAVAclManager.h
-lib/GNUstep/SOGo/SOGo.framework/Versions/2/Headers/SOGoWebDAVValue.h
-lib/GNUstep/SOGo/SOGo.framework/Versions/2/Headers/SQLSource.h
-lib/GNUstep/SOGo/SOGo.framework/Versions/2/Headers/WOContext+SOGo.h
-lib/GNUstep/SOGo/SOGo.framework/Versions/2/Headers/WORequest+SOGo.h
-lib/GNUstep/SOGo/SOGo.framework/Versions/2/Headers/WOResourceManager+SOGo.h
-lib/GNUstep/SOGo/SOGo.framework/Versions/2/Headers/WOResponse+SOGo.h
-lib/GNUstep/SOGo/SOGo.framework/Versions/2/Resources/DAVReportMap.plist
-lib/GNUstep/SOGo/SOGo.framework/Versions/2/Resources/Info-gnustep.plist
-lib/GNUstep/SOGo/SOGo.framework/Versions/2/Resources/SOGoDefaults.plist
-lib/GNUstep/SOGo/SOGo.framework/Versions/2/SOGo
-lib/GNUstep/SOGo/SOGo.framework/Versions/2/libSOGo.so
-lib/GNUstep/SOGo/SOGo.framework/Versions/2/libSOGo.so.2.0.0
-lib/GNUstep/SOGo/SOGo.framework/Versions/Current
-lib/GNUstep/SOGo/SOGo.framework/libSOGo.so
 lib/GNUstep/SOGo/SchedulerUI.SOGo/Resources/BrazilianPortuguese.lproj/Localizable.strings
 lib/GNUstep/SOGo/SchedulerUI.SOGo/Resources/Catalan.lproj/Localizable.strings
 lib/GNUstep/SOGo/SchedulerUI.SOGo/Resources/Czech.lproj/Localizable.strings
@@ -1350,7 +1347,6 @@ lib/GNUstep/SOGo/WebServerResources/icon-forwarded-replied.png
 lib/GNUstep/SOGo/WebServerResources/icon-forwarded.png
 lib/GNUstep/SOGo/WebServerResources/icon-new.png
 lib/GNUstep/SOGo/WebServerResources/icon-replied.png
-lib/GNUstep/SOGo/WebServerResources/icon_unread.gif
 lib/GNUstep/SOGo/WebServerResources/iefixes.css
 lib/GNUstep/SOGo/WebServerResources/important.png
 lib/GNUstep/SOGo/WebServerResources/input_bg.gif
@@ -1613,6 +1609,7 @@ lib/GNUstep/SOGo/WebServerResources/title_sortdown_12x12.png
 lib/GNUstep/SOGo/WebServerResources/title_sortup_12x12.png
 lib/GNUstep/SOGo/WebServerResources/toolbarbtn_a_bg.png
 lib/GNUstep/SOGo/WebServerResources/toolbarbtn_span_bg.png
+lib/GNUstep/SOGo/WebServerResources/unread.png
 lib/GNUstep/SOGo/WebServerResources/up-icon.png
 lib/GNUstep/SOGo/WebServerResources/week-view.png
 lib/GNUstep/SOGo/WebServerResources/write-message.png
@@ -1641,3 +1638,6 @@ sbin/sogo-ealarms-notify
 sbin/sogo-slapd-sockd
 sbin/sogo-tool
 sbin/sogod
+share/examples/SOGo/SOGo.conf
+share/examples/SOGo/sogo-conf.sh
+share/examples/rc.d/sogod
diff --git a/www/SOGo/distinfo b/www/SOGo/distinfo
index bc8dcfc9f28..965b50f4e26 100644
--- a/www/SOGo/distinfo
+++ b/www/SOGo/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.3 2011/12/06 16:14:31 dholland Exp $
+$NetBSD: distinfo,v 1.4 2011/12/14 15:02:24 manu Exp $
 
-SHA1 (SOGo-2.0.0b1.tar.gz) = 42100087bdce048a47cdfe5ce150eaef6271448d
-RMD160 (SOGo-2.0.0b1.tar.gz) = df412186822665d3baeca8bd4cd38a2dc94b12f2
-Size (SOGo-2.0.0b1.tar.gz) = 3768330 bytes
-SHA1 (patch-SoObjects_SOGo_NSString+Utilities.m) = 003d015629adff3b0f2bee165518fa549840901b
+SHA1 (SOGo-2.0.0b3.tar.gz) = 3da9fc968842c521cabb3277017f9e128b3c16c6
+RMD160 (SOGo-2.0.0b3.tar.gz) = 711cd54c4b5cbb7481142c0600131579344cbdbb
+Size (SOGo-2.0.0b3.tar.gz) = 3801713 bytes
 SHA1 (patch-aa) = d5f7c3caea148b6b5f872fb0561d14ec15312c90
+SHA1 (patch-ab) = ec26ccfebdd54d4002e231c021cc4824d810d1e0