Update SOGo to 2.0.4b.

2.0.4b (2013-02-04)
------------------

Bug fixes
 - Fixed order of precedence for options (#2166)
   The following order is enforced - first match wins
     1. Command line arguments
     2. .GNUstepDefaults
     3. /etc/sogo/{debconf,sogo}.conf
     4. SOGoDefaults.plist
 - fixed handling of LDAP DN containing special characters (#2152, #2207)
 - fixed handling of credential files for older GNUsteps (#2216)
 - fixed display of messages with control characters (#2079, #2177)
 - fixed tooltips in contacts list (#2211)
 - fixed classification menu in component editor (#2223)
 - fixed link to ACL editor for 'any authenticated user' (#2222, #2224)
 - fixed saving preferences when mail module is disabled
 - fixed handling for long credential strings (#2212)

2.0.4a (2013-01-30)
------------------

Enhancements
 - updated Czech translation
 - birthday is now properly formatted in addressbook module

Bug fixes
 - fixed handling of groups with spaces in their UID
 - fixed possible infinite loop in repeatable object
 - fixed until date in component editor
 - fixed saving all-day event in appointment editor
 - fixed handling of decoding contacts UID
 - fixed support of GNUstep 1.20 / Debian Squeeze

2.0.4 (2013-01-25)
------------------

New features
 - sogo-tool: new "dump-defaults" command to easily create /etc/sogo/sogo.conf

Enhancements
 - The sogo user is now a system user.
   For new installs, this means that 'su - sogo' won't work anymore.
   Please use 'sudo -u sogo cmd' instead
   If used in scripts from cronjobs, 'requiretty' must be disabled in sudoers
 - added basic support for LDAP URL in user sources
 - renamed default SOGoForceIMAPLoginWithEmail to
   SOGoForceExternalLoginWithEmail and extended it to SMTP authentication
 - updated the timezone files to the 2012j edition and removed RRDATES
 - updated CKEditor to version 4.0.1
 - added Finnish translation - thanks to Kari Salmu
 - updated translations
 - recurrence-id of all-day events is now set as a proper date with no time
 - 'show completed tasks' is now persistent
 - fixed memory usage consumption for remote ICS subscriptions

Bug fixes
 - fixed usage of browser's language for the login page
 - fixed partstat of attendee in her/his calendar
 - fixed French templates encoding
 - fixed CardDAV collections for OS X
 - fixed event recurrence editor (until date)
 - fixed column display for subfolders of draft & sent
 - improved IE7 support
 - fixed drag'n'drop of events with Safari
 - fixed first day of the week in datepickers
 - fixed exceptions of recurring all-day events

2.0.3 (2012-12-06)
------------------

New features
 - support for SAML2 for single sign-on, with the help of the lasso library
 - added support for the "AUTHENTICATE" command and SASL mechanisms
 - added domain default SieveHostFieldName
 - added a search field for tasks

Enhancements
 - search the contacts for the organization attribute
 - in HTML mode, optionally place answer after the quoted text
 - improved memory usage of "sogo-tool restore"
 - fixed invitations status in OSX iCal.app/Calendar.app (cleanup RSVP attribute)
 - now uses "imap4flags" instead of the deprecated "imapflags"
 - added Slovak translation - thanks to Martin Pastor
 - updated translations

Bug fixes
 - fixed LDIF import with categories
 - imported events now keep their UID when possible
 - fixed importation of multiple calendars
 - fixed modification date when drag'n'droping events
 - fixed missing 'from' header in Outlook
 - fixed invitations in Outlook
 - fixed JavaScript regexp for Firefox
 - fixed JavaScript syntax for IE7
 - fixed all-day event display in day/week view
 - fixed parsing of alarm
 - fixed Sieve server URL fallback
 - fixed Debian cronjob (spool directory cleanup)

1 files changed, 9 insertions, 6 deletions

diff --git a/www/SOGo/Makefile b/www/SOGo/Makefile
index d013e2dc9d5..e266b95c0d6 100644
--- a/www/SOGo/Makefile
+++ b/www/SOGo/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.11 2013/02/06 23:23:56 jperkin Exp $
+# $NetBSD: Makefile,v 1.12 2013/03/16 15:12:57 taca Exp $
 #
 
-DISTNAME=	SOGo-2.0.2a
-PKGREVISION=	3
+DISTNAME=	SOGo-2.0.4b
 CATEGORIES=	www
 MASTER_SITES=	http://www.sogo.nu/files/downloads/SOGo/Sources/
 
@@ -19,12 +18,14 @@ CONFIGURE_ARGS= --enable-debug --disable-strip
 
 SOGOUSER?=	sogo
 SOGOGROUP?=	sogo
-SOGOETCDIR?=	${PKG_SYSCONFDIR}/sogo
+SOGOETCDIR?=	${PKG_SYSCONFDIR}
 SOGORUNDIR?=	${VARBASE}/sogo
+
 INSTALLATION_DIRS+=	share/examples/SOGo
-CONF_FILES+=	${DESTDIR}${PREFIX}/share/examples/SOGo/sogo-conf.sh \
+
+CONF_FILES+=	share/examples/SOGo/sogo-conf.sh \
 		${PKG_SYSCONFDIR}/sogo-conf.sh
-CONF_FILES+=	${DESTDIR}${PREFIX}/share/examples/SOGo/SOGo.conf \
+CONF_FILES+=	share/examples/SOGo/SOGo.conf \
 		${PKG_SYSCONFDIR}/SOGo.conf
 OWN_DIRS+=	${SOGOETCDIR}
 OWN_DIRS+=	${SOGORUNDIR}
@@ -38,6 +39,8 @@ PKG_HOME.${SOGOUSER}=	${SOGOETCDIR}
 PKG_SHELL.${SOGOUSER}=	${SH}
 PKG_GECOS.${SOGOUSER}=	SOGo daemon user
 
+PKG_SYSCONFSUBDIR=	sogo
+
 FILES_SUBST+=	SOGORUNDIR=${SOGORUNDIR}
 FILES_SUBST+=	SOGOETCDIR=${SOGOETCDIR}
 FILES_SUBST+=	SOGOUSER=${SOGOUSER}