- Update to 2.3.17

Approved by:	maintainer (implicit)

4 files changed, 37 insertions, 21 deletions

diff --git a/www/sogo2/Makefile b/www/sogo2/Makefile
index d3242c2a067a..4403c3a3a6e5 100644
--- a/www/sogo2/Makefile
+++ b/www/sogo2/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=		sogo2
-PORTVERSION=		2.3.13
-PORTREVISION=		1
+PORTVERSION=		2.3.17
 CATEGORIES=		www gnustep
 MASTER_SITES=		http://www.sogo.nu/files/downloads/SOGo/Sources/
 DISTNAME=		SOGo-${PORTVERSION}
@@ -27,7 +26,7 @@ ACTIVESYNC_LIB_DEPENDS=	libwbxml2.so:textproc/wbxml2
 USERS=			sogod
 GROUPS=			sogod
 
-USES=			gnustep objc
+USES=			gnustep ssl objc
 USE_GNUSTEP=		base build
 USE_LDCONFIG=		${GNUSTEP_LOCAL_LIBRARIES}/sogo
 
@@ -44,6 +43,7 @@ post-patch:
 	@${GREP} -rlF '/etc/sogo' ${WRKSRC} \
 		| ${XARGS} ${REINPLACE_CMD} 's#/etc/sogo#${PREFIX}/etc/sogo#g'
 	@${REINPLACE_CMD} -e 's|/usr/lib/GNUstep|${GNUSTEP_LOCAL_ROOT}/Library|' ${WRKSRC}/Apache/SOGo.conf
+	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/configure
 
 post-patch-ACTIVESYNC-on:
 	@${REINPLACE_CMD} -e 's/Tools/Tools ActiveSync/' ${WRKSRC}/GNUmakefile
diff --git a/www/sogo2/distinfo b/www/sogo2/distinfo
index a7f27b4e2a5d..81533d34e309 100644
--- a/www/sogo2/distinfo
+++ b/www/sogo2/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1468338820
-SHA256 (SOGo-2.3.13.tar.gz) = eedda075bc39e6a4225b6b95afffddc483bc93c6bd80da24ad44fe248293fad1
-SIZE (SOGo-2.3.13.tar.gz) = 12362301
+TIMESTAMP = 1478673245
+SHA256 (SOGo-2.3.17.tar.gz) = 6c84b3fad8874d45aabef6d2f9ce63b11cd44615cf5f90ee5517e6001819cc65
+SIZE (SOGo-2.3.17.tar.gz) = 12373265
diff --git a/www/sogo2/files/patch-configure b/www/sogo2/files/patch-configure
index a5afdcb4a6bc..ee84da778495 100644
--- a/www/sogo2/files/patch-configure
+++ b/www/sogo2/files/patch-configure
@@ -1,18 +1,11 @@
---- configure.orig	2016-07-06 11:37:52 UTC
-+++ configure
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!/bin/sh
+--- configure.orig	2016-11-09 01:55:36.202443000 -0500
++++ configure	2016-11-09 01:57:47.331793000 -0500
+@@ -49,7 +49,7 @@
  
