CVS commit: pkgsrc

["Emmanuel Dreyfus" <manu%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   manu
Date:           Thu Feb 20 14:34:53 UTC 2025

Modified Files:
        pkgsrc/devel/gnustep-make: Makefile buildlink3.mk distinfo
        pkgsrc/devel/gnustep-make/patches: patch-ad patch-target.make
        pkgsrc/doc: CHANGES-2025

Log Message:
Update www/gnustep-make to 2.9.3

Change in version 2.9.3
 * Added support for ASAN/LSAN builds
 * Various minor bugfixes.

Changes in version 2.9.2
 * Update for newer versions of Java
 * Various minor bugfixes.

Changes in version 2.9.0
 * Better check for objc runtime on Windows.

 * Split linker flags to better support partial linking: 'ALL_LDFLAGS'
   is now a combination of 'FINAL_LDFLAGS' and 'ALL_LDFLAGS'.

 * Better support for newer gcc versions.

 * Add support for storyboard files.

 * Increase autoconf version to 2.65 and make autoconf handle
   Objective-C++ and OBJCXX variables directly.

 * Fix bug that prevented ARC from getting used.

 * Link subproject object files directly instead of first merging them
   into 'subproject.o'.

 * Support building on Windows with Clang MSVC target.

 * Improve mingw64 support: for instance, adopt the triplet used by
   the mingw-w64 project rather than using the one returned by
   autoconf.  Fixes building Gorm.


To generate a diff of this commit:
cvs rdiff -u -r1.64 -r1.65 pkgsrc/devel/gnustep-make/Makefile
cvs rdiff -u -r1.20 -r1.21 pkgsrc/devel/gnustep-make/buildlink3.mk
cvs rdiff -u -r1.33 -r1.34 pkgsrc/devel/gnustep-make/distinfo
cvs rdiff -u -r1.12 -r1.13 pkgsrc/devel/gnustep-make/patches/patch-ad
cvs rdiff -u -r1.1 -r1.2 pkgsrc/devel/gnustep-make/patches/patch-target.make
cvs rdiff -u -r1.1514 -r1.1515 pkgsrc/doc/CHANGES-2025

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/gnustep-make/Makefile
diff -u pkgsrc/devel/gnustep-make/Makefile:1.64 pkgsrc/devel/gnustep-make/Makefile:1.65
--- pkgsrc/devel/gnustep-make/Makefile:1.64     Thu Oct 21 17:45:40 2021
+++ pkgsrc/devel/gnustep-make/Makefile  Thu Feb 20 14:34:52 2025
@@ -1,9 +1,12 @@
-# $NetBSD: Makefile,v 1.64 2021/10/21 17:45:40 jperkin Exp $
+# $NetBSD: Makefile,v 1.65 2025/02/20 14:34:52 manu Exp $
 
-DISTNAME=      gnustep-make-2.8.0
-PKGREVISION=   1
+DISTNAME=      gnustep-make-2.9.3
+MASTER_SITES=  ${MASTER_SITE_GITHUB:=gnustep/}
+GITHUB_PROJECT=        tools-make
+GITHUB_TAG=    make-2_9_3
+WRKSRC=                ${WRKDIR}/tools-make-make-2_9_3
+#PKGREVISION=  1
 CATEGORIES=    devel gnustep
-MASTER_SITES=  ${MASTER_SITE_GNUSTEP:=core/}
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      http://www.gnustep.org/

Index: pkgsrc/devel/gnustep-make/buildlink3.mk
diff -u pkgsrc/devel/gnustep-make/buildlink3.mk:1.20 pkgsrc/devel/gnustep-make/buildlink3.mk:1.21
--- pkgsrc/devel/gnustep-make/buildlink3.mk:1.20        Mon Oct 22 02:06:19 2012
+++ pkgsrc/devel/gnustep-make/buildlink3.mk     Thu Feb 20 14:34:52 2025
@@ -1,12 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.20 2012/10/22 02:06:19 rh Exp $
+# $NetBSD: buildlink3.mk,v 1.21 2025/02/20 14:34:52 manu Exp $
 
 BUILDLINK_TREE+=       gnustep-make
 
 .if !defined(GNUSTEP_MAKE_BUILDLINK3_MK)
 GNUSTEP_MAKE_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.gnustep-make+=   gnustep-make>=2.6.2
-BUILDLINK_ABI_DEPENDS.gnustep-make+=   gnustep-make>=2.6.2
+BUILDLINK_API_DEPENDS.gnustep-make+=   gnustep-make>=2.9.3
+BUILDLINK_ABI_DEPENDS.gnustep-make+=   gnustep-make>=2.9.3
 BUILDLINK_PKGSRCDIR.gnustep-make?=     ../../devel/gnustep-make
 
 .include "../../devel/gnustep-make/gnustep.mk"

Index: pkgsrc/devel/gnustep-make/distinfo
diff -u pkgsrc/devel/gnustep-make/distinfo:1.33 pkgsrc/devel/gnustep-make/distinfo:1.34
--- pkgsrc/devel/gnustep-make/distinfo:1.33     Tue Oct 26 10:14:44 2021
+++ pkgsrc/devel/gnustep-make/distinfo  Thu Feb 20 14:34:52 2025
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.33 2021/10/26 10:14:44 nia Exp $
+$NetBSD: distinfo,v 1.34 2025/02/20 14:34:52 manu Exp $
 
-BLAKE2s (gnustep-make-2.8.0.tar.gz) = 8fbf838318e8b44eace501835c320ce7aa8d9867c72b9436f07c0c178d039d1b
-SHA512 (gnustep-make-2.8.0.tar.gz) = e9e57ed7a1c360c2dbf17f70d38e5107a1a9613842dcc645f10ed7a01eb9f9ee71bd2d0cacbe00439ce73f194a3eb3ed2e71409241ac96ee3bba704dcf6dfd7b
-Size (gnustep-make-2.8.0.tar.gz) = 606337 bytes
+BLAKE2s (gnustep-make-2.9.3.tar.gz) = 8eb54c6b2f8e8dadba8987127a303694d4799bc8f2fc6ab91101d0ea6db00944
+SHA512 (gnustep-make-2.9.3.tar.gz) = e3230d3bf5ca6cb0cb721ebc9f2a0b554315e14d7e71a6e4d4f54d23d8e4c09cc229609e5b87f911f59873721ba46bd7f3cc22d19a4b5a2fd1456c2f7e3ec50d
+Size (gnustep-make-2.9.3.tar.gz) = 613298 bytes
 SHA1 (patch-aa) = 2b727a92404aeead88c9699fee144bfb0114370b
 SHA1 (patch-ab) = 5bd17b33f9b8381f77371228057cf6109f76d5b0
-SHA1 (patch-ad) = ee7dfbf7d6a7c35b1141b598b54dde3a2bd237de
+SHA1 (patch-ad) = 2eb3d84da290ad924228c16dc141bc84821e9efc
 SHA1 (patch-ae) = efd4d53184cb1e34ae129e52235de86f77e8a06a
-SHA1 (patch-target.make) = 5a46d7f391d6107a3cd61ad3db5e0bd2c1e1dfaf
+SHA1 (patch-target.make) = 4ec3141ee92d417891ad7aa0edf32476031b4bab

Index: pkgsrc/devel/gnustep-make/patches/patch-ad
diff -u pkgsrc/devel/gnustep-make/patches/patch-ad:1.12 pkgsrc/devel/gnustep-make/patches/patch-ad:1.13
--- pkgsrc/devel/gnustep-make/patches/patch-ad:1.12     Thu Apr 16 09:21:51 2020
+++ pkgsrc/devel/gnustep-make/patches/patch-ad  Thu Feb 20 14:34:52 2025
@@ -1,10 +1,10 @@
-$NetBSD: patch-ad,v 1.12 2020/04/16 09:21:51 manu Exp $
+$NetBSD: patch-ad,v 1.13 2025/02/20 14:34:52 manu Exp $
 
---- 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
+--- configure.orig     2025-02-10 16:22:04.000000000 +0100
++++ configure  2025-02-18 15:57:17.613190582 +0100
+@@ -4310,15 +4310,15 @@
+ printf "%s\n" "$ac_cv_prog_cc_g" >&6; }
+ if test $ac_test_CFLAGS; then
    CFLAGS=$ac_save_CFLAGS
  elif test $ac_cv_prog_cc_g = yes; then
 -  if test "$GCC" = yes; then
@@ -20,24 +20,25 @@ $NetBSD: patch-ad,v 1.12 2020/04/16 09:2
    else
      CFLAGS=
    fi
-@@ -7462,18 +7462,18 @@
+@@ -9057,9 +9057,9 @@
  fi
  
    fi
    if test x"$objc_threaded" = x""; then
 -    LIBS="$OBJCRT $saved_LIBS -lthread "
 +    LIBS="$OBJCRT $saved_LIBS ${OBJC_THREAD} "
-     if test "$cross_compiling" = yes; then :
+     if test "$cross_compiling" = yes
+ then :
    objc_threaded=""
- else
-   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
+ else $as_nop
+@@ -9068,9 +9068,9 @@
  #include "config_thread.m"
  _ACEOF
- if ac_fn_c_try_run "$LINENO"; then :
+ if ac_fn_c_try_run "$LINENO"
+ then :
 -  objc_threaded="-lthread"
 +  objc_threaded="${OBJC_THREAD}"
- else
+ else $as_nop
    objc_threaded=""
  fi
  rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \

Index: pkgsrc/devel/gnustep-make/patches/patch-target.make
diff -u pkgsrc/devel/gnustep-make/patches/patch-target.make:1.1 pkgsrc/devel/gnustep-make/patches/patch-target.make:1.2
--- pkgsrc/devel/gnustep-make/patches/patch-target.make:1.1     Tue Nov  3 11:24:31 2020
+++ pkgsrc/devel/gnustep-make/patches/patch-target.make Thu Feb 20 14:34:52 2025
@@ -1,11 +1,12 @@
-$NetBSD: patch-target.make,v 1.1 2020/11/03 11:24:31 triaxx Exp $
+$NetBSD: patch-target.make,v 1.2 2025/02/20 14:34:52 manu Exp $
 
 Prefer SUBST_VARS instead of SUBST_SED since mk/scripts/subst-identity.awk
 seems to be broken on FreeBSD.
 
---- target.make.orig   2020-04-05 14:59:54.000000000 +0000
-+++ target.make
-@@ -591,7 +591,7 @@ endif
+--- target.make.orig   2025-02-10 16:22:04.000000000 +0100
++++ target.make        2025-02-18 15:59:18.064294492 +0100
+@@ -626,9 +626,9 @@
+ # NetBSD (ELF)
  #
  ifeq ($(findstring netbsd, $(GNUSTEP_TARGET_OS)), netbsd)
  HAVE_SHARED_LIBS    = yes
@@ -14,7 +15,9 @@ seems to be broken on FreeBSD.
  SHARED_LIB_LINK_CMD = \
        $(LD) -shared -Wl,-soname,$(LIB_LINK_VERSION_FILE) \
                $(ALL_LDFLAGS) -o $(LIB_LINK_OBJ_DIR)/$(LIB_LINK_VERSION_FILE) \
-@@ -624,7 +624,7 @@ endif
+                  $^ $(INTERNAL_LIBRARIES_DEPEND_UPON) \
+@@ -659,9 +659,9 @@
+ # DragonFly
  #
  ifeq ($(findstring dragonfly, $(GNUSTEP_TARGET_OS)), dragonfly)
  HAVE_SHARED_LIBS    = yes
@@ -23,14 +26,18 @@ seems to be broken on FreeBSD.
  SHARED_LIB_LINK_CMD = \
        $(LD) -shared -Wl,-soname,$(LIB_LINK_VERSION_FILE) \
                $(ALL_LDFLAGS) -o $(LIB_LINK_OBJ_DIR)/$(LIB_LINK_VERSION_FILE) \
-@@ -642,8 +642,8 @@ SHARED_LIBEXT      = .so
+                  $^ $(INTERNAL_LIBRARIES_DEPEND_UPON) \
+@@ -677,11 +677,11 @@
+ 
  HAVE_BUNDLES  = yes
  BUNDLE_LD     = $(LD)
  BUNDLE_LDFLAGS        += -shared
--ADDITIONAL_LDFLAGS += -rdynamic -Wl,-R/usr/pkg/lib -L/usr/pkg/lib -Wl,-R/usr/X11R6/lib -L/usr/X11R6/lib
+-ADDITIONAL_LDFLAGS += -Wl,-R/usr/pkg/lib -L/usr/pkg/lib -Wl,-R/usr/X11R6/lib -L/usr/X11R6/lib
++ADDITIONAL_LDFLAGS += -Wl,-R@PREFIX@/lib -L@PREFIX@/lib -Wl,-R/usr/X11R6/lib -L/usr/X11R6/lib
+ FINAL_LDFLAGS   = -rdynamic
 -ADDITIONAL_INCLUDE_DIRS += -I/usr/pkg/include
-+ADDITIONAL_LDFLAGS += -rdynamic -Wl,-R@PREFIX@/lib -L@PREFIX@/lib -Wl,-R/usr/X11R6/lib -L/usr/X11R6/lib
 +ADDITIONAL_INCLUDE_DIRS += -I@PREFIX@/include
  STATIC_LDFLAGS += -static
  endif
  #
+ # end DragonFly

Index: pkgsrc/doc/CHANGES-2025
diff -u pkgsrc/doc/CHANGES-2025:1.1514 pkgsrc/doc/CHANGES-2025:1.1515
--- pkgsrc/doc/CHANGES-2025:1.1514      Thu Feb 20 14:30:14 2025
+++ pkgsrc/doc/CHANGES-2025     Thu Feb 20 14:34:52 2025
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES-2025,v 1.1514 2025/02/20 14:30:14 manu Exp $
+$NetBSD: CHANGES-2025,v 1.1515 2025/02/20 14:34:52 manu Exp $
 
 Changes to the packages collection and infrastructure in 2025:
 
@@ -2010,3 +2010,4 @@ Changes to the packages collection and i
        Updated databases/py-elasticsearch to 8.17.1 [adam 2025-02-20]
        Updated www/gnustep-objc to 2.2.1 [manu 2025-02-20]
        Updated www/gnustep-base to 1.31.0 [manu 2025-02-20]
+       Updated www/gnustep-make to 2.9.3 [manu 2025-02-20]