Hi,
long overdue an update. The update to 2.2.6 was too short to make it into the
release for 5.6. Meanwhile we're at 2.2.9.
Attached patches update to that newer version, I have running since a few
days without issues so far.
With the change of 2.2.8 -> 2.2.9, the documentation is not provided as
pdf anymore. It would need Apache FOP java thingie to build the documentation.
I think that is just too much, and those are documents not included anymore.
as with the 2.2.6 update I sent in July, www/opengroupware needs a patch to
since the changes in www/sope.
This version does not yet include a SUBPACKAGE for activesync, but hope
to get it added with next release 2.2.10, which is supposed to be released
in not too far future.
OK?
Sebastian
? sogo-2.2.9.diff
Index: Makefile
===================================================================
RCS file: /cvs/ports/www/sogo/Makefile,v
retrieving revision 1.40
diff -u -r1.40 Makefile
--- Makefile 12 Jun 2014 06:16:35 -0000 1.40
+++ Makefile 30 Sep 2014 16:59:00 -0000
@@ -2,15 +2,13 @@
COMMENT = web based groupware server
-VERSION = 2.1.1
-DISTNAME = SOGo-${VERSION}b
-PKGNAME = sogo-${VERSION}.1
-REVISION = 3
+VERSION = 2.2.9
+DISTNAME = SOGo-${VERSION}
+PKGNAME = sogo-${VERSION}
SHARED_LIBS += GDLContentStore 2.0
SHARED_LIBS += NGCards 2.0
-SHARED_LIBS += OGoContentStore 2.0
-SHARED_LIBS += SOGo 2.1
+SHARED_LIBS += SOGo 2.2
SHARED_LIBS += SOGoUI 2.0
CATEGORIES = www
@@ -51,15 +49,8 @@
SOGOLIBDIR = lib/GNUstep/Frameworks/SOGo.framework/Versions/${LIBSOGo_VERSION}
SUBST_VARS += SOGOLIBDIR VARBASE
-pre-configure:
-.for f in SOGo_Installation_Guide SOGo_Mobile_Devices_Configuration \
- SOGo_Mozilla_Thunderbird_Configuration SOGo_Native_Microsoft_Outlook_Configuration
- cd ${WRKSRC}/Documentation; mv "${f:S/_/ /g}.odt" "$f.odt"
-.endfor
-
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/sogo
- ${INSTALL_DATA} ${WRKSRC}/Documentation/* ${PREFIX}/share/doc/sogo
${INSTALL_SCRIPT} -c -o ${SHAREOWN} -g ${SHAREGRP} \
${WRKSRC}/Scripts/cas-proxy-validate.py \
${PREFIX}/share/doc/sogo/cas-proxy-validate.py
Index: distinfo
===================================================================
RCS file: /cvs/ports/www/sogo/distinfo,v
retrieving revision 1.19
diff -u -r1.19 distinfo
--- distinfo 3 Jan 2014 18:39:51 -0000 1.19
+++ distinfo 30 Sep 2014 16:59:00 -0000
@@ -1,2 +1,2 @@
-SHA256 (SOGo-2.1.1b.tar.gz) = 7JCs4kogu8K6BJ/fsiT6ntSeRhVZuHA1YJMFqUUbs94=
-SIZE (SOGo-2.1.1b.tar.gz) = 5846822
+SHA256 (SOGo-2.2.9.tar.gz) = qXA1vF8MfObZBpojySMGJJKY8/RF89JFJtGp7AByZcU=
+SIZE (SOGo-2.2.9.tar.gz) = 11535599
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/www/sogo/pkg/PLIST,v
retrieving revision 1.19
diff -u -r1.19 PLIST
--- pkg/PLIST 3 Jan 2014 18:39:51 -0000 1.19
+++ pkg/PLIST 30 Sep 2014 16:59:01 -0000
@@ -6,7 +6,6 @@
include/GDLContentStore/GCSAlarmsFolder.h
include/GDLContentStore/GCSChannelManager.h
include/GDLContentStore/GCSContext.h
-include/GDLContentStore/GCSFieldExtractor.h
include/GDLContentStore/GCSFieldInfo.h
include/GDLContentStore/GCSFolder.h
include/GDLContentStore/GCSFolderManager.h
@@ -64,7 +63,11 @@
lib/GNUstep/Frameworks/SOGo.framework/Versions/
${SOGOLIBDIR}/
${SOGOLIBDIR}/Headers/
+${SOGOLIBDIR}/Headers/BSONCodec.h
${SOGOLIBDIR}/Headers/DOMNode+SOGo.h
+${SOGOLIBDIR}/Headers/EOBitmaskQualifier.h
+${SOGOLIBDIR}/Headers/EOQualifier+SOGoCacheObject.h
+${SOGOLIBDIR}/Headers/GCSSpecialQueries+SOGoCacheObject.h
${SOGOLIBDIR}/Headers/LDAPSource.h
${SOGOLIBDIR}/Headers/LDAPSourceSchema.h
${SOGOLIBDIR}/Headers/NSArray+DAV.h
@@ -86,6 +89,9 @@
${SOGOLIBDIR}/Headers/SOGoBuild.h
${SOGOLIBDIR}/Headers/SOGoCASSession.h
${SOGOLIBDIR}/Headers/SOGoCache.h
+${SOGOLIBDIR}/Headers/SOGoCacheGCSFolder.h
+${SOGOLIBDIR}/Headers/SOGoCacheGCSObject.h
+${SOGOLIBDIR}/Headers/SOGoCacheObject.h
${SOGOLIBDIR}/Headers/SOGoConstants.h
${SOGOLIBDIR}/Headers/SOGoContentObject.h
${SOGOLIBDIR}/Headers/SOGoCredentialsFile.h
@@ -890,7 +896,41 @@
lib/GNUstep/SOGo/Mailer.SOGo/
@bin lib/GNUstep/SOGo/Mailer.SOGo/Mailer
lib/GNUstep/SOGo/Mailer.SOGo/Resources/
+lib/GNUstep/SOGo/Mailer.SOGo/Resources/Arabic.lproj/
+lib/GNUstep/SOGo/Mailer.SOGo/Resources/Arabic.lproj/Localizable.strings
+lib/GNUstep/SOGo/Mailer.SOGo/Resources/BrazilianPortuguese.lproj/
+lib/GNUstep/SOGo/Mailer.SOGo/Resources/BrazilianPortuguese.lproj/Localizable.strings
+lib/GNUstep/SOGo/Mailer.SOGo/Resources/Catalan.lproj/
+lib/GNUstep/SOGo/Mailer.SOGo/Resources/Catalan.lproj/Localizable.strings
+lib/GNUstep/SOGo/Mailer.SOGo/Resources/Czech.lproj/
+lib/GNUstep/SOGo/Mailer.SOGo/Resources/Czech.lproj/Localizable.strings
+lib/GNUstep/SOGo/Mailer.SOGo/Resources/Danish.lproj/
+lib/GNUstep/SOGo/Mailer.SOGo/Resources/Danish.lproj/Localizable.strings
+lib/GNUstep/SOGo/Mailer.SOGo/Resources/Dutch.lproj/
+lib/GNUstep/SOGo/Mailer.SOGo/Resources/Dutch.lproj/Localizable.strings
+lib/GNUstep/SOGo/Mailer.SOGo/Resources/English.lproj/
+lib/GNUstep/SOGo/Mailer.SOGo/Resources/English.lproj/Localizable.strings
+lib/GNUstep/SOGo/Mailer.SOGo/Resources/Finnish.lproj/
+lib/GNUstep/SOGo/Mailer.SOGo/Resources/Finnish.lproj/Localizable.strings
+lib/GNUstep/SOGo/Mailer.SOGo/Resources/French.lproj/
+lib/GNUstep/SOGo/Mailer.SOGo/Resources/French.lproj/Localizable.strings
+lib/GNUstep/SOGo/Mailer.SOGo/Resources/German.lproj/
+lib/GNUstep/SOGo/Mailer.SOGo/Resources/German.lproj/Localizable.strings
+lib/GNUstep/SOGo/Mailer.SOGo/Resources/Hungarian.lproj/
+lib/GNUstep/SOGo/Mailer.SOGo/Resources/Hungarian.lproj/Localizable.strings
+lib/GNUstep/SOGo/Mailer.SOGo/Resources/Icelandic.lproj/
+lib/GNUstep/SOGo/Mailer.SOGo/Resources/Icelandic.lproj/Localizable.strings
lib/GNUstep/SOGo/Mailer.SOGo/Resources/Info-gnustep.plist
+lib/GNUstep/SOGo/Mailer.SOGo/Resources/Italian.lproj/
+lib/GNUstep/SOGo/Mailer.SOGo/Resources/Italian.lproj/Localizable.strings
+lib/GNUstep/SOGo/Mailer.SOGo/Resources/NorwegianBokmal.lproj/
+lib/GNUstep/SOGo/Mailer.SOGo/Resources/NorwegianBokmal.lproj/Localizable.strings
+lib/GNUstep/SOGo/Mailer.SOGo/Resources/NorwegianNynorsk.lproj/
+lib/GNUstep/SOGo/Mailer.SOGo/Resources/NorwegianNynorsk.lproj/Localizable.strings
+lib/GNUstep/SOGo/Mailer.SOGo/Resources/Polish.lproj/
+lib/GNUstep/SOGo/Mailer.SOGo/Resources/Polish.lproj/Localizable.strings
+lib/GNUstep/SOGo/Mailer.SOGo/Resources/Russian.lproj/
+lib/GNUstep/SOGo/Mailer.SOGo/Resources/Russian.lproj/Localizable.strings
lib/GNUstep/SOGo/Mailer.SOGo/Resources/SOGoMailArabicForward.wo/
lib/GNUstep/SOGo/Mailer.SOGo/Resources/SOGoMailArabicForward.wo/SOGoMailArabicForward.html
lib/GNUstep/SOGo/Mailer.SOGo/Resources/SOGoMailArabicForward.wo/SOGoMailArabicForward.wod
@@ -1029,7 +1069,19 @@
lib/GNUstep/SOGo/Mailer.SOGo/Resources/SOGoMailWelshReply.wo/
lib/GNUstep/SOGo/Mailer.SOGo/Resources/SOGoMailWelshReply.wo/SOGoMailWelshReply.html
lib/GNUstep/SOGo/Mailer.SOGo/Resources/SOGoMailWelshReply.wo/SOGoMailWelshReply.wod
+lib/GNUstep/SOGo/Mailer.SOGo/Resources/Slovak.lproj/
+lib/GNUstep/SOGo/Mailer.SOGo/Resources/Slovak.lproj/Localizable.strings
+lib/GNUstep/SOGo/Mailer.SOGo/Resources/SpanishArgentina.lproj/
+lib/GNUstep/SOGo/Mailer.SOGo/Resources/SpanishArgentina.lproj/Localizable.strings
+lib/GNUstep/SOGo/Mailer.SOGo/Resources/SpanishSpain.lproj/
+lib/GNUstep/SOGo/Mailer.SOGo/Resources/SpanishSpain.lproj/Localizable.strings
+lib/GNUstep/SOGo/Mailer.SOGo/Resources/Swedish.lproj/
+lib/GNUstep/SOGo/Mailer.SOGo/Resources/Swedish.lproj/Localizable.strings
+lib/GNUstep/SOGo/Mailer.SOGo/Resources/Ukrainian.lproj/
+lib/GNUstep/SOGo/Mailer.SOGo/Resources/Ukrainian.lproj/Localizable.strings
lib/GNUstep/SOGo/Mailer.SOGo/Resources/WebServer/
+lib/GNUstep/SOGo/Mailer.SOGo/Resources/Welsh.lproj/
+lib/GNUstep/SOGo/Mailer.SOGo/Resources/Welsh.lproj/Localizable.strings
lib/GNUstep/SOGo/Mailer.SOGo/Resources/product.plist
lib/GNUstep/SOGo/Mailer.SOGo/bundle-info.plist
lib/GNUstep/SOGo/MailerUI.SOGo/
@@ -1294,6 +1346,7 @@
lib/GNUstep/SOGo/Templates/Appointments/SOGoAptMailUpdate.wox
lib/GNUstep/SOGo/Templates/ContactsUI/
lib/GNUstep/SOGo/Templates/ContactsUI/UIxContactEditor.wox
+lib/GNUstep/SOGo/Templates/ContactsUI/UIxContactFolderProperties.wox
lib/GNUstep/SOGo/Templates/ContactsUI/UIxContactFoldersView.wox
lib/GNUstep/SOGo/Templates/ContactsUI/UIxContactView.wox
lib/GNUstep/SOGo/Templates/ContactsUI/UIxContactsFilterPanel.wox
@@ -1320,6 +1373,7 @@
lib/GNUstep/SOGo/Templates/MailerUI/UIxMailMainFrame.wox
lib/GNUstep/SOGo/Templates/MailerUI/UIxMailMoveToPopUp.wox
lib/GNUstep/SOGo/Templates/MailerUI/UIxMailPopupView.wox
+lib/GNUstep/SOGo/Templates/MailerUI/UIxMailSearch.wox
lib/GNUstep/SOGo/Templates/MailerUI/UIxMailToSelection.wox
lib/GNUstep/SOGo/Templates/MailerUI/UIxMailUserDelegationEditor.wox
lib/GNUstep/SOGo/Templates/MailerUI/UIxMailUserRightsEditor.wox
@@ -1458,6 +1512,7 @@
lib/GNUstep/SOGo/Templates/SchedulerUI/UIxCalMonthView.wox
lib/GNUstep/SOGo/Templates/SchedulerUI/UIxCalMulticolumnDayView.wox
lib/GNUstep/SOGo/Templates/SchedulerUI/UIxCalUserRightsEditor.wox
+lib/GNUstep/SOGo/Templates/SchedulerUI/UIxCalViewPrint.wox
lib/GNUstep/SOGo/Templates/SchedulerUI/UIxCalWeekView.wox
lib/GNUstep/SOGo/Templates/SchedulerUI/UIxCalendarProperties.wox
lib/GNUstep/SOGo/Templates/SchedulerUI/UIxCalendarSelector.wox
@@ -1520,6 +1575,8 @@
lib/GNUstep/SOGo/WebServerResources/UIxAttendeesEditor.js
lib/GNUstep/SOGo/WebServerResources/UIxCalUserRightsEditor.css
lib/GNUstep/SOGo/WebServerResources/UIxCalUserRightsEditor.js
+lib/GNUstep/SOGo/WebServerResources/UIxCalViewPrint.css
+lib/GNUstep/SOGo/WebServerResources/UIxCalViewPrint.js
lib/GNUstep/SOGo/WebServerResources/UIxCalendarProperties.css
lib/GNUstep/SOGo/WebServerResources/UIxCalendarProperties.js
lib/GNUstep/SOGo/WebServerResources/UIxColorPicker.js
@@ -1527,6 +1584,8 @@
lib/GNUstep/SOGo/WebServerResources/UIxComponentEditor.js
lib/GNUstep/SOGo/WebServerResources/UIxContactEditor.css
lib/GNUstep/SOGo/WebServerResources/UIxContactEditor.js
+lib/GNUstep/SOGo/WebServerResources/UIxContactFolderProperties.css
+lib/GNUstep/SOGo/WebServerResources/UIxContactFolderProperties.js
lib/GNUstep/SOGo/WebServerResources/UIxContactsUserFolders.css
lib/GNUstep/SOGo/WebServerResources/UIxContactsUserFolders.js
lib/GNUstep/SOGo/WebServerResources/UIxContactsUserRightsEditor.css
@@ -1539,6 +1598,8 @@
lib/GNUstep/SOGo/WebServerResources/UIxMailEditor.js
lib/GNUstep/SOGo/WebServerResources/UIxMailPartExternalHTMLViewer.css
lib/GNUstep/SOGo/WebServerResources/UIxMailPopupView.js
+lib/GNUstep/SOGo/WebServerResources/UIxMailSearch.css
+lib/GNUstep/SOGo/WebServerResources/UIxMailSearch.js
lib/GNUstep/SOGo/WebServerResources/UIxMailToSelection.js
lib/GNUstep/SOGo/WebServerResources/UIxMailUserDelegationEditor.css
lib/GNUstep/SOGo/WebServerResources/UIxMailUserDelegationEditor.js
@@ -1576,6 +1637,7 @@
lib/GNUstep/SOGo/WebServerResources/arrow-right.png
lib/GNUstep/SOGo/WebServerResources/arrow-up.png
lib/GNUstep/SOGo/WebServerResources/attachment.gif
+lib/GNUstep/SOGo/WebServerResources/attachment.png
lib/GNUstep/SOGo/WebServerResources/attendee-partstats.png
lib/GNUstep/SOGo/WebServerResources/attendee-roles.png
lib/GNUstep/SOGo/WebServerResources/browser_chrome.gif
@@ -1635,9 +1697,6 @@
lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/div/
lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/div/dialogs/
lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/div/dialogs/div.js
-lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/fakeobjects/
-lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/fakeobjects/images/
-lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/fakeobjects/images/spacer.gif
lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/icons.png
lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/icons_hidpi.png
lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/image/
@@ -1654,6 +1713,7 @@
lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/link/images/hidpi/
lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/link/images/hidpi/anchor.png
lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/scayt/
+lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/scayt/LICENSE.md
lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/scayt/dialogs/
lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/scayt/dialogs/options.js
lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/scayt/dialogs/toolbar.css
@@ -1664,9 +1724,9 @@
lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/tabletools/dialogs/
lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/tabletools/dialogs/tableCell.js
lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/wsc/
+lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/wsc/LICENSE.md
lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/wsc/dialogs/
lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/wsc/dialogs/ciframe.html
-lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/wsc/dialogs/tmp.html
lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/wsc/dialogs/tmpFrameset.html
lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/wsc/dialogs/wsc.css
lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/wsc/dialogs/wsc.js
@@ -1678,7 +1738,6 @@
lib/GNUstep/SOGo/WebServerResources/ckeditor/skins/moono/dialog_ie7.css
lib/GNUstep/SOGo/WebServerResources/ckeditor/skins/moono/dialog_ie8.css
lib/GNUstep/SOGo/WebServerResources/ckeditor/skins/moono/dialog_iequirks.css
-lib/GNUstep/SOGo/WebServerResources/ckeditor/skins/moono/dialog_opera.css
lib/GNUstep/SOGo/WebServerResources/ckeditor/skins/moono/editor.css
lib/GNUstep/SOGo/WebServerResources/ckeditor/skins/moono/editor_gecko.css
lib/GNUstep/SOGo/WebServerResources/ckeditor/skins/moono/editor_ie.css
@@ -1717,10 +1776,12 @@
lib/GNUstep/SOGo/WebServerResources/dtree.js
lib/GNUstep/SOGo/WebServerResources/edit.png
lib/GNUstep/SOGo/WebServerResources/empty.gif
+lib/GNUstep/SOGo/WebServerResources/error.png
lib/GNUstep/SOGo/WebServerResources/event-gradient.png
lib/GNUstep/SOGo/WebServerResources/event-grippy-bottom.png
lib/GNUstep/SOGo/WebServerResources/event-grippy-top.png
lib/GNUstep/SOGo/WebServerResources/event-grippy-vertical.png
+lib/GNUstep/SOGo/WebServerResources/event7.png
lib/GNUstep/SOGo/WebServerResources/first.gif
lib/GNUstep/SOGo/WebServerResources/flag-col.png
lib/GNUstep/SOGo/WebServerResources/flag.png
@@ -1738,6 +1799,9 @@
lib/GNUstep/SOGo/WebServerResources/input_bg.gif
lib/GNUstep/SOGo/WebServerResources/inverse.png
lib/GNUstep/SOGo/WebServerResources/jquery-ui.js
+lib/GNUstep/SOGo/WebServerResources/jquery.fileupload.css
+lib/GNUstep/SOGo/WebServerResources/jquery.fileupload.js
+lib/GNUstep/SOGo/WebServerResources/jquery.iframe-transport.js
lib/GNUstep/SOGo/WebServerResources/jquery.js
lib/GNUstep/SOGo/WebServerResources/js_color_picker_v2.js
lib/GNUstep/SOGo/WebServerResources/last.gif
@@ -1907,6 +1971,7 @@
lib/GNUstep/SOGo/WebServerResources/new-list.png
lib/GNUstep/SOGo/WebServerResources/new-task.png
lib/GNUstep/SOGo/WebServerResources/next.gif
+lib/GNUstep/SOGo/WebServerResources/notice.png
lib/GNUstep/SOGo/WebServerResources/offline-settings.png
lib/GNUstep/SOGo/WebServerResources/options.png
lib/GNUstep/SOGo/WebServerResources/plus.png
@@ -1936,6 +2001,7 @@
lib/GNUstep/SOGo/WebServerResources/submenu-active.gif
lib/GNUstep/SOGo/WebServerResources/submenu-disabled.gif
lib/GNUstep/SOGo/WebServerResources/submenu.gif
+lib/GNUstep/SOGo/WebServerResources/success.png
lib/GNUstep/SOGo/WebServerResources/tab_a_active_bg.png
lib/GNUstep/SOGo/WebServerResources/tab_a_inactive_bg.png
lib/GNUstep/SOGo/WebServerResources/tab_left_active.gif
@@ -1947,6 +2013,7 @@
lib/GNUstep/SOGo/WebServerResources/tablekit-sogo.js
lib/GNUstep/SOGo/WebServerResources/tablekit-trueresize.js
lib/GNUstep/SOGo/WebServerResources/tablekit.js
+lib/GNUstep/SOGo/WebServerResources/task.png
lib/GNUstep/SOGo/WebServerResources/tb-ab-properties-flat-24x24.png
lib/GNUstep/SOGo/WebServerResources/tb-compose-attach-flat-24x24.png
lib/GNUstep/SOGo/WebServerResources/tb-compose-contacts-flat-24x24.png
@@ -1988,6 +2055,8 @@
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/upload_document.png
+lib/GNUstep/SOGo/WebServerResources/warning.png
lib/GNUstep/SOGo/WebServerResources/week-view.png
lib/GNUstep/SOGo/WebServerResources/write-message.png
lib/GNUstep/SOGo/WebServerResources/write.png
@@ -2010,7 +2079,6 @@
lib/GNUstep/WOxElemBuilders-4.9/SOGoElements.wox/stamp.make
@lib lib/libGDLContentStore.so.${LIBGDLContentStore_VERSION}
@lib lib/libNGCards.so.${LIBNGCards_VERSION}
-@lib lib/libOGoContentStore.so.${LIBOGoContentStore_VERSION}
@lib lib/libSOGo.so.${LIBSOGo_VERSION}
@lib lib/libSOGoUI.so.${LIBSOGoUI_VERSION}
@bin sbin/sogo-ealarms-notify
@@ -2019,17 +2087,7 @@
@bin sbin/sogod
share/doc/pkg-readmes/${FULLPKGNAME}
share/doc/sogo/
-share/doc/sogo/SOGo_Installation_Guide.odt
-share/doc/sogo/SOGo_Mobile_Devices_Configuration.odt
-share/doc/sogo/SOGo_Mozilla_Thunderbird_Configuration.odt
-share/doc/sogo/SOGo_Native_Microsoft_Outlook_Configuration.odt
-share/doc/sogo/architecture.png
share/doc/sogo/cas-proxy-validate.py
-share/doc/sogo/inverse.jpg
-share/doc/sogo/openchange.png
-share/doc/sogo/preferences.png
-share/doc/sogo/sogo-2.png
-share/doc/sogo/sogo.png
share/doc/sogo/sql-update-1.3.11_to_1.3.12-mysql.sh
share/doc/sogo/sql-update-1.3.11_to_1.3.12-postgres.sh
share/doc/sogo/sql-update-1.3.16_to_1.3.17-mysql.sh
Index: Makefile
===================================================================
RCS file: /cvs/ports/www/sope/Makefile,v
retrieving revision 1.42
diff -u -r1.42 Makefile
--- Makefile 13 Sep 2014 18:09:22 -0000 1.42
+++ Makefile 30 Sep 2014 17:21:13 -0000
@@ -4,17 +4,14 @@
COMMENT-mysql= SOPE MySQL adaptor
COMMENT-postgres= SOPE PostgreSQL adaptor
-VERSION = 2.1.1
-DISTNAME = SOPE-${VERSION}b
-PKGNAME-main = sope-${VERSION}.1
-REVISION-main = 2
-PKGNAME-mysql = sope-mysql-${VERSION}.1
-REVISION-mysql = 1
-PKGNAME-postgres = sope-postgres-${VERSION}.1
-REVISION-postgres = 0
+VERSION = 2.2.9
+DISTNAME = SOPE-${VERSION}
+PKGNAME-main = sope-${VERSION}
+PKGNAME-mysql = sope-mysql-${VERSION}
+PKGNAME-postgres = sope-postgres-${VERSION}
SO_MAJOR= 2
-SO_MINOR= 1
+SO_MINOR= 2
.for _lib in DOM EOControl GDLAccess NGExtensions NGLdap NGMime \
NGObjWeb NGStreams SaxObjC WEExtensions \
WOExtensions XmlRpc SBJson
@@ -44,9 +41,9 @@
databases/openldap \
x11/gnustep/libobjc2 \
${MODLIBICONV_LIB_DEPENDS}
-LIB_DEPENDS-mysql = ${BASE_PKGPATH}=${VERSION}.1 \
+LIB_DEPENDS-mysql = ${BASE_PKGPATH}=${VERSION} \
databases/mariadb,-main
-LIB_DEPENDS-postgres = ${BASE_PKGPATH}=${VERSION}.1 \
+LIB_DEPENDS-postgres = ${BASE_PKGPATH}=${VERSION} \
databases/postgresql,-main
CONFIGURE_STYLE=simple dest
Index: distinfo
===================================================================
RCS file: /cvs/ports/www/sope/distinfo,v
retrieving revision 1.21
diff -u -r1.21 distinfo
--- distinfo 3 Jan 2014 18:37:48 -0000 1.21
+++ distinfo 30 Sep 2014 17:21:13 -0000
@@ -1,2 +1,2 @@
-SHA256 (SOPE-2.1.1b.tar.gz) = ebM2X/gpH147dMeli9K2SjHypztsOV8B4RV4Iv1lTMM=
-SIZE (SOPE-2.1.1b.tar.gz) = 2256252
+SHA256 (SOPE-2.2.9.tar.gz) = PI9uhE/ZEEeweg9ZR4O6LHOPTfaWKxJHv1LuRKIPWrE=
+SIZE (SOPE-2.2.9.tar.gz) = 2262388
Index: patches/patch-sope-appserver_NGObjWeb_Associations_WOKeyPathAssociation_m
===================================================================
RCS file: patches/patch-sope-appserver_NGObjWeb_Associations_WOKeyPathAssociation_m
diff -N patches/patch-sope-appserver_NGObjWeb_Associations_WOKeyPathAssociation_m
--- patches/patch-sope-appserver_NGObjWeb_Associations_WOKeyPathAssociation_m 22 Jul 2014 18:46:43 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,140 +0,0 @@
-$OpenBSD: patch-sope-appserver_NGObjWeb_Associations_WOKeyPathAssociation_m,v 1.1 2014/07/22 18:46:43 sebastia Exp $
-
-fix for bug: http://www.sogo.nu/bugs/view.php?id=2814
-and few other compiler warnings
-
---- sope-appserver/NGObjWeb/Associations/WOKeyPathAssociation.m.orig Thu Jun 5 19:40:06 2014
-+++ sope-appserver/NGObjWeb/Associations/WOKeyPathAssociation.m Thu Jun 12 20:40:32 2014
-@@ -109,6 +109,8 @@ typedef union {
- unsigned char (*ucmethod)(id, SEL);
- int (*imethod) (id, SEL);
- unsigned int (*uimethod)(id, SEL);
-+ long (*lmethod) (id, SEL);
-+ unsigned long (*ulmethod) (id, SEL);
- long long (*llmethod) (id, SEL);
- unsigned long long (*ullmethod)(id, SEL);
- short (*smethod) (id, SEL);
-@@ -125,6 +127,8 @@ typedef union {
- void (*ucmethod) (id, SEL, unsigned char);
- void (*imethod) (id, SEL, int);
- void (*uimethod) (id, SEL, unsigned int);
-+ void (*lmethod) (id, SEL, long);
-+ void (*ulmethod) (id, SEL, unsigned long);
- void (*llmethod) (id, SEL, long long);
- void (*ullmethod) (id, SEL, unsigned long long);
- void (*smethod) (id, SEL, short);
-@@ -156,6 +160,8 @@ typedef union {
- const char *cstr;
- int sint;
- unsigned int uint;
-+ long longt;
-+ unsigned long ulongt;
- long long llong;
- unsigned long long ullong;
- short ss;
-@@ -559,6 +565,13 @@ static WOReturnValueHolder _getComponentValue(WOKeyPat
- retValue.uint = info->access.uimethod(object, info->extra.sel.get);
- break;
-
-+ case _C_LNG:
-+ retValue.longt = info->access.lmethod(object, info->extra.sel.get);
-+ break;
-+ case _C_ULNG:
-+ retValue.ulongt = info->access.ulmethod(object, info->extra.sel.get);
-+ break;
-+
- case _C_LNG_LNG:
- retValue.llong = info->access.llmethod(object, info->extra.sel.get);
- break;
-@@ -665,6 +678,12 @@ static inline id _objectify(unsigned char _type, WORet
- case _C_UINT:
- result = uintNumObj(_value->uint);
- break;
-+ case _C_LNG:
-+ result = [NumberClass numberWithLong:_value->longt];
-+ break;
-+ case _C_ULNG:
-+ result = [NumberClass numberWithUnsignedLong:_value->ulongt];
-+ break;
- case _C_LNG_LNG:
- result = [NumberClass numberWithLongLong:_value->llong];
- break;
-@@ -852,6 +871,13 @@ static BOOL _setValue(WOKeyPathAssociation *self, id _
- sm.uimethod(object, setSel, [_value unsignedIntValue]);
- break;
-
-+ case _C_LNG:
-+ sm.lmethod(object, setSel, [_value longValue]);
-+ break;
-+ case _C_ULNG:
-+ sm.ulmethod(object, setSel, [_value unsignedLongValue]);
-+ break;
-+
- case _C_LNG_LNG:
- sm.llmethod(object, setSel, [_value longLongValue]);
- break;
-@@ -1049,7 +1075,7 @@ static BOOL _setValue(WOKeyPathAssociation *self, id _
- break;
- }
- case _C_UCHR: {
-- if ((_value < 0) || (_value > 255))
-+ if (_value > 255)
- [self errorWithFormat:
- @"value (%i) out of range for uchar!", _value];
- sm.ucmethod(_wo, setSel, (unsigned char)_value);
-@@ -1063,6 +1089,14 @@ static BOOL _setValue(WOKeyPathAssociation *self, id _
- sm.uimethod(_wo, setSel, (unsigned int)_value);
- break;
- }
-+ case _C_LNG: {
-+ sm.lmethod(_wo, setSel, (long)_value);
-+ break;
-+ }
-+ case _C_ULNG: {
-+ sm.ulmethod(_wo, setSel, (unsigned long)_value);
-+ break;
-+ }
- case _C_LNG_LNG: {
- sm.llmethod(_wo, setSel, (long long)_value);
- break;
-@@ -1187,6 +1221,14 @@ static BOOL _setValue(WOKeyPathAssociation *self, id _
- sm.uimethod(_wo, setSel, (unsigned int)_value);
- break;
- }
-+ case _C_LNG: {
-+ sm.lmethod(_wo, setSel, (long)_value);
-+ break;
-+ }
-+ case _C_ULNG: {
-+ sm.ulmethod(_wo, setSel, (unsigned long)_value);
-+ break;
-+ }
- case _C_LNG_LNG: {
- sm.llmethod(_wo, setSel, (long long)_value);
- break;
-@@ -1299,6 +1341,12 @@ static BOOL _setValue(WOKeyPathAssociation *self, id _
- sm.uimethod(_wo, setSel, (unsigned int)_value);
- break;
- }
-+ case _C_LNG:
-+ sm.lmethod(_wo, setSel, (long)_value);
-+ break;
-+ case _C_ULNG:
-+ sm.ulmethod(_wo, setSel, (unsigned long)_value);
-+ break;
- case _C_LNG_LNG:
- sm.llmethod(_wo, setSel, (long long)_value);
- break;
-@@ -1397,10 +1445,10 @@ static BOOL _setValue(WOKeyPathAssociation *self, id _
- return [StringClass stringWithFormat:@"%d", retValue.sint];
- case _C_ULNG_LNG:
- if (IS_NUMSTR(retValue.ullong)) return numStrings[retValue.ullong];
-- return [StringClass stringWithFormat:@"%ull", retValue.ullong];
-+ return [StringClass stringWithFormat:@"%llu", retValue.ullong];
- case _C_LNG_LNG:
- if (IS_NUMSTR(retValue.llong)) return numStrings[retValue.llong];
-- return [StringClass stringWithFormat:@"%ll", retValue.llong];
-+ return [StringClass stringWithFormat:@"%lli", retValue.llong];
- case _C_UCHR:
- if (IS_UNUMSTR(retValue.c)) return numStrings[retValue.c];
- return [StringClass stringWithFormat:@"%d", (int)retValue.c];
Index: patches/patch-sope-core_EOControl_common_h
===================================================================
RCS file: /cvs/ports/www/sope/patches/patch-sope-core_EOControl_common_h,v
retrieving revision 1.1
diff -u -r1.1 patch-sope-core_EOControl_common_h
--- patches/patch-sope-core_EOControl_common_h 19 Oct 2013 09:48:23 -0000 1.1
+++ patches/patch-sope-core_EOControl_common_h 30 Sep 2014 17:21:13 -0000
@@ -2,9 +2,9 @@
fix build with libobjc2-1.7
---- sope-core/EOControl/common.h.orig Sun Oct 13 15:55:39 2013
-+++ sope-core/EOControl/common.h Sun Oct 13 15:55:43 2013
-@@ -39,10 +39,11 @@
+--- sope-core/EOControl/common.h.orig Fri Sep 26 20:38:11 2014
++++ sope-core/EOControl/common.h Tue Sep 30 12:38:09 2014
+@@ -40,10 +40,11 @@
# endif
#endif
Index: patches/patch-sope-mime_NGMime_NGMimeFileData_m
===================================================================
RCS file: patches/patch-sope-mime_NGMime_NGMimeFileData_m
diff -N patches/patch-sope-mime_NGMime_NGMimeFileData_m
--- patches/patch-sope-mime_NGMime_NGMimeFileData_m 16 May 2014 14:54:16 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,16 +0,0 @@
-$OpenBSD: patch-sope-mime_NGMime_NGMimeFileData_m,v 1.1 2014/05/16 14:54:16 giovanni Exp $
-Fixed fd leak where files were unlinked w/o being closed first.
-https://github.com/inverse-inc/sope/commit/60caf252df2eed12115f05ff5025b54f01b42efb
-
---- sope-mime/NGMime/NGMimeFileData.m.orig Thu May 15 18:22:04 2014
-+++ sope-mime/NGMime/NGMimeFileData.m Thu May 15 18:23:19 2014
-@@ -95,6 +95,9 @@ static unsigned tmpmask = 0600;
- [self release];
- return nil;
- }
-+
-+ close(fd);
-+
- return [self initWithPath:filename removeFile:YES];
- }
-
