Fix build with Perl 5.26.0

4 files changed, 45 insertions, 5 deletions

diff --git a/math/pari23/Makefile b/math/pari23/Makefile
index 942a1d7787d..b273aee78fb 100644
--- a/math/pari23/Makefile
+++ b/math/pari23/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2016/07/09 06:38:33 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2017/06/07 14:45:31 ryoon Exp $
 
 DISTNAME=	pari-2.3.5
 PKGREVISION=	20
@@ -13,7 +13,7 @@ LICENSE=	gnu-gpl-v2
 MAKE_JOBS_SAFE=	no
 
 USE_LIBTOOL=		yes
-USE_TOOLS+=		perl:run
+USE_TOOLS+=		perl
 USE_LANGUAGES+=		c c++
 HAS_CONFIGURE=		yes
 CONFIGURE_ENV+=		LOCALBASE=${LOCALBASE}
diff --git a/math/pari23/distinfo b/math/pari23/distinfo
index 855a5eeb483..8a104f8b5cf 100644
--- a/math/pari23/distinfo
+++ b/math/pari23/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.1 2016/03/03 13:23:22 wiz Exp $
+$NetBSD: distinfo,v 1.2 2017/06/07 14:45:31 ryoon Exp $
 
 SHA1 (pari-2.3.5.tar.gz) = f211ccfe42a4b18dbcde832dfd1ece6f477f4966
 RMD160 (pari-2.3.5.tar.gz) = 488adf3af5398d0ab5390eb86b65cd79bd1044c5
@@ -12,7 +12,7 @@ SHA1 (patch-ae) = 34e174cf1c97ee8b627691f3a5bf19fbbea43324
 SHA1 (patch-af) = 985b3a35f4c69124336c23c9c78690eb7e7d1567
 SHA1 (patch-ag) = 8c50e5b01832bc876874d51df02905dddb7839f3
 SHA1 (patch-ah) = 3febc677f1b94a9b3f4dec79388fdb8f77fa184f
-SHA1 (patch-ai) = 19b1f467ee0e534c19cce5768de070950e147c67
+SHA1 (patch-ai) = 391588df28a5ccdd7876a6c60ea94f49b52231d5
 SHA1 (patch-aj) = 9231890613515ceb2c7018189dc549872f04a14d
 SHA1 (patch-ak) = 622a06c67fd16c61ca8219c01e7f9dc9de202df4
 SHA1 (patch-al) = 4b9fe2464fb1136449ab3f46dcd743e937db470f
@@ -21,6 +21,7 @@ SHA1 (patch-an) = 4e1f9c8e0c63e2f1922bb8b181212b3e09c56ce6
 SHA1 (patch-ao) = 44bf077f1585e20277dcd42a7c5fd38d12b19af5
 SHA1 (patch-ap) = 21a20b68b589f8be3036d1f2f9c4b2a7f43210a8
 SHA1 (patch-config_get_fltk) = 2c2aa271fad5880a44b2df70a7143d2aea690ca0
+SHA1 (patch-src_desc_merge__822) = 8c4c317a21174d73d59b4fd9d5a3e155df141752
 SHA1 (patch-src_headers_paridecl.h) = ee02e487807d8ed1c1a11268965ade76a2f80cf2
 SHA1 (patch-src_language_anal.c) = d0028a51e8ef14cae766cb881fcfce82cec0346f
 SHA1 (patch-src_language_es.c) = 27c286da66ce1a2fc6e5179cfb3f4e222984813d
diff --git a/math/pari23/patches/patch-ai b/math/pari23/patches/patch-ai
index 3b2e56d6636..b5b5868e888 100644
--- a/math/pari23/patches/patch-ai
+++ b/math/pari23/patches/patch-ai
@@ -1,4 +1,6 @@
-$NetBSD: patch-ai,v 1.1 2016/03/03 13:23:22 wiz Exp $
+$NetBSD: patch-ai,v 1.2 2017/06/07 14:45:31 ryoon Exp $
+
+* PERL5LIB part: Fix build with Perl 5.26.0
 
 --- config/Makefile.SH.orig	2010-01-09 17:59:48.000000000 +0000
 +++ config/Makefile.SH
@@ -347,3 +349,27 @@ $NetBSD: patch-ai,v 1.1 2016/03/03 13:23:22 wiz Exp $
  
  if test -n "$add_funclist"; then
    cat >> $file << EOT
+@@ -533,19 +431,19 @@ $desc/\$(DESC): $src/funclist $desc/merg
+ 	mv $desc/def\$(TMPSUF) \$@
+ 
+ $src/language/members.h: $desc/\$(DESC) $desc/gen_member
+-	cd $desc && \$(PERL) gen_member \$(DESC) > members\$(TMPSUF)
++	cd $desc && PERL5LIB=. \$(PERL) gen_member \$(DESC) > members\$(TMPSUF)
+ 	mv $desc/members\$(TMPSUF) \$@
+ 
+ $src/language/init.h: $desc/\$(DESC) \$(DESC_HELP_GEN)
+-	cd $desc && \$(PERL) gen_proto basic \$(DESC) > init\$(TMPSUF)
++	cd $desc && PERL5LIB=. \$(PERL) gen_proto basic \$(DESC) > init\$(TMPSUF)
+ 	mv $desc/init\$(TMPSUF) \$@
+ 
+ $src/gp/gp_init.h: $desc/\$(DESC) \$(DESC_HELP_GEN)
+-	cd $desc && \$(PERL) gen_proto gp \$(DESC) > gp_init\$(TMPSUF)
++	cd $desc && PERL5LIB=. \$(PERL) gen_proto gp \$(DESC) > gp_init\$(TMPSUF)
+ 	mv $desc/gp_init\$(TMPSUF) \$@
+ 
+ $src/gp/highlvl.h: $desc/\$(DESC) \$(DESC_HELP_GEN)
+-	cd $desc && \$(PERL) gen_proto highlevel \$(DESC) > highlvl\$(TMPSUF)
++	cd $desc && PERL5LIB=. \$(PERL) gen_proto highlevel \$(DESC) > highlvl\$(TMPSUF)
+ 	mv $desc/highlvl\$(TMPSUF) \$@
+ 
+ L0MODS=$kern0/asm0.h $knone/addll.h $knone/mulll.h $knone/bfffo.h $knone/divll.h
diff --git a/math/pari23/patches/patch-src_desc_merge__822 b/math/pari23/patches/patch-src_desc_merge__822
new file mode 100644
index 00000000000..9e08440b310
--- /dev/null
+++ b/math/pari23/patches/patch-src_desc_merge__822
@@ -0,0 +1,13 @@
+$NetBSD: patch-src_desc_merge__822,v 1.1 2017/06/07 14:45:31 ryoon Exp $
+
+* Fix build with Perl 5.26.0
+
+--- src/desc/merge_822.orig	2008-03-31 11:43:59.000000000 +0000
++++ src/desc/merge_822
+@@ -1,4 +1,6 @@
+ #!/usr/bin/perl -w
++use FindBin;
++use lib $FindBin::Bin;
+ use PARI::822;
+ 
+ PARI::822::read(\%funcs,$_,1)