pari: Update to latest version.

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

Module Name:	pkgsrc-wip
Committed By:	Thomas Klausner <wiz%NetBSD.org@localhost>
Pushed By:	wiz
Date:		Tue Dec 29 16:10:30 2015 +0100
Changeset:	c1a0daedc0b6bda9b41d1088b6394e2af4b0266b

Added Files:
	pari/DESCR
	pari/Makefile
	pari/PLIST
	pari/TODO
	pari/buildlink3.mk
	pari/distinfo
	pari/options.mk
	pari/patches/patch-Configure
	pari/patches/patch-config_DOC__Make.SH
	pari/patches/patch-config_Makefile.SH
	pari/patches/patch-config_TOP__Make.SH
	pari/patches/patch-config_get__PATH
	pari/patches/patch-config_get__X11
	pari/patches/patch-config_get__archos
	pari/patches/patch-config_get__dlld
	pari/patches/patch-config_get__install
	pari/patches/patch-config_get__ld
	pari/patches/patch-config_get__libpth
	pari/patches/patch-src_headers_paridecl.h
	pari/patches/patch-src_headers_paristio.h
	pari/patches/patch-src_language_anal.c
	pari/patches/patch-src_language_compile.c
	pari/patches/patch-src_language_es.c
	pari/patches/patch-src_language_parsec.h
	pari/patches/patch-src_modules_mpqs.c

Log Message:
pari: Update to latest version.

Builds fine and seems to work fine, but p5-Math-Pari breaks.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=c1a0daedc0b6bda9b41d1088b6394e2af4b0266b

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

diffstat:
 pari/DESCR                                |  12 ++
 pari/Makefile                             |  53 +++++++
 pari/PLIST                                |  66 ++++++++
 pari/TODO                                 |   1 +
 pari/buildlink3.mk                        |  23 +++
 pari/distinfo                             |  24 +++
 pari/options.mk                           |  46 ++++++
 pari/patches/patch-Configure              |  21 +++
 pari/patches/patch-config_DOC__Make.SH    |  15 ++
 pari/patches/patch-config_Makefile.SH     | 240 ++++++++++++++++++++++++++++++
 pari/patches/patch-config_TOP__Make.SH    |  12 ++
 pari/patches/patch-config_get__PATH       |  41 +++++
 pari/patches/patch-config_get__X11        |  28 ++++
 pari/patches/patch-config_get__archos     |  13 ++
 pari/patches/patch-config_get__dlld       |  30 ++++
 pari/patches/patch-config_get__install    |  13 ++
 pari/patches/patch-config_get__ld         |  13 ++
 pari/patches/patch-config_get__libpth     |  36 +++++
 pari/patches/patch-src_headers_paridecl.h |  13 ++
 pari/patches/patch-src_headers_paristio.h |  13 ++
 pari/patches/patch-src_language_anal.c    |  13 ++
 pari/patches/patch-src_language_compile.c |  13 ++
 pari/patches/patch-src_language_es.c      |  21 +++
 pari/patches/patch-src_language_parsec.h  |  13 ++
 pari/patches/patch-src_modules_mpqs.c     |  40 +++++
 25 files changed, 813 insertions(+)

