From f82c6a9c5c02c281f70edff5f40999d14fc2d35e Mon Sep 17 00:00:00 2001 From: sebastia Date: Mon, 18 Apr 2011 11:30:47 +0000 Subject: [PATCH] Update gnustep-make to 2.6.0, enable strict v2 mode, since v1 is ancient. Further change the way how frameworks are installed, create a couple of more symlinks, to get rid of a lot of patches for other dependent ports. OK landry@, ajacoutot@ --- x11/gnustep/make/Makefile | 9 ++-- x11/gnustep/make/distinfo | 10 ++--- x11/gnustep/make/patches/patch-GNUmakefile_in | 18 ++++---- .../patches/patch-Instance_framework_make | 42 ++++++++++++------- x11/gnustep/make/patches/patch-target_make | 12 +++--- x11/gnustep/make/pkg/PLIST | 18 +++++++- 6 files changed, 68 insertions(+), 41 deletions(-) diff --git a/x11/gnustep/make/Makefile b/x11/gnustep/make/Makefile index 4694b741456..f55a1b62251 100644 --- a/x11/gnustep/make/Makefile +++ b/x11/gnustep/make/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.26 2010/12/22 09:20:00 sebastia Exp $ +# $OpenBSD: Makefile,v 1.27 2011/04/18 11:30:47 sebastia Exp $ # WARNING: this port does NOT use the x11/gnustep MODULE @@ -6,8 +6,7 @@ PKG_ARCH= * COMMENT= GNUstep makefile package -DISTNAME= gnustep-make-2.4.0 -REVISION= 5 +DISTNAME = gnustep-make-2.6.0 CATEGORIES= devel x11/gnustep HOMEPAGE= http://www.gnustep.org/ @@ -31,7 +30,9 @@ CONFIGURE_ARGS= --with-layout=openbsd \ --with-tar=${LOCALBASE}/bin/gtar \ --enable-multi-platform \ --with-library-combo="gnu-gnu-gnu" \ - --with-thread-lib="-pthread" + --with-thread-lib="-pthread" \ + --disable-native-objc-exceptions \ + --enable-strict-v2-mode pre-configure: ${SUBST_CMD} -c ${FILESDIR}/openbsd \ diff --git a/x11/gnustep/make/distinfo b/x11/gnustep/make/distinfo index 67ac9708c34..2b67738c182 100644 --- a/x11/gnustep/make/distinfo +++ b/x11/gnustep/make/distinfo @@ -1,5 +1,5 @@ -MD5 (gnustep/gnustep-make-2.4.0.tar.gz) = vCE45iVmZeVbAPsP+sdm8Q== -RMD160 (gnustep/gnustep-make-2.4.0.tar.gz) = bx3YEDnJk15B63mIkjw7PGUH44M= -SHA1 (gnustep/gnustep-make-2.4.0.tar.gz) = r9oUGGOUxlsIcdupP5LcllsvxyQ= -SHA256 (gnustep/gnustep-make-2.4.0.tar.gz) = itbJ0OUy4L9w/cJavmCvvUEDsW3EezJGRqFHy6xsbvk= -SIZE (gnustep/gnustep-make-2.4.0.tar.gz) = 521818 +MD5 (gnustep/gnustep-make-2.6.0.tar.gz) = cabG2aCzQUleZ8kV/mciwQ== +RMD160 (gnustep/gnustep-make-2.6.0.tar.gz) = BUIbOseEZ6vnmJN5Be7oExbSsoY= +SHA1 (gnustep/gnustep-make-2.6.0.tar.gz) = 481d2dHwMUxm5uRbXlv5slE/m+Q= +SHA256 (gnustep/gnustep-make-2.6.0.tar.gz) = 24MSoPxjfVxmwRwz7FGx7MDGkwkewGyjnrrEPKDyeCg= +SIZE (gnustep/gnustep-make-2.6.0.tar.gz) = 564848 diff --git a/x11/gnustep/make/patches/patch-GNUmakefile_in b/x11/gnustep/make/patches/patch-GNUmakefile_in index db7392f5acc..1a395983b69 100644 --- a/x11/gnustep/make/patches/patch-GNUmakefile_in +++ b/x11/gnustep/make/patches/patch-GNUmakefile_in @@ -1,7 +1,7 @@ -$OpenBSD: patch-GNUmakefile_in,v 1.5 2010/06/07 06:28:13 ajacoutot Exp $ ---- GNUmakefile.in.orig Fri Feb 12 23:00:05 2010 -+++ GNUmakefile.in Mon Jun 7 08:15:35 2010 -@@ -98,7 +98,7 @@ export GNUSTEP_TARGET_LDIR +$OpenBSD: patch-GNUmakefile_in,v 1.6 2011/04/18 11:30:47 sebastia Exp $ +--- GNUmakefile.in.orig Sun Apr 3 18:10:31 2011 ++++ GNUmakefile.in Sun Apr 3 18:13:14 2011 +@@ -99,7 +99,7 @@ export GNUSTEP_TARGET_LDIR export MAYBE_LIBRARY_COMBO INSTALL = @INSTALL@ @@ -10,7 +10,7 @@ $OpenBSD: patch-GNUmakefile_in,v 1.5 2010/06/07 06:28:13 ajacoutot Exp $ INSTALL_DATA = @INSTALL_DATA@ VERTAG = $(subst .,_,$(GNUSTEP_MAKE_VERSION)) -@@ -164,7 +164,6 @@ install: generated-files +@@ -170,7 +170,6 @@ install: generated-files echo "Creating makefile directories in: $(makedir)"; \ "$(srcdir)/mkinstalldirs" \ "$(makedir)" \ @@ -18,17 +18,17 @@ $OpenBSD: patch-GNUmakefile_in,v 1.5 2010/06/07 06:28:13 ajacoutot Exp $ "$(makedir)/$(GNUSTEP_TARGET_DIR)" \ "$(makedir)/$(GNUSTEP_TARGET_LDIR)" \ "$(makedir)/Additional" \ -@@ -173,9 +172,6 @@ install: generated-files - "$(makedir)/Instance" \ +@@ -180,9 +179,6 @@ install: generated-files "$(makedir)/Instance/Shared" \ - "$(makedir)/Instance/Documentation") + "$(makedir)/Instance/Documentation" \ + "$(testdir)") - $(EC)(echo "Installing GNUstep configuration file in $(GNUSTEP_CONFIG_FILE)"; \ - "$(srcdir)/mkinstalldirs" "$(GNUSTEP_CONFIG_FILE_DIR)"; \ - $(INSTALL_DATA) $(GNUSTEP_DOT_CONF_FILE) "$(GNUSTEP_CONFIG_FILE)") $(EC)(echo "Installing gnustep-make support software") $(EC)(for f in config.guess config.sub install-sh mkinstalldirs \ clean_cpu.sh clean_os.sh \ -@@ -223,17 +219,11 @@ install: generated-files +@@ -237,17 +233,11 @@ install: generated-files "$(srcdir)/mkinstalldirs" "$(mandir)/man1" \ "$(mandir)/man7"; \ $(INSTALL_DATA) "$(srcdir)/Documentation/debugapp.1" "$(mandir)/man1"; \ diff --git a/x11/gnustep/make/patches/patch-Instance_framework_make b/x11/gnustep/make/patches/patch-Instance_framework_make index 63be2e3e659..6399d68f1ce 100644 --- a/x11/gnustep/make/patches/patch-Instance_framework_make +++ b/x11/gnustep/make/patches/patch-Instance_framework_make @@ -1,6 +1,6 @@ -$OpenBSD: patch-Instance_framework_make,v 1.7 2010/11/24 07:10:44 sebastia Exp $ +$OpenBSD: patch-Instance_framework_make,v 1.8 2011/04/18 11:30:47 sebastia Exp $ --- Instance/framework.make.orig Mon Feb 15 00:13:47 2010 -+++ Instance/framework.make Thu Nov 18 11:11:02 2010 ++++ Instance/framework.make Thu Apr 14 19:51:45 2011 @@ -252,7 +252,7 @@ FRAMEWORK_CURRENT_LIBRARY_DIR = $(GNUSTEP_BUILD_DIR)/$ ifneq ($(BUILD_DLL), yes) @@ -10,41 +10,51 @@ $OpenBSD: patch-Instance_framework_make,v 1.7 2010/11/24 07:10:44 sebastia Exp $ SONAME_FRAMEWORK_FILE = $(FRAMEWORK_LIBRARY_FILE).$(INTERFACE_VERSION) else # BUILD_DLL -@@ -557,13 +557,7 @@ $(GNUSTEP_BUILD_DIR)/$(GNUSTEP_INSTANCE).framework/$(G +@@ -557,13 +557,13 @@ $(GNUSTEP_BUILD_DIR)/$(GNUSTEP_INSTANCE).framework/$(G $(GNUSTEP_BUILD_DIR)/$(GNUSTEP_INSTANCE).framework/$(GNUSTEP_TARGET_LDIR)/$(GNUSTEP_INSTANCE): $(GNUSTEP_BUILD_DIR)/$(GNUSTEP_INSTANCE).framework/$(GNUSTEP_TARGET_LDIR)/ ifeq ($(MAKE_CURRENT_VERSION),yes) $(ECHO_NOTHING)cd $(GNUSTEP_BUILD_DIR)/$(GNUSTEP_INSTANCE).framework/$(GNUSTEP_TARGET_LDIR); \ - $(RM_LN_S) $(GNUSTEP_INSTANCE) $(FRAMEWORK_LIBRARY_FILE); \ -- $(LN_S) `$(REL_PATH_SCRIPT) $(GNUSTEP_TARGET_LDIR) \ -- Versions/Current/$(GNUSTEP_TARGET_LDIR)/$(GNUSTEP_INSTANCE) short` \ ++ $(RM_LN_S) $(GNUSTEP_INSTANCE) $(VERSION_FRAMEWORK_LIBRARY_FILE); \ + $(LN_S) `$(REL_PATH_SCRIPT) $(GNUSTEP_TARGET_LDIR) \ + Versions/Current/$(GNUSTEP_TARGET_LDIR)/$(GNUSTEP_INSTANCE) short` \ - $(GNUSTEP_INSTANCE); \ -- $(LN_S) `$(REL_PATH_SCRIPT) $(GNUSTEP_TARGET_LDIR) \ ++ $(GNUSTEP_INSTANCE); \ + $(LN_S) `$(REL_PATH_SCRIPT) $(GNUSTEP_TARGET_LDIR) \ - Versions/Current/$(GNUSTEP_TARGET_LDIR)/$(FRAMEWORK_LIBRARY_FILE) short` \ - $(FRAMEWORK_LIBRARY_FILE)$(END_ECHO) -+ $(RM_LN_S) $(GNUSTEP_INSTANCE) $(FRAMEWORK_LIBRARY_FILE)$(END_ECHO) ++ Versions/Current/$(GNUSTEP_TARGET_LDIR)/$(VERSION_FRAMEWORK_LIBRARY_FILE) short` \ ++ $(VERSION_FRAMEWORK_LIBRARY_FILE)$(END_ECHO) endif endif endif -@@ -590,8 +584,7 @@ endif - $(ECHO_LINKING) \ +@@ -591,7 +591,7 @@ endif $(LIB_LINK_CMD) || $(RM) $(FRAMEWORK_FILE) ; \ (cd $(LIB_LINK_OBJ_DIR); \ -- $(RM_LN_S) $(GNUSTEP_INSTANCE); \ + $(RM_LN_S) $(GNUSTEP_INSTANCE); \ - $(LN_S) $(LIB_LINK_FRAMEWORK_FILE) $(GNUSTEP_INSTANCE)) \ -+ $(RM_LN_S) $(GNUSTEP_INSTANCE)) \ ++ $(LN_S) $(VERSION_FRAMEWORK_LIBRARY_FILE) $(GNUSTEP_INSTANCE)) \ $(END_ECHO) ifeq ($(GNUSTEP_MAKE_PARALLEL_BUILDING), no) -@@ -679,11 +672,7 @@ endif +@@ -679,18 +679,14 @@ endif $(RM_LN_S) $(FRAMEWORK_LIBRARY_FILE); \ $(RM_LN_S) $(SONAME_FRAMEWORK_FILE); \ $(RM_LN_S) $(VERSION_FRAMEWORK_LIBRARY_FILE); \ - $(LN_S) `$(REL_PATH_SCRIPT) $(GNUSTEP_LIBRARIES)/$(GNUSTEP_TARGET_LDIR) $(FRAMEWORK_INSTALL_DIR)/$(FRAMEWORK_CURRENT_LIBRARY_DIR_NAME)/$(FRAMEWORK_LIBRARY_FILE) short` $(FRAMEWORK_LIBRARY_FILE); \ -- if test -r "$(FRAMEWORK_INSTALL_DIR)/$(FRAMEWORK_CURRENT_LIBRARY_DIR_NAME)/$(SONAME_FRAMEWORK_FILE)"; then \ -- $(LN_S) `$(REL_PATH_SCRIPT) $(GNUSTEP_LIBRARIES)/$(GNUSTEP_TARGET_LDIR) $(FRAMEWORK_INSTALL_DIR)/$(FRAMEWORK_CURRENT_LIBRARY_DIR_NAME)/$(SONAME_FRAMEWORK_FILE) short` $(SONAME_FRAMEWORK_FILE); \ + if test -r "$(FRAMEWORK_INSTALL_DIR)/$(FRAMEWORK_CURRENT_LIBRARY_DIR_NAME)/$(SONAME_FRAMEWORK_FILE)"; then \ + $(LN_S) `$(REL_PATH_SCRIPT) $(GNUSTEP_LIBRARIES)/$(GNUSTEP_TARGET_LDIR) $(FRAMEWORK_INSTALL_DIR)/$(FRAMEWORK_CURRENT_LIBRARY_DIR_NAME)/$(SONAME_FRAMEWORK_FILE) short` $(SONAME_FRAMEWORK_FILE); \ - fi; \ - $(LN_S) `$(REL_PATH_SCRIPT) $(GNUSTEP_LIBRARIES)/$(GNUSTEP_TARGET_LDIR) $(FRAMEWORK_INSTALL_DIR)/$(FRAMEWORK_CURRENT_LIBRARY_DIR_NAME)/$(VERSION_FRAMEWORK_LIBRARY_FILE) short` $(VERSION_FRAMEWORK_LIBRARY_FILE)$(END_ECHO) -+ mv `$(REL_PATH_SCRIPT) $(GNUSTEP_LIBRARIES)/$(GNUSTEP_TARGET_LDIR) $(FRAMEWORK_INSTALL_DIR)/$(FRAMEWORK_CURRENT_LIBRARY_DIR_NAME)/$(VERSION_FRAMEWORK_LIBRARY_FILE)` $(VERSION_FRAMEWORK_LIBRARY_FILE)$(END_ECHO) ++ fi;$(END_ECHO) ifneq ($(CHOWN_TO),) $(ECHO_CHOWNING)cd $(GNUSTEP_LIBRARIES)/$(GNUSTEP_TARGET_LDIR); \ - $(CHOWN) $(CHOWN_TO) $(FRAMEWORK_LIBRARY_FILE); \ +- $(CHOWN) $(CHOWN_TO) $(FRAMEWORK_LIBRARY_FILE); \ + if test -r "$(SONAME_FRAMEWORK_FILE)"; then \ + $(CHOWN) $(CHOWN_TO) $(SONAME_FRAMEWORK_FILE); \ +- fi; \ +- $(CHOWN) $(CHOWN_TO) $(VERSION_FRAMEWORK_LIBRARY_FILE)$(END_ECHO) ++ fi;$(END_ECHO) + endif + + else diff --git a/x11/gnustep/make/patches/patch-target_make b/x11/gnustep/make/patches/patch-target_make index 5e2a4370162..0419d5cc50f 100644 --- a/x11/gnustep/make/patches/patch-target_make +++ b/x11/gnustep/make/patches/patch-target_make @@ -1,11 +1,11 @@ -$OpenBSD: patch-target_make,v 1.5 2010/10/01 09:18:42 sebastia Exp $ +$OpenBSD: patch-target_make,v 1.6 2011/04/18 11:30:47 sebastia Exp $ We do not want to use the -Wl,-soname, cruft to encode soname into the library. ---- target.make.orig Sat Mar 6 22:13:58 2010 -+++ target.make Wed Sep 29 16:33:06 2010 -@@ -736,7 +736,7 @@ endif +--- target.make.orig Tue Apr 12 18:51:34 2011 ++++ target.make Thu Apr 14 16:59:50 2011 +@@ -748,7 +748,7 @@ endif ifeq ($(findstring openbsd, $(GNUSTEP_TARGET_OS)), openbsd) HAVE_SHARED_LIBS = yes SHARED_LIB_LINK_CMD = \ @@ -14,7 +14,7 @@ library. $(ALL_LDFLAGS) -o $(LIB_LINK_OBJ_DIR)/$(LIB_LINK_VERSION_FILE) $^ \ $(INTERNAL_LIBRARIES_DEPEND_UPON) \ $(SHARED_LD_POSTFLAGS) \ -@@ -744,18 +744,17 @@ SHARED_LIB_LINK_CMD = \ +@@ -756,18 +756,17 @@ SHARED_LIB_LINK_CMD = \ $(RM_LN_S) $(LIB_LINK_FILE); \ if [ "$(LIB_LINK_SONAME_FILE)" != "$(LIB_LINK_VERSION_FILE)" ]; then\ $(RM_LN_S) $(LIB_LINK_SONAME_FILE);\ @@ -36,4 +36,4 @@ library. + chown $(CHOWN_TO) $(LIB_LINK_SONAME_FILE)) OBJ_MERGE_CMD = \ - $(LD) -nostdlib -r $(ALL_LDFLAGS) -o $(GNUSTEP_OBJ_DIR)/$(SUBPROJECT_PRODUCT) $^ ; + $(LD) -nostdlib $(OBJ_MERGE_CMD_FLAG) $(ALL_LDFLAGS) -o $(GNUSTEP_OBJ_DIR)/$(SUBPROJECT_PRODUCT) $^ ; diff --git a/x11/gnustep/make/pkg/PLIST b/x11/gnustep/make/pkg/PLIST index 3b37bf8db0b..4154623b7f2 100644 --- a/x11/gnustep/make/pkg/PLIST +++ b/x11/gnustep/make/pkg/PLIST @@ -1,6 +1,7 @@ -@comment $OpenBSD: PLIST,v 1.6 2010/11/09 08:58:06 jasper Exp $ +@comment $OpenBSD: PLIST,v 1.7 2011/04/18 11:30:47 sebastia Exp $ bin/debugapp bin/gnustep-config +bin/gnustep-tests bin/openapp bin/opentool @man man/man1/debugapp.1 @@ -80,6 +81,21 @@ share/GNUstep/Makefiles/Master/test-application.make share/GNUstep/Makefiles/Master/test-library.make share/GNUstep/Makefiles/Master/test-tool.make share/GNUstep/Makefiles/Master/tool.make +share/GNUstep/Makefiles/TestFramework/ +share/GNUstep/Makefiles/TestFramework/GNUmakefile.in +share/GNUstep/Makefiles/TestFramework/ObjectTesting.h +share/GNUstep/Makefiles/TestFramework/README +share/GNUstep/Makefiles/TestFramework/Summary.sh +share/GNUstep/Makefiles/TestFramework/Testing.h +share/GNUstep/Makefiles/TestFramework/example1.m +share/GNUstep/Makefiles/TestFramework/example2.m +share/GNUstep/Makefiles/TestFramework/example3.m +share/GNUstep/Makefiles/TestFramework/example4.m +share/GNUstep/Makefiles/TestFramework/example5.m +share/GNUstep/Makefiles/TestFramework/example6.m +share/GNUstep/Makefiles/TestFramework/example7.m +share/GNUstep/Makefiles/TestFramework/example8.m +share/GNUstep/Makefiles/TestFramework/example9.m share/GNUstep/Makefiles/aggregate.make share/GNUstep/Makefiles/app-wrapper.template share/GNUstep/Makefiles/application.make