CVS commit: pkgsrc/devel/libtecla

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Wed Mar 30 07:09:58 UTC 2022

Modified Files:
        pkgsrc/devel/libtecla: Makefile distinfo
Added Files:
        pkgsrc/devel/libtecla/patches: patch-Makefile.in

Log Message:
libtecla: quote CPPFLAGS/LDFLAGS before passing them on.

Fixes build with whitespace in either of them.
Found with debugging help from rillig@

Remove gmake dependency, builds fine for me with BSD make.


To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 pkgsrc/devel/libtecla/Makefile
cvs rdiff -u -r1.10 -r1.11 pkgsrc/devel/libtecla/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/devel/libtecla/patches/patch-Makefile.in

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

Modified files:

Index: pkgsrc/devel/libtecla/Makefile
diff -u pkgsrc/devel/libtecla/Makefile:1.17 pkgsrc/devel/libtecla/Makefile:1.18
--- pkgsrc/devel/libtecla/Makefile:1.17 Sun Mar 15 23:41:54 2020
+++ pkgsrc/devel/libtecla/Makefile      Wed Mar 30 07:09:57 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2020/03/15 23:41:54 tnn Exp $
+# $NetBSD: Makefile,v 1.18 2022/03/30 07:09:57 wiz Exp $
 
 DISTNAME=      libtecla-1.6.1
 PKGREVISION=   4
@@ -12,7 +12,6 @@ COMMENT=      Interactive command line editin
 MAKE_JOBS_SAFE=                no
 
 WRKSRC=                        ${WRKDIR}/${PKGBASE}
-USE_TOOLS+=            gmake
 GNU_CONFIGURE=         yes
 BUILD_TARGET=          default
 

Index: pkgsrc/devel/libtecla/distinfo
diff -u pkgsrc/devel/libtecla/distinfo:1.10 pkgsrc/devel/libtecla/distinfo:1.11
--- pkgsrc/devel/libtecla/distinfo:1.10 Tue Oct 26 10:15:29 2021
+++ pkgsrc/devel/libtecla/distinfo      Wed Mar 30 07:09:57 2022
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.10 2021/10/26 10:15:29 nia Exp $
+$NetBSD: distinfo,v 1.11 2022/03/30 07:09:57 wiz Exp $
 
 BLAKE2s (libtecla-1.6.1.tar.gz) = eb4bc5ef10493a400f11bce594e8dc03ed76f8cb1c7a6cd2dae98886b1e61f16
 SHA512 (libtecla-1.6.1.tar.gz) = 89d550868c99739b5cfd0ddba45f61d9a8fd1454c7044f29db6cced9cd1de83b895409706a8b85024d6c75678469a4b8b39dd184322d01e1ab6b5faf03c90fc7
 Size (libtecla-1.6.1.tar.gz) = 518995 bytes
+SHA1 (patch-Makefile.in) = c35528253258c5aa7a4cde643341e1cb71daaa32
 SHA1 (patch-aa) = 11be4b3d36a8bfc3247db1999b0c0546d5994413
 SHA1 (patch-configure) = 16200249075ab7379e3a0f03331b9265862742b0

Added files:

Index: pkgsrc/devel/libtecla/patches/patch-Makefile.in
diff -u /dev/null pkgsrc/devel/libtecla/patches/patch-Makefile.in:1.1
--- /dev/null   Wed Mar 30 07:09:58 2022
+++ pkgsrc/devel/libtecla/patches/patch-Makefile.in     Wed Mar 30 07:09:58 2022
@@ -0,0 +1,19 @@
+$NetBSD: patch-Makefile.in,v 1.1 2022/03/30 07:09:58 wiz Exp $
+
+Quote LDFLAGS/CPPFLAGS before passing them down.
+
+--- Makefile.in.orig   2004-10-31 20:30:57.000000000 +0000
++++ Makefile.in
+@@ -165,10 +165,10 @@ CFLAGS = $(OPT) $(WARNING_FLAGS) $(DEFIN
+ default: $(TARGETS)
+ 
+ normal:
+-      @$(MAKE) -f $(srcdir)/Makefile.rules TARGETS="$(TARGET_LIBS)" SUFFIX="" CFLAGS="$(CFLAGS)" CC="$(CC)" OBJDIR=normal_obj LINK_SHARED='@LINK_SHARED@' SHARED_EXT='@SHARED_EXT@' 
SHARED_ALT='@SHARED_ALT@' LIBS='$(LIBS)' srcdir='$(srcdir)' LIBDIR='$(LIBDIR)' LN_S='@LN_S@' DEMOS="$(DEMOS)" PROGRAMS='$(PROGRAMS)' RANLIB='$(RANLIB)' LDFLAGS=$(LDFLAGS) CPPFLAGS=$(CPPFLAGS)
++      @$(MAKE) -f $(srcdir)/Makefile.rules TARGETS="$(TARGET_LIBS)" SUFFIX="" CFLAGS="$(CFLAGS)" CC="$(CC)" OBJDIR=normal_obj LINK_SHARED='@LINK_SHARED@' SHARED_EXT='@SHARED_EXT@' 
SHARED_ALT='@SHARED_ALT@' LIBS='$(LIBS)' srcdir='$(srcdir)' LIBDIR='$(LIBDIR)' LN_S='@LN_S@' DEMOS="$(DEMOS)" PROGRAMS='$(PROGRAMS)' RANLIB='$(RANLIB)' LDFLAGS='$(LDFLAGS)' CPPFLAGS='$(CPPFLAGS)'
+ 
+ reentrant:
+-      @$(MAKE) -f $(srcdir)/Makefile.rules TARGETS="$(TARGET_LIBS)" SUFFIX="_r" CFLAGS="$(CFLAGS) $(DEFINES_R)" CC="$(CC)" OBJDIR=reentrant_obj LINK_SHARED='@LINK_SHARED@' SHARED_EXT='@SHARED_EXT@' 
SHARED_ALT='@SHARED_ALT@' LIBS='$(LIBS)' srcdir='$(srcdir)' LIBDIR='$(LIBDIR)' LN_S='@LN_S@' DEMOS="$(DEMOS)" PROGRAMS='$(PROGRAMS_R)' RANLIB='$(RANLIB)' LDFLAGS=$(LDFLAGS) CPPFLAGS=$(CPPFLAGS)
++      @$(MAKE) -f $(srcdir)/Makefile.rules TARGETS="$(TARGET_LIBS)" SUFFIX="_r" CFLAGS="$(CFLAGS) $(DEFINES_R)" CC="$(CC)" OBJDIR=reentrant_obj LINK_SHARED='@LINK_SHARED@' SHARED_EXT='@SHARED_EXT@' 
SHARED_ALT='@SHARED_ALT@' LIBS='$(LIBS)' srcdir='$(srcdir)' LIBDIR='$(LIBDIR)' LN_S='@LN_S@' DEMOS="$(DEMOS)" PROGRAMS='$(PROGRAMS_R)' RANLIB='$(RANLIB)' LDFLAGS='$(LDFLAGS)' CPPFLAGS='$(CPPFLAGS)'
+ 
+ demos: normal
+