diffs:
diff --git a/pari/DESCR b/pari/DESCR
new file mode 100644
index 0000000..bd270df
--- /dev/null
+++ b/pari/DESCR
@@ -0,0 +1,12 @@
+PARI-GP is a package which is aimed at efficient computations in
+number theory, but also contains a large number of other useful
+functions.  It is somewhat related to a Computer Algebra System, but
+is not really one since it treats symbolic expressions as mathematical
+entities such as matrices, polynomials, series, etc..., and not as
+expressions per se.  However it is often much faster than other CAS,
+and contains a large number of specific functions not found elsewhere,
+essentially for use in number theory.
+
+This package can be used in an interactive shell (GP) or as a C/C++
+library (PARI). It is free software, in the sense of freedom AND 'free
+of charge'.
diff --git a/pari/Makefile b/pari/Makefile
new file mode 100644
index 0000000..4a52f8a
--- /dev/null
+++ b/pari/Makefile
@@ -0,0 +1,53 @@
+# $NetBSD: Makefile,v 1.66 2015/08/18 07:31:12 wiz Exp $
+
+DISTNAME=	pari-2.7.5
+CATEGORIES=	math
+MASTER_SITES=	http://pari.math.u-bordeaux.fr/pub/pari/unix/
+
+MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
+HOMEPAGE=	http://pari.math.u-bordeaux.fr/
+COMMENT=	Software package for computer-aided number theory
+LICENSE=	gnu-gpl-v2
+
+MAKE_JOBS_SAFE=	no
+
+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_SCRIPT=	${WRKSRC}/Configure
+CONFIGURE_ARGS+=	--prefix=${PREFIX}
+CONFIGURE_ARGS+=	--mandir=${PREFIX}/${PKGMANDIR}/man1
+CONFIGURE_ARGS+=	--share-prefix=${PREFIX}/share
+
+REPLACE_PERL+=		src/desc/PARI/822.pm
+REPLACE_PERL+=		doc/gphelp
+REPLACE_PERL+=		misc/tex2mail
+
+BUILD_TARGET=		all
+TEST_TARGET=		test-compat bench
+INSTALL_TARGET=		install
+
+SUBST_CLASSES+=		fix-cfg
+SUBST_STAGE.fix-cfg=	pre-configure
+SUBST_MESSAGE.fix-cfg=	Adding CFLAGS to Configure scripts.
+SUBST_FILES.fix-cfg=	config/get_*
+SUBST_SED.fix-cfg=	-e 's,$$CC $$extraflag,$$CC $$CFLAGS $$extraflag,g'
+
+SUBST_CLASSES+=		fix-wrap
+SUBST_STAGE.fix-wrap=	post-build
+SUBST_MESSAGE.fix-wrap=	Removing TOOLS_DIR references
+SUBST_FILES.fix-wrap=	*/pari.cfg
+SUBST_SED.fix-wrap=	-e "s,${TOOLS_DIR}/bin/,,g"
+
+pre-install: replace-interpreter
+
+.include "options.mk"
+
+.include "../../devel/ncurses/buildlink3.mk"
+# rl_save_prompt()
+.include "../../devel/readline/buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/pari/PLIST b/pari/PLIST
new file mode 100644
index 0000000..36ec0a7
--- /dev/null
+++ b/pari/PLIST
@@ -0,0 +1,66 @@
+@comment $NetBSD: PLIST,v 1.10 2010/10/01 20:50:55 minskim Exp $
+bin/gp-2.7
+include/pari/genpari.h
+include/pari/mpinl.h
+include/pari/pari.h
+include/pari/paricast.h
+include/pari/paricfg.h
+include/pari/paricom.h
+include/pari/paridecl.h
+include/pari/parierr.h
+include/pari/parigen.h
+include/pari/pariinl.h
+include/pari/parinf.h
+include/pari/parimt.h
+include/pari/pariold.h
+include/pari/paripriv.h
+include/pari/paristio.h
+include/pari/parisys.h
+include/pari/paritune.h
+${PLIST.nogmp}lib/libpari.la
+${PLIST.gmp}lib/libpari-gmp.la
+lib/pari/pari.cfg
+man/man1/gp.1
+man/man1/gp-2.7.1
+man/man1/pari.1
+share/pari/PARI/822.pm
+${PLIST.doc}share/pari/doc/appa.tex
+${PLIST.doc}share/pari/doc/appb.tex
+${PLIST.doc}share/pari/doc/appd.tex
+${PLIST.doc}share/pari/doc/develop.pdf
+${PLIST.doc}share/pari/doc/develop.tex
+${PLIST.doc}share/pari/doc/libpari.pdf
+${PLIST.doc}share/pari/doc/paricfg.tex
+${PLIST.doc}share/pari/doc/parimacro.tex
+${PLIST.doc}share/pari/doc/pdfmacs.tex
+${PLIST.doc}share/pari/doc/refcard.pdf
+${PLIST.doc}share/pari/doc/refcard.tex
+${PLIST.doc}share/pari/doc/translations
+${PLIST.doc}share/pari/doc/tutorial.pdf
+${PLIST.doc}share/pari/doc/tutorial.tex
+${PLIST.doc}share/pari/doc/users.pdf
+${PLIST.doc}share/pari/doc/users.tex
+${PLIST.doc}share/pari/doc/usersch1.tex
+${PLIST.doc}share/pari/doc/usersch2.tex
+${PLIST.doc}share/pari/doc/usersch3.tex
+${PLIST.doc}share/pari/doc/usersch4.tex
+${PLIST.doc}share/pari/doc/usersch5.tex
+share/pari/examples/EXPLAIN
+share/pari/examples/Inputrc
+share/pari/examples/Makefile
+share/pari/examples/bench.gp
+share/pari/examples/cl.gp
+share/pari/examples/classno.gp
+share/pari/examples/contfrac.gp
+share/pari/examples/extgcd.c
+share/pari/examples/lucas.gp
+share/pari/examples/rho.gp
+share/pari/examples/squfof.gp
+share/pari/examples/taylor.gp
+share/pari/misc/README
+share/pari/misc/color.dft
+share/pari/misc/gpalias
+share/pari/misc/gpflog
+share/pari/misc/gprc.dft
+share/pari/misc/xgp
+share/pari/pari.desc
diff --git a/pari/TODO b/pari/TODO
new file mode 100644
index 0000000..a86c4ea
--- /dev/null
+++ b/pari/TODO
@@ -0,0 +1 @@
+package finished and seems to work, but p5-Math-Pari breaks.
diff --git a/pari/buildlink3.mk b/pari/buildlink3.mk
new file mode 100644
index 0000000..403c9d1
--- /dev/null
+++ b/pari/buildlink3.mk
@@ -0,0 +1,23 @@
+# $NetBSD: buildlink3.mk,v 1.11 2011/03/18 15:00:01 adam Exp $
+
+BUILDLINK_TREE+=	pari
+
+.if !defined(PARI_BUILDLINK3_MK)
+PARI_BUILDLINK3_MK:=
+
+BUILDLINK_API_DEPENDS.pari+=	pari>=2.3.4
+BUILDLINK_ABI_DEPENDS.pari+=	pari>=2.3.5nb5
+BUILDLINK_PKGSRCDIR.pari?=	../../math/pari
+
+pkgbase := pari
+.include "../../mk/pkg-build-options.mk"
+
+PARI_LIB?=	pari
+.if !empty(PKG_BUILD_OPTIONS.pari:Mgmp)
+PARI_LIB=	pari-gmp
+.  include "../../devel/gmp/buildlink3.mk"
+.endif
+
+.endif # PARI_BUILDLINK3_MK
+
+BUILDLINK_TREE+=	-pari
diff --git a/pari/distinfo b/pari/distinfo
new file mode 100644
index 0000000..5851786
--- /dev/null
+++ b/pari/distinfo
@@ -0,0 +1,24 @@
+$NetBSD: distinfo,v 1.22 2015/11/03 23:33:41 agc Exp $
+
+SHA1 (pari-2.7.5.tar.gz) = ca6f6bc57d2028df5a5bddd3810a82cb05d139f2
+RMD160 (pari-2.7.5.tar.gz) = b5cc28e5382cc31d7da7dcb9258a7099d31872ce
+SHA512 (pari-2.7.5.tar.gz) = 1dcc60d3b9ab6b46fd8e5d0e28e5e37369da0eb872869788b6ac7f92ce69a21789c114cd432cf8416014e4359db5c23816b49a26ad59965f51092d30b8af9d41
+Size (pari-2.7.5.tar.gz) = 3159103 bytes
+SHA1 (patch-Configure) = b8f86c8111709e09616383dedeb9dda8fd098157
+SHA1 (patch-config_DOC__Make.SH) = 088e1b0ff98a42ed50ef90fae87e3a7989239dea
+SHA1 (patch-config_Makefile.SH) = d1754104438aa0a4d6f86c809d81300ecb3aa3f2
+SHA1 (patch-config_TOP__Make.SH) = 82e39e82660fbe94b304e4691f0598b8f28a856a
+SHA1 (patch-config_get__PATH) = 3b7bae3610a3c7a51afd27f2610aa71169a2bc44
+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-src_headers_paridecl.h) = 996c1d0d0fcf1a1070699cd46a10def8901718ee
+SHA1 (patch-src_headers_paristio.h) = dd37ba9c6882a72e0d78d28eaaa00e7e18803111
+SHA1 (patch-src_language_anal.c) = 4570cd7fdd0c0d135391630bf0f6612a22ceaea8
+SHA1 (patch-src_language_compile.c) = ea356968c3e5f8d599a61d4413bf04552b673ea6
+SHA1 (patch-src_language_es.c) = ee470a5e050839573e213d7644d1e182fb3a4f0f
+SHA1 (patch-src_language_parsec.h) = 5cf4772aa2c9d7c912e68f2638bbc99de2d388a6
+SHA1 (patch-src_modules_mpqs.c) = 54adabc5bffe06ebbb79f3dd6366a4e7e219a676
diff --git a/pari/options.mk b/pari/options.mk
new file mode 100644
index 0000000..8f41d53
--- /dev/null
+++ b/pari/options.mk
@@ -0,0 +1,46 @@
+# $NetBSD: options.mk,v 1.11 2014/02/25 09:32:57 obache Exp $
+
+PKG_OPTIONS_VAR=	PKG_OPTIONS.pari
+PKG_SUPPORTED_OPTIONS=	doc gmp x11
+# x11 is not suggested because it's not reasonable to include a GUI in
+# a foundation library.
+PKG_SUGGESTED_OPTIONS=	doc gmp
+
+.include "../../mk/bsd.options.mk"
+
+PLIST_VARS+=		doc
+.if !empty(PKG_OPTIONS:Mdoc)
+BUILD_DEPENDS+=		tex-amsfonts>=3.0:../../fonts/tex-amsfonts
+BUILD_DEPENDS+=		tex-pdftex>=1.40.11:../../print/tex-pdftex
+BUILD_DEPENDS+=		dvipsk-[0-9]*:../../print/dvipsk
+PLIST.doc=		yes
+BUILD_TARGET+=		doc
+INSTALL_TARGET+=	install-doc
+MAKE_ENV+=		PDFTEX=${LOCALBASE}/bin/pdftex
+.endif
+
+PLIST_VARS+=		nogmp gmp
+.if !empty(PKG_OPTIONS:Mgmp)
+PLIST.gmp=		yes
+CONFIGURE_ARGS+=	--with-gmp=${BUILDLINK_PREFIX.gmp}
+.include "../../devel/gmp/buildlink3.mk"
+.else
+PLIST.nogmp=		yes
+CONFIGURE_ARGS+=	--without-gmp
+.endif
+
+.if !empty(PKG_OPTIONS:Mx11)
+USE_TOOLS+=		imake
+CONFIGURE_ARGS+=	--graphic=X11
+CONFIGURE_ARGS+=	--with-fltk=${BUILDLINK_PREFIX.fltk}
+CONFIGURE_ENV+=		X11BASE=${X11BASE}
+CONFIGURE_ENV+=		Xincroot=${X11BASE}/include
+.include "../../x11/libX11/buildlink3.mk"
+.include "../../x11/libXft/buildlink3.mk"
+.include "../../x11/libXrender/buildlink3.mk"
+.include "../../x11/fltk13/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=	--graphic=none
+# don't let the configure script find an installed fltk
+CONFIGURE_ARGS+=	--with-fltk={BUILDLINK_DIR:Q}/nonexistent
+.endif
diff --git a/pari/patches/patch-Configure b/pari/patches/patch-Configure
new file mode 100644
index 0000000..d9e5994
--- /dev/null
+++ b/pari/patches/patch-Configure
@@ -0,0 +1,21 @@
+$NetBSD$
+
+--- Configure.orig	2015-06-02 14:03:57.000000000 +0000
++++ Configure
+@@ -119,14 +119,14 @@ fi
+ . ./get_static  # static
+ # For dynamic linking, before and after installing
+ runpath=\"$libdir\"
+-LDDYN="-lpari"
++LDDYN="-Wl,-R$libdir -L$libdir -lpari"
+ # get_modld needs $includedir from get_install, static, and LDDYN
+ . ./get_modld   # $_modld_list
+ 
+ # Which copy, SHELL ?
+ case "$osname" in
+   os2) ln_s=cp;      make_sh=sh;;
+-  *)   ln_s="ln -s"; make_sh="/bin/sh";;
++  *)   ln_s="ln -sf"; make_sh="/bin/sh";;
+ esac
+ ####################### CONFIGURE - CLEANUP #################################
+ rm -f gmon.out # created by Configure -pg
diff --git a/pari/patches/patch-config_DOC__Make.SH b/pari/patches/patch-config_DOC__Make.SH
new file mode 100644
index 0000000..b6e9bf6
--- /dev/null
+++ b/pari/patches/patch-config_DOC__Make.SH
@@ -0,0 +1,15 @@
+$NetBSD$
+
+Rules for dvi/ps are broken, just generate PDFs to work around this.
+
+--- config/DOC_Make.SH.orig	2014-07-30 13:38:47.000000000 +0000
++++ config/DOC_Make.SH
+@@ -21,7 +21,7 @@ MACROS= paricfg.tex parimacro.tex
+ USERS_TEX=\$(MACROS) appa.tex users.tex usersch1.tex usersch2.tex usersch3.tex
+ PARI_TEX=\$(MACROS) libpari.tex appb.tex appd.tex usersch4.tex usersch5.tex usersch6.tex usersch7.tex
+ 
+-doc all: develop.dvi libpari.dvi parallel.dvi users.dvi refcard.ps tutorial.dvi
++doc all: develop.pdf libpari.pdf parallel.pdf users.pdf refcard.pdf tutorial.pdf
+ docps: develop.ps libpari.ps parallel.ps refcard.ps tutorial.ps users.ps INSTALL.ps
+ docpdf: develop.pdf libpari.pdf parallel.pdf users.pdf tutorial.pdf refcard.pdf INSTALL.pdf
+ 
diff --git a/pari/patches/patch-config_Makefile.SH b/pari/patches/patch-config_Makefile.SH
new file mode 100644
index 0000000..ddb256f
--- /dev/null
+++ b/pari/patches/patch-config_Makefile.SH
@@ -0,0 +1,240 @@
+$NetBSD$
+
+--- config/Makefile.SH.orig	2014-12-13 20:52:52.000000000 +0000
++++ config/Makefile.SH
+@@ -52,8 +52,6 @@ case "$osname" in
+ 	dlld_ignore=- ;;
+   mingw)
+     export_file='$(LIBPARI).def';;
+-  darwin)
+-    ld_install_name="-Wl,-install_name -Wl,\"$libdir\"/\$(LIBPARI_DYN)";;
+ esac
+ case "$osname" in
+   mingw|cygwin)
+@@ -93,7 +91,7 @@ plotrunpath=
+ case "$which_graphic_lib" in
+   *X11*)
+     PLOTCFLAGS="$PLOTCFLAGS $X11_INC"
+-    PLOTLIBS="$PLOTLIBS $X11_LIBS"
++    PLOTLIBS="-Wl,-R${X11BASE}/lib $PLOTLIBS $X11_LIBS"
+     plotrunpath=$X11
+     graph="plotX $graph"
+   ;;
+@@ -134,20 +132,11 @@ if test -n "$runpathprefix"; then
+   RUNPTH=`$config_dir/ldflags "$LDneedsWl" $runpathprefix\\\$\(TOPDIR\)/$objdir$dir_sep"$tmp"`
+ fi
+ 
+-if test -z "$DLLD"; then
+-  exec="gp-sta"; static=y
+-else
+-  exec="gp-sta gp-dyn"
+-fi
+ case "$sizeof_long" in
+   4) numbits=32;;
+   8) numbits=64;;
+ esac
+ dotest="env \"RUNTEST=\$(RUNTEST)\" \"LD_LIBRARY_PATH=.$dir_sep\$\$LD_LIBRARY_PATH\" \$(SHELL) $src/test/dotest $numbits"
+-case "$static" in
+-  n) dft=dyn; libdft=lib-dyn;;
+-  y) dft=sta; libdft= ;;
+-esac
+ 
+ CPPFLAGS="-I. -I$src/headers"
+ if test "$has_dlopen" = builtin; then
+@@ -176,16 +165,16 @@ RANLIB     = ranlib
+ SIZEOF_LONG= $sizeof_long
+ 
+ CC_FLAVOR  =
+-CC         = $CC \$(CC_FLAVOR)
++CC         = \$(LIBTOOL) --mode=compile $CC \$(CC_FLAVOR)
+ CPPFLAGS   = $CPPFLAGS
+ CFLAGS     = $CFLAGS
+ DLCFLAGS   = $DLCFLAGS
+ KERNELCFLAGS  = $KERNELCFLAGS
+ LD_FLAVOR  = \$(CC_FLAVOR)
+-LD         = $LD \$(LD_FLAVOR)
++LD         = \$(LIBTOOL) --mode=link $LD \$(LD_FLAVOR)
+ LDFLAGS    = $LDFLAGS
+ DLLD_FLAVOR  = \$(LD_FLAVOR)
+-DLLD       = $DLLD \$(DLLD_FLAVOR)
++DLLD       = \$(LIBTOOL) --mode=link $DLLD \$(DLLD_FLAVOR)
+ DLLDFLAGS  = $DLLDFLAGS
+ EXTRADLLDFLAGS = $EXTRADLLDFLAGS
+ RUNTEST    = $RUNTEST
+@@ -204,18 +193,12 @@ RUNTEST    = $RUNTEST
+ #the following line
+ #GMPO2 = \$(GMP)/sparcv9.o
+ 
+-_O	   = .o
+-_A	   = .a
++_O	   = .lo
++_A	   = .la
+ LIB_PREFIX = $lib_prefix
+ DLLIB_PREFIX = $dllib_prefix
+-LIBPARI_BASE = $libpari_base
+-LIBPARI      = \$(LIB_PREFIX)pari
+-DLLIBPARI    = \$(DLLIB_PREFIX)pari
+-LIBPARI_STA  = \$(LIBPARI)\$(_A)
+-LIBPARI_SO   = \$(DLLIBPARI).$DLSUFFIX
+-SOLIBPARI    = \$(DLLIB_PREFIX)\$(LIBPARI_BASE).$DLSUFFIX
+-LIBPARI_DYN   = \$(SOLIBPARI)$sodest
+-LIBPARI_SONAME= \$(SOLIBPARI)$soname
++LIBPARI_BASE = $eibpari_base
++LIBPARI      = \$(LIB_PREFIX)$libpari_base\$(_A)
+ DL_DFLT_NAME = $DL_DFLT_NAME
+ 
+ LD_INSTALL_NAME  = $ld_install_name
+@@ -289,21 +272,15 @@ OBJSGP = $OBJSGP
+ 
+ .PHONY: gp dft clean
+ 
+-gp: gp-$dft ../gp$suffix$exe_suff $libdft
+-
+-../gp$suffix$exe_suff: gp-$dft
+-	-\$(RM) \$@
+-	-\$(LN) $ln_objdir/gp-$dft \$@
+-
+-all: $exec lib-sta
++gp: \$(OBJSGP) \$(LIBPARI)
++	\$(RM) \$@
++	\$(LD) -o \$@ \$(LDFLAGS) \$(OBJSGP) \$(RUNPTH_FINAL) \$(PLOTLIBS) \$(LIBS) \$(RLLIBS) \$(LIBPARI)
+ 
+-lib-sta: \$(LIBPARI_STA)
+-lib-dyn: \$(LIBPARI_DYN)
++all: gp \$(LIBPARI)
++lib: \$(LIBPARI)
+ 
+-\$(LIBPARI_STA): $add_funclist \$(OBJS)
+-	-\$(RM) \$@
+-	\$(AR) r \$@ \$(OBJS)
+-	-\$(RANLIB) \$@
++\$(LIBPARI): \$(OBJS)
++	\$(LD) -o \$@ \$(OBJS) -rpath \$(LIBDIR) \$(GMPLIBS) --version-info 0:0
+ 
+ kerntest\$(_O): $src/test/kerntest.c
+ 	\$(CC) -c -I$src/language \$(CPPFLAGS) \$(CFLAGS) -o \$@ $src/test/kerntest.c
+@@ -335,11 +312,6 @@ tune-dyn: tune\$(_O) \$(LIBPARI_DYN)
+ tune-sta: tune\$(_O) \$(LIBPARI_STA)
+ 	\$(LD) \$(LDFLAGS) \$(RUNPTH) -o \$@ \$< \$(GMPOBJS) ./\$(LIBPARI_STA) \$(STA_LIBS)
+ 
+-gp-sta: $add_funclist \$(OBJS) \$(OBJSGP)
+-	\$(RM) \$@
+-	\$(LD) -o \$@ \$(LDFLAGS) \$(OBJS) \$(OBJSGP) \$(RUNPTH) \$(RLLIBS) \$(PLOTLIBS) \$(STA_LIBS)
+-	$postconfig gp-sta
+-
+ cleantest:
+ 	\$(RM) *.dif gp.out io-testfile pari.ps
+ cleanobj:
+@@ -364,7 +336,7 @@ clean: cleanall
+ .headers: $HEADERS
+ 	@touch \$@
+ 
+-install-nodata: install-lib-$dft install-include install-bin install-man install-misc install-doc install-examples install-cfg
++install-nodata: install-lib install-include install-bin install-man install-misc install-examples install-cfg
+ 
+ install: install-nodata install-data
+ 
+@@ -377,37 +349,19 @@ install-include:
+ 	-\$(RM) \$(INCLUDEDIR)/pari/genpari.h
+ 	-\$(LN) pari.h \$(INCLUDEDIR)/pari/genpari.h
+ 
+-install-bin: install-bin-$dft
+-
+-install-bin-dyn: gp-dyn install-lib-dyn
++install-bin: gp
+ 	-mkdir -p \$(BINDIR)
+-	-\$(RM) \$(BINDIR)/gp-$version$exe_suff \$(BINDIR)/gp$exe_suff
+-	\$(LD) -o \$(BINDIR)/gp-$version$exe_suff -L\$(LIBDIR) \$(LDFLAGS) \$(OBJSGP) \$(RUNPTH_FINAL) \$(LDDYN) \$(RLLIBS) \$(PLOTLIBS) \$(LIBS)
+-	-\$(STRIP) \$(STRIPFLAGS) \$(BINDIR)/gp-$version$exe_suff
+-	-cd \$(BINDIR); $postconfig gp-$version$exe_suff
+-	-\$(LN) gp-$version$exe_suff \$(BINDIR)/gp$exe_suff
+-
+-install-bin-sta: gp-sta
+-	-mkdir -p \$(BINDIR)
+-	-\$(RM) \$(BINDIR)/gp-$version$exe_suff \$(BINDIR)/gp$exe_suff
+-	\$(INSTALL_PROGRAM) gp-sta \$(BINDIR)/gp-$version$exe_suff
+-	-\$(LN) gp-$version$exe_suff \$(BINDIR)/gp$exe_suff
+-# Can't strip it if we want install() to work on OSF.
+-#	-\$(STRIP) \$(STRIPFLAGS)  \$(BINDIR)/gp-$version
+-	-cd \$(BINDIR); $postconfig gp-$version$exe_suff
++	\$(LIBTOOL) --mode=install \$(INSTALL_PROGRAM) gp$exe_suff \$(BINDIR)/gp-$version$exe_suff
+ 
+ install-man::
+ 	-mkdir -p \$(MANDIR)
+ 	-\$(RM) \$(MANDIR)/pari.1 \$(MANDIR)/gp.1 \$(MANDIR)/gp-$version.1
+-	\$(INSTALL_DATA) $doc/gphelp.1 \$(MANDIR)
+ 	\$(INSTALL_DATA) $doc/gp.1 \$(MANDIR)/gp-$version.1
+ 	-\$(LN) gp.1 \$(MANDIR)/pari.1
+ 	-\$(LN) gp-$version.1 \$(MANDIR)/gp.1
+ 
+ install-misc:
+ 	-mkdir -p \$(MISCDIR) \$(BINDIR)
+-	\$(INSTALL_PROGRAM) $misc/tex2mail \$(BINDIR)
+-	\$(INSTALL_DATA) $doc/tex2mail.1 \$(MANDIR)
+ 	\$(INSTALL_DATA) $misc/README    \$(MISCDIR)
+ 	\$(INSTALL_DATA) $misc/color.dft \$(MISCDIR)
+ 	\$(INSTALL_DATA) $misc/gpalias   \$(MISCDIR)
+@@ -426,7 +380,6 @@ install-cfg::
+ install-doc::
+ 	-mkdir -p \$(BINDIR) \$(DOCDIR)
+ 	-cd $doc; \$(MAKE) all
+-	-\$(INSTALL_PROGRAM) $doc/gphelp    \$(BINDIR)
+ 	-\$(INSTALL_DATA) $doc/translations \$(DOCDIR)
+ 	-\$(INSTALL_DATA) $doc/appa.tex     \$(DOCDIR)
+ 	-\$(INSTALL_DATA) $doc/appb.tex     \$(DOCDIR)
+@@ -443,12 +396,11 @@ install-doc::
+ 	-\$(INSTALL_DATA) $doc/usersch4.tex \$(DOCDIR)
+ 	-\$(INSTALL_DATA) $doc/usersch5.tex \$(DOCDIR)
+ 	-\$(INSTALL_DATA) $doc/paricfg.tex  \$(DOCDIR)
+-	-\$(INSTALL_DATA) $doc/develop.dvi  \$(DOCDIR)
+-	-\$(INSTALL_DATA) $doc/libpari.dvi  \$(DOCDIR)
+-	-\$(INSTALL_DATA) $doc/users.dvi    \$(DOCDIR)
+-	-\$(INSTALL_DATA) $doc/tutorial.dvi \$(DOCDIR)
+-	-\$(INSTALL_DATA) $doc/refcard.dvi  \$(DOCDIR)
+-	-\$(INSTALL_DATA) $doc/refcard.ps   \$(DOCDIR)
++	-\$(INSTALL_DATA) $doc/develop.pdf  \$(DOCDIR)
++	-\$(INSTALL_DATA) $doc/libpari.pdf  \$(DOCDIR)
++	-\$(INSTALL_DATA) $doc/users.pdf    \$(DOCDIR)
++	-\$(INSTALL_DATA) $doc/tutorial.pdf \$(DOCDIR)
++	-\$(INSTALL_DATA) $doc/refcard.pdf  \$(DOCDIR)
+ 
+ install-docpdf::
+ 	-mkdir -p \$(BINDIR) \$(DOCDIR)
+@@ -483,23 +435,9 @@ install-data:
+ 	   done; \
+ 	 fi
+ 
+-install-lib-sta: \$(LIBPARI_STA)
+-	-mkdir -p \$(LIBDIR)
+-	-\$(RM) \$(LIBDIR)/\$(LIBPARI_STA)
+-	\$(INSTALL_DATA) \$(LIBPARI_STA) \$(LIBDIR)/\$(LIBPARI_STA)
+-
+-install-lib-dyn-base:
++install-lib: \$(LIBPARI)
+ 	-mkdir -p \$(LIBDIR)
+-	-\$(RM) \$(LIBDIR)/\$(LIBPARI_DYN) \$(LIBDIR)/\$(LIBPARI_SONAME) \$(LIBDIR)/\$(LIBPARI_SO)
+-	\$(DLLD_IGNORE)\$(DLLD) -o \$(LIBDIR)/\$(LIBPARI_DYN) \$(DLLDFLAGS) \$(OBJS) \$(EXTRADLLDFLAGS) \$(DYN_LIBS) \$(EXPORT_FILE) \$(LD_INSTALL_NAME)
+-	$install_implib
+-
+-install-lib-dyn-link: install-lib-dyn-base
+-	-if test "\$(LIBPARI_DYN)" != "\$(LIBDIR)/\$(LIBPARI_SO)"; then \
+-          \$(LN) \$(LIBPARI_DYN) \$(LIBDIR)/\$(LIBPARI_SO); fi
+-	-if test "\$(LIBPARI_SONAME)" != "\$(LIBPARI_SO)"; then \
+-	  \$(LN) \$(LIBPARI_DYN) \$(LIBDIR)/\$(LIBPARI_SONAME); fi
+-install-lib-dyn: \$(LIBPARI_DYN) install-lib-dyn-link
++	\$(LIBTOOL) --mode=install \$(BSD_INSTALL_LIB) \$(LIBPARI) \$(LIBDIR)/
+ 
+ nsis: gp
+ 	-cd $doc; \$(MAKE) docpdf
+@@ -595,11 +533,6 @@ EOT
+   fi
+   cat >> $file << EOT
+ 
+-gp-dyn: $add_funclist \$(OBJSGP) \$(LIBPARI_DYN) \$(EXPORT_LIB)
+-	\$(RM) \$@
+-	\$(LD) -o \$@ -L\$(TOPLDDYN) \$(LDFLAGS) \$(OBJSGP) \$(RUNPTH) \$(RLLIBS) \$(LDDYN) \$(PLOTLIBS) \$(LIBS)
+-	$postconfig gp-dyn
+-
+ \$(LIBPARI_DYN): $add_funclist \$(OBJS) \$(EXPORT_FILE)
+ 	-\$(RM) \$(LIBPARI_DYN)
+ 	\$(DLLD_IGNORE)\$(DLLD) -o \$(TOPLDDYN)/\$(LIBPARI_DYN) \$(DLLDFLAGS) \$(OBJS) \$(EXTRADLLDFLAGS) \$(DYN_LIBS) \$(EXPORT_FILE)
diff --git a/pari/patches/patch-config_TOP__Make.SH b/pari/patches/patch-config_TOP__Make.SH
new file mode 100644
index 0000000..c9b29f2
--- /dev/null
+++ b/pari/patches/patch-config_TOP__Make.SH
@@ -0,0 +1,12 @@
+$NetBSD$
+
+--- config/TOP_Make.SH.orig	2014-07-30 13:38:47.000000000 +0000
++++ config/TOP_Make.SH
+@@ -40,7 +40,6 @@ dft target::
+ 
+ all::
+ 	@\$(MAKE) gp
+-	@-cd doc && \$(MAKE) doc
+ 
+ gp bench test-kernel test-all install cleanall cleanobj cleantest nsis install-bin install-doc install-docpdf install-nodata install-data install-lib-sta install-bin-sta dobench dyntest-all statest-all tune $top_test_extra $top_dotest_extra::
+ 	@dir=\`config/objdir\`; echo "Making \$@ in \$\$dir";\\
diff --git a/pari/patches/patch-config_get__PATH b/pari/patches/patch-config_get__PATH
new file mode 100644
index 0000000..1290e1a
--- /dev/null
+++ b/pari/patches/patch-config_get__PATH
@@ -0,0 +1,41 @@
+$NetBSD$
+
+--- config/get_PATH.orig	2011-09-22 20:02:11.000000000 +0000
++++ config/get_PATH
+@@ -4,35 +4,7 @@ if test -z "$OS2_SHELL"; then dir_sep=':
+ pth="\
+   /bin\
+   /usr/bin\
+-  /usr/locateal/bin\
+-  /usr/ucb\
+-  /usr/locateal\
+-  /usr/lbin\
+-  /usr/5bin\
+-  /etc\
+-  /usr/etc\
+-  /usr/gnu/bin\
+-  /usr/new\
+-  /usr/new/bin\
+-  /usr/nbin\
+-  /sys5.3/bin\
+-  /sys5.3/usr/bin\
+-  /bsd4.3/bin\
+-  /bsd4.3/usr/ucb\
+-  /bsd4.3/usr/bin\
+-  /usr/bsd\
+-  /bsd43/bin\
+-  /opt/ansic/bin\
+-  /usr/ccs/bin\
+-  /usr/lib\
+-  /usr/ucblib\
+-  /lib\
+-  /usr/ccs/lib\
+-  /sbin\
+-  /usr/sbin\
+-  /usr/libexec\
+-  /usr/openwin/bin\
+-  /usr/local/bin\
++  $LOCALBASE/bin\
+ "
+ # /usr/openwin/bin added for xmkmf
+ 
diff --git a/pari/patches/patch-config_get__X11 b/pari/patches/patch-config_get__X11
new file mode 100644
index 0000000..fb8408f
--- /dev/null
+++ b/pari/patches/patch-config_get__X11
@@ -0,0 +1,28 @@
+$NetBSD$
+
+--- config/get_X11.orig	2014-03-25 08:59:21.000000000 +0000
++++ config/get_X11
+@@ -10,21 +10,8 @@ cd ..; rm -rf $tdir
+ # Check xmkmf answer
+ # X11 -- Headers
+ if test ! -f $Xincroot/X11/Xos.h; then
+-  x11pth="$addlib64\
+-    /usr/openwin/share/lib\
+-    /usr/openwin/lib\
+-    /usr/X11R6/lib       /usr/X11R5/lib       /usr/X11R4/lib\
+-    /usr/lib/X11R6       /usr/lib/X11R5       /usr/lib/X11R4\
+-    /usr/local/X11R6/lib /usr/local/X11R5/lib /usr/local/X11R4/lib\
+-    /usr/local/lib/X11R6 /usr/local/lib/X11R5 /usr/local/lib/X11R4\
+-    /usr/X11/lib\
+-    /usr/lib/X11\
+-    /usr/local/X11/lib\
+-    /usr/local/lib/X11\
+-    /usr/XFree86/lib/X11\
+-    /usr/lib\
+-    /usr/local/lib\
+-    /usr/athena/lib\
++  x11pth="\
++    $X11BASE/lib\
+   ";
+   pth=`echo $x11pth | sed 's,/lib,/include,g'`
+   x=`./locate X11/Xos.h '' $pth`
diff --git a/pari/patches/patch-config_get__archos b/pari/patches/patch-config_get__archos
new file mode 100644
index 0000000..dfdc408
--- /dev/null
+++ b/pari/patches/patch-config_get__archos
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- config/get_archos.orig	2011-09-22 20:02:11.000000000 +0000
++++ config/get_archos
+@@ -26,7 +26,7 @@ if test "$fastread" != yes; then
+ ==========================================================================
+ I know of the following Operating Systems
+ EOM
+-  rep='os2 freebsd netbsd cygwin linux mingw gnu gnukfreebsd hpux aix osf1 solaris sunos nextstep concentrix irix';
++  rep='os2 freebsd netbsd cygwin linux mingw gnu gnukfreebsd hpux aix osf1 solaris sunos nextstep concentrix irix dragonfly';
+   . ./display
+   echo $n ..."Any of these apply ? $c"
+   dflt=$osname; . ./myread
diff --git a/pari/patches/patch-config_get__dlld b/pari/patches/patch-config_get__dlld
new file mode 100644
index 0000000..a2c2d21
--- /dev/null
+++ b/pari/patches/patch-config_get__dlld
@@ -0,0 +1,30 @@
+$NetBSD$
+
+--- config/get_dlld.orig	2015-03-18 10:33:24.000000000 +0000
++++ config/get_dlld
+@@ -9,7 +9,7 @@ DLSUFFIX=so
+ soname=.$soname_num
+ do_dll=yes
+ case "$osname" in
+-  gnu*|aix|osf1|solaris|linux|freebsd|netbsd)
++  dragonfly*|gnu*|aix|osf1|solaris|linux|freebsd|netbsd)
+     case $pari_release_verbose in
+       *STABLE*)      sodest=.$version.$patch;; # released version
+       *DEVELOPMENT*) sodest=.$patch.0.0;;      # unstable version
+@@ -76,6 +76,7 @@ if test -n "$DLLD"; then
+       aix)     DLLDFLAGS='-r' ;;
+       darwin)  DLLDFLAGS="-compatibility_version $compat_ver -current_version $num_ver" ;;
+       freebsd) DLLDFLAGS='-Bshareable -x' ;;
++      dragonfly*) DLLDFLAGS='-Bshareable -x' ;;
+       hpux)    DLLDFLAGS='-b' ;;
+       irix)    DLLDFLAGS='-shared -elf -no_unresolved -all' ;;
+       osf1)    DLLDFLAGS='-shared' ;;
+@@ -107,7 +108,7 @@ if test -n "$DLLD"; then
+   fi
+   case "$osname" in
+ # Beware: will run through 'eval' [ hence ${...} instead of \$(...) ]
+-    gnu*|cygwin|osf1|freebsd|linux|sunos|solaris) EXTRADLLDFLAGS='-lc ${LIBS}';;
++    dragonfly*|gnu*|cygwin|osf1|freebsd|linux|sunos|solaris) EXTRADLLDFLAGS='-lc ${LIBS}';;
+   esac
+ 
+   if test "$fastread" != yes; then
diff --git a/pari/patches/patch-config_get__install b/pari/patches/patch-config_get__install
new file mode 100644
index 0000000..ee7d622
--- /dev/null
+++ b/pari/patches/patch-config_get__install
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- config/get_install.orig	2014-07-30 13:38:47.000000000 +0000
++++ config/get_install
+@@ -23,7 +23,7 @@ fi
+ echo $n "...for architecture-independent files (share-prefix) ? $c"
+ dflt=$share_prefix; . ./myread; share_prefix=$ans
+ 
+-dfltman=$share_prefix/man/man1
++dfltman=$prefix/man/man1
+ dfltdata=$share_prefix/pari
+ 
+ echo "Installation directories for:"
diff --git a/pari/patches/patch-config_get__ld b/pari/patches/patch-config_get__ld
new file mode 100644
index 0000000..76f10d1
--- /dev/null
+++ b/pari/patches/patch-config_get__ld
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- config/get_ld.orig	2011-09-22 20:02:11.000000000 +0000
++++ config/get_ld
+@@ -70,7 +70,7 @@ if test "$GNULDused" = yes; then
+   runpathprefix='-rpath '
+ else # guess...
+   case "$osname" in
+-    gnu|osf1|linux|cygwin*|freebsd|netbsd) runpathprefix='-rpath ' ;;
++    gnu|osf1|linux|cygwin*|freebsd|netbsd|dragonfly*) runpathprefix='-rpath ' ;;
+     solaris) runpathprefix='-R ' ;;
+     hpux) runpathprefix='+b ' ;;
+     aix) runpathprefix='-blibpath:' ;;
diff --git a/pari/patches/patch-config_get__libpth b/pari/patches/patch-config_get__libpth
new file mode 100644
index 0000000..eb937eb
--- /dev/null
+++ b/pari/patches/patch-config_get__libpth
@@ -0,0 +1,36 @@
+$NetBSD$
+
+--- config/get_libpth.orig	2014-03-25 08:59:21.000000000 +0000
++++ config/get_libpth
+@@ -1,7 +1,3 @@
+-case "$sizeof_long" in
+-  8) addlib64="/usr/local/lib64 /lib64 /usr/lib64"
+-esac
+-
+ libpth="`echo $LIBRARY_PATH | sed -e \"s%\([^$dir_sep]*\)$dir_sep*%\1 %g\"`"
+ case "$osname" in
+   cygwin*)
+@@ -34,21 +30,9 @@ case "$osname" in
+       "
+     fi;;
+   os2) libpth=`echo $libpth | sed 's,\\\\,/,g'`;;
+-  *) libpth="$libpth $addlib64\
+-      /usr/local/lib\
+-      /lib\
++  *) libpth="
+       /usr/lib\
+-      /opt/lib\
+-      /opt/local/lib\
+-      /opt/gnu/lib\
+-      /lib/pa1.1\
+-      /usr/lib/large\
+-      /lib/large\
+-      /usr/lib/small\
+-      /lib/small\
+-      /usr/ccs/lib\
+-      /usc/ucblib\
+-      /usr/shlib\
++      $LOCALBASE/lib\
+       .\
+    ";;
+ esac
diff --git a/pari/patches/patch-src_headers_paridecl.h b/pari/patches/patch-src_headers_paridecl.h
new file mode 100644
index 0000000..029dd84
--- /dev/null
+++ b/pari/patches/patch-src_headers_paridecl.h
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- src/headers/paridecl.h.orig	2015-05-27 15:40:13.000000000 +0000
++++ src/headers/paridecl.h
+@@ -1165,7 +1165,7 @@ GEN*    safelistel(GEN x, long l);
+ GEN*    safegcoeff(GEN x, long a, long b);
+ GEN     strntoGENstr(const char *s, long n0);
+ GEN     strtoGENstr(const char *s);
+-GEN     strtoi(const char *s);
++GEN     pari_strtoi(const char *s);
+ GEN     strtor(const char *s, long prec);
+ GEN     type0(GEN x);
+ 
diff --git a/pari/patches/patch-src_headers_paristio.h b/pari/patches/patch-src_headers_paristio.h
new file mode 100644
index 0000000..7cf9056
--- /dev/null
+++ b/pari/patches/patch-src_headers_paristio.h
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- src/headers/paristio.h.orig	2014-09-15 11:32:55.000000000 +0000
++++ src/headers/paristio.h
+@@ -13,6 +13,8 @@ Foundation, Inc., 51 Franklin Street, Fi
+ 
+ /* This file contains memory and I/O management definitions       */
+ 
++#include <fcntl.h>
++
+ typedef struct {
+   long s, us;
+ } pari_timer;
diff --git a/pari/patches/patch-src_language_anal.c b/pari/patches/patch-src_language_anal.c
new file mode 100644
index 0000000..b443a5f
--- /dev/null
+++ b/pari/patches/patch-src_language_anal.c
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- src/language/anal.c.orig	2014-10-01 14:57:39.000000000 +0000
++++ src/language/anal.c
+@@ -496,7 +496,7 @@ int_read(const char **s)
+ }
+ 
+ GEN
+-strtoi(const char *s) { return int_read(&s); }
++pari_strtoi(const char *s) { return int_read(&s); }
+ 
+ GEN
+ strtor(const char *s, long prec)
diff --git a/pari/patches/patch-src_language_compile.c b/pari/patches/patch-src_language_compile.c
new file mode 100644
index 0000000..7aeb6b7
--- /dev/null
+++ b/pari/patches/patch-src_language_compile.c
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- src/language/compile.c.orig	2015-03-18 10:33:24.000000000 +0000
++++ src/language/compile.c
+@@ -1915,7 +1915,7 @@ compilenode(long n, int mode, long flag)
+         op_push(OCpushreal, data_push(strntoGENstr(tree[n].str,tree[n].len)),n);
+         break;
+       case CSTint:
+-        op_push(OCpushgen,  data_push(strtoi((char*)tree[n].str)),n);
++        op_push(OCpushgen,  data_push(pari_strtoi((char*)tree[n].str)),n);
+         compilecast(n,Ggen, mode);
+         break;
+       case CSTstr:
diff --git a/pari/patches/patch-src_language_es.c b/pari/patches/patch-src_language_es.c
new file mode 100644
index 0000000..6112ea2
--- /dev/null
+++ b/pari/patches/patch-src_language_es.c
@@ -0,0 +1,21 @@
+$NetBSD$
+
+--- src/language/es.c.orig	2015-09-26 23:11:11.000000000 +0000
++++ src/language/es.c
+@@ -243,7 +243,6 @@ gp_read_stream_buf(FILE *fi, Buffer *b)
+   init_filtre(&F, b);
+ 
+   IM.file = fi;
+-  IM.fgets= &fgets;
+   IM.getline= &file_input;
+   IM.free = 0;
+   return input_loop(&F,&IM);
+@@ -337,7 +336,7 @@ file_getline(Buffer *b, char **s0, input
+     /* # of chars read by fgets is an int; be careful */
+     read = minuu(left, MAX);
+     s = b->buf + used;
+-    if (! IM->fgets(s, (int)read, IM->file)) return **s0? *s0: NULL; /* EOF */
++    if (! fgets(s, (int)read, IM->file)) return **s0? *s0: NULL; /* EOF */
+ 
+     l = strlen(s);
+     if (l+1 < read || s[l-1] == '\n') return *s0; /* \n */
diff --git a/pari/patches/patch-src_language_parsec.h b/pari/patches/patch-src_language_parsec.h
new file mode 100644
index 0000000..3084a1d
--- /dev/null
+++ b/pari/patches/patch-src_language_parsec.h
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- src/language/parsec.h.orig	2014-07-30 13:38:47.000000000 +0000
++++ src/language/parsec.h
+@@ -203,7 +203,7 @@ newintnode(struct node_loc *loc)
+   if (loc->end-loc->start<=(long)(1+LOG10_2*BITS_IN_LONG))
+   {
+     pari_sp ltop=avma;
+-    GEN g=strtoi(loc->start);
++    GEN g=pari_strtoi(loc->start);
+     long s;
+     avma=ltop;
+     if (signe(g)==0)      return newnode(Fsmall,0,-1,loc);
diff --git a/pari/patches/patch-src_modules_mpqs.c b/pari/patches/patch-src_modules_mpqs.c
new file mode 100644
index 0000000..ebd71a0
--- /dev/null
+++ b/pari/patches/patch-src_modules_mpqs.c
@@ -0,0 +1,40 @@
+$NetBSD$
+
+--- src/modules/mpqs.c.orig	2014-09-15 11:32:55.000000000 +0000
++++ src/modules/mpqs.c
+@@ -2215,7 +2215,7 @@ mpqs_combine_large_primes(mpqs_handle_t 
+     *f = gerepileuptoint(av0, inv_q);
+     return c;
+   }
+-  Y1 = strtoi(e[0].Y);
++  Y1 = pari_strtoi(e[0].Y);
+   av2 = avma; /* preserve inv_q and Y1 */
+ 
+   while (fgets(buf, MPQS_STRING_LENGTH, COMB))
+@@ -2241,7 +2241,7 @@ mpqs_combine_large_primes(mpqs_handle_t 
+         *f = gerepileuptoint(av0, inv_q);
+         return c;
+       }
+-      Y1 = strtoi(e[i].Y);
++      Y1 = pari_strtoi(e[i].Y);
+       i = 1 - i; /* subsequent relations go to other row */
+       av2 = avma; /* preserve inv_q and Y1 */
+       continue;
+@@ -2251,7 +2251,7 @@ mpqs_combine_large_primes(mpqs_handle_t 
+     memset((void *)ei, 0, ei_size * sizeof(long));
+     mpqs_set_exponents(ei, e[0].E);
+     mpqs_set_exponents(ei, e[1].E);
+-    Y2 = strtoi(e[i].Y);
++    Y2 = pari_strtoi(e[i].Y);
+     new_Y = modii(mulii(mulii(Y1, Y2), inv_q), h->N);
+     new_Y1 = subii(h->N, new_Y);
+     if (absi_cmp(new_Y1, new_Y) < 0) new_Y = new_Y1;
+@@ -2362,7 +2362,7 @@ mpqs_add_relation(GEN Y_prod, GEN N, lon
+   s = strchr(rel, ':') - 1;
+   *s = '\0';
+ 
+-  res = remii(mulii(Y_prod, strtoi(rel)), N);
++  res = remii(mulii(Y_prod, pari_strtoi(rel)), N);
+ 
+   s = paristrtok_r(s + 3, " \n", &tok);
+   while (s != NULL)