CVS commit: pkgsrc/devel/gnustep-make

[Frédéric Fauberteau <triaxx%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   triaxx
Date:           Tue Nov  3 11:24:31 UTC 2020

Modified Files:
        pkgsrc/devel/gnustep-make: Makefile PLIST distinfo
Added Files:
        pkgsrc/devel/gnustep-make/patches: patch-target.make

Log Message:
gnustep-make: fix build on FreeBSD

pkgsrc changes:
---------------
  * Replace SUBST_SED by SUBST_VARS in target substitution because
    mk/scripts/subst-identity.awk seems to be broken on FreeBSD and returns
    error when PREFIX == /usr/pkg.
  * Fix some typos that have been kindly reported by pkglint.


To generate a diff of this commit:
cvs rdiff -u -r1.60 -r1.61 pkgsrc/devel/gnustep-make/Makefile
cvs rdiff -u -r1.23 -r1.24 pkgsrc/devel/gnustep-make/PLIST
cvs rdiff -u -r1.30 -r1.31 pkgsrc/devel/gnustep-make/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/devel/gnustep-make/patches/patch-target.make

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.60 pkgsrc/devel/gnustep-make/Makefile:1.61
--- pkgsrc/devel/gnustep-make/Makefile:1.60     Thu Apr 16 09:21:51 2020
+++ pkgsrc/devel/gnustep-make/Makefile  Tue Nov  3 11:24:31 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.60 2020/04/16 09:21:51 manu Exp $
+# $NetBSD: Makefile,v 1.61 2020/11/03 11:24:31 triaxx Exp $
 
 DISTNAME=      gnustep-make-2.8.0
 #PKGREVISION=  1
@@ -10,7 +10,7 @@ HOMEPAGE=     http://www.gnustep.org/
 COMMENT=       GNUstep makefile package
 LICENSE=       gnu-gpl-v3
 
-USE_LANGUAGES+=                c99 objc c++ obj-c++
+USE_LANGUAGES+=                c99 objc c++ objc-c++
 USE_TOOLS+=            csh
 GNU_CONFIGURE=         yes
 CONFIGURE_ENV+=                INSTALL_PROGRAM=${INSTALL_SCRIPT:Q}
@@ -18,10 +18,10 @@ CONFIGURE_ARGS+=    --disable-importing-con
 CONFIGURE_ARGS+=       --with-layout=fhs
 CONFIGURE_ARGS+=       --enable-native-objc-exceptions
 CONFIGURE_ARGS+=       --with-config-file=${PKG_SYSCONFDIR}/GNUstep.conf
-CONFIGURE_ARGS+=       --with-objc-lib-flag="-L${PREFIX}/lib -Wl,-R${PREFIX}/lib -lobjc"
+CONFIGURE_ARGS+=       --with-objc-lib-flag="-L${PREFIX}/lib ${COMPILER_RPATH_FLAG}${PREFIX}/lib -lobjc"
 MAKE_FILE=             GNUmakefile
 
-CONF_FILES+=           ${PREFIX}/share/examples/GNUstep/GNUstep-strict-v2.conf\
+CONF_FILES+=           ${PREFIX}/share/examples/GNUstep/GNUstep-strict-v2.conf \
                        ${PKG_SYSCONFDIR}/GNUstep.conf
 
 REPLACE_BASH+=         bake_debian_files.sh
@@ -45,12 +45,12 @@ PLIST_SUBST+=       GNUSTEP_ARCH=${GNUSTEP_ARC
 SUBST_CLASSES+=                target
 SUBST_STAGE.target=    pre-configure
 SUBST_FILES.target=    target.make
-SUBST_SED.target+=     -e 's|/usr/pkg|${PREFIX}|g'
+SUBST_VARS.target=     PREFIX
 
 SUBST_CLASSES+=                maninfo
 SUBST_STAGE.maninfo=   pre-configure
 SUBST_MESSAGE.maninfo= Fixing man directory references.
-SUBST_FILES.maninfo=   ${WRKSRC}/FilesystemLayouts/fhs
+SUBST_FILES.maninfo=   FilesystemLayouts/fhs
 SUBST_SED.maninfo=     -e 's|share/man|${PKGMANDIR}|'
 SUBST_SED.maninfo+=    -e 's|share/info|${PKGINFODIR}|'
 

Index: pkgsrc/devel/gnustep-make/PLIST
diff -u pkgsrc/devel/gnustep-make/PLIST:1.23 pkgsrc/devel/gnustep-make/PLIST:1.24
--- pkgsrc/devel/gnustep-make/PLIST:1.23        Thu Apr 16 09:21:51 2020
+++ pkgsrc/devel/gnustep-make/PLIST     Tue Nov  3 11:24:31 2020
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.23 2020/04/16 09:21:51 manu Exp $
+@comment $NetBSD: PLIST,v 1.24 2020/11/03 11:24:31 triaxx Exp $
 bin/debugapp
 bin/gnustep-config
 bin/gnustep-tests
@@ -6,7 +6,7 @@ bin/openapp
 bin/opentool
 man/man1/debugapp.1
 man/man1/gnustep-config.1
-man/man1/gnustep-tests.1.gz
+man/man1/gnustep-tests.1
 man/man1/openapp.1
 man/man1/opentool.1
 man/man7/GNUstep.7

Index: pkgsrc/devel/gnustep-make/distinfo
diff -u pkgsrc/devel/gnustep-make/distinfo:1.30 pkgsrc/devel/gnustep-make/distinfo:1.31
--- pkgsrc/devel/gnustep-make/distinfo:1.30     Thu Apr 16 09:21:51 2020
+++ pkgsrc/devel/gnustep-make/distinfo  Tue Nov  3 11:24:31 2020
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.30 2020/04/16 09:21:51 manu Exp $
+$NetBSD: distinfo,v 1.31 2020/11/03 11:24:31 triaxx Exp $
 
 SHA1 (gnustep-make-2.8.0.tar.gz) = 5ebc1f89a600ba112874319e4bd0f3699866a7bd
 RMD160 (gnustep-make-2.8.0.tar.gz) = 924687b3cb75f094a7cb5be9e4e1d6abd74c6c4c
@@ -8,3 +8,4 @@ SHA1 (patch-aa) = 2b727a92404aeead88c969
 SHA1 (patch-ab) = 5bd17b33f9b8381f77371228057cf6109f76d5b0
 SHA1 (patch-ad) = ee7dfbf7d6a7c35b1141b598b54dde3a2bd237de
 SHA1 (patch-ae) = efd4d53184cb1e34ae129e52235de86f77e8a06a
+SHA1 (patch-target.make) = 5a46d7f391d6107a3cd61ad3db5e0bd2c1e1dfaf

Added files:

Index: pkgsrc/devel/gnustep-make/patches/patch-target.make
diff -u /dev/null pkgsrc/devel/gnustep-make/patches/patch-target.make:1.1
--- /dev/null   Tue Nov  3 11:24:31 2020
+++ pkgsrc/devel/gnustep-make/patches/patch-target.make Tue Nov  3 11:24:31 2020
@@ -0,0 +1,36 @@
+$NetBSD: patch-target.make,v 1.1 2020/11/03 11:24:31 triaxx 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
+ #
+ ifeq ($(findstring netbsd, $(GNUSTEP_TARGET_OS)), netbsd)
+ HAVE_SHARED_LIBS    = yes
+-SHARED_LD_POSTFLAGS = -Wl,-R/usr/pkg/lib -L/usr/pkg/lib
++SHARED_LD_POSTFLAGS = -Wl,-R@PREFIX@/lib -L@PREFIX@/lib
+ 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
+ #
+ ifeq ($(findstring dragonfly, $(GNUSTEP_TARGET_OS)), dragonfly)
+ HAVE_SHARED_LIBS    = yes
+-SHARED_LD_POSTFLAGS = -Wl,-R/usr/pkg/lib -L/usr/pkg/lib
++SHARED_LD_POSTFLAGS = -Wl,-R@PREFIX@/lib -L@PREFIX@/lib
+ 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
+ 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_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
+ #