Hi,
attached an update to libobjc2 to the new 1.7 version.
tested especially with www/sope, www/sogo on all 3 platforms, and
the x11/gnustep applications tested on amd64.
It now uses cmake for building.
The patches for www/sope, www/sogo I sent yesterday are needed to
not break them after the update.
OK?
Seastian
Index: Makefile
===================================================================
RCS file: /cvs/ports/x11/gnustep/libobjc2/Makefile,v
retrieving revision 1.6
diff -u -p -u -r1.6 Makefile
--- Makefile 15 Sep 2013 16:24:58 -0000 1.6
+++ Makefile 18 Oct 2013 14:29:27 -0000
@@ -5,19 +5,19 @@ BROKEN-hppa = missing asm impl in block_
NOT_FOR_ARCHS = ${GCC3_ARCHS}
# note: this port does not use the gnustep module
-DISTNAME = libobjc2-1.6.1
-REVISION = 0
+DISTNAME = libobjc2-1.7
PKGNAME = gnustep-${DISTNAME}
EXTRACT_SUFX = .tar.bz2
CATEGORIES = x11/gnustep devel
-SHARED_LIBS += objc2 0.0
+SHARED_LIBS += objc2 1.0
SHARED_LIBS += objcxx 0.0
HOMEPAGE = http://www.gnustep.org/
MASTER_SITES = http://download.gna.org/gnustep/
-WANTLIB += m stdc++
+MODULES = devel/cmake
+WANTLIB += m stdc++ pthread
MAKE_ENV += CPPFLAGS+=${CPPFLAGS}
MAKE_FLAGS += LIBOBJCLIBNAME=objc2 \
@@ -25,5 +25,13 @@ MAKE_FLAGS += LIBOBJCLIBNAME=objc2 \
HEADER_DIR=${DESTDIR}${PREFIX}/include/gnustep \
VERSION=${LIBobjc2_VERSION} \
SILENT=""
+
+CONFIGURE_ARGS += -DLIBOBJC_NAME=objc2 -DINCLUDE_DIRECTORY=gnustep/objc \
+ -DCMAKE_MODULE_PATH=${PREFIX}/share/llvm/cmake \
+ -DBUILD_STATIC_LIBOBJC=On \
+ -DLLVM_OPTS=Off \
+ -DTESTS=Off
+MAKE_FLAGS += LIBOBJCLIBNAME=objc2 \
+ LIBOBJC=libobjc2
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/x11/gnustep/libobjc2/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -u -r1.1.1.1 distinfo
--- distinfo 22 Aug 2012 07:01:45 -0000 1.1.1.1
+++ distinfo 18 Oct 2013 14:29:27 -0000
@@ -1,2 +1,2 @@
-SHA256 (gnustep/libobjc2-1.6.1.tar.bz2) =
lBdkaE52TyWGTT8xjVysgLW4md9A1IXFIXQkMfwT4vk=
-SIZE (gnustep/libobjc2-1.6.1.tar.bz2) = 116263
+SHA256 (gnustep/libobjc2-1.7.tar.bz2) =
OhtK9v9vPY5Xv7J0AdGySWcKwukrpUrVaD/z1EOdPME=
+SIZE (gnustep/libobjc2-1.7.tar.bz2) = 132662
Index: patches/patch-CMakeLists_txt
===================================================================
RCS file: patches/patch-CMakeLists_txt
diff -N patches/patch-CMakeLists_txt
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-CMakeLists_txt 18 Oct 2013 14:29:27 -0000
@@ -0,0 +1,15 @@
+$OpenBSD$
+--- CMakeLists.txt.orig Thu Jun 27 13:30:41 2013
++++ CMakeLists.txt Sat Oct 5 09:07:26 2013
+@@ -291,6 +291,11 @@ else ()
+ set(DEFAULT_INSTALL_TYPE "NONE")
+ endif ()
+
++if (NOT CMAKE_INSTALL_LIBDIR)
++ set(CMAKE_INSTALL_LIBDIR lib)
++endif ()
++
++
+ set(GNUSTEP_INSTALL_TYPE ${DEFAULT_INSTALL_TYPE} CACHE STRING
+ "GNUstep installation type. Options are NONE, SYSTEM, NETWORK or
LOCAL.")
+ if (${GNUSTEP_INSTALL_TYPE} STREQUAL "NONE")
Index: patches/patch-Makefile
===================================================================
RCS file: patches/patch-Makefile
diff -N patches/patch-Makefile
--- patches/patch-Makefile 22 Aug 2012 07:01:45 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,45 +0,0 @@
-$OpenBSD: patch-Makefile,v 1.1.1.1 2012/08/22 07:01:45 sebastia Exp $
-
-do not create symlinks to the libraries installed
-get rid of not understood parameter
-do not encode wrong library name into the library
-
---- Makefile.orig Sat Mar 24 17:43:01 2012
-+++ Makefile Tue Aug 14 18:31:13 2012
-@@ -14,7 +14,7 @@ LIBOBJCXX=libobjcxx
- SILENT=@
-
- CFLAGS += -std=gnu99 -fPIC -fexceptions
--CFLAGS += -Wno-deprecated-objc-isa-usage
-+#CFLAGS += -Wno-deprecated-objc-isa-usage
- CXXFLAGS += -fPIC -fexceptions
- CPPFLAGS += -DTYPE_DEPENDENT_DISPATCH -DGNUSTEP
- CPPFLAGS += -D__OBJC_RUNTIME_INTERNAL__=1 -D_XOPEN_SOURCE=500
-D__BSD_VISIBLE=1 -D_BSD_SOURCE=1
-@@ -74,13 +74,11 @@ all: $(LIBOBJC).a $(LIBOBJCXX).so.$(VERSION)
- $(LIBOBJCXX).so.$(VERSION): $(LIBOBJC).so.$(VERSION) $(OBJCXX_OBJECTS)
- $(SILENT)echo Linking shared Objective-C++ runtime library...
- $(SILENT)$(CXX) -shared \
-- -Wl,-soname=$(LIBOBJCXX).so.$(MAJOR_VERSION) \
- -o $@ $(OBJCXX_OBJECTS)
-
- $(LIBOBJC).so.$(VERSION): $(OBJECTS)
- $(SILENT)echo Linking shared Objective-C runtime library...
- $(SILENT)$(CC) -shared -rdynamic \
-- -Wl,-soname=$(LIBOBJC).so.$(MAJOR_VERSION) \
- -o $@ $(OBJECTS)
-
- $(LIBOBJC).a: $(OBJECTS)
-@@ -109,13 +107,6 @@ install: all
- $(SILENT)install -m 444 $(STRIP) $(LIBOBJC).so.$(VERSION) $(LIB_DIR)
- $(SILENT)install -m 444 $(STRIP) $(LIBOBJCXX).so.$(VERSION) $(LIB_DIR)
- $(SILENT)install -m 444 $(STRIP) $(LIBOBJC).a $(LIB_DIR)
-- $(SILENT)echo Creating symbolic links...
-- $(SILENT)ln -sf $(LIBOBJC).so.$(VERSION) $(LIB_DIR)/$(LIBOBJC).so
-- $(SILENT)ln -sf $(LIBOBJC).so.$(VERSION)
$(LIB_DIR)/$(LIBOBJC).so.$(MAJOR_VERSION)
-- $(SILENT)ln -sf $(LIBOBJC).so.$(VERSION)
$(LIB_DIR)/$(LIBOBJC).so.$(MAJOR_VERSION).$(MINOR_VERSION)
-- $(SILENT)ln -sf $(LIBOBJCXX).so.$(VERSION) $(LIB_DIR)/$(LIBOBJCXX).so
-- $(SILENT)ln -sf $(LIBOBJCXX).so.$(VERSION)
$(LIB_DIR)/$(LIBOBJCXX).so.$(MAJOR_VERSION)
-- $(SILENT)ln -sf $(LIBOBJCXX).so.$(VERSION)
$(LIB_DIR)/$(LIBOBJCXX).so.$(MAJOR_VERSION).$(MINOR_VERSION)
- $(SILENT)echo Installing headers...
- $(SILENT)install -d $(HEADER_DIR)/objc
- $(SILENT)install -m 444 objc/*.h $(HEADER_DIR)/objc
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/x11/gnustep/libobjc2/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -u -r1.1.1.1 PLIST
--- pkg/PLIST 22 Aug 2012 07:01:45 -0000 1.1.1.1
+++ pkg/PLIST 18 Oct 2013 14:29:28 -0000
@@ -10,6 +10,7 @@ include/gnustep/objc/capabilities.h
include/gnustep/objc/developer.h
include/gnustep/objc/encoding.h
include/gnustep/objc/hooks.h
+include/gnustep/objc/message.h
include/gnustep/objc/objc-api.h
include/gnustep/objc/objc-arc.h
include/gnustep/objc/objc-auto.h
@@ -17,7 +18,6 @@ include/gnustep/objc/objc.h
include/gnustep/objc/runtime-deprecated.h
include/gnustep/objc/runtime.h
include/gnustep/objc/slot.h
-include/gnustep/objc/toydispatch.h
lib/libobjc2.a
@lib lib/libobjc2.so.${LIBobjc2_VERSION}
@lib lib/libobjcxx.so.${LIBobjcxx_VERSION}
