Hi, attached patches that bring both mentioned ports to the latest releases.
Jumping over a few releases in between, due to bugs/regressions in intermediate releases, now with all the patches to fix them merged upstream. Finding and fixing those caused me a lot of grey hair and are the cause of the delay with updating :( I've run most of the intermediate releases on amd64 and i386. 2.2.6 tested on amd64. Note, www/opengroupware needs some patches to keep working. This will be sent in a separate mail. OK?
? sope-2.2.6.diff Index: Makefile =================================================================== RCS file: /cvs/ports/www/sope/Makefile,v retrieving revision 1.40 diff -u -r1.40 Makefile --- Makefile 23 May 2014 22:25:50 -0000 1.40 +++ Makefile 16 Jul 2014 10:38: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 = 1 -PKGNAME-mysql = sope-mysql-${VERSION}.1 -REVISION-mysql = 0 -PKGNAME-postgres = sope-postgres-${VERSION}.1 -REVISION-postgres = 0 +VERSION = 2.2.6 +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/mysql,-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 16 Jul 2014 10:38: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.6.tar.gz) = b4zA8BaOuLONq5gNaenO0k0mkxt4xnrY4Vzh7ODMr9g= +SIZE (SOPE-2.2.6.tar.gz) = 2261306 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 16 Jul 2014 10:38: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 Thu Jun 5 19:40:06 2014 ++++ sope-core/EOControl/common.h Thu Jun 12 20:39:49 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]; - } -
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 16 Jul 2014 10:38:56 -0000 @@ -2,15 +2,14 @@ COMMENT = web based groupware server -VERSION = 2.1.1 -DISTNAME = SOGo-${VERSION}b -PKGNAME = sogo-${VERSION}.1 -REVISION = 3 +VERSION = 2.2.6 +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 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 16 Jul 2014 10:38:56 -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.6.tar.gz) = 5LDs9XgUUEgn+OsS0NIpuDapwZM3AkSN06o2ih0BaGY= +SIZE (SOGo-2.2.6.tar.gz) = 5488220 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 16 Jul 2014 10:38:57 -0000 @@ -64,7 +64,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 +90,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 +897,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 +1070,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 +1347,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 @@ -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 @@ -1576,6 +1635,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 +1695,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 +1711,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 +1722,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 +1736,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,6 +1774,7 @@ 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 @@ -1738,6 +1796,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 +1968,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 +1998,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 @@ -1988,6 +2051,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