CVS commit: pkgsrc/devel/gtexinfo

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

Module Name:    pkgsrc
Committed By:   wiz
Date:           Wed Jul 12 11:04:59 UTC 2017

Modified Files:
        pkgsrc/devel/gtexinfo: distinfo
        pkgsrc/devel/gtexinfo/patches: patch-util_texi2dvi
Added Files:
        pkgsrc/devel/gtexinfo/patches:
            patch-tp_Texinfo_Convert_XSParagraph_Makefile.in

Log Message:
Honor LDFLAGS. Fixes RELRO build.


To generate a diff of this commit:
cvs rdiff -u -r1.49 -r1.50 pkgsrc/devel/gtexinfo/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/devel/gtexinfo/patches/patch-tp_Texinfo_Convert_XSParagraph_Makefile.in
cvs rdiff -u -r1.5 -r1.6 pkgsrc/devel/gtexinfo/patches/patch-util_texi2dvi

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

Modified files:

Index: pkgsrc/devel/gtexinfo/distinfo
diff -u pkgsrc/devel/gtexinfo/distinfo:1.49 pkgsrc/devel/gtexinfo/distinfo:1.50
--- pkgsrc/devel/gtexinfo/distinfo:1.49 Wed Oct 19 12:49:39 2016
+++ pkgsrc/devel/gtexinfo/distinfo      Wed Jul 12 11:04:59 2017
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.49 2016/10/19 12:49:39 wiz Exp $
+$NetBSD: distinfo,v 1.50 2017/07/12 11:04:59 wiz Exp $
 
 SHA1 (texinfo-6.3.tar.gz) = 29b16c646c7bc9cd351b2f1d8dafdce70e5377f6
 RMD160 (texinfo-6.3.tar.gz) = 5673030cc0a9907489c206fd0c4bf1a925b69ea9
@@ -9,6 +9,6 @@ SHA1 (patch-ac) = 7f7226ee521fddba9f967b
 SHA1 (patch-gnulib_lib_mbiter.h) = 34c291e6994c6eb51aba803f3ebf5f09d46e9bdd
 SHA1 (patch-gnulib_lib_mbuiter.h) = be293674c37cb91746527be07aa40acbd285d2f4
 SHA1 (patch-texindex_texindex.awk) = 1f022f1495c951337997036ef1cd758ef9c116a7
+SHA1 (patch-tp_Texinfo_Convert_XSParagraph_Makefile.in) = cdb6c78c2c15d3f8ee5755625694c11ecd9004e9
 SHA1 (patch-tp_Texinfo_Convert_XSParagraph_configure) = d4557bae4417cd42297bceaa76478b00b3875df3
-SHA1 (patch-tp_Texinfo_Convert_XSParagraph_xspara.c) = 198d64b5bc38a3b934ade641c282e8be3e41c4df
-SHA1 (patch-util_texi2dvi) = d17608312d4b5546a2295e1be2b193124ad97256
+SHA1 (patch-util_texi2dvi) = c894eb109ef3faa7ed1cb544556ca6a97af439e9

Index: pkgsrc/devel/gtexinfo/patches/patch-util_texi2dvi
diff -u pkgsrc/devel/gtexinfo/patches/patch-util_texi2dvi:1.5 pkgsrc/devel/gtexinfo/patches/patch-util_texi2dvi:1.6
--- pkgsrc/devel/gtexinfo/patches/patch-util_texi2dvi:1.5       Tue Jun 30 11:00:33 2015
+++ pkgsrc/devel/gtexinfo/patches/patch-util_texi2dvi   Wed Jul 12 11:04:59 2017
@@ -1,14 +1,12 @@
-$NetBSD: patch-util_texi2dvi,v 1.5 2015/06/30 11:00:33 ryoon Exp $
+$NetBSD: patch-util_texi2dvi,v 1.6 2017/07/12 11:04:59 wiz Exp $
 
 As indicated in pkg/48075, pdksh doesn't support double-parens
 if not containing an arithmetic expression of a particular form.
 Older bash and ast-ksh apparently also had problems with this.
 
---- util/texi2dvi.orig 2015-06-26 12:49:37.000000000 +0000
+--- util/texi2dvi.orig 2016-09-10 19:25:16.000000000 +0000
 +++ util/texi2dvi
-@@ -25,10 +25,10 @@
- # If possible, please send a copy of the output of the script called with
- # the `--debug' option when making a bug report.
+@@ -27,6 +27,6 @@
  
 -test -f /bin/ksh && test -z "$RUNNING_KSH" \
 -  && { UNAMES=`uname -s`; test "x$UNAMES" = xULTRIX; } 2>/dev/null \
@@ -19,5 +17,3 @@ Older bash and ast-ksh apparently also h
 +#  && { RUNNING_KSH=true; export RUNNING_KSH; exec /bin/ksh $0 ${1+"$@"}; }
 +#unset RUNNING_KSH
  
- # No failure shall remain unpunished.
- set -e

Added files:

Index: pkgsrc/devel/gtexinfo/patches/patch-tp_Texinfo_Convert_XSParagraph_Makefile.in
diff -u /dev/null pkgsrc/devel/gtexinfo/patches/patch-tp_Texinfo_Convert_XSParagraph_Makefile.in:1.1
--- /dev/null   Wed Jul 12 11:04:59 2017
+++ pkgsrc/devel/gtexinfo/patches/patch-tp_Texinfo_Convert_XSParagraph_Makefile.in      Wed Jul 12 11:04:59 2017
@@ -0,0 +1,15 @@
+$NetBSD: patch-tp_Texinfo_Convert_XSParagraph_Makefile.in,v 1.1 2017/07/12 11:04:59 wiz Exp $
+
+Honor LDFLAGS for RELRO builds.
+
+--- tp/Texinfo/Convert/XSParagraph/Makefile.in.orig    2017-07-12 10:57:18.518824283 +0000
++++ tp/Texinfo/Convert/XSParagraph/Makefile.in
+@@ -573,7 +573,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ LD = @LD@
+-LDFLAGS = $(PERL_EXT_LDFLAGS)
++LDFLAGS = $(PERL_EXT_LDFLAGS) @LDFLAGS@
+ LIBOBJS = @LIBOBJS@
+ LIBS = @LIBS@
+ LIBTOOL = @LIBTOOL@