- #
- # Note: When adding make options to this script, ensure that the source still
-@@ -235,7 +235,8 @@ genConfigMake() {
-   cfgwrite "#         $MAKE debug=yes"
-   cfgwrite ""
  
--  cfgwrite "TOPDIR:=$( sed 's/ /\\\ /g' <<< ${TOPDIR} )"
-+  TOPDIR_CFGWRITE=`echo ${TOPDIR} | sed 's/ /\\\ /g'`
-+  cfgwrite "TOPDIR:=${TOPDIR_CFGWRITE}"
-   cfgwrite ""
+ NGSTREAMS_DIR="./sope-core/NGStreams"
+-LINK_SYSLIBDIRS="-L/usr/local/pgsql/lib -L/usr/local/lib -L/usr/lib"
++LINK_SYSLIBDIRS="-L%%LOCALBASE%%/lib/postgresql -L%%LOCALBASE%%/lib/mysql -L%%LOCALBASE%%/lib -L/usr/lib"
+ 
+ # ******************** usage ********************
  
-   cfgwrite "NEEDS_GUI=no"
diff --git a/www/sogo2/pkg-plist b/www/sogo2/pkg-plist
index 5fc8576c0c13..6632a1af921a 100644
--- a/www/sogo2/pkg-plist
+++ b/www/sogo2/pkg-plist
@@ -599,6 +599,7 @@ GNUstep/Local/Library/SOGo/AdministrationUI.SOGo/Resources/NorwegianNynorsk.lpro
 GNUstep/Local/Library/SOGo/AdministrationUI.SOGo/Resources/Polish.lproj/Localizable.strings
 GNUstep/Local/Library/SOGo/AdministrationUI.SOGo/Resources/Portuguese.lproj/Localizable.strings
 GNUstep/Local/Library/SOGo/AdministrationUI.SOGo/Resources/Russian.lproj/Localizable.strings
+GNUstep/Local/Library/SOGo/AdministrationUI.SOGo/Resources/Serbian.lproj/Localizable.strings
 GNUstep/Local/Library/SOGo/AdministrationUI.SOGo/Resources/Slovak.lproj/Localizable.strings
 GNUstep/Local/Library/SOGo/AdministrationUI.SOGo/Resources/Slovenian.lproj/Localizable.strings
 GNUstep/Local/Library/SOGo/AdministrationUI.SOGo/Resources/SpanishArgentina.lproj/Localizable.strings
@@ -638,6 +639,7 @@ GNUstep/Local/Library/SOGo/Appointments.SOGo/Resources/NorwegianNynorsk.lproj/Lo
 GNUstep/Local/Library/SOGo/Appointments.SOGo/Resources/Polish.lproj/Localizable.strings
 GNUstep/Local/Library/SOGo/Appointments.SOGo/Resources/Portuguese.lproj/Localizable.strings
 GNUstep/Local/Library/SOGo/Appointments.SOGo/Resources/Russian.lproj/Localizable.strings
+GNUstep/Local/Library/SOGo/Appointments.SOGo/Resources/Serbian.lproj/Localizable.strings
 GNUstep/Local/Library/SOGo/Appointments.SOGo/Resources/Slovak.lproj/Localizable.strings
 GNUstep/Local/Library/SOGo/Appointments.SOGo/Resources/Slovenian.lproj/Localizable.strings
 GNUstep/Local/Library/SOGo/Appointments.SOGo/Resources/SpanishArgentina.lproj/Localizable.strings
@@ -673,6 +675,7 @@ GNUstep/Local/Library/SOGo/CommonUI.SOGo/Resources/NorwegianNynorsk.lproj/Locali
 GNUstep/Local/Library/SOGo/CommonUI.SOGo/Resources/Polish.lproj/Localizable.strings
 GNUstep/Local/Library/SOGo/CommonUI.SOGo/Resources/Portuguese.lproj/Localizable.strings
 GNUstep/Local/Library/SOGo/CommonUI.SOGo/Resources/Russian.lproj/Localizable.strings
+GNUstep/Local/Library/SOGo/CommonUI.SOGo/Resources/Serbian.lproj/Localizable.strings
 GNUstep/Local/Library/SOGo/CommonUI.SOGo/Resources/Slovak.lproj/Localizable.strings
 GNUstep/Local/Library/SOGo/CommonUI.SOGo/Resources/Slovenian.lproj/Localizable.strings
 GNUstep/Local/Library/SOGo/CommonUI.SOGo/Resources/SpanishArgentina.lproj/Localizable.strings
@@ -709,6 +712,7 @@ GNUstep/Local/Library/SOGo/Contacts.SOGo/Resources/NorwegianNynorsk.lproj/Locali
 GNUstep/Local/Library/SOGo/Contacts.SOGo/Resources/Polish.lproj/Localizable.strings
 GNUstep/Local/Library/SOGo/Contacts.SOGo/Resources/Portuguese.lproj/Localizable.strings
 GNUstep/Local/Library/SOGo/Contacts.SOGo/Resources/Russian.lproj/Localizable.strings
+GNUstep/Local/Library/SOGo/Contacts.SOGo/Resources/Serbian.lproj/Localizable.strings
 GNUstep/Local/Library/SOGo/Contacts.SOGo/Resources/Slovak.lproj/Localizable.strings
 GNUstep/Local/Library/SOGo/Contacts.SOGo/Resources/Slovenian.lproj/Localizable.strings
 GNUstep/Local/Library/SOGo/Contacts.SOGo/Resources/SpanishArgentina.lproj/Localizable.strings
@@ -745,6 +749,7 @@ GNUstep/Local/Library/SOGo/ContactsUI.SOGo/Resources/Polish.lproj/Localizable.st
 GNUstep/Local/Library/SOGo/ContactsUI.SOGo/Resources/Portuguese.lproj/Localizable.strings
 GNUstep/Local/Library/SOGo/ContactsUI.SOGo/Resources/Russian.lproj/Localizable.strings
 GNUstep/Local/Library/SOGo/ContactsUI.SOGo/Resources/SOGoContactFolder.toolbar
+GNUstep/Local/Library/SOGo/ContactsUI.SOGo/Resources/Serbian.lproj/Localizable.strings
 GNUstep/Local/Library/SOGo/ContactsUI.SOGo/Resources/Slovak.lproj/Localizable.strings
 GNUstep/Local/Library/SOGo/ContactsUI.SOGo/Resources/Slovenian.lproj/Localizable.strings
 GNUstep/Local/Library/SOGo/ContactsUI.SOGo/Resources/SpanishArgentina.lproj/Localizable.strings
@@ -781,6 +786,7 @@ GNUstep/Local/Library/SOGo/MailPartViewers.SOGo/Resources/NorwegianNynorsk.lproj
 GNUstep/Local/Library/SOGo/MailPartViewers.SOGo/Resources/Polish.lproj/Localizable.strings
 GNUstep/Local/Library/SOGo/MailPartViewers.SOGo/Resources/Portuguese.lproj/Localizable.strings
 GNUstep/Local/Library/SOGo/MailPartViewers.SOGo/Resources/Russian.lproj/Localizable.strings
+GNUstep/Local/Library/SOGo/MailPartViewers.SOGo/Resources/Serbian.lproj/Localizable.strings
 GNUstep/Local/Library/SOGo/MailPartViewers.SOGo/Resources/Slovak.lproj/Localizable.strings
 GNUstep/Local/Library/SOGo/MailPartViewers.SOGo/Resources/Slovenian.lproj/Localizable.strings
 GNUstep/Local/Library/SOGo/MailPartViewers.SOGo/Resources/SpanishArgentina.lproj/Localizable.strings
@@ -904,6 +910,10 @@ GNUstep/Local/Library/SOGo/Mailer.SOGo/Resources/SOGoMailRussianForward.wo/SOGoM
 GNUstep/Local/Library/SOGo/Mailer.SOGo/Resources/SOGoMailRussianForward.wo/SOGoMailRussianForward.wod
 GNUstep/Local/Library/SOGo/Mailer.SOGo/Resources/SOGoMailRussianReply.wo/SOGoMailRussianReply.html
 GNUstep/Local/Library/SOGo/Mailer.SOGo/Resources/SOGoMailRussianReply.wo/SOGoMailRussianReply.wod
+GNUstep/Local/Library/SOGo/Mailer.SOGo/Resources/SOGoMailSerbianForward.wo/SOGoMailSerbianForward.html
+GNUstep/Local/Library/SOGo/Mailer.SOGo/Resources/SOGoMailSerbianForward.wo/SOGoMailSerbianForward.wod
+GNUstep/Local/Library/SOGo/Mailer.SOGo/Resources/SOGoMailSerbianReply.wo/SOGoMailSerbianReply.html
+GNUstep/Local/Library/SOGo/Mailer.SOGo/Resources/SOGoMailSerbianReply.wo/SOGoMailSerbianReply.wod
 GNUstep/Local/Library/SOGo/Mailer.SOGo/Resources/SOGoMailSlovakForward.wo/SOGoMailSlovakForward.html
 GNUstep/Local/Library/SOGo/Mailer.SOGo/Resources/SOGoMailSlovakForward.wo/SOGoMailSlovakForward.wod
 GNUstep/Local/Library/SOGo/Mailer.SOGo/Resources/SOGoMailSlovakReply.wo/SOGoMailSlovakReply.html
@@ -936,6 +946,7 @@ GNUstep/Local/Library/SOGo/Mailer.SOGo/Resources/SOGoMailWelshForward.wo/SOGoMai
 GNUstep/Local/Library/SOGo/Mailer.SOGo/Resources/SOGoMailWelshForward.wo/SOGoMailWelshForward.wod
 GNUstep/Local/Library/SOGo/Mailer.SOGo/Resources/SOGoMailWelshReply.wo/SOGoMailWelshReply.html
 GNUstep/Local/Library/SOGo/Mailer.SOGo/Resources/SOGoMailWelshReply.wo/SOGoMailWelshReply.wod
+GNUstep/Local/Library/SOGo/Mailer.SOGo/Resources/Serbian.lproj/Localizable.strings
 GNUstep/Local/Library/SOGo/Mailer.SOGo/Resources/Slovak.lproj/Localizable.strings
 GNUstep/Local/Library/SOGo/Mailer.SOGo/Resources/Slovenian.lproj/Localizable.strings
 GNUstep/Local/Library/SOGo/Mailer.SOGo/Resources/SpanishArgentina.lproj/Localizable.strings
@@ -974,6 +985,7 @@ GNUstep/Local/Library/SOGo/MailerUI.SOGo/Resources/Russian.lproj/Localizable.str
 GNUstep/Local/Library/SOGo/MailerUI.SOGo/Resources/SOGoDraftObject.toolbar
 GNUstep/Local/Library/SOGo/MailerUI.SOGo/Resources/SOGoMailFolder.toolbar
 GNUstep/Local/Library/SOGo/MailerUI.SOGo/Resources/SOGoMailObject.toolbar
+GNUstep/Local/Library/SOGo/MailerUI.SOGo/Resources/Serbian.lproj/Localizable.strings
 GNUstep/Local/Library/SOGo/MailerUI.SOGo/Resources/Slovak.lproj/Localizable.strings
 GNUstep/Local/Library/SOGo/MailerUI.SOGo/Resources/Slovenian.lproj/Localizable.strings
 GNUstep/Local/Library/SOGo/MailerUI.SOGo/Resources/SpanishArgentina.lproj/Localizable.strings
@@ -1037,6 +1049,8 @@ GNUstep/Local/Library/SOGo/MainUI.SOGo/Resources/Russian.lproj/Locale
 GNUstep/Local/Library/SOGo/MainUI.SOGo/Resources/Russian.lproj/Localizable.strings
 GNUstep/Local/Library/SOGo/MainUI.SOGo/Resources/SOGoProfile-oracle.sql
 GNUstep/Local/Library/SOGo/MainUI.SOGo/Resources/SOGoProfile.sql
+GNUstep/Local/Library/SOGo/MainUI.SOGo/Resources/Serbian.lproj/Locale
+GNUstep/Local/Library/SOGo/MainUI.SOGo/Resources/Serbian.lproj/Localizable.strings
 GNUstep/Local/Library/SOGo/MainUI.SOGo/Resources/Slovak.lproj/Locale
 GNUstep/Local/Library/SOGo/MainUI.SOGo/Resources/Slovak.lproj/Localizable.strings
 GNUstep/Local/Library/SOGo/MainUI.SOGo/Resources/Slovenian.lproj/Locale
@@ -1080,6 +1094,7 @@ GNUstep/Local/Library/SOGo/PreferencesUI.SOGo/Resources/NorwegianNynorsk.lproj/L
 GNUstep/Local/Library/SOGo/PreferencesUI.SOGo/Resources/Polish.lproj/Localizable.strings
 GNUstep/Local/Library/SOGo/PreferencesUI.SOGo/Resources/Portuguese.lproj/Localizable.strings
 GNUstep/Local/Library/SOGo/PreferencesUI.SOGo/Resources/Russian.lproj/Localizable.strings
+GNUstep/Local/Library/SOGo/PreferencesUI.SOGo/Resources/Serbian.lproj/Localizable.strings
 GNUstep/Local/Library/SOGo/PreferencesUI.SOGo/Resources/Slovak.lproj/Localizable.strings
 GNUstep/Local/Library/SOGo/PreferencesUI.SOGo/Resources/Slovenian.lproj/Localizable.strings
 GNUstep/Local/Library/SOGo/PreferencesUI.SOGo/Resources/SpanishArgentina.lproj/Localizable.strings
@@ -1120,6 +1135,7 @@ GNUstep/Local/Library/SOGo/SchedulerUI.SOGo/Resources/SOGoAppointmentObject.tool
 GNUstep/Local/Library/SOGo/SchedulerUI.SOGo/Resources/SOGoComponentClose.toolbar
 GNUstep/Local/Library/SOGo/SchedulerUI.SOGo/Resources/SOGoEmpty.toolbar
 GNUstep/Local/Library/SOGo/SchedulerUI.SOGo/Resources/SOGoTaskObject.toolbar
+GNUstep/Local/Library/SOGo/SchedulerUI.SOGo/Resources/Serbian.lproj/Localizable.strings
 GNUstep/Local/Library/SOGo/SchedulerUI.SOGo/Resources/Slovak.lproj/Localizable.strings
 GNUstep/Local/Library/SOGo/SchedulerUI.SOGo/Resources/Slovenian.lproj/Localizable.strings
 GNUstep/Local/Library/SOGo/SchedulerUI.SOGo/Resources/SpanishArgentina.lproj/Localizable.strings
@@ -1249,6 +1265,9 @@ GNUstep/Local/Library/SOGo/Templates/SOGoACLPortugueseRemovalAdvisory.wox
 GNUstep/Local/Library/SOGo/Templates/SOGoACLRussianAdditionAdvisory.wox
 GNUstep/Local/Library/SOGo/Templates/SOGoACLRussianModificationAdvisory.wox
 GNUstep/Local/Library/SOGo/Templates/SOGoACLRussianRemovalAdvisory.wox
+GNUstep/Local/Library/SOGo/Templates/SOGoACLSerbianAdditionAdvisory.wox
+GNUstep/Local/Library/SOGo/Templates/SOGoACLSerbianModificationAdvisory.wox
+GNUstep/Local/Library/SOGo/Templates/SOGoACLSerbianRemovalAdvisory.wox
 GNUstep/Local/Library/SOGo/Templates/SOGoACLSlovakAdditionAdvisory.wox
 GNUstep/Local/Library/SOGo/Templates/SOGoACLSlovakModificationAdvisory.wox
 GNUstep/Local/Library/SOGo/Templates/SOGoACLSlovakRemovalAdvisory.wox
@@ -1316,6 +1335,8 @@ GNUstep/Local/Library/SOGo/Templates/SOGoFolderPortugueseAdditionAdvisory.wox
 GNUstep/Local/Library/SOGo/Templates/SOGoFolderPortugueseRemovalAdvisory.wox
 GNUstep/Local/Library/SOGo/Templates/SOGoFolderRussianAdditionAdvisory.wox
 GNUstep/Local/Library/SOGo/Templates/SOGoFolderRussianRemovalAdvisory.wox
+GNUstep/Local/Library/SOGo/Templates/SOGoFolderSerbianAdditionAdvisory.wox
+GNUstep/Local/Library/SOGo/Templates/SOGoFolderSerbianRemovalAdvisory.wox
 GNUstep/Local/Library/SOGo/Templates/SOGoFolderSlovakAdditionAdvisory.wox
 GNUstep/Local/Library/SOGo/Templates/SOGoFolderSlovakRemovalAdvisory.wox
 GNUstep/Local/Library/SOGo/Templates/SOGoFolderSlovenianAdditionAdvisory.wox
@@ -1378,6 +1399,7 @@ GNUstep/Local/Library/SOGo/WebServerResources/MailerUI.css
 GNUstep/Local/Library/SOGo/WebServerResources/MailerUI.js
 GNUstep/Local/Library/SOGo/WebServerResources/MailerUIdTree.js
 GNUstep/Local/Library/SOGo/WebServerResources/PasswordPolicy.js
+GNUstep/Local/Library/SOGo/WebServerResources/ResizeSensor.js
 GNUstep/Local/Library/SOGo/WebServerResources/RowEditionController.js
 GNUstep/Local/Library/SOGo/WebServerResources/SOGoAutoCompletion.js
 GNUstep/Local/Library/SOGo/WebServerResources/SOGoDataTable.js
@@ -1507,6 +1529,7 @@ GNUstep/Local/Library/SOGo/WebServerResources/ckeditor/lang/pt.js
 GNUstep/Local/Library/SOGo/WebServerResources/ckeditor/lang/ru.js
 GNUstep/Local/Library/SOGo/WebServerResources/ckeditor/lang/sk.js
 GNUstep/Local/Library/SOGo/WebServerResources/ckeditor/lang/sl.js
+GNUstep/Local/Library/SOGo/WebServerResources/ckeditor/lang/sr.js
 GNUstep/Local/Library/SOGo/WebServerResources/ckeditor/lang/sv.js
 GNUstep/Local/Library/SOGo/WebServerResources/ckeditor/lang/tr.js
 GNUstep/Local/Library/SOGo/WebServerResources/ckeditor/lang/uk.js