Don't leak tools-perl into config file. Bump revision.

Avoid LOCALBASE and similar clean-up.

7 files changed, 27 insertions, 20 deletions

diff --git a/math/pari/Makefile b/math/pari/Makefile
index 2342f305115..039c4b2cf01 100644
--- a/math/pari/Makefile
+++ b/math/pari/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.79 2020/05/22 17:45:24 rillig Exp $
+# $NetBSD: Makefile,v 1.80 2020/08/09 23:12:13 joerg Exp $
 
 DISTNAME=	pari-2.7.6
-PKGREVISION=	5
+PKGREVISION=	6
 CATEGORIES=	math
 MASTER_SITES=	http://pari.math.u-bordeaux.fr/pub/pari/unix/
 
@@ -16,8 +16,7 @@ USE_LIBTOOL=		yes
 USE_TOOLS+=		gmake perl:run
 USE_LANGUAGES+=		c c++
 HAS_CONFIGURE=		yes
-CONFIGURE_ENV+=		LOCALBASE=${LOCALBASE}
-CONFIGURE_ENV+=		PERL5=${PERL5:Q}
+CONFIGURE_ENV+=		PERL5=${PERL5}
 MAKE_ENV+=		PERL_USE_UNSAFE_INC=1
 
 CONFIGURE_SCRIPT=	${WRKSRC}/Configure
diff --git a/math/pari/distinfo b/math/pari/distinfo
index 04210487db3..ec2aa518172 100644
--- a/math/pari/distinfo
+++ b/math/pari/distinfo
@@ -1,20 +1,20 @@
-$NetBSD: distinfo,v 1.26 2016/07/03 12:05:29 wiz Exp $
+$NetBSD: distinfo,v 1.27 2020/08/09 23:12:13 joerg Exp $
 
 SHA1 (pari-2.7.6.tar.gz) = b8c803e82740ffe6548f84e94e2ddb70786dd0fb
 RMD160 (pari-2.7.6.tar.gz) = 55a3adf974de63967ce20e1f8fb5925c38229d0c
 SHA512 (pari-2.7.6.tar.gz) = 9cc623778068fe06878b2be0e4c60b75b585220e78446ed0c5e0197a3688e32cb901ce8a0e794d6dd310dab036784f73c0c9a608628ef89dd3e40fe3d9f7dc48
 Size (pari-2.7.6.tar.gz) = 3160272 bytes
-SHA1 (patch-Configure) = b8f86c8111709e09616383dedeb9dda8fd098157
+SHA1 (patch-Configure) = b2aa2e01b94b73cf9741d942c8bc71c93d6e7e31
 SHA1 (patch-config_DOC__Make.SH) = 088e1b0ff98a42ed50ef90fae87e3a7989239dea
-SHA1 (patch-config_Makefile.SH) = 1b653ec4b506637e5e63b63ec58035912749bef4
+SHA1 (patch-config_Makefile.SH) = 7a0c80c195eb5e922d36ff75e94e4386c6db7f20
 SHA1 (patch-config_TOP__Make.SH) = 82e39e82660fbe94b304e4691f0598b8f28a856a
-SHA1 (patch-config_get__PATH) = 3b7bae3610a3c7a51afd27f2610aa71169a2bc44
+SHA1 (patch-config_get__PATH) = 6644f898eb784c2131bbb443ad4e1115fafd1bb8
 SHA1 (patch-config_get__X11) = 0bb8f77d5c5adfb29f89ad95ead1b5726c1a3918
 SHA1 (patch-config_get__archos) = f813a841f4795df30ef0b908263bea3d90e42b86
 SHA1 (patch-config_get__dlld) = 2e356255cb84d43f9859a66907bf8ed335639d78
 SHA1 (patch-config_get__install) = 0cccbb2dcf875b287787d88265730fdbeb5abd42
 SHA1 (patch-config_get__ld) = 3a0539211311c2686f3c8b1b289038ad54397134
-SHA1 (patch-config_get__libpth) = dc9e0178f41125396d51663e02f221fa95f24343
+SHA1 (patch-config_get__libpth) = 8716d5ad8fb363593c0589196a72e452af727c02
 SHA1 (patch-src_headers_paridecl.h) = 996c1d0d0fcf1a1070699cd46a10def8901718ee
 SHA1 (patch-src_headers_paristio.h) = dd37ba9c6882a72e0d78d28eaaa00e7e18803111
 SHA1 (patch-src_language_anal.c) = 4570cd7fdd0c0d135391630bf0f6612a22ceaea8
diff --git a/math/pari/options.mk b/math/pari/options.mk
index 7701676c439..d7f2f1ea11a 100644
--- a/math/pari/options.mk
+++ b/math/pari/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.12 2016/03/03 13:28:22 wiz Exp $
+# $NetBSD: options.mk,v 1.13 2020/08/09 23:12:13 joerg Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.pari
 PKG_SUPPORTED_OPTIONS=	doc gmp x11
@@ -16,7 +16,7 @@ BUILD_DEPENDS+=		dvipsk-[0-9]*:../../print/dvipsk
 PLIST.doc=		yes
 BUILD_TARGET+=		doc
 INSTALL_TARGET+=	install-doc
-MAKE_ENV+=		PDFTEX=${LOCALBASE}/bin/pdftex
+MAKE_ENV+=		PDFTEX=${PREFIX}/bin/pdftex
 .endif
 
 PLIST_VARS+=		nogmp gmp
diff --git a/math/pari/patches/patch-Configure b/math/pari/patches/patch-Configure
index 4a497c6df66..054c003472d 100644
--- a/math/pari/patches/patch-Configure
+++ b/math/pari/patches/patch-Configure
@@ -1,8 +1,16 @@
-$NetBSD: patch-Configure,v 1.1 2016/03/03 13:28:22 wiz Exp $
+$NetBSD: patch-Configure,v 1.2 2020/08/09 23:12:13 joerg Exp $
 
---- Configure.orig	2015-06-02 14:03:57.000000000 +0000
+--- Configure.orig	2016-02-25 14:12:36.000000000 +0000
 +++ Configure
-@@ -119,14 +119,14 @@ fi
+@@ -53,6 +53,7 @@ for file in $_tools_list; do
+ done
+ if test -z "$zcat" -a -n "$gzip"; then zcat="$gzip -dc"; fi
+ 
++perl=$PERL5
+ ####################### CONFIGURE - ARCHITECTURE ############################
+ . ./get_archos # arch, osname
+ config_log="$TOP/config-$arch-$osname$$.log"
+@@ -119,14 +120,14 @@ fi
  . ./get_static  # static
  # For dynamic linking, before and after installing
  runpath=\"$libdir\"
diff --git a/math/pari/patches/patch-config_Makefile.SH b/math/pari/patches/patch-config_Makefile.SH
index 7a16c641115..c39d8997d3a 100644
--- a/math/pari/patches/patch-config_Makefile.SH
+++ b/math/pari/patches/patch-config_Makefile.SH
@@ -1,6 +1,6 @@
-$NetBSD: patch-config_Makefile.SH,v 1.2 2016/05/07 10:03:25 joerg Exp $
+$NetBSD: patch-config_Makefile.SH,v 1.3 2020/08/09 23:12:13 joerg Exp $
 
---- config/Makefile.SH.orig	2014-12-13 20:52:52.000000000 +0000
+--- config/Makefile.SH.orig	2016-02-25 14:12:36.000000000 +0000
 +++ config/Makefile.SH
 @@ -52,8 +52,6 @@ case "$osname" in
  	dlld_ignore=- ;;
diff --git a/math/pari/patches/patch-config_get__PATH b/math/pari/patches/patch-config_get__PATH
index 4f34bbfbe3b..f64af799db1 100644
--- a/math/pari/patches/patch-config_get__PATH
+++ b/math/pari/patches/patch-config_get__PATH
@@ -1,4 +1,4 @@
-$NetBSD: patch-config_get__PATH,v 1.1 2016/03/03 13:28:22 wiz Exp $
+$NetBSD: patch-config_get__PATH,v 1.2 2020/08/09 23:12:13 joerg Exp $
 
 --- config/get_PATH.orig	2011-09-22 20:02:11.000000000 +0000
 +++ config/get_PATH
@@ -35,7 +35,7 @@ $NetBSD: patch-config_get__PATH,v 1.1 2016/03/03 13:28:22 wiz Exp $
 -  /usr/libexec\
 -  /usr/openwin/bin\
 -  /usr/local/bin\
-+  $LOCALBASE/bin\
++  $PREFIX/bin\
  "
  # /usr/openwin/bin added for xmkmf
  
diff --git a/math/pari/patches/patch-config_get__libpth b/math/pari/patches/patch-config_get__libpth
index f940b1fed27..9d87b42b3bc 100644
--- a/math/pari/patches/patch-config_get__libpth
+++ b/math/pari/patches/patch-config_get__libpth
@@ -1,4 +1,4 @@
-$NetBSD: patch-config_get__libpth,v 1.1 2016/03/03 13:28:22 wiz Exp $
+$NetBSD: patch-config_get__libpth,v 1.2 2020/08/09 23:12:13 joerg Exp $
 
 --- config/get_libpth.orig	2014-03-25 08:59:21.000000000 +0000
 +++ config/get_libpth
@@ -30,7 +30,7 @@ $NetBSD: patch-config_get__libpth,v 1.1 2016/03/03 13:28:22 wiz Exp $
 -      /usr/ccs/lib\
 -      /usc/ucblib\
 -      /usr/shlib\
-+      $LOCALBASE/lib\
++      $PREFIX/lib\
        .\
     ";;
  esac