fix XSParagraph support by adding perl bl3, forcing use of pkgsrc libtool

instead of bundled libtool to get over rm issue.
bump PKGREVISION

4 files changed, 22 insertions, 3 deletions

diff --git a/devel/gtexinfo/Makefile b/devel/gtexinfo/Makefile
index a615da7b15d..d4d8a9b0f3a 100644
--- a/devel/gtexinfo/Makefile
+++ b/devel/gtexinfo/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.91 2016/02/13 07:02:07 ryoon Exp $
+# $NetBSD: Makefile,v 1.92 2016/03/17 05:35:47 richard Exp $
 
 DISTNAME=		texinfo-6.1
 PKGNAME=		g${DISTNAME}
+PKGREVISION=		1
 CATEGORIES=		devel sysutils
 MASTER_SITES=		${MASTER_SITE_GNU:=texinfo/}
 
@@ -20,6 +21,7 @@ GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--with-external-libintl-perl
 CONFIGURE_ARGS+=	--with-external-Text-Unidecode
 CONFIGURE_ARGS+=	--with-external-Unicode-EastAsianWidth
+USE_LIBTOOL=		yes
 
 INFO_FILES=		yes
 TEST_TARGET=		check
@@ -34,6 +36,7 @@ REPLACE_SH+=		util/texi2dvi
 .include "../../mk/bsd.prefs.mk"
 .include "options.mk"
 
+.include "../../lang/perl5/buildlink3.mk"	 # for EXTERN.h in XSParagraph
 .include "../../mk/termcap.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
 
diff --git a/devel/gtexinfo/PLIST b/devel/gtexinfo/PLIST
index 2e87bf67d24..ac16674c975 100644
--- a/devel/gtexinfo/PLIST
+++ b/devel/gtexinfo/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.20 2016/02/14 07:08:01 jperkin Exp $
+@comment $NetBSD: PLIST,v 1.21 2016/03/17 05:35:47 richard Exp $
 bin/info
 bin/install-info
 bin/makeinfo
@@ -10,6 +10,7 @@ bin/texi2pdf
 bin/texindex
 info/info-stnd.info
 info/texinfo.info
+lib/texinfo/XSParagraph.la
 man/man1/info.1
 man/man1/install-info.1
 man/man1/makeinfo.1
@@ -44,6 +45,7 @@ share/texinfo/Texinfo/Convert/Text.pm
 share/texinfo/Texinfo/Convert/TextContent.pm
 share/texinfo/Texinfo/Convert/UnFilled.pm
 share/texinfo/Texinfo/Convert/Unicode.pm
+share/texinfo/Texinfo/Convert/XSParagraph/TestXS.pm
 share/texinfo/Texinfo/Documentlanguages.pm
 share/texinfo/Texinfo/Encoding.pm
 share/texinfo/Texinfo/ModulePath.pm
diff --git a/devel/gtexinfo/distinfo b/devel/gtexinfo/distinfo
index af3298cef2f..65a38fd5600 100644
--- a/devel/gtexinfo/distinfo
+++ b/devel/gtexinfo/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.46 2016/02/13 07:02:07 ryoon Exp $
+$NetBSD: distinfo,v 1.47 2016/03/17 05:35:47 richard Exp $
 
 SHA1 (texinfo-6.1.tar.gz) = b6ed8b4af3fe9a4aa7c72081dc61f095f73d895c
 RMD160 (texinfo-6.1.tar.gz) = 6ab09576dab209cf8784c8052039126e0b21d941
@@ -9,4 +9,5 @@ SHA1 (patch-ac) = 7f7226ee521fddba9f967be4fe199f6bedcfa148
 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_configure) = d4557bae4417cd42297bceaa76478b00b3875df3
 SHA1 (patch-util_texi2dvi) = d17608312d4b5546a2295e1be2b193124ad97256
diff --git a/devel/gtexinfo/patches/patch-tp_Texinfo_Convert_XSParagraph_configure b/devel/gtexinfo/patches/patch-tp_Texinfo_Convert_XSParagraph_configure
new file mode 100644
index 00000000000..3cdfe29a48e
--- /dev/null
+++ b/devel/gtexinfo/patches/patch-tp_Texinfo_Convert_XSParagraph_configure
@@ -0,0 +1,13 @@
+$NetBSD: patch-tp_Texinfo_Convert_XSParagraph_configure,v 1.1 2016/03/17 05:35:47 richard Exp $
+force use of pkgsrc libtool instead of bundled to get over rm issue.
+--- tp/Texinfo/Convert/XSParagraph/configure.orig	2016-01-30 18:04:16.000000000 +0000
++++ tp/Texinfo/Convert/XSParagraph/configure
+@@ -14592,7 +14592,7 @@ esac
+ LIBTOOL_DEPS=$ltmain
+ 
+ # Always use our own libtool.
+-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
++#LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+ 
+ 
+