[pkgsrc/trunk]: pkgsrc/devel/gnustep-base (devel/gnustep-base) revert some re...

[mef <mef%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/ae5206fdeca1
branches:  trunk
changeset: 441808:ae5206fdeca1
user:      mef <mef%pkgsrc.org@localhost>
date:      Wed Nov 11 11:03:11 2020 +0000

description:
(devel/gnustep-base) revert some recent changes by pkglint -F

diffstat:

 devel/gnustep-base/Makefile         |   4 ++--
 devel/gnustep-base/distinfo         |   8 ++++----
 devel/gnustep-base/patches/patch-aa |  12 +++++++-----
 devel/gnustep-base/patches/patch-ab |  14 +++++++++-----
 devel/gnustep-base/patches/patch-ad |  10 ++++++----
 5 files changed, 28 insertions(+), 20 deletions(-)

diffs (107 lines):

diff -r 381d0ff81249 -r ae5206fdeca1 devel/gnustep-base/Makefile
--- a/devel/gnustep-base/Makefile       Wed Nov 11 10:45:52 2020 +0000
+++ b/devel/gnustep-base/Makefile       Wed Nov 11 11:03:11 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.91 2020/11/11 10:45:52 mef Exp $
+# $NetBSD: Makefile,v 1.92 2020/11/11 11:03:11 mef Exp $
 
 DISTNAME=      gnustep-base-1.27.0
 #PKGREVISION=  1
@@ -42,7 +42,7 @@
 SUBST_CLASSES+=                pthread
 SUBST_STAGE.pthread=   pre-configure
 SUBST_FILES.pthread=   configure
-SUBST_VARS.pthread=    PTHREAD_LIBS
+SUBST_SED.pthread=     -e 's,@PTHREAD_LIBS@,${PTHREAD_LIBS},'
 SUBST_MESSAGE.pthread= Fix @PTHREAD_LIBS@ left out in file configure
 
 CONFIGURE_ARGS+=       --with-library-flags=${GNUSTEP_LDFLAGS:Q}
diff -r 381d0ff81249 -r ae5206fdeca1 devel/gnustep-base/distinfo
--- a/devel/gnustep-base/distinfo       Wed Nov 11 10:45:52 2020 +0000
+++ b/devel/gnustep-base/distinfo       Wed Nov 11 11:03:11 2020 +0000
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.34 2020/11/11 10:45:52 mef Exp $
+$NetBSD: distinfo,v 1.35 2020/11/11 11:03:11 mef Exp $
 
 SHA1 (gnustep-base-1.27.0.tar.gz) = fea6c63ac901bd60a2d7a42ff8e4b54d385e220f
 RMD160 (gnustep-base-1.27.0.tar.gz) = a21e4ea86bdb4eb2094012654e22e24a1b4a53e6
 SHA512 (gnustep-base-1.27.0.tar.gz) = bbdf45379dbb684f6bdb507b645e0f611cefb05caadff1bf620c2e85f104396cf91782bcce05ff2173078603b76b8a0ba2ea3b71bc56a84c220310910dbcb705
 Size (gnustep-base-1.27.0.tar.gz) = 4141163 bytes
 SHA1 (patch-Source_common.h) = ed8a68a023b01b1562793678b7ddbd641e3a40d8
-SHA1 (patch-aa) = aa69fb26675201a44952fb3430a542cb5d69e952
-SHA1 (patch-ab) = 7ec07e7cca784fa4f9275d99adcd4a66a56bbff6
+SHA1 (patch-aa) = 5b2b61058fcc8f4c8073598d61cccb3c23429a7c
+SHA1 (patch-ab) = 1eb9746ae2cb8ba9c02d6131c4d797b210318851
 SHA1 (patch-ac) = 4e8e209ad202385948d0f4b0d29e5e61e01da410
-SHA1 (patch-ad) = 1e1952027e1a9dae9d54e2446dc3f0c53baa8c20
+SHA1 (patch-ad) = 16442b907021c0e490ed6f2072887d7849b5df40
diff -r 381d0ff81249 -r ae5206fdeca1 devel/gnustep-base/patches/patch-aa
--- a/devel/gnustep-base/patches/patch-aa       Wed Nov 11 10:45:52 2020 +0000
+++ b/devel/gnustep-base/patches/patch-aa       Wed Nov 11 11:03:11 2020 +0000
@@ -1,12 +1,14 @@
-$NetBSD: patch-aa,v 1.18 2020/11/11 10:45:52 mef Exp $
+$NetBSD: patch-aa,v 1.19 2020/11/11 11:03:12 mef Exp $
 
---- configure.orig     2020-04-05 18:00:40.000000000 +0000
-+++ configure
-@@ -6030,6 +6030,7 @@ if test "$LIBOBJC" = ""; then
+--- configure.orig     2020-04-05 20:00:40.000000000 +0200
++++ configure  2020-04-14 14:56:23.350836708 +0200
+@@ -6029,8 +6029,9 @@
+ if test "$LIBOBJC" = ""; then
    as_fn_error $? "The command 'gnustep-config --objc-libs' (provided by the gnustep-make package) returned no Objective-C library.  Unable to continue configuring without Objective-C support." 
"$LINENO" 5
    exit 1
  fi
-+LIBOBJC="$LIBOBJC -lpthread"
++LIBOBJC="$LIBOBJC @PTHREAD_LIBS@"
  
  #--------------------------------------------------------------------
  # Miscellaneous flags
+ #--------------------------------------------------------------------
diff -r 381d0ff81249 -r ae5206fdeca1 devel/gnustep-base/patches/patch-ab
--- a/devel/gnustep-base/patches/patch-ab       Wed Nov 11 10:45:52 2020 +0000
+++ b/devel/gnustep-base/patches/patch-ab       Wed Nov 11 11:03:11 2020 +0000
@@ -1,12 +1,16 @@
-$NetBSD: patch-ab,v 1.10 2020/11/11 10:45:52 mef Exp $
+$NetBSD: patch-ab,v 1.11 2020/11/11 11:03:12 mef Exp $
 
---- base.make.in.orig  2020-04-05 18:00:40.000000000 +0000
-+++ base.make.in
-@@ -42,6 +42,7 @@ ifeq ($(BASE_MAKE_LOADED),)
+--- base.make.in.orig  2020-04-05 20:00:40.000000000 +0200
++++ base.make.in       2020-04-14 15:07:00.418458617 +0200
+@@ -40,9 +40,10 @@
+     GNUSTEP_BASE_MINOR_VERSION = @MINOR_VERSION@
+     GNUSTEP_BASE_SUBMINOR_VERSION = @SUBMINOR_VERSION@
  
      FND_LDFLAGS =
-     FND_LIBS = -lgnustep-base
+-    FND_LIBS = -lgnustep-base
++    FND_LIBS = -lgnustep-base
 +    OBJC_LIBS = -lpthread
      FND_DEFINE = -DGNUSTEP_BASE_LIBRARY=1
      GNUSTEP_DEFINE = -DGNUSTEP
    else
+     #
diff -r 381d0ff81249 -r ae5206fdeca1 devel/gnustep-base/patches/patch-ad
--- a/devel/gnustep-base/patches/patch-ad       Wed Nov 11 10:45:52 2020 +0000
+++ b/devel/gnustep-base/patches/patch-ad       Wed Nov 11 11:03:11 2020 +0000
@@ -1,8 +1,9 @@
-$NetBSD: patch-ad,v 1.9 2020/11/11 10:45:52 mef Exp $
+$NetBSD: patch-ad,v 1.10 2020/11/11 11:03:12 mef Exp $
 
---- Source/GNUmakefile.orig    2020-04-05 18:00:40.000000000 +0000
-+++ Source/GNUmakefile
-@@ -103,7 +103,7 @@ GNU_MFILES = \
+--- Source/GNUmakefile.orig    2020-04-05 20:00:40.000000000 +0200
++++ Source/GNUmakefile 2020-04-14 15:07:59.290740281 +0200
+@@ -102,9 +102,9 @@
+ GNU_MFILES = \
  GSLocale.m \
  preface.m
  
@@ -11,3 +12,4 @@
    OBJC_LIBS += -pthread
  endif
  
+ ifeq ($(GNUSTEP_TARGET_OS), mingw32)