summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--devel/gnustep-make/Makefile13
-rw-r--r--devel/gnustep-make/PLIST8
-rw-r--r--devel/gnustep-make/distinfo17
-rw-r--r--devel/gnustep-make/gnustep.mk5
-rw-r--r--devel/gnustep-make/patches/patch-Instance_framework.make36
-rw-r--r--devel/gnustep-make/patches/patch-ab12
-rw-r--r--devel/gnustep-make/patches/patch-ad17
-rw-r--r--devel/gnustep-make/patches/patch-ae10
-rw-r--r--doc/CHANGES-20203
9 files changed, 47 insertions, 74 deletions
diff --git a/devel/gnustep-make/Makefile b/devel/gnustep-make/Makefile
index 58135ed0599..7d7ea6cffc5 100644
--- a/devel/gnustep-make/Makefile
+++ b/devel/gnustep-make/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.59 2019/11/03 10:39:13 rillig Exp $
+# $NetBSD: Makefile,v 1.60 2020/04/16 09:21:51 manu Exp $
-DISTNAME= gnustep-make-2.6.2
-PKGREVISION= 2
+DISTNAME= gnustep-make-2.8.0
+#PKGREVISION= 1
CATEGORIES= devel gnustep
MASTER_SITES= ${MASTER_SITE_GNUSTEP:=core/}
@@ -21,9 +21,11 @@ CONFIGURE_ARGS+= --with-config-file=${PKG_SYSCONFDIR}/GNUstep.conf
CONFIGURE_ARGS+= --with-objc-lib-flag="-L${PREFIX}/lib -Wl,-R${PREFIX}/lib -lobjc"
MAKE_FILE= GNUmakefile
-CONF_FILES+= ${PREFIX}/share/examples/GNUstep/GNUstep.conf \
+CONF_FILES+= ${PREFIX}/share/examples/GNUstep/GNUstep-strict-v2.conf\
${PKG_SYSCONFDIR}/GNUstep.conf
+REPLACE_BASH+= bake_debian_files.sh
+
.include "gnustep.mk"
.include "../../mk/pthread.buildlink3.mk"
@@ -32,9 +34,6 @@ PTHREAD_LIBS+= -lpth
.endif
CONFIGURE_ARGS+= --with-thread-lib=${PTHREAD_LIBS:Q}
-.if empty(PKG_OPTIONS:Mfragile)
-CONFIGURE_ARGS+= --enable-objc-nonfragile-abi
-.endif
.if ${MACHINE_ARCH} == "i386"
GNUSTEP_ARCH= ix86
diff --git a/devel/gnustep-make/PLIST b/devel/gnustep-make/PLIST
index 924a941bcad..211a1ee58d0 100644
--- a/devel/gnustep-make/PLIST
+++ b/devel/gnustep-make/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.22 2012/10/22 02:06:19 rh Exp $
+@comment $NetBSD: PLIST,v 1.23 2020/04/16 09:21:51 manu Exp $
bin/debugapp
bin/gnustep-config
bin/gnustep-tests
@@ -6,6 +6,7 @@ bin/openapp
bin/opentool
man/man1/debugapp.1
man/man1/gnustep-config.1
+man/man1/gnustep-tests.1.gz
man/man1/openapp.1
man/man1/opentool.1
man/man7/GNUstep.7
@@ -22,6 +23,7 @@ share/GNUstep/Makefiles/Instance/Documentation/texi.make
share/GNUstep/Makefiles/Instance/Shared/bundle.make
share/GNUstep/Makefiles/Instance/Shared/headers.make
share/GNUstep/Makefiles/Instance/Shared/java.make
+share/GNUstep/Makefiles/Instance/Shared/pkgconfig.make
share/GNUstep/Makefiles/Instance/Shared/stamp-string.make
share/GNUstep/Makefiles/Instance/Shared/strings.make
share/GNUstep/Makefiles/Instance/application.make
@@ -49,6 +51,7 @@ share/GNUstep/Makefiles/Master/application.make
share/GNUstep/Makefiles/Master/bundle.make
share/GNUstep/Makefiles/Master/clibrary.make
share/GNUstep/Makefiles/Master/ctool.make
+share/GNUstep/Makefiles/Master/deb.make
share/GNUstep/Makefiles/Master/documentation.make
share/GNUstep/Makefiles/Master/framework.make
share/GNUstep/Makefiles/Master/gswapp.make
@@ -88,6 +91,7 @@ share/GNUstep/Makefiles/TestFramework/example9.m
share/GNUstep/Makefiles/aggregate.make
share/GNUstep/Makefiles/app-wrapper.template
share/GNUstep/Makefiles/application.make
+share/GNUstep/Makefiles/bake_debian_files.sh
share/GNUstep/Makefiles/bundle.make
share/GNUstep/Makefiles/clean_cpu.sh
share/GNUstep/Makefiles/clean_os.sh
@@ -143,7 +147,7 @@ share/GNUstep/Makefiles/test-library.make
share/GNUstep/Makefiles/test-tool.make
share/GNUstep/Makefiles/tool.make
share/GNUstep/Makefiles/vendor.sh
-share/examples/GNUstep/GNUstep.conf
+share/examples/GNUstep/GNUstep-strict-v2.conf
@pkgdir share/GNUstep/Makefiles/${GNUSTEP_ARCH}
@pkgdir share/GNUstep/Makefiles/Auxiliary
@pkgdir share/GNUstep/Makefiles/Additional
diff --git a/devel/gnustep-make/distinfo b/devel/gnustep-make/distinfo
index cb1820ec615..be06d7a6eec 100644
--- a/devel/gnustep-make/distinfo
+++ b/devel/gnustep-make/distinfo
@@ -1,11 +1,10 @@
-$NetBSD: distinfo,v 1.29 2015/11/03 03:27:29 agc Exp $
+$NetBSD: distinfo,v 1.30 2020/04/16 09:21:51 manu Exp $
-SHA1 (gnustep-make-2.6.2.tar.gz) = 3f85cb25f4f7fd35cdcbd8d948a2673c84c605ff
-RMD160 (gnustep-make-2.6.2.tar.gz) = 683b6a034d4bb7e17b64209c7e7e289e9e94a042
-SHA512 (gnustep-make-2.6.2.tar.gz) = 5ef7889418e7e5acc40cd045772b08d178333dd7cb396b46bfcc117b8953c868cffff5ad41153f6cf2029f1d78d7213516cf1c2cfc88f028ffb883d0e83ea6a4
-Size (gnustep-make-2.6.2.tar.gz) = 562770 bytes
-SHA1 (patch-Instance_framework.make) = ff6f0259e38f99ce2dd88f9ffc00299da9d1eb86
+SHA1 (gnustep-make-2.8.0.tar.gz) = 5ebc1f89a600ba112874319e4bd0f3699866a7bd
+RMD160 (gnustep-make-2.8.0.tar.gz) = 924687b3cb75f094a7cb5be9e4e1d6abd74c6c4c
+SHA512 (gnustep-make-2.8.0.tar.gz) = e9e57ed7a1c360c2dbf17f70d38e5107a1a9613842dcc645f10ed7a01eb9f9ee71bd2d0cacbe00439ce73f194a3eb3ed2e71409241ac96ee3bba704dcf6dfd7b
+Size (gnustep-make-2.8.0.tar.gz) = 606337 bytes
SHA1 (patch-aa) = 2b727a92404aeead88c9699fee144bfb0114370b
-SHA1 (patch-ab) = ac45dbe789292feb263cbde11fc8bdaf2e0cb71d
-SHA1 (patch-ad) = 8e4d864a05ea824ff5243c87ef9d6f43892ca661
-SHA1 (patch-ae) = f91fb89ab2c11b73592bae7fe62476e7a353d8d8
+SHA1 (patch-ab) = 5bd17b33f9b8381f77371228057cf6109f76d5b0
+SHA1 (patch-ad) = ee7dfbf7d6a7c35b1141b598b54dde3a2bd237de
+SHA1 (patch-ae) = efd4d53184cb1e34ae129e52235de86f77e8a06a
diff --git a/devel/gnustep-make/gnustep.mk b/devel/gnustep-make/gnustep.mk
index 2a9aa812269..b12b0434156 100644
--- a/devel/gnustep-make/gnustep.mk
+++ b/devel/gnustep-make/gnustep.mk
@@ -1,4 +1,4 @@
-# $NetBSD: gnustep.mk,v 1.28 2019/11/03 10:39:13 rillig Exp $
+# $NetBSD: gnustep.mk,v 1.29 2020/04/16 09:21:51 manu Exp $
.if !defined(GNUSTEP_MK)
GNUSTEP_MK= #defined
@@ -139,9 +139,7 @@ MAKE_ENV+= GNUSTEP_HOST_CPU=${GNUSTEP_HOST_CPU:Q}
MAKE_ENV+= GNUSTEP_HOST_VENDOR=${GNUSTEP_HOST_VENDOR:Q}
MAKE_ENV+= GNUSTEP_HOST_OS=${GNUSTEP_HOST_OS:Q}
MAKE_ENV+= GNUSTEP_PATHLIST=${GNUSTEP_PATHLIST:Q}
-MAKE_ENV+= GNUSTEP_FLATTENED=${GNUSTEP_FLATTENED:Q}
MAKE_ENV+= GNUSTEP_IS_FLATTENED=${GNUSTEP_IS_FLATTENED:Q}
-MAKE_ENV+= GNUSTEP_USER_ROOT=${GNUSTEP_USER_ROOT:Q}
MAKE_ENV+= GNUSTEP_CONFIG_FILE=${GNUSTEP_CONFIG_FILE:Q}
. if defined(GNUSTEP_OBSOLETE_ENV)
@@ -162,7 +160,6 @@ CONFIGURE_ENV+= GNUSTEP_HOST_OS=${GNUSTEP_HOST_OS:Q}
CONFIGURE_ENV+= GNUSTEP_PATHLIST=${GNUSTEP_PATHLIST:Q}
CONFIGURE_ENV+= GNUSTEP_FLATTENED=${GNUSTEP_FLATTENED:Q}
CONFIGURE_ENV+= GNUSTEP_IS_FLATTENED=${GNUSTEP_IS_FLATTENED:Q}
-CONFIGURE_ENV+= GNUSTEP_USER_ROOT=${GNUSTEP_USER_ROOT:Q}
CONFIGURE_ENV+= GNUSTEP_CONFIG_FILE=${GNUSTEP_CONFIG_FILE:Q}
. if defined(GNUSTEP_OBSOLETE_ENV)
diff --git a/devel/gnustep-make/patches/patch-Instance_framework.make b/devel/gnustep-make/patches/patch-Instance_framework.make
deleted file mode 100644
index 927df7fcf80..00000000000
--- a/devel/gnustep-make/patches/patch-Instance_framework.make
+++ /dev/null
@@ -1,36 +0,0 @@
-$NetBSD: patch-Instance_framework.make,v 1.2 2015/04/19 04:13:26 manu Exp $
-
-Hunk #1: Don't create interfaces don't derive from NSObject
-
-Hunk #2 and #3: Apply fix from upstream, required to build SOGo
-http://svn.gna.org/viewcvs/gnustep?view=revision&revision=36185
-
---- Instance/framework.make.orig 2013-03-23 21:46:20.000000000 +0000
-+++ Instance/framework.make
-@@ -484,7 +484,7 @@ $(DUMMY_FRAMEWORK_FILE): $(DERIVED_SOURC
- fi; \
- echo "$$classarray" > $(DUMMY_FRAMEWORK_CLASS_LIST); \
- echo "#include <Foundation/NSString.h>" > $@; \
-- echo "@interface $(DUMMY_FRAMEWORK)" >> $@; \
-+ echo "@interface $(DUMMY_FRAMEWORK) : NSObject" >> $@; \
- echo "+ (NSString *)frameworkEnv;" >> $@; \
- echo "+ (NSString *)frameworkPath;" >> $@; \
- echo "+ (NSString *)frameworkVersion;" >> $@; \
-@@ -536,7 +536,7 @@
- $(GNUSTEP_BUILD_DIR)/$(GNUSTEP_INSTANCE).framework/$(GNUSTEP_TARGET_LDIR):
- $(ECHO_CREATING)$(MKDIRS) $@$(END_ECHO)
-
--$(GNUSTEP_BUILD_DIR)/$(GNUSTEP_INSTANCE).framework/$(GNUSTEP_TARGET_LDIR)/$(GNUSTEP_INSTANCE): $(GNUSTEP_BUILD_DIR)/$(GNUSTEP_INSTANCE).framework/$(GNUSTEP_TARGET_LDIR)/
-+$(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; \
- $(RM_LN_S) $(GNUSTEP_INSTANCE); \
-@@ -562,7 +562,7 @@
- $(GNUSTEP_BUILD_DIR)/$(GNUSTEP_INSTANCE).framework/$(GNUSTEP_TARGET_LDIR):
- $(ECHO_CREATING)$(MKDIRS) $@$(END_ECHO)
-
--$(GNUSTEP_BUILD_DIR)/$(GNUSTEP_INSTANCE).framework/$(GNUSTEP_TARGET_LDIR)/$(GNUSTEP_INSTANCE): $(GNUSTEP_BUILD_DIR)/$(GNUSTEP_INSTANCE).framework/$(GNUSTEP_TARGET_LDIR)/
-+$(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); \
diff --git a/devel/gnustep-make/patches/patch-ab b/devel/gnustep-make/patches/patch-ab
index a1f949d7bb8..453fc28126d 100644
--- a/devel/gnustep-make/patches/patch-ab
+++ b/devel/gnustep-make/patches/patch-ab
@@ -1,8 +1,9 @@
-$NetBSD: patch-ab,v 1.6 2009/04/18 03:10:33 rh Exp $
+$NetBSD: patch-ab,v 1.7 2020/04/16 09:21:51 manu Exp $
---- config.make.in.orig 2008-05-22 23:16:43.000000000 +1000
-+++ config.make.in
-@@ -116,9 +116,9 @@ LEX = lex
+--- config.make.in.orig 2020-04-05 16:59:54.000000000 +0200
++++ config.make.in 2020-04-14 10:33:05.421958633 +0200
+@@ -153,11 +153,11 @@
+ LEX = lex
CHOWN = chown
STRIP = strip
@@ -13,5 +14,6 @@ $NetBSD: patch-ab,v 1.6 2009/04/18 03:10:33 rh Exp $
+INSTALL_PROGRAM ?= @INSTALL_PROGRAM@
+INSTALL_DATA ?= @INSTALL_DATA@
TAR = @TAR@
+ MAKE = @GNUMAKE@
MKDIRS = $(GNUSTEP_MAKEFILES)/mkinstalldirs
-
+ NM = @NM@
diff --git a/devel/gnustep-make/patches/patch-ad b/devel/gnustep-make/patches/patch-ad
index 837b91ba001..10462ccaabe 100644
--- a/devel/gnustep-make/patches/patch-ad
+++ b/devel/gnustep-make/patches/patch-ad
@@ -1,8 +1,9 @@
-$NetBSD: patch-ad,v 1.11 2012/10/22 02:06:19 rh Exp $
+$NetBSD: patch-ad,v 1.12 2020/04/16 09:21:51 manu Exp $
---- configure.orig 2011-05-03 15:28:07.000000000 +0000
-+++ configure
-@@ -2918,13 +2918,13 @@ $as_echo "$ac_cv_prog_cc_g" >&6; }
+--- configure.orig 2020-04-05 16:59:54.000000000 +0200
++++ configure 2020-04-14 10:31:20.723580801 +0200
+@@ -3442,15 +3442,15 @@
+ $as_echo "$ac_cv_prog_cc_g" >&6; }
if test "$ac_test_CFLAGS" = set; then
CFLAGS=$ac_save_CFLAGS
elif test $ac_cv_prog_cc_g = yes; then
@@ -18,7 +19,9 @@ $NetBSD: patch-ad,v 1.11 2012/10/22 02:06:19 rh Exp $
CFLAGS="-O2"
else
CFLAGS=
-@@ -5484,7 +5484,7 @@ fi
+ fi
+@@ -7462,18 +7462,18 @@
+ fi
fi
if test x"$objc_threaded" = x""; then
@@ -27,7 +30,8 @@ $NetBSD: patch-ad,v 1.11 2012/10/22 02:06:19 rh Exp $
if test "$cross_compiling" = yes; then :
objc_threaded=""
else
-@@ -5493,7 +5493,7 @@ else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
#include "config_thread.m"
_ACEOF
if ac_fn_c_try_run "$LINENO"; then :
@@ -36,3 +40,4 @@ $NetBSD: patch-ad,v 1.11 2012/10/22 02:06:19 rh Exp $
else
objc_threaded=""
fi
+ rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
diff --git a/devel/gnustep-make/patches/patch-ae b/devel/gnustep-make/patches/patch-ae
index 5603f244e22..58275aa7b24 100644
--- a/devel/gnustep-make/patches/patch-ae
+++ b/devel/gnustep-make/patches/patch-ae
@@ -1,8 +1,9 @@
-$NetBSD: patch-ae,v 1.9 2012/10/22 02:06:19 rh Exp $
+$NetBSD: patch-ae,v 1.10 2020/04/16 09:21:51 manu Exp $
---- GNUmakefile.in.orig 2011-03-16 10:25:42.000000000 +0000
-+++ GNUmakefile.in
-@@ -180,9 +180,9 @@ install: generated-files
+--- GNUmakefile.in.orig 2020-04-05 16:59:54.000000000 +0200
++++ GNUmakefile.in 2020-04-14 10:31:20.761270469 +0200
+@@ -200,11 +200,11 @@
+ "$(makedir)/Instance" \
"$(makedir)/Instance/Shared" \
"$(makedir)/Instance/Documentation" \
"$(testdir)")
@@ -15,3 +16,4 @@ $NetBSD: patch-ae,v 1.9 2012/10/22 02:06:19 rh Exp $
$(EC)(echo "Installing gnustep-make support software")
$(EC)(for f in config.guess config.sub install-sh mkinstalldirs \
clean_cpu.sh clean_os.sh \
+ clean_vendor.sh cpu.sh os.sh vendor.sh \
diff --git a/doc/CHANGES-2020 b/doc/CHANGES-2020
index 6f95fe915ce..25905a88ed7 100644
--- a/doc/CHANGES-2020
+++ b/doc/CHANGES-2020
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES-2020,v 1.2309 2020/04/16 09:03:46 manu Exp $
+$NetBSD: CHANGES-2020,v 1.2310 2020/04/16 09:21:51 manu Exp $
Changes to the packages collection and infrastructure in 2020:
@@ -3165,3 +3165,4 @@ Changes to the packages collection and infrastructure in 2020:
Updated www/py-daphne to 2.5.0 [adam 2020-04-16]
Updated databases/mariadb55-client to 5.5.67 [manu 2020-04-16]
Updated databases/mariadb55-server to 5.5.67 [manu 2020-04-16]
+ Updated devel/gnustep-make to 2.8.0 [manu 2020-04-16]
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-04 03:49:59 +0000