$ cat www/sogo/files/patch-Main_GNUmakefile.preamble
--- Main/GNUmakefile.preamble.orig 2015-09-16 18:41:29 UTC
+++ Main/GNUmakefile.preamble
@@ -22,4 +22,4 @@ $(SOGOD)_TOOL_LIBS += \
-lNGObjWeb \
-lNGMime -lNGLdap \
-lNGStreams -lNGExtensions -lEOControl \
- -lDOM -lSaxObjC
+ -lDOM -lSaxObjC -lSBJson
$ cat www/sogo/files/patch-SoObjects_SOGo_GNUmakefile
--- SoObjects/SOGo/GNUmakefile.orig 2015-09-16 18:41:36 UTC
+++ SoObjects/SOGo/GNUmakefile
@@ -203,7 +203,8 @@ ifneq ($(FHS_INSTALL_ROOT),)
GNUSTEP_HEADERS=$(DESTDIR)$(FHS_INSTALL_ROOT)/include
endif
GNUSTEP_TARGET_LDIR=sogo
-include $(GNUSTEP_MAKEFILES)/framework.make
+
+include master-framework.make
include $(GNUSTEP_MAKEFILES)/library.make
include $(GNUSTEP_MAKEFILES)/tool.make
-include GNUmakefile.postamble
$ cat www/sogo/files/patch-SoObjects_SOGo_master-framework.make
--- SoObjects/SOGo/master-framework.make.orig 2015-09-23 03:38:31 UTC
+++ SoObjects/SOGo/master-framework.make
@@ -0,0 +1,30 @@
+#
+# framework.make
+#
+# Makefile rules to build GNUstep-based frameworks.
+#
+# Copyright (C) 2002 Free Software Foundation, Inc.
+#
+# Author: Nicola Pero <nicola@brainstorm.co.uk>
+#
+# This file is part of the GNUstep Makefile Package.
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 3
+# of the License, or (at your option) any later version.
+#
+# You should have received a copy of the GNU General Public
+# License along with this library; see the file COPYING.
+# If not, write to the Free Software Foundation,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+ifeq ($(GNUSTEP_INSTANCE),)
+include $(GNUSTEP_MAKEFILES)/Master/framework.make
+else
+
+ifeq ($(GNUSTEP_TYPE),framework)
+include instance-framework.make
+endif
+
+endif
$ cat www/sogo/files/patch-Tests_Unit_GNUmakefile
--- Tests/Unit/GNUmakefile.orig 2015-09-16 18:41:31 UTC
+++ Tests/Unit/GNUmakefile
@@ -35,7 +35,10 @@ $(TEST_TOOL)_CPPFLAGS += \
-Wall -D_GNU_SOURCE -I../../SOPE/ -I../../SoObjects/ -I../../UI/
ADDITIONAL_LIB_DIRS += \
- -L../../SoObjects/SOGo/SOGo.framework/Versions/Current/sogo -L../../SOPE/NGCards/obj -L../../SOPE/GDLContentStore/obj -lSOGo -lNGMime -lNGCards -lGDLContentStore -lNGExtensions -lSBJson -lobjc \
+ -L../../SoObjects/SOGo/SOGo.framework/Versions/Current/sogo -L../../SOPE/NGCards/obj -L../../SOPE/GDLContentStore/obj \
+ -lSOGo -lNGMime -lNGCards -lGDLContentStore -lNGExtensions \
+ -lSBJson -lGDLAccess -lNGObjWeb -lNGStreams -lEOControl -lDOM \
+ -lNGLdap -lobjc \
-L/usr/local/lib -lSaxObjC \
-Wl,-rpath,../../SoObjects/SOGo/SOGo.framework/Versions/Current/sogo -Wl,-rpath,../../SOPE/NGCards/obj -Wl,-rpath,../../SOPE/GDLContentStore/obj
ADDITIONAL_LDFLAGS += -Wl,--no-as-needed
$ cat www/sogo/files/patch-Tools_GNUmakefile.preamble
--- Tools/GNUmakefile.preamble.orig 2015-09-16 18:41:31 UTC
+++ Tools/GNUmakefile.preamble
@@ -13,4 +13,5 @@ ADDITIONAL_LIB_DIRS += \
-L../SoObjects/SOGo/SOGo.framework/sogo -lSOGo \
-L../SOPE/GDLContentStore/$(GNUSTEP_OBJ_DIR)/ -lGDLContentStore \
-L../SOPE/NGCards/$(GNUSTEP_OBJ_DIR)/ -lNGCards \
- -lEOControl -lNGStreams -lNGMime -lNGExtensions -lNGObjWeb
+ -lEOControl -lNGStreams -lNGMime -lNGExtensions -lNGObjWeb \
+ -lGDLAccess -lDOM -lSaxObjC -lNGLdap -lSBJson