CVS commit: pkgsrc/devel/gtexinfo

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

Module Name:    pkgsrc
Committed By:   wiz
Date:           Wed Oct 16 21:17:08 UTC 2019

Modified Files:
        pkgsrc/devel/gtexinfo: Makefile

Log Message:
gtexinfo: fix RELRO build

Some pkglint cleanup while here.


To generate a diff of this commit:
cvs rdiff -u -r1.105 -r1.106 pkgsrc/devel/gtexinfo/Makefile

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/Makefile
diff -u pkgsrc/devel/gtexinfo/Makefile:1.105 pkgsrc/devel/gtexinfo/Makefile:1.106
--- pkgsrc/devel/gtexinfo/Makefile:1.105        Wed Oct  9 11:01:18 2019
+++ pkgsrc/devel/gtexinfo/Makefile      Wed Oct 16 21:17:08 2019
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.105 2019/10/09 11:01:18 hauke Exp $
+# $NetBSD: Makefile,v 1.106 2019/10/16 21:17:08 wiz Exp $
 
 DISTNAME=              texinfo-6.7
-PKGREVISION=           1
 PKGNAME=               g${DISTNAME}
+PKGREVISION=           1
 CATEGORIES=            devel sysutils
 MASTER_SITES=          ${MASTER_SITE_GNU:=texinfo/}
 
@@ -22,6 +22,9 @@ GNU_CONFIGURE_STRICT= no # otherwise Mis
 CONFIGURE_ARGS+=       --with-external-libintl-perl
 CONFIGURE_ARGS+=       --with-external-Text-Unidecode
 CONFIGURE_ARGS+=       --with-external-Unicode-EastAsianWidth
+CONFIGURE_ARGS+=       PERL_EXT_CFLAGS=${CFLAGS:Q}
+CONFIGURE_ARGS+=       PERL_EXT_LDFLAGS=${LDFLAGS:Q}
+
 USE_LIBTOOL=           yes
 
 INFO_FILES=            yes
@@ -32,7 +35,7 @@ USE_TOOLS+=           perl:run
 # Replace deeply nested config.sub files (in vendored perl libraries)
 OVERRIDE_DIRDEPTH=     4
 
-PKGSRC_INFOPATH=       ${PREFIX}/${PKGINFODIR}:${X11BASE}/${PKGINFODIR}:${LOCALBASE}/${PKGINFODIR}
+PKGSRC_INFOPATH=       ${PREFIX}/${PKGINFODIR}:${X11BASE}/${PKGINFODIR}:${PREFIX}/${PKGINFODIR}
 MAKE_ENV+=             PKGSRC_INFOPATH=${PKGSRC_INFOPATH:Q}
 
 REPLACE_SH+=           util/texi2dvi