Hi,
this bumps www/sope and www/sogo from 2.3.2 to 2.3.4.
lots of cleanup was done for 2.3.3 in sope, so a lot
of patches are there gone now.
works well for me on amd64. If I don't here objections
I'll update at the end of the week.
Otherwise, test (success/failure) reports, comments
or OKs welcome too ;)
cheers,
Sebastian
Index: Makefile
===================================================================
RCS file: /cvs/ports/www/sogo/Makefile,v
retrieving revision 1.50
diff -u -r1.50 Makefile
--- Makefile 26 Oct 2015 11:55:36 -0000 1.50
+++ Makefile 4 Jan 2016 09:20:57 -0000
@@ -2,8 +2,7 @@
COMMENT = web based groupware server
-VERSION = 2.3.2
-REVISION = 1
+VERSION = 2.3.4
DISTNAME = SOGo-${VERSION}
PKGNAME = sogo-${VERSION}
Index: distinfo
===================================================================
RCS file: /cvs/ports/www/sogo/distinfo,v
retrieving revision 1.24
diff -u -r1.24 distinfo
--- distinfo 26 Sep 2015 14:29:22 -0000 1.24
+++ distinfo 4 Jan 2016 09:20:57 -0000
@@ -1,2 +1,2 @@
-SHA256 (SOGo-2.3.2.tar.gz) = eDDirWhLVMiaRyDt9+cyUKB2iFo+JQUsCT54lCJ5Oaw=
-SIZE (SOGo-2.3.2.tar.gz) = 11781695
+SHA256 (SOGo-2.3.4.tar.gz) = CkEadYV4NDC0m2GG2SjjsPluSY3+8Dz5k7kUdBsB608=
+SIZE (SOGo-2.3.4.tar.gz) = 11875672
Index: patches/patch-Tests_Unit_GNUmakefile
===================================================================
RCS file: /cvs/ports/www/sogo/patches/patch-Tests_Unit_GNUmakefile,v
retrieving revision 1.3
diff -u -r1.3 patch-Tests_Unit_GNUmakefile
--- patches/patch-Tests_Unit_GNUmakefile 26 Sep 2015 14:29:22 -0000
1.3
+++ patches/patch-Tests_Unit_GNUmakefile 4 Jan 2016 09:20:57 -0000
@@ -1,8 +1,8 @@
$OpenBSD: patch-Tests_Unit_GNUmakefile,v 1.3 2015/09/26 14:29:22 sebastia Exp $
Do not hardcode libobjc library name, ask GNUstep what to use.
---- Tests/Unit/GNUmakefile.orig Fri Sep 25 10:52:19 2015
-+++ Tests/Unit/GNUmakefile Fri Sep 25 10:53:53 2015
-@@ -35,8 +35,8 @@ $(TEST_TOOL)_CPPFLAGS += \
+--- Tests/Unit/GNUmakefile.orig Wed Dec 16 14:52:58 2015
++++ Tests/Unit/GNUmakefile Mon Dec 21 22:28:23 2015
+@@ -36,8 +36,8 @@ $(TEST_TOOL)_CPPFLAGS += \
-Wall -D_GNU_SOURCE -I../../SOPE/ -I../../SoObjects/ -I../../UI/
ADDITIONAL_LIB_DIRS += \
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/www/sogo/pkg/PLIST,v
retrieving revision 1.23
diff -u -r1.23 PLIST
--- pkg/PLIST 26 Sep 2015 14:29:22 -0000 1.23
+++ pkg/PLIST 4 Jan 2016 09:20:57 -0000
@@ -615,12 +615,16 @@
lib/GNUstep/SOGo/AdministrationUI.SOGo/Resources/Info-gnustep.plist
lib/GNUstep/SOGo/AdministrationUI.SOGo/Resources/Italian.lproj/
lib/GNUstep/SOGo/AdministrationUI.SOGo/Resources/Italian.lproj/Localizable.strings
+lib/GNUstep/SOGo/AdministrationUI.SOGo/Resources/Macedonian.lproj/
+lib/GNUstep/SOGo/AdministrationUI.SOGo/Resources/Macedonian.lproj/Localizable.strings
lib/GNUstep/SOGo/AdministrationUI.SOGo/Resources/NorwegianBokmal.lproj/
lib/GNUstep/SOGo/AdministrationUI.SOGo/Resources/NorwegianBokmal.lproj/Localizable.strings
lib/GNUstep/SOGo/AdministrationUI.SOGo/Resources/NorwegianNynorsk.lproj/
lib/GNUstep/SOGo/AdministrationUI.SOGo/Resources/NorwegianNynorsk.lproj/Localizable.strings
lib/GNUstep/SOGo/AdministrationUI.SOGo/Resources/Polish.lproj/
lib/GNUstep/SOGo/AdministrationUI.SOGo/Resources/Polish.lproj/Localizable.strings
+lib/GNUstep/SOGo/AdministrationUI.SOGo/Resources/Portuguese.lproj/
+lib/GNUstep/SOGo/AdministrationUI.SOGo/Resources/Portuguese.lproj/Localizable.strings
lib/GNUstep/SOGo/AdministrationUI.SOGo/Resources/Russian.lproj/
lib/GNUstep/SOGo/AdministrationUI.SOGo/Resources/Russian.lproj/Localizable.strings
lib/GNUstep/SOGo/AdministrationUI.SOGo/Resources/Slovak.lproj/
@@ -678,12 +682,16 @@
lib/GNUstep/SOGo/Appointments.SOGo/Resources/MSExchangeFreeBusySOAPRequest.wo/MSExchangeFreeBusySOAPRequest.html
lib/GNUstep/SOGo/Appointments.SOGo/Resources/MSExchangeFreeBusySOAPRequest.wo/MSExchangeFreeBusySOAPRequest.wod
lib/GNUstep/SOGo/Appointments.SOGo/Resources/MSExchangeFreeBusySOAPResponseMap.plist
+lib/GNUstep/SOGo/Appointments.SOGo/Resources/Macedonian.lproj/
+lib/GNUstep/SOGo/Appointments.SOGo/Resources/Macedonian.lproj/Localizable.strings
lib/GNUstep/SOGo/Appointments.SOGo/Resources/NorwegianBokmal.lproj/
lib/GNUstep/SOGo/Appointments.SOGo/Resources/NorwegianBokmal.lproj/Localizable.strings
lib/GNUstep/SOGo/Appointments.SOGo/Resources/NorwegianNynorsk.lproj/
lib/GNUstep/SOGo/Appointments.SOGo/Resources/NorwegianNynorsk.lproj/Localizable.strings
lib/GNUstep/SOGo/Appointments.SOGo/Resources/Polish.lproj/
lib/GNUstep/SOGo/Appointments.SOGo/Resources/Polish.lproj/Localizable.strings
+lib/GNUstep/SOGo/Appointments.SOGo/Resources/Portuguese.lproj/
+lib/GNUstep/SOGo/Appointments.SOGo/Resources/Portuguese.lproj/Localizable.strings
lib/GNUstep/SOGo/Appointments.SOGo/Resources/Russian.lproj/
lib/GNUstep/SOGo/Appointments.SOGo/Resources/Russian.lproj/Localizable.strings
lib/GNUstep/SOGo/Appointments.SOGo/Resources/Slovak.lproj/
@@ -737,12 +745,16 @@
lib/GNUstep/SOGo/CommonUI.SOGo/Resources/Info-gnustep.plist
lib/GNUstep/SOGo/CommonUI.SOGo/Resources/Italian.lproj/
lib/GNUstep/SOGo/CommonUI.SOGo/Resources/Italian.lproj/Localizable.strings
+lib/GNUstep/SOGo/CommonUI.SOGo/Resources/Macedonian.lproj/
+lib/GNUstep/SOGo/CommonUI.SOGo/Resources/Macedonian.lproj/Localizable.strings
lib/GNUstep/SOGo/CommonUI.SOGo/Resources/NorwegianBokmal.lproj/
lib/GNUstep/SOGo/CommonUI.SOGo/Resources/NorwegianBokmal.lproj/Localizable.strings
lib/GNUstep/SOGo/CommonUI.SOGo/Resources/NorwegianNynorsk.lproj/
lib/GNUstep/SOGo/CommonUI.SOGo/Resources/NorwegianNynorsk.lproj/Localizable.strings
lib/GNUstep/SOGo/CommonUI.SOGo/Resources/Polish.lproj/
lib/GNUstep/SOGo/CommonUI.SOGo/Resources/Polish.lproj/Localizable.strings
+lib/GNUstep/SOGo/CommonUI.SOGo/Resources/Portuguese.lproj/
+lib/GNUstep/SOGo/CommonUI.SOGo/Resources/Portuguese.lproj/Localizable.strings
lib/GNUstep/SOGo/CommonUI.SOGo/Resources/Russian.lproj/
lib/GNUstep/SOGo/CommonUI.SOGo/Resources/Russian.lproj/Localizable.strings
lib/GNUstep/SOGo/CommonUI.SOGo/Resources/Slovak.lproj/
@@ -796,12 +808,16 @@
lib/GNUstep/SOGo/Contacts.SOGo/Resources/Info-gnustep.plist
lib/GNUstep/SOGo/Contacts.SOGo/Resources/Italian.lproj/
lib/GNUstep/SOGo/Contacts.SOGo/Resources/Italian.lproj/Localizable.strings
+lib/GNUstep/SOGo/Contacts.SOGo/Resources/Macedonian.lproj/
+lib/GNUstep/SOGo/Contacts.SOGo/Resources/Macedonian.lproj/Localizable.strings
lib/GNUstep/SOGo/Contacts.SOGo/Resources/NorwegianBokmal.lproj/
lib/GNUstep/SOGo/Contacts.SOGo/Resources/NorwegianBokmal.lproj/Localizable.strings
lib/GNUstep/SOGo/Contacts.SOGo/Resources/NorwegianNynorsk.lproj/
lib/GNUstep/SOGo/Contacts.SOGo/Resources/NorwegianNynorsk.lproj/Localizable.strings
lib/GNUstep/SOGo/Contacts.SOGo/Resources/Polish.lproj/
lib/GNUstep/SOGo/Contacts.SOGo/Resources/Polish.lproj/Localizable.strings
+lib/GNUstep/SOGo/Contacts.SOGo/Resources/Portuguese.lproj/
+lib/GNUstep/SOGo/Contacts.SOGo/Resources/Portuguese.lproj/Localizable.strings
lib/GNUstep/SOGo/Contacts.SOGo/Resources/Russian.lproj/
lib/GNUstep/SOGo/Contacts.SOGo/Resources/Russian.lproj/Localizable.strings
lib/GNUstep/SOGo/Contacts.SOGo/Resources/Slovak.lproj/
@@ -854,12 +870,16 @@
lib/GNUstep/SOGo/ContactsUI.SOGo/Resources/Info-gnustep.plist
lib/GNUstep/SOGo/ContactsUI.SOGo/Resources/Italian.lproj/
lib/GNUstep/SOGo/ContactsUI.SOGo/Resources/Italian.lproj/Localizable.strings
+lib/GNUstep/SOGo/ContactsUI.SOGo/Resources/Macedonian.lproj/
+lib/GNUstep/SOGo/ContactsUI.SOGo/Resources/Macedonian.lproj/Localizable.strings
lib/GNUstep/SOGo/ContactsUI.SOGo/Resources/NorwegianBokmal.lproj/
lib/GNUstep/SOGo/ContactsUI.SOGo/Resources/NorwegianBokmal.lproj/Localizable.strings
lib/GNUstep/SOGo/ContactsUI.SOGo/Resources/NorwegianNynorsk.lproj/
lib/GNUstep/SOGo/ContactsUI.SOGo/Resources/NorwegianNynorsk.lproj/Localizable.strings
lib/GNUstep/SOGo/ContactsUI.SOGo/Resources/Polish.lproj/
lib/GNUstep/SOGo/ContactsUI.SOGo/Resources/Polish.lproj/Localizable.strings
+lib/GNUstep/SOGo/ContactsUI.SOGo/Resources/Portuguese.lproj/
+lib/GNUstep/SOGo/ContactsUI.SOGo/Resources/Portuguese.lproj/Localizable.strings
lib/GNUstep/SOGo/ContactsUI.SOGo/Resources/Russian.lproj/
lib/GNUstep/SOGo/ContactsUI.SOGo/Resources/Russian.lproj/Localizable.strings
lib/GNUstep/SOGo/ContactsUI.SOGo/Resources/SOGoContactFolder.toolbar
@@ -914,12 +934,16 @@
lib/GNUstep/SOGo/MailPartViewers.SOGo/Resources/Info-gnustep.plist
lib/GNUstep/SOGo/MailPartViewers.SOGo/Resources/Italian.lproj/
lib/GNUstep/SOGo/MailPartViewers.SOGo/Resources/Italian.lproj/Localizable.strings
+lib/GNUstep/SOGo/MailPartViewers.SOGo/Resources/Macedonian.lproj/
+lib/GNUstep/SOGo/MailPartViewers.SOGo/Resources/Macedonian.lproj/Localizable.strings
lib/GNUstep/SOGo/MailPartViewers.SOGo/Resources/NorwegianBokmal.lproj/
lib/GNUstep/SOGo/MailPartViewers.SOGo/Resources/NorwegianBokmal.lproj/Localizable.strings
lib/GNUstep/SOGo/MailPartViewers.SOGo/Resources/NorwegianNynorsk.lproj/
lib/GNUstep/SOGo/MailPartViewers.SOGo/Resources/NorwegianNynorsk.lproj/Localizable.strings
lib/GNUstep/SOGo/MailPartViewers.SOGo/Resources/Polish.lproj/
lib/GNUstep/SOGo/MailPartViewers.SOGo/Resources/Polish.lproj/Localizable.strings
+lib/GNUstep/SOGo/MailPartViewers.SOGo/Resources/Portuguese.lproj/
+lib/GNUstep/SOGo/MailPartViewers.SOGo/Resources/Portuguese.lproj/Localizable.strings
lib/GNUstep/SOGo/MailPartViewers.SOGo/Resources/Russian.lproj/
lib/GNUstep/SOGo/MailPartViewers.SOGo/Resources/Russian.lproj/Localizable.strings
lib/GNUstep/SOGo/MailPartViewers.SOGo/Resources/Slovak.lproj/
@@ -970,12 +994,16 @@
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/Macedonian.lproj/
+lib/GNUstep/SOGo/Mailer.SOGo/Resources/Macedonian.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/Portuguese.lproj/
+lib/GNUstep/SOGo/Mailer.SOGo/Resources/Portuguese.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/
@@ -1062,6 +1090,12 @@
lib/GNUstep/SOGo/Mailer.SOGo/Resources/SOGoMailItalianReply.wo/
lib/GNUstep/SOGo/Mailer.SOGo/Resources/SOGoMailItalianReply.wo/SOGoMailItalianReply.html
lib/GNUstep/SOGo/Mailer.SOGo/Resources/SOGoMailItalianReply.wo/SOGoMailItalianReply.wod
+lib/GNUstep/SOGo/Mailer.SOGo/Resources/SOGoMailMacedonianForward.wo/
+lib/GNUstep/SOGo/Mailer.SOGo/Resources/SOGoMailMacedonianForward.wo/SOGoMailMacedonianForward.html
+lib/GNUstep/SOGo/Mailer.SOGo/Resources/SOGoMailMacedonianForward.wo/SOGoMailMacedonianForward.wod
+lib/GNUstep/SOGo/Mailer.SOGo/Resources/SOGoMailMacedonianReply.wo/
+lib/GNUstep/SOGo/Mailer.SOGo/Resources/SOGoMailMacedonianReply.wo/SOGoMailMacedonianReply.html
+lib/GNUstep/SOGo/Mailer.SOGo/Resources/SOGoMailMacedonianReply.wo/SOGoMailMacedonianReply.wod
lib/GNUstep/SOGo/Mailer.SOGo/Resources/SOGoMailNorwegianBokmalForward.wo/
lib/GNUstep/SOGo/Mailer.SOGo/Resources/SOGoMailNorwegianBokmalForward.wo/SOGoMailNorwegianBokmalForward.html
lib/GNUstep/SOGo/Mailer.SOGo/Resources/SOGoMailNorwegianBokmalForward.wo/SOGoMailNorwegianBokmalForward.wod
@@ -1080,6 +1114,12 @@
lib/GNUstep/SOGo/Mailer.SOGo/Resources/SOGoMailPolishReply.wo/
lib/GNUstep/SOGo/Mailer.SOGo/Resources/SOGoMailPolishReply.wo/SOGoMailPolishReply.html
lib/GNUstep/SOGo/Mailer.SOGo/Resources/SOGoMailPolishReply.wo/SOGoMailPolishReply.wod
+lib/GNUstep/SOGo/Mailer.SOGo/Resources/SOGoMailPortugueseForward.wo/
+lib/GNUstep/SOGo/Mailer.SOGo/Resources/SOGoMailPortugueseForward.wo/SOGoMailPortugueseForward.html
+lib/GNUstep/SOGo/Mailer.SOGo/Resources/SOGoMailPortugueseForward.wo/SOGoMailPortugueseForward.wod
+lib/GNUstep/SOGo/Mailer.SOGo/Resources/SOGoMailPortugueseReply.wo/
+lib/GNUstep/SOGo/Mailer.SOGo/Resources/SOGoMailPortugueseReply.wo/SOGoMailPortugueseReply.html
+lib/GNUstep/SOGo/Mailer.SOGo/Resources/SOGoMailPortugueseReply.wo/SOGoMailPortugueseReply.wod
lib/GNUstep/SOGo/Mailer.SOGo/Resources/SOGoMailRussianForward.wo/
lib/GNUstep/SOGo/Mailer.SOGo/Resources/SOGoMailRussianForward.wo/SOGoMailRussianForward.html
lib/GNUstep/SOGo/Mailer.SOGo/Resources/SOGoMailRussianForward.wo/SOGoMailRussianForward.wod
@@ -1177,12 +1217,16 @@
lib/GNUstep/SOGo/MailerUI.SOGo/Resources/Info-gnustep.plist
lib/GNUstep/SOGo/MailerUI.SOGo/Resources/Italian.lproj/
lib/GNUstep/SOGo/MailerUI.SOGo/Resources/Italian.lproj/Localizable.strings
+lib/GNUstep/SOGo/MailerUI.SOGo/Resources/Macedonian.lproj/
+lib/GNUstep/SOGo/MailerUI.SOGo/Resources/Macedonian.lproj/Localizable.strings
lib/GNUstep/SOGo/MailerUI.SOGo/Resources/NorwegianBokmal.lproj/
lib/GNUstep/SOGo/MailerUI.SOGo/Resources/NorwegianBokmal.lproj/Localizable.strings
lib/GNUstep/SOGo/MailerUI.SOGo/Resources/NorwegianNynorsk.lproj/
lib/GNUstep/SOGo/MailerUI.SOGo/Resources/NorwegianNynorsk.lproj/Localizable.strings
lib/GNUstep/SOGo/MailerUI.SOGo/Resources/Polish.lproj/
lib/GNUstep/SOGo/MailerUI.SOGo/Resources/Polish.lproj/Localizable.strings
+lib/GNUstep/SOGo/MailerUI.SOGo/Resources/Portuguese.lproj/
+lib/GNUstep/SOGo/MailerUI.SOGo/Resources/Portuguese.lproj/Localizable.strings
lib/GNUstep/SOGo/MailerUI.SOGo/Resources/Russian.lproj/
lib/GNUstep/SOGo/MailerUI.SOGo/Resources/Russian.lproj/Localizable.strings
lib/GNUstep/SOGo/MailerUI.SOGo/Resources/SOGoDraftObject.toolbar
@@ -1254,6 +1298,9 @@
lib/GNUstep/SOGo/MainUI.SOGo/Resources/Italian.lproj/
lib/GNUstep/SOGo/MainUI.SOGo/Resources/Italian.lproj/Locale
lib/GNUstep/SOGo/MainUI.SOGo/Resources/Italian.lproj/Localizable.strings
+lib/GNUstep/SOGo/MainUI.SOGo/Resources/Macedonian.lproj/
+lib/GNUstep/SOGo/MainUI.SOGo/Resources/Macedonian.lproj/Locale
+lib/GNUstep/SOGo/MainUI.SOGo/Resources/Macedonian.lproj/Localizable.strings
lib/GNUstep/SOGo/MainUI.SOGo/Resources/NorwegianBokmal.lproj/
lib/GNUstep/SOGo/MainUI.SOGo/Resources/NorwegianBokmal.lproj/Locale
lib/GNUstep/SOGo/MainUI.SOGo/Resources/NorwegianBokmal.lproj/Localizable.strings
@@ -1265,6 +1312,9 @@
lib/GNUstep/SOGo/MainUI.SOGo/Resources/Polish.lproj/
lib/GNUstep/SOGo/MainUI.SOGo/Resources/Polish.lproj/Locale
lib/GNUstep/SOGo/MainUI.SOGo/Resources/Polish.lproj/Localizable.strings
+lib/GNUstep/SOGo/MainUI.SOGo/Resources/Portuguese.lproj/
+lib/GNUstep/SOGo/MainUI.SOGo/Resources/Portuguese.lproj/Locale
+lib/GNUstep/SOGo/MainUI.SOGo/Resources/Portuguese.lproj/Localizable.strings
lib/GNUstep/SOGo/MainUI.SOGo/Resources/Russian.lproj/
lib/GNUstep/SOGo/MainUI.SOGo/Resources/Russian.lproj/Locale
lib/GNUstep/SOGo/MainUI.SOGo/Resources/Russian.lproj/Localizable.strings
@@ -1327,12 +1377,16 @@
lib/GNUstep/SOGo/PreferencesUI.SOGo/Resources/Info-gnustep.plist
lib/GNUstep/SOGo/PreferencesUI.SOGo/Resources/Italian.lproj/
lib/GNUstep/SOGo/PreferencesUI.SOGo/Resources/Italian.lproj/Localizable.strings
+lib/GNUstep/SOGo/PreferencesUI.SOGo/Resources/Macedonian.lproj/
+lib/GNUstep/SOGo/PreferencesUI.SOGo/Resources/Macedonian.lproj/Localizable.strings
lib/GNUstep/SOGo/PreferencesUI.SOGo/Resources/NorwegianBokmal.lproj/
lib/GNUstep/SOGo/PreferencesUI.SOGo/Resources/NorwegianBokmal.lproj/Localizable.strings
lib/GNUstep/SOGo/PreferencesUI.SOGo/Resources/NorwegianNynorsk.lproj/
lib/GNUstep/SOGo/PreferencesUI.SOGo/Resources/NorwegianNynorsk.lproj/Localizable.strings
lib/GNUstep/SOGo/PreferencesUI.SOGo/Resources/Polish.lproj/
lib/GNUstep/SOGo/PreferencesUI.SOGo/Resources/Polish.lproj/Localizable.strings
+lib/GNUstep/SOGo/PreferencesUI.SOGo/Resources/Portuguese.lproj/
+lib/GNUstep/SOGo/PreferencesUI.SOGo/Resources/Portuguese.lproj/Localizable.strings
lib/GNUstep/SOGo/PreferencesUI.SOGo/Resources/Russian.lproj/
lib/GNUstep/SOGo/PreferencesUI.SOGo/Resources/Russian.lproj/Localizable.strings
lib/GNUstep/SOGo/PreferencesUI.SOGo/Resources/Slovak.lproj/
@@ -1385,12 +1439,16 @@
lib/GNUstep/SOGo/SchedulerUI.SOGo/Resources/Info-gnustep.plist
lib/GNUstep/SOGo/SchedulerUI.SOGo/Resources/Italian.lproj/
lib/GNUstep/SOGo/SchedulerUI.SOGo/Resources/Italian.lproj/Localizable.strings
+lib/GNUstep/SOGo/SchedulerUI.SOGo/Resources/Macedonian.lproj/
+lib/GNUstep/SOGo/SchedulerUI.SOGo/Resources/Macedonian.lproj/Localizable.strings
lib/GNUstep/SOGo/SchedulerUI.SOGo/Resources/NorwegianBokmal.lproj/
lib/GNUstep/SOGo/SchedulerUI.SOGo/Resources/NorwegianBokmal.lproj/Localizable.strings
lib/GNUstep/SOGo/SchedulerUI.SOGo/Resources/NorwegianNynorsk.lproj/
lib/GNUstep/SOGo/SchedulerUI.SOGo/Resources/NorwegianNynorsk.lproj/Localizable.strings
lib/GNUstep/SOGo/SchedulerUI.SOGo/Resources/Polish.lproj/
lib/GNUstep/SOGo/SchedulerUI.SOGo/Resources/Polish.lproj/Localizable.strings
+lib/GNUstep/SOGo/SchedulerUI.SOGo/Resources/Portuguese.lproj/
+lib/GNUstep/SOGo/SchedulerUI.SOGo/Resources/Portuguese.lproj/Localizable.strings
lib/GNUstep/SOGo/SchedulerUI.SOGo/Resources/Russian.lproj/
lib/GNUstep/SOGo/SchedulerUI.SOGo/Resources/Russian.lproj/Localizable.strings
lib/GNUstep/SOGo/SchedulerUI.SOGo/Resources/SOGoAppointmentFolders.toolbar
@@ -1517,6 +1575,9 @@
lib/GNUstep/SOGo/Templates/SOGoACLItalianAdditionAdvisory.wox
lib/GNUstep/SOGo/Templates/SOGoACLItalianModificationAdvisory.wox
lib/GNUstep/SOGo/Templates/SOGoACLItalianRemovalAdvisory.wox
+lib/GNUstep/SOGo/Templates/SOGoACLMacedonianAdditionAdvisory.wox
+lib/GNUstep/SOGo/Templates/SOGoACLMacedonianModificationAdvisory.wox
+lib/GNUstep/SOGo/Templates/SOGoACLMacedonianRemovalAdvisory.wox
lib/GNUstep/SOGo/Templates/SOGoACLNorwegianBokmalAdditionAdvisory.wox
lib/GNUstep/SOGo/Templates/SOGoACLNorwegianBokmalModificationAdvisory.wox
lib/GNUstep/SOGo/Templates/SOGoACLNorwegianBokmalRemovalAdvisory.wox
@@ -1526,6 +1587,9 @@
lib/GNUstep/SOGo/Templates/SOGoACLPolishAdditionAdvisory.wox
lib/GNUstep/SOGo/Templates/SOGoACLPolishModificationAdvisory.wox
lib/GNUstep/SOGo/Templates/SOGoACLPolishRemovalAdvisory.wox
+lib/GNUstep/SOGo/Templates/SOGoACLPortugueseAdditionAdvisory.wox
+lib/GNUstep/SOGo/Templates/SOGoACLPortugueseModificationAdvisory.wox
+lib/GNUstep/SOGo/Templates/SOGoACLPortugueseRemovalAdvisory.wox
lib/GNUstep/SOGo/Templates/SOGoACLRussianAdditionAdvisory.wox
lib/GNUstep/SOGo/Templates/SOGoACLRussianModificationAdvisory.wox
lib/GNUstep/SOGo/Templates/SOGoACLRussianRemovalAdvisory.wox
@@ -1533,8 +1597,8 @@
lib/GNUstep/SOGo/Templates/SOGoACLSlovakModificationAdvisory.wox
lib/GNUstep/SOGo/Templates/SOGoACLSlovakRemovalAdvisory.wox
lib/GNUstep/SOGo/Templates/SOGoACLSlovenianAdditionAdvisory.wox
+lib/GNUstep/SOGo/Templates/SOGoACLSlovenianModificationAdvisory.wox
lib/GNUstep/SOGo/Templates/SOGoACLSlovenianRemovalAdvisory.wox
-lib/GNUstep/SOGo/Templates/SOGoACLSolvenianModificationAdvisory.wox
lib/GNUstep/SOGo/Templates/SOGoACLSpanishArgentinaAdditionAdvisory.wox
lib/GNUstep/SOGo/Templates/SOGoACLSpanishArgentinaModificationAdvisory.wox
lib/GNUstep/SOGo/Templates/SOGoACLSpanishArgentinaRemovalAdvisory.wox
@@ -1577,12 +1641,16 @@
lib/GNUstep/SOGo/Templates/SOGoFolderIcelandicRemovalAdvisory.wox
lib/GNUstep/SOGo/Templates/SOGoFolderItalianAdditionAdvisory.wox
lib/GNUstep/SOGo/Templates/SOGoFolderItalianRemovalAdvisory.wox
+lib/GNUstep/SOGo/Templates/SOGoFolderMacedonianAdditionAdvisory.wox
+lib/GNUstep/SOGo/Templates/SOGoFolderMacedonianRemovalAdvisory.wox
lib/GNUstep/SOGo/Templates/SOGoFolderNorwegianBokmalAdditionAdvisory.wox
lib/GNUstep/SOGo/Templates/SOGoFolderNorwegianBokmalRemovalAdvisory.wox
lib/GNUstep/SOGo/Templates/SOGoFolderNorwegianNynorskAdditionAdvisory.wox
lib/GNUstep/SOGo/Templates/SOGoFolderNorwegianNynorskRemovalAdvisory.wox
lib/GNUstep/SOGo/Templates/SOGoFolderPolishAdditionAdvisory.wox
lib/GNUstep/SOGo/Templates/SOGoFolderPolishRemovalAdvisory.wox
+lib/GNUstep/SOGo/Templates/SOGoFolderPortugueseAdditionAdvisory.wox
+lib/GNUstep/SOGo/Templates/SOGoFolderPortugueseRemovalAdvisory.wox
lib/GNUstep/SOGo/Templates/SOGoFolderRussianAdditionAdvisory.wox
lib/GNUstep/SOGo/Templates/SOGoFolderRussianRemovalAdvisory.wox
lib/GNUstep/SOGo/Templates/SOGoFolderSlovakAdditionAdvisory.wox
@@ -1766,11 +1834,13 @@
lib/GNUstep/SOGo/WebServerResources/ckeditor/lang/hu.js
lib/GNUstep/SOGo/WebServerResources/ckeditor/lang/is.js
lib/GNUstep/SOGo/WebServerResources/ckeditor/lang/it.js
+lib/GNUstep/SOGo/WebServerResources/ckeditor/lang/mk.js
lib/GNUstep/SOGo/WebServerResources/ckeditor/lang/nb.js
lib/GNUstep/SOGo/WebServerResources/ckeditor/lang/nl.js
lib/GNUstep/SOGo/WebServerResources/ckeditor/lang/no.js
lib/GNUstep/SOGo/WebServerResources/ckeditor/lang/pl.js
lib/GNUstep/SOGo/WebServerResources/ckeditor/lang/pt-br.js
+lib/GNUstep/SOGo/WebServerResources/ckeditor/lang/pt.js
lib/GNUstep/SOGo/WebServerResources/ckeditor/lang/ru.js
lib/GNUstep/SOGo/WebServerResources/ckeditor/lang/sk.js
lib/GNUstep/SOGo/WebServerResources/ckeditor/lang/sl.js
Index: Makefile
===================================================================
RCS file: /cvs/ports/www/sope/Makefile,v
retrieving revision 1.50
diff -u -r1.50 Makefile
--- Makefile 26 Oct 2015 11:55:01 -0000 1.50
+++ Makefile 4 Jan 2016 09:20:16 -0000
@@ -4,8 +4,7 @@
COMMENT-mysql= SOPE MySQL adaptor
COMMENT-postgres= SOPE PostgreSQL adaptor
-VERSION = 2.3.2
-REVISION = 0
+VERSION = 2.3.4
DISTNAME = SOPE-${VERSION}
PKGNAME-main = sope-${VERSION}
PKGNAME-mysql = sope-mysql-${VERSION}
Index: distinfo
===================================================================
RCS file: /cvs/ports/www/sope/distinfo,v
retrieving revision 1.26
diff -u -r1.26 distinfo
--- distinfo 26 Sep 2015 14:26:35 -0000 1.26
+++ distinfo 4 Jan 2016 09:20:16 -0000
@@ -1,2 +1,2 @@
-SHA256 (SOPE-2.3.2.tar.gz) = nSByxu4rhk1X0w9DB5/3wJIfipTeBm8ydTM3rvdOhdg=
-SIZE (SOPE-2.3.2.tar.gz) = 2269903
+SHA256 (SOPE-2.3.4.tar.gz) = ft1+PR41sOdNko26FK4CLPPLoOo46RFpOqgesF1U92E=
+SIZE (SOPE-2.3.4.tar.gz) = 2272757
Index:
patches/patch-sope-appserver_NGObjWeb_DynamicElements_WOComponentContent_m
===================================================================
RCS file:
patches/patch-sope-appserver_NGObjWeb_DynamicElements_WOComponentContent_m
diff -N
patches/patch-sope-appserver_NGObjWeb_DynamicElements_WOComponentContent_m
--- patches/patch-sope-appserver_NGObjWeb_DynamicElements_WOComponentContent_m
19 Oct 2013 09:48:22 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,18 +0,0 @@
-$OpenBSD: patch-sope-appserver_NGObjWeb_DynamicElements_WOComponentContent_m,v
1.1 2013/10/19 09:48:22 sebastia Exp $
-
-fix build with libobjc2-1.7
-
---- sope-appserver/NGObjWeb/DynamicElements/WOComponentContent.m.orig Sun Oct
13 16:59:47 2013
-+++ sope-appserver/NGObjWeb/DynamicElements/WOComponentContent.m Sun Oct
13 17:00:20 2013
-@@ -75,11 +75,7 @@ static Class NSDateClass = Nil;
- printf(" ");
- printf("content: [%s %s]: %0.3fs\n",
- [[component name] cString],
--#if (defined(__GNU_LIBOBJC__) && (__GNU_LIBOBJC__ >= 20100911)) ||
defined(APPLE_RUNTIME) || defined(__GNUSTEP_RUNTIME__)
-- sel_getName(_cmd),
--#else
- sel_get_name(_cmd),
--#endif
- diff);
- }
-
Index: patches/patch-sope-appserver_NGObjWeb_NSObject+WO_m
===================================================================
RCS file: patches/patch-sope-appserver_NGObjWeb_NSObject+WO_m
diff -N patches/patch-sope-appserver_NGObjWeb_NSObject+WO_m
--- patches/patch-sope-appserver_NGObjWeb_NSObject+WO_m 16 May 2014 14:54:16
-0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,27 +0,0 @@
-$OpenBSD: patch-sope-appserver_NGObjWeb_NSObject+WO_m,v 1.2 2014/05/16
14:54:16 giovanni Exp $
-
-fix for build with libobjc2-1.7
-patch from David Chisnall
-
---- sope-appserver/NGObjWeb/NSObject+WO.m.orig Wed Dec 4 17:51:26 2013
-+++ sope-appserver/NGObjWeb/NSObject+WO.m Thu May 15 18:21:20 2014
-@@ -259,7 +259,7 @@ IMP WOGetKVCGetMethod(id object, NSString *_key) {
- if (object == nil) return NULL;
- if (_key == nil) return NULL;
-
--#if GNU_RUNTIME && !(defined(__GNU_LIBOBJC__) && (__GNU_LIBOBJC__ >=
20100911))
-+#if GNU_RUNTIME && !(defined(__GNU_LIBOBJC__) && (__GNU_LIBOBJC__ >=
20100911)) && !defined(__GNUSTEP_RUNTIME__)
- {
- unsigned keyLen;
- char *buf;
-@@ -317,7 +317,9 @@ id WOGetKVCValueUsingMethod(id object, NSString *_key)
- return nil;
- free(buf); buf = NULL;
- }
--#if GNUSTEP_BASE_LIBRARY
-+// This appears to be a work around for an old version of GNUstep-base not
-+// correctly handling the case where there is no method.
-+#if GNUSTEP_BASE_LIBRARY && !defined(__GNUSTEP_RUNTIME__)
- if (!__objc_responds_to(object, getSel))
- return nil;
- #endif
Index: patches/patch-sope-appserver_NGObjWeb_WOSession_m
===================================================================
RCS file: patches/patch-sope-appserver_NGObjWeb_WOSession_m
diff -N patches/patch-sope-appserver_NGObjWeb_WOSession_m
--- patches/patch-sope-appserver_NGObjWeb_WOSession_m 19 Oct 2013 09:48:23
-0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,17 +0,0 @@
-$OpenBSD: patch-sope-appserver_NGObjWeb_WOSession_m,v 1.1 2013/10/19 09:48:23
sebastia Exp $
-
-fix build with libobc2-1.7
-
---- sope-appserver/NGObjWeb/WOSession.m.orig Sun Oct 13 16:36:40 2013
-+++ sope-appserver/NGObjWeb/WOSession.m Sun Oct 13 16:36:51 2013
-@@ -33,10 +33,6 @@
- #include "common.h"
- #include <string.h>
-
--#if !defined(sel_get_name) && ((defined(__GNU_LIBOBJC__) && (__GNU_LIBOBJC__
>= 20100911)) || defined(APPLE_RUNTIME) || defined(__GNUSTEP_RUNTIME__))
--# define sel_get_name sel_getName
--#endif
--
- #if APPLE_FOUNDATION_LIBRARY || NeXT_Foundation_LIBRARY
- @interface NSObject(Miss)
- - (id)notImplemented:(SEL)cmd;
Index: patches/patch-sope-appserver_NGObjWeb_common_h
===================================================================
RCS file: patches/patch-sope-appserver_NGObjWeb_common_h
diff -N patches/patch-sope-appserver_NGObjWeb_common_h
--- patches/patch-sope-appserver_NGObjWeb_common_h 19 Oct 2013 09:48:23
-0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,23 +0,0 @@
-$OpenBSD: patch-sope-appserver_NGObjWeb_common_h,v 1.1 2013/10/19 09:48:23
sebastia Exp $
-
-fix for build with libobjc2-1.7
-
---- sope-appserver/NGObjWeb/common.h.orig Sun Oct 13 10:18:46 2013
-+++ sope-appserver/NGObjWeb/common.h Sun Oct 13 10:24:47 2013
-@@ -51,11 +51,15 @@
- #include <NGExtensions/NGLogging.h>
- #include <NGStreams/NGStreams.h>
-
--#if NeXT_RUNTIME || APPLE_RUNTIME || (__GNU_LIBOBJC__ >= 20100911)
-+#if (defined(__GNU_LIBOBJC__) && (__GNU_LIBOBJC__ >= 20100911)) ||
defined(APPLE_RUNTIME) || defined(__GNUSTEP_RUNTIME__)
- # ifndef sel_get_name
- # define sel_get_name(__XXX__) sel_getName(__XXX__)
- # define sel_get_any_uid(__XXX__) sel_getUid(__XXX__)
- # endif
-+#endif
-+
-+#if (defined(__GNU_LIBOBJC__) && (__GNU_LIBOBJC__ >= 20100911)) ||
defined(APPLE_RUNTIME) || defined(__GNUSTEP_RUNTIME__)
-+# define sel_get_uid(__XXX__) sel_getUid(__XXX__);
- #endif
-
- #define IS_DEPRECATED \
Index: patches/patch-sope-core_EOControl_EOKeyValueCoding_m
===================================================================
RCS file: patches/patch-sope-core_EOControl_EOKeyValueCoding_m
diff -N patches/patch-sope-core_EOControl_EOKeyValueCoding_m
--- patches/patch-sope-core_EOControl_EOKeyValueCoding_m 19 Oct 2013
09:48:23 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,14 +0,0 @@
-$OpenBSD: patch-sope-core_EOControl_EOKeyValueCoding_m,v 1.1 2013/10/19
09:48:23 sebastia Exp $
-
-fix build with libobjc2-1.7
-
---- sope-core/EOControl/EOKeyValueCoding.m.orig Sun Oct 13 15:46:37 2013
-+++ sope-core/EOControl/EOKeyValueCoding.m Sun Oct 13 15:46:47 2013
-@@ -26,7 +26,6 @@
- #if GNU_RUNTIME
-
- #if __GNU_LIBOBJC__ >= 20100911
--# define sel_get_any_uid sel_getUid
- # include <objc/runtime.h>
- #else
- # include <objc/encoding.h>
Index: patches/patch-sope-core_EOControl_EOSortOrdering_m
===================================================================
RCS file: patches/patch-sope-core_EOControl_EOSortOrdering_m
diff -N patches/patch-sope-core_EOControl_EOSortOrdering_m
--- patches/patch-sope-core_EOControl_EOSortOrdering_m 19 Oct 2013 09:48:23
-0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,30 +0,0 @@
-$OpenBSD: patch-sope-core_EOControl_EOSortOrdering_m,v 1.1 2013/10/19 09:48:23
sebastia Exp $
-
-fix build with libobjc2-1.7
-
---- sope-core/EOControl/EOSortOrdering.m.orig Sun Oct 13 15:43:30 2013
-+++ sope-core/EOControl/EOSortOrdering.m Sun Oct 13 15:43:55 2013
-@@ -28,14 +28,6 @@
- # include <objc/objc.h>
- #endif
-
--#ifndef SEL_EQ
--# if GNU_RUNTIME
--# define SEL_EQ(sel1,sel2) sel_eq(sel1,sel2)
--# else
--# define SEL_EQ(sel1,sel2) (sel1 == sel2)
--# endif
--#endif
--
- @implementation EOSortOrdering
- /*"
- This class specifies a sort-ordering as used with
-@@ -83,7 +75,7 @@
- /* equality */
-
- - (BOOL)isEqualToSortOrdering:(EOSortOrdering *)_sortOrdering {
-- if (!SEL_EQ([_sortOrdering selector], [self selector]))
-+ if (!sel_eq([_sortOrdering selector], [self selector]))
- return NO;
- if (![[_sortOrdering key] isEqualToString:[self key]])
- return NO;
Index: patches/patch-sope-core_EOControl_EOValidation_m
===================================================================
RCS file: patches/patch-sope-core_EOControl_EOValidation_m
diff -N patches/patch-sope-core_EOControl_EOValidation_m
--- patches/patch-sope-core_EOControl_EOValidation_m 19 Oct 2013 09:48:23
-0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,17 +0,0 @@
-$OpenBSD: patch-sope-core_EOControl_EOValidation_m,v 1.1 2013/10/19 09:48:23
sebastia Exp $
-
-fix build with libobjc2-1.7
-
---- sope-core/EOControl/EOValidation.m.orig Sun Oct 13 15:44:43 2013
-+++ sope-core/EOControl/EOValidation.m Sun Oct 13 15:45:01 2013
-@@ -24,10 +24,6 @@
- #include "EONull.h"
- #include "common.h"
-
--#if __GNU_LIBOBJC__ >= 20100911
--# define sel_get_any_uid sel_getUid
--#endif
--
- #if !LIB_FOUNDATION_LIBRARY
-
- @interface NSException(UsedSetUI) /* does Jaguar allow -setUserInfo: ? */
Index: patches/patch-sope-core_EOControl_common_h
===================================================================
RCS file: patches/patch-sope-core_EOControl_common_h
diff -N patches/patch-sope-core_EOControl_common_h
--- patches/patch-sope-core_EOControl_common_h 17 Oct 2014 09:19:32 -0000
1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,19 +0,0 @@
-$OpenBSD: patch-sope-core_EOControl_common_h,v 1.2 2014/10/17 09:19:32
sebastia Exp $
-
-fix build with libobjc2-1.7
-
---- 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
-
--#if __GNU_LIBOBJC__ >= 20100911
-+#if (defined(__GNU_LIBOBJC__) && (__GNU_LIBOBJC__ >= 20100911)) ||
defined(APPLE_RUNTIME) || defined(__GNUSTEP_RUNTIME__)
- # ifndef sel_eq
- # define sel_eq(__A__,__B__) sel_isEqual(__A__,__B__)
- # endif
-+# define sel_get_any_uid(__XXX__) sel_getUid(__XXX__)
- #endif
-
- #ifndef ASSIGN
Index: patches/patch-sope-core_NGExtensions_EOExt_subproj_EOQualifier+CtxEval_m
===================================================================
RCS file:
patches/patch-sope-core_NGExtensions_EOExt_subproj_EOQualifier+CtxEval_m
diff -N patches/patch-sope-core_NGExtensions_EOExt_subproj_EOQualifier+CtxEval_m
--- patches/patch-sope-core_NGExtensions_EOExt_subproj_EOQualifier+CtxEval_m
19 Oct 2013 09:48:23 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,15 +0,0 @@
-$OpenBSD: patch-sope-core_NGExtensions_EOExt_subproj_EOQualifier+CtxEval_m,v
1.1 2013/10/19 09:48:23 sebastia Exp $
-
-fix build with libobjc2-1.7
-
---- sope-core/NGExtensions/EOExt.subproj/EOQualifier+CtxEval.m.orig Sun Oct
13 18:08:20 2013
-+++ sope-core/NGExtensions/EOExt.subproj/EOQualifier+CtxEval.m Sun Oct 13
18:10:08 2013
-@@ -29,7 +29,7 @@
- # import <objc/objc.h>
- # import <extensions/objc-runtime.h>
- #elif GNUSTEP_BASE_LIBRARY
--#if __GNU_LIBOBJC__ >= 20100911
-+#if (defined(__GNU_LIBOBJC__) && (__GNU_LIBOBJC__ >= 20100911)) ||
defined(__GNUSTEP_RUNTIME__)
- # define sel_get_name sel_getName
- # import <objc/runtime.h>
- #else
Index: patches/patch-sope-gdl1_GDLAccess_common_h
===================================================================
RCS file: patches/patch-sope-gdl1_GDLAccess_common_h
diff -N patches/patch-sope-gdl1_GDLAccess_common_h
--- patches/patch-sope-gdl1_GDLAccess_common_h 19 Oct 2013 09:48:23 -0000
1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,15 +0,0 @@
-$OpenBSD: patch-sope-gdl1_GDLAccess_common_h,v 1.1 2013/10/19 09:48:23
sebastia Exp $
-
-fix building with libobjc2-1.7
-
---- sope-gdl1/GDLAccess/common.h.orig Sun Oct 13 18:16:32 2013
-+++ sope-gdl1/GDLAccess/common.h Sun Oct 13 18:17:48 2013
-@@ -55,7 +55,7 @@
- # endif
- #endif
-
--#if __GNU_LIBOBJC__ >= 20100911
-+#if (defined(__GNU_LIBOBJC__) && (__GNU_LIBOBJC__ >= 20100911)) ||
defined(__GNUSTEP_RUNTIME__)
- # define sel_eq(__A__,__B__) sel_isEqual(__A__,__B__)
- # ifndef SEL_EQ
- # define SEL_EQ(__A__,__B__) sel_isEqual(__A__,__B__)
Index: patches/patch-sope-ldap_NGLdap_EOQualifier+LDAP_m
===================================================================
RCS file: patches/patch-sope-ldap_NGLdap_EOQualifier+LDAP_m
diff -N patches/patch-sope-ldap_NGLdap_EOQualifier+LDAP_m
--- patches/patch-sope-ldap_NGLdap_EOQualifier+LDAP_m 19 Oct 2013 09:48:23
-0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,15 +0,0 @@
-$OpenBSD: patch-sope-ldap_NGLdap_EOQualifier+LDAP_m,v 1.1 2013/10/19 09:48:23
sebastia Exp $
-
-fix build with libobjc2-1.7
-
---- sope-ldap/NGLdap/EOQualifier+LDAP.m.orig Sun Oct 13 19:19:03 2013
-+++ sope-ldap/NGLdap/EOQualifier+LDAP.m Sun Oct 13 19:19:33 2013
-@@ -26,7 +26,7 @@
- #define sel_eq(sel1, sel2) ((sel1)) == ((sel2))
- #endif
-
--#if __GNU_LIBOBJC__ >= 20100911
-+#if (defined(__GNU_LIBOBJC__) && (__GNU_LIBOBJC__ >= 20100911)) ||
defined(APPLE_RUNTIME) || defined(__GNUSTEP_RUNTIME__)
- # define sel_eq(__A__,__B__) sel_isEqual(__A__,__B__)
- #endif
-
Index: patches/patch-sope-mime_NGImap4_imCommon_h
===================================================================
RCS file: patches/patch-sope-mime_NGImap4_imCommon_h
diff -N patches/patch-sope-mime_NGImap4_imCommon_h
--- patches/patch-sope-mime_NGImap4_imCommon_h 19 Oct 2013 09:48:23 -0000
1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,22 +0,0 @@
-$OpenBSD: patch-sope-mime_NGImap4_imCommon_h,v 1.1 2013/10/19 09:48:23
sebastia Exp $
-
-fix build with libobjc2-1.7
-
---- sope-mime/NGImap4/imCommon.h.orig Sun Oct 13 16:21:42 2013
-+++ sope-mime/NGImap4/imCommon.h Sun Oct 13 16:22:35 2013
-@@ -37,13 +37,13 @@
- #include <NGMime/NGMime.h>
- #include <NGMail/NGMail.h>
-
--#if NeXT_RUNTIME || APPLE_RUNTIME
-+#if NeXT_RUNTIME
- # ifndef sel_eq
- # define sel_eq(__A__,__B__) (__A__==__B__)
- # endif
- #endif
-
--#if __GNU_LIBOBJC__ >= 20100911
-+#if (defined(__GNU_LIBOBJC__) && (__GNU_LIBOBJC__ >= 20100911)) ||
defined(APPLE_RUNTIME) || defined(__GNUSTEP_RUNTIME__)
- # ifndef sel_eq
- # define sel_eq(__A__,__B__) sel_isEqual(__A__,__B__)
- # endif
Index: patches/patch-sope-mime_NGMime_common_h
===================================================================
RCS file: patches/patch-sope-mime_NGMime_common_h
diff -N patches/patch-sope-mime_NGMime_common_h
--- patches/patch-sope-mime_NGMime_common_h 19 Oct 2013 09:48:24 -0000
1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,17 +0,0 @@
-$OpenBSD: patch-sope-mime_NGMime_common_h,v 1.1 2013/10/19 09:48:24 sebastia
Exp $
-
-fix build with libobjc2-1.7
-
---- sope-mime/NGMime/common.h.orig Sun Oct 13 16:18:04 2013
-+++ sope-mime/NGMime/common.h Sun Oct 13 16:21:27 2013
-@@ -37,7 +37,9 @@
- #include "NGMimeType.h"
-
- #if !GNU_RUNTIME
--# ifndef sel_eq
-+# if (defined(__GNU_LIBOBJC__) && (__GNU_LIBOBJC__ >= 20100911)) ||
defined(APPLE_RUNTIME) || defined(__GNUSTEP_RUNTIME__)
-+# define sel_eq(__A__,__B__) sel_isEqual(__A__,__B__)
-+# else ifndef sel_eq
- # define sel_eq(__A__, __B__) (__A__==__B__)
- # endif
- #endif
