diff options
author | sno <sno> | 2010-02-06 10:37:06 +0000 |
---|---|---|
committer | sno <sno> | 2010-02-06 10:37:06 +0000 |
commit | 295cb7599897db2a489de8a2488a9f4eba6d9955 (patch) | |
tree | d4cfe2f11e026a03ab8550646a0de9173652ed50 /math/pari | |
parent | bf3a9971530840ffe75c0aab3192278be0cf1368 (diff) | |
download | pkgsrc-295cb7599897db2a489de8a2488a9f4eba6d9955.tar.gz |
Updating math/pari from 2.1.6nb3 to 2.3.5 (newer than PR pkg/38116)
pkgsrc changes:
- Adding license (GPLv2)
- Adding X11 and GMP support (latter via option)
- Adding patches to support math/p5-Math-Pari can be build without
rebuilding pari again
Upstream changes:
* Primarily a lot of bug fixes
* Plotting API reworked
* More targets are supported
Diffstat (limited to 'math/pari')
-rw-r--r-- | math/pari/Makefile | 30 | ||||
-rw-r--r-- | math/pari/PLIST | 34 | ||||
-rw-r--r-- | math/pari/buildlink3.mk | 16 | ||||
-rw-r--r-- | math/pari/distinfo | 41 | ||||
-rw-r--r-- | math/pari/options.mk | 19 | ||||
-rw-r--r-- | math/pari/patches/patch-aa | 279 | ||||
-rw-r--r-- | math/pari/patches/patch-ab | 369 | ||||
-rw-r--r-- | math/pari/patches/patch-ac | 24 | ||||
-rw-r--r-- | math/pari/patches/patch-ad | 47 | ||||
-rw-r--r-- | math/pari/patches/patch-ae | 95 | ||||
-rw-r--r-- | math/pari/patches/patch-af | 43 | ||||
-rw-r--r-- | math/pari/patches/patch-ag | 54 | ||||
-rw-r--r-- | math/pari/patches/patch-ah | 36 | ||||
-rw-r--r-- | math/pari/patches/patch-ai | 369 | ||||
-rw-r--r-- | math/pari/patches/patch-aj | 36 | ||||
-rw-r--r-- | math/pari/patches/patch-ak | 116 | ||||
-rw-r--r-- | math/pari/patches/patch-al | 117 | ||||
-rw-r--r-- | math/pari/patches/patch-am | 113 | ||||
-rw-r--r-- | math/pari/patches/patch-an | 57 | ||||
-rw-r--r-- | math/pari/patches/patch-ao | 44 | ||||
-rw-r--r-- | math/pari/patches/patch-ap | 22 | ||||
-rw-r--r-- | math/pari/patches/patch-aq | 17 | ||||
-rw-r--r-- | math/pari/patches/patch-ar | 9 |
23 files changed, 915 insertions, 1072 deletions
diff --git a/math/pari/Makefile b/math/pari/Makefile index 224fc8005ef..26faefeeeab 100644 --- a/math/pari/Makefile +++ b/math/pari/Makefile @@ -1,14 +1,16 @@ -# $NetBSD: Makefile,v 1.42 2009/05/20 00:58:22 wiz Exp $ +# $NetBSD: Makefile,v 1.43 2010/02/06 10:37:06 sno Exp $ -DISTNAME= pari-2.1.6 -PKGREVISION= 3 +DISTNAME= pari-2.3.5 CATEGORIES= math MASTER_SITES= http://pari.math.u-bordeaux.fr/pub/pari/unix/ -EXTRACT_SUFX= .tgz +EXTRACT_SUFX= .tar.gz MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://pari.math.u-bordeaux.fr/ COMMENT= Software package for computer-aided number theory +LICENSE= gnu-gpl-v2 + +MAKE_JOBS_SAFE= no BUILD_DEPENDS+= dvipsk-[0-9]*:../../print/dvipsk @@ -17,24 +19,32 @@ PKG_DESTDIR_SUPPORT= user-destdir TEX_ACCEPTED= teTeX3 TEX_DEPMETHOD= build -USE_GNU_READLINE= yes # rl_save_prompt() USE_LIBTOOL= yes -USE_TOOLS+= perl:run +USE_TOOLS+= perl:run imake +USE_LANGUAGES+= c c++ +USE_GNU_READLINE= yes # rl_save_prompt() HAS_CONFIGURE= yes +CONFIGURE_ENV+= LOCALBASE=${LOCALBASE:Q} +CONFIGURE_ENV+= PERL5=${PERL5:Q} +CONFIGURE_ENV+= X11BASE=${X11BASE:Q} +CONFIGURE_ENV+= Xincroot=${X11BASE}/include + CONFIGURE_SCRIPT= ${WRKSRC}/Configure CONFIGURE_ARGS+= --graphic=X11 CONFIGURE_ARGS+= --prefix=${PREFIX:Q} CONFIGURE_ARGS+= --mandir=${PREFIX}/${PKGMANDIR}/man1 CONFIGURE_ARGS+= --share-prefix=${PREFIX}/share -CONFIGURE_ENV+= LOCALBASE=${LOCALBASE:Q} -CONFIGURE_ENV+= PERL5=${PERL5:Q} -CONFIGURE_ENV+= X11BASE=${X11BASE:Q} -CONFIGURE_ENV+= Xincroot=${X11BASE}/include +CONFIGURE_ARGS+= --with-fltk=${PREFIX:Q} + +REPLACE_PERL+= src/desc/PARI/822.pm TEST_TARGET= test-compat bench +.include "options.mk" + .include "../../devel/ncurses/buildlink3.mk" .include "../../devel/readline/buildlink3.mk" .include "../../x11/libX11/buildlink3.mk" +.include "../../x11/fltk/buildlink3.mk" .include "../../mk/tex.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/math/pari/PLIST b/math/pari/PLIST index 6aceca1071f..c1dab99b32e 100644 --- a/math/pari/PLIST +++ b/math/pari/PLIST @@ -1,6 +1,6 @@ -@comment $NetBSD: PLIST,v 1.7 2009/06/14 20:47:53 joerg Exp $ +@comment $NetBSD: PLIST,v 1.8 2010/02/06 10:37:06 sno Exp $ bin/gp -bin/gp-2.1 +bin/gp-2.3 bin/gphelp bin/tex2mail include/pari/genpari.h @@ -12,31 +12,43 @@ include/pari/paridecl.h include/pari/parierr.h include/pari/parigen.h include/pari/pariinl.h +include/pari/parinf.h +include/pari/pariold.h include/pari/pariport.h +include/pari/paripriv.h include/pari/paristio.h include/pari/parisys.h +include/pari/paritune.h include/pari/paritype.h -lib/libpari.la +${PLIST.nogmp}lib/libpari.la +${PLIST.gmp}lib/libpari-gmp.la +lib/pari/pari.cfg man/man1/gp.1 man/man1/gphelp.1 man/man1/pari.1 man/man1/tex2mail.1 +share/emacs/site-lisp/pari/pari-completion.el +share/emacs/site-lisp/pari/pari-conf.el +share/emacs/site-lisp/pari/pari-fontification.el +share/emacs/site-lisp/pari/pari-help.el +share/emacs/site-lisp/pari/pari-messages.el +share/emacs/site-lisp/pari/pari.el +share/emacs/site-lisp/pari/pariemacs.txt +share/emacs/site-lisp/pari/sli-tools.el share/pari/AUTHORS -share/pari/Announce.2.1 share/pari/CHANGES share/pari/COMPAT share/pari/COPYING -share/pari/CVS.txt share/pari/MACHINES share/pari/NEW +share/pari/PARI/822.pm share/pari/README -share/pari/TODO share/pari/doc/Makefile share/pari/doc/appa.tex share/pari/doc/appb.tex share/pari/doc/appc.tex +share/pari/doc/libpari.dvi share/pari/doc/paricfg.tex -share/pari/doc/paricfg.tex.in share/pari/doc/parimacro.tex share/pari/doc/pdfmacs.tex share/pari/doc/refcard.dvi @@ -52,10 +64,6 @@ share/pari/doc/usersch2.tex share/pari/doc/usersch3.tex share/pari/doc/usersch4.tex share/pari/doc/usersch5.tex -share/pari/emacs/pari-translator.el -share/pari/emacs/pari.el -share/pari/emacs/pariemacs.txt -share/pari/emacs/with-syntax.el share/pari/examples/EXPLAIN share/pari/examples/Inputrc share/pari/examples/Makefile @@ -63,8 +71,8 @@ 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/matexp.c share/pari/examples/rho.gp share/pari/examples/squfof.gp share/pari/examples/taylor.gp @@ -76,4 +84,4 @@ share/pari/misc/gprc.dft share/pari/misc/new.dic share/pari/misc/pari.xpm share/pari/misc/xgp -@pkgdir share/pari/galdata +share/pari/pari.desc diff --git a/math/pari/buildlink3.mk b/math/pari/buildlink3.mk index 4878aaaae75..5710b4805b7 100644 --- a/math/pari/buildlink3.mk +++ b/math/pari/buildlink3.mk @@ -1,13 +1,23 @@ -# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 19:24:58 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.9 2010/02/06 10:37:06 sno Exp $ BUILDLINK_TREE+= pari .if !defined(PARI_BUILDLINK3_MK) PARI_BUILDLINK3_MK:= -BUILDLINK_API_DEPENDS.pari+= pari>=2.1.5nb1 -BUILDLINK_ABI_DEPENDS.pari+= pari>=2.1.6nb1 +BUILDLINK_API_DEPENDS.pari+= pari>=2.3.4 +BUILDLINK_ABI_DEPENDS.pari+= pari>=2.3.4 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/math/pari/distinfo b/math/pari/distinfo index 4139f6ad557..9cdc4838169 100644 --- a/math/pari/distinfo +++ b/math/pari/distinfo @@ -1,23 +1,20 @@ -$NetBSD: distinfo,v 1.15 2006/09/19 22:57:18 joerg Exp $ +$NetBSD: distinfo,v 1.16 2010/02/06 10:37:06 sno Exp $ -SHA1 (pari-2.1.6.tgz) = 54bd40fa70a02e76d78d0ea19c0f56f7da62de8e -RMD160 (pari-2.1.6.tgz) = 6b79e84b639d1862df148b253136deacd73bf4f0 -Size (pari-2.1.6.tgz) = 1541464 bytes -SHA1 (patch-aa) = 5e12a0e5f91ee0646cd86515134eb586745e1df1 -SHA1 (patch-ab) = 7e0a7fdc64fe02c65dcff595d57c00c491a3d552 -SHA1 (patch-ac) = 84af235f319ae108aadeedea5a25e005540160ac -SHA1 (patch-ad) = 82c0532ba6bc23b1c91865591c2bdfbee144bcf9 -SHA1 (patch-ae) = 0b8cd90077b3722c53175685e23915770d53b2b8 -SHA1 (patch-af) = e5be2dc087a5c6290ccbdbacc09bf8078abc11ba -SHA1 (patch-ag) = 2d20a9d84c869ff9854b43e62cc4b716241e459b -SHA1 (patch-ah) = a5517f6f83812de3a7e3c5f6842df12a40871951 -SHA1 (patch-ai) = 3e82dd6786bca74c0a1fa4bcff770216efa6d281 -SHA1 (patch-aj) = 46bb1f1d1f98e28070f5c75c90d94ec359f9683f -SHA1 (patch-ak) = 62d2663b06cd709ac04e2b097687201826049e73 -SHA1 (patch-al) = 11fb045f08a306b65962855e4af8d68d6146e8a9 -SHA1 (patch-am) = f37571baaf6b4ff3f805a5917f55a61324347842 -SHA1 (patch-an) = 881878c2903b4f1114b41349b103bb70574fcecb -SHA1 (patch-ao) = d6f818278f2ef0599479d2a58efc412a9eedc779 -SHA1 (patch-ap) = 985c5c49efb52c04f53f098480f0de1209fa16ef -SHA1 (patch-aq) = 43a6f7a4b74a2affbdffca7bf781009e3e1dece0 -SHA1 (patch-ar) = 753d10a31dbf106c3217976b6dd16a4d3f864428 +SHA1 (pari-2.3.5.tar.gz) = f211ccfe42a4b18dbcde832dfd1ece6f477f4966 +RMD160 (pari-2.3.5.tar.gz) = 488adf3af5398d0ab5390eb86b65cd79bd1044c5 +Size (pari-2.3.5.tar.gz) = 2018097 bytes +SHA1 (patch-aa) = 34efbc67afe5a98874c4fb3f18f4591bfa859d1f +SHA1 (patch-ab) = b008e8c3388fe7dae4eecbb6613408492ba03e14 +SHA1 (patch-ac) = a53784be5a94a289f86e1e6bae108adecd2d01c3 +SHA1 (patch-ad) = 5399688168b6f55073a460459fb3a89971583a6d +SHA1 (patch-ae) = 34e174cf1c97ee8b627691f3a5bf19fbbea43324 +SHA1 (patch-af) = 985b3a35f4c69124336c23c9c78690eb7e7d1567 +SHA1 (patch-ag) = 8c50e5b01832bc876874d51df02905dddb7839f3 +SHA1 (patch-ah) = 3febc677f1b94a9b3f4dec79388fdb8f77fa184f +SHA1 (patch-ai) = 21877efea2de94cf26e53234c80ef9ae15f6c836 +SHA1 (patch-aj) = 9231890613515ceb2c7018189dc549872f04a14d +SHA1 (patch-ak) = 622a06c67fd16c61ca8219c01e7f9dc9de202df4 +SHA1 (patch-al) = 3cb64ea5b1caeaeeeebb7297a7e061d235925686 +SHA1 (patch-am) = 09e158e5cd3a680d786aa876ce66d034df0c3b86 +SHA1 (patch-an) = 235aec62e4344307427270f084c4491e7abba8b3 +SHA1 (patch-ao) = b0854d8e32953c99f7c8fe9fafae59e8bccfa316 diff --git a/math/pari/options.mk b/math/pari/options.mk new file mode 100644 index 00000000000..55044c025f2 --- /dev/null +++ b/math/pari/options.mk @@ -0,0 +1,19 @@ +# $NetBSD: options.mk,v 1.1 2010/02/06 10:37:06 sno Exp $ + +PKG_OPTIONS_VAR= PKG_OPTIONS.pari +PKG_SUPPORTED_OPTIONS= gmp +PKG_SUGGESTED_OPTIONS= gmp + +.include "../../mk/bsd.options.mk" + +PLIST_VARS+= nogmp gmp + +.if !empty(PKG_OPTIONS:Mgmp) +PLIST.gmp= yes + +CONFIGURE_ARGS+= --with-gmp=${PREFIX:Q} + +.include "../../devel/gmp/buildlink3.mk" +.else +PLIST.nogmp= yes +.endif diff --git a/math/pari/patches/patch-aa b/math/pari/patches/patch-aa index d5d49cf051a..eb577cd74cd 100644 --- a/math/pari/patches/patch-aa +++ b/math/pari/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.12 2005/12/03 00:54:11 joerg Exp $ +$NetBSD: patch-aa,v 1.13 2010/02/06 10:37:06 sno Exp $ ---- Configure.orig 2004-11-25 15:58:25.000000000 +0000 -+++ Configure -@@ -187,35 +187,7 @@ if test -z "$OS2_SHELL"; then dir_sep=': +--- config/get_PATH.orig 2008-01-16 15:57:16.000000000 +0000 ++++ config/get_PATH +@@ -4,35 +4,7 @@ if test -z "$OS2_SHELL"; then dir_sep=': pth="\ /bin\ /usr/bin\ @@ -39,274 +39,3 @@ $NetBSD: patch-aa,v 1.12 2005/12/03 00:54:11 joerg Exp $ " # /usr/openwin/bin added for xmkmf -@@ -246,7 +218,7 @@ fi - # We might need the following : - # - echo Looking for some tools first ... --list='ld zcat gzip ranlib perl emacs' -+list='ld zcat ranlib emacs' - pathspace=`echo $PATH | sed -e "s/$dir_sep/ /g" | sed -e 's,\\\\,/,g'` - - for file in $list; do -@@ -259,6 +231,7 @@ for file in $list; do - esac - done - if test -z "$zcat" -a -n "$gzip"; then zcat="$gzip -dc"; fi -+perl="${PERL5}"; - - ####################### CONFIGURE - ARCHITECTURE ############################ - # -@@ -290,7 +263,7 @@ if test "$fastread" != yes; then - ========================================================================== - I know of the following Operating Systems - EOM -- rep='os2 freebsd cygwin linux hpux aix osf1 solaris sunos nextstep concentrix irix'; -+ rep='os2 freebsd netbsd cygwin linux hpux aix osf1 solaris sunos nextstep concentrix irix dragonfly'; - . ./display - echo $n ..."Any of these apply ? $c" - dflt=$osname; . ./myread -@@ -302,20 +275,26 @@ fi - # The asm file used (if any) - # - case "$arch" in -- sparc) asmarch=sparcv8_micro; pretty=Sparc ;; -+ sparc) asmarch=sparcv8_micro; pretty=SPARC ;; - sparcv7) asmarch=$arch; pretty=SparcV7 ;; - sparcv8_micro) asmarch=$arch; pretty=MicroSparc ;; - sparcv8_super) asmarch=$arch; pretty=SuperSparc ;; - sparcv9) asmarch=sparcv8_micro; pretty=UltraSparc ;; -+ sparc64) asmarch=none; pretty=UltraSPARC ;; - m68k) asmarch=$arch; pretty="MC680x0, x>=2" ;; - i?86) asmarch=ix86 ; pretty=$arch ;; -- hppa) asmarch=none ; pretty=HP -+ hppa) asmarch=none ; pretty=HPPA - case "$osname-`uname -r`" in - hpux-?.09.*) asmarch=none ;; - hpux-?.10.*) asmarch=$arch ;; - esac ;; - alpha) asmarch=$arch; pretty=Alpha ;; -- mips) asmarch=none; pretty=Mips ;; -+ arm) asmarch=$arch; pretty=ARM ;; -+ mips) asmarch=none; pretty=MIPS ;; -+ powerpc) asmarch=none; pretty=PowerPC ;; -+ sh3) asmarch=none; pretty=SH-3 ;; -+ sh5) asmarch=none; pretty=SH-5 ;; -+ vax) asmarch=none; pretty=VAX ;; - fx2800) asmarch=none; pretty="Alliant FX/2800" ;; - none) asmarch=none; pretty="unknown" ;; - *) asmarch=none; pretty=$arch -@@ -326,9 +305,12 @@ esac - # Modifications for pretty name and asm file - # - case "$osname" in -- nextstep|cygwin*|linux|freebsd|os2|gnu) -+ nextstep|cygwin*|linux|freebsd|os2|gnu|dragonfly) - pretty="$pretty running $osname"; - if test "$arch" = m68k; then asmarch=none; fi ;; -+ netbsd) -+ pretty="$pretty running NetBSD"; -+ if test "$arch" = m68k; then asmarch=none; fi ;; - esac - - if test "$kernel" = no; then -@@ -351,7 +333,7 @@ EOM - fi - fi - case "$asmarch" in -- none) prettyk="C portable";; -+ none) prettyk="portable C";; - sparcv7) prettyk=SparcV7;; - sparcv8_super) prettyk=SuperSparc;; - sparcv8_micro) prettyk=MicroSparc;; -@@ -375,7 +357,7 @@ echo "Building for architecture: $pretty - case "$osname-$arch" in - os2-*) ln_s=cp; make_sh=sh; exe_suff=.exe; extraflag="-Zexe" ;; - cygwin*) ln_s="ln -s"; make_sh="/bin/sh"; exe_suff=.exe; extraflag="" ;; -- *) ln_s="ln -s"; make_sh="/bin/sh"; exe_suff=; extraflag="" ;; -+ *) ln_s="ln -sf"; make_sh="/bin/sh"; exe_suff=; extraflag="" ;; - esac - - ####################### CONFIGURE - LIBRARIES ############################### -@@ -418,20 +400,8 @@ if test "$optimization" != profiling; th - fi;; - os2) libpth=`echo $LIBRARY_PATH | sed 's/;/ /g' | sed 's,\\\\,/,g'`;; - *) libpth="\ -- /usr/local/lib\ -- /lib\ - /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 -@@ -518,17 +488,9 @@ if test "$optimization" != profiling; th - # Readline -- TermCap - lib=$rl_fullname; sym=tgetent; . ./locatesymbol - if test -n "$try"; then # tgetent needed -- lib=ncurses; . ./locatelib -- if test -n "$try"; then # ncurses found. Does it contain tgetent ? -- lib=$try; . ./locatesymbol -- fi -- if test -n "$try"; then -- rl_ncurses=$ncurses -- else - lib=termcap; . ./locatelib - rl_termcap=$termcap - fi -- fi - # Readline -- Allocation - lib=$rl_fullname; sym=alloca; . ./locatesymbol - if test -n "$try"; then # alloca needed -@@ -546,24 +508,15 @@ if test "$optimization" != profiling; th - $cygtop/H-${arch}-cygwin32/${arch}-cygwin32/include\ - ";; - *) incpth="\ -- /usr/local/include/readline\ -- /usr/include/readline\ -- /opt/include/readline\ -- /opt/local/include/readline\ -- /opt/gnu/include/readline\ -- /usr/unsupported/include/readline\ -- /usr/local/include\ -- /usr/include\ -- /opt/include\ -- /opt/local/include\ -- /opt/gnu/include\ -+ $LOCALBASE/include\ - ";; - esac - pth="$readline_add $incpth" -- x=`./locate 'readline.h' '' $pth` -+ x=`./locate 'readline/readline.h' '' $pth` - CPPF_defined= - case $x in - ?:/*|/*) rl_include=`echo $x | sed 's,/readline.h,,'` -+ echo $x $rl_include - if (grep CPPFunction $x > /dev/null 2>&1); then CPPF_defined=yes; fi - if (grep rl_message $x > /dev/null 2>&1); then rl_message=yes; fi - if (grep rl_completion_matches $x > /dev/null 2>&1); then -@@ -601,7 +554,7 @@ if test "$optimization" != profiling; th - # in case headers are not installed correctly - RLINCLUDE="-I$rl_include -DREADLINE_LIBRARY" - fi -- RLLIBS="-L$readline -lreadline" -+ RLLIBS="-Wl,-R$readline -L$readline -lreadline" - if test -n "$rl_ncurses"; then - echo ..."Library ncurses needed by readline" - RLLIBS="$RLLIBS -lncurses" -@@ -662,33 +615,7 @@ EOT - # X11 -- Headers - if test ! -f $Xincroot/X11/Xos.h; then - x11pth="\ -- /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/X386/lib\ -- /usr/x386/lib\ -- /usr/XFree86/lib/X11\ -- /usr/lib\ -- /usr/local/lib\ -- /usr/unsupported/lib\ -- /usr/athena/lib\ -- /usr/local/x11r5/lib\ -- /usr/lpp/Xamples/lib\ -+ $X11BASE/lib\ - "; - pth=`echo $x11pth | s,/lib,/include,g` - x=`./locate X11/Xos.h '' $pth` -@@ -867,7 +794,7 @@ else - OPTFLAGS=-O; cflags=-Aa; DLCFLAGS=+z;; - # best tuning option, even for PPC604: - aix-*) OPTFLAGS=-O2; cflags='-qlanglvl=ansi -qtune=601';; -- cygwin*|linux-i?86|freebsd-i?86) -+ cygwin*|linux-i?86|freebsd-i?86|dragonfly-i?86) - OPTFLAGS=-O2; cflags=-m486;; - osf1-*) OPTFLAGS='-O4 -migrate -ifo -Olimit 9999';; - sunos-*) OPTFLAGS=-fast; PRFFLAGS='-pg -Bstatic';; -@@ -877,7 +804,7 @@ else - esac - PRFFLAGS="$PRFFLAGS $OPTFLAGS" - fi --cflags="$cflags $DLCFLAGS" -+cflags="$CFLAGS $cflags $DLCFLAGS" - - case "$osname" in - nextstep) cflags="-traditional-cpp $cflags";; -@@ -962,6 +889,7 @@ case "$osname-$arch" in - linux-*|cygwin*|gnu-*) - LD=$CC; LDFLAGS="$cflags -Xlinker -export-dynamic" - runpathprefix='-Xlinker -rpath -Xlinker ';; -+ netbsd*) LD=$CC; LDFLAGS="$LDFLAGS -Wl,-E";; - osf1-alpha) - LD=$ld; LIBS="$LIBS -lots -lc"; runpathprefix='-rpath ' - LDFLAGS='-std0 -call_shared /usr/lib/cmplrs/cc/crt0.o' -@@ -1006,7 +934,7 @@ if test "$optimization" = profiling; the - # aix-*) DLSUFFIX=a ;; dynamic linking does not work! - sunos-*) sodest=$VersionMajor$VersionMinor.$patch - soname=$sodest;; -- gnu-*|*-alpha|solaris-*|linux-*|freebsd-*) -+ gnu-*|*-alpha|solaris-*|linux-*|freebsd-*|dragonfly-*) - case $libpari_base in - pari) sodest=$version.$patch;; # released versions - *) sodest=$patch.0.0;; # unstable versions -@@ -1042,6 +970,7 @@ if test -n "$DLLD"; then - aix-*) DLLDFLAGS="-r" ;; - hpux-*) DLLDFLAGS="-b -E" ;; - freebsd-*) DLLDFLAGS="-Bshareable -x" ;; -+ dragonfly-*) DLLDFLAGS="-Bshareable -x" ;; - gnu-*|linux-*) DLLDFLAGS="-shared -soname \$(LIBPARI_SONAME)" ;; - irix-*) DLLDFLAGS="-shared -elf -no_unresolved -all" ;; - *-alpha) DLLDFLAGS="-shared"; EXTRADLLDFLAGS='${LIBS}' -@@ -1054,7 +983,7 @@ if test -n "$DLLD"; then - esac - fi - case "$osname" in -- freebsd|linux|sunos|solaris) DLLDFLAGS="$DLLDFLAGS -lc -lm";; -+ dragonfly|freebsd|linux|sunos|solaris) DLLDFLAGS="$DLLDFLAGS -lc -lm";; - esac - - if test "$fastread" != yes; then -@@ -1207,8 +1136,8 @@ if test -z "$share_prefix"; then - dfltman=$prefix/man/man1 - dfltall=$prefix/lib/pari - else -- dfltman=$share_prefix/man/man1 -- dfltall=$share_prefix/doc/pari -+ dfltman=$prefix/man/man1 -+ dfltall=$share_prefix/pari - fi - - echo $n ..."\"gp\" executable ? $c" -@@ -1289,6 +1218,7 @@ fi - case "$osname" in - *cygwin*) LDDYN="-L$libdir -lpari_dll" ; runpath="$libdir" ; - DYNLIBS=-lpari_dll ; DYNFLAGS=-Dlibpari_USE_DLL ;; -+ netbsd) LDDYN="-Wl,-R$libdir -L$libdir -l$libpari_base" ; runpath="$libdir" ;; - *) LDDYN="-L$libdir -l$libpari_base" ; runpath="$libdir" ;; - esac - diff --git a/math/pari/patches/patch-ab b/math/pari/patches/patch-ab index e8198692268..2d9716c7012 100644 --- a/math/pari/patches/patch-ab +++ b/math/pari/patches/patch-ab @@ -1,322 +1,57 @@ -$NetBSD: patch-ab,v 1.6 2006/09/19 22:57:18 joerg Exp $ +$NetBSD: patch-ab,v 1.7 2010/02/06 10:37:06 sno Exp $ ---- config/Makefile.SH.orig -+++ config/Makefile.SH -@@ -60,10 +60,8 @@ - OBJS="$OBJS $f\$(_O)" +--- Configure.orig 2008-01-16 15:57:54.000000000 +0000 ++++ Configure +@@ -36,7 +36,7 @@ cd $config_dir + . ./get_PATH + # We might need the following : + echo Looking for some tools first ... +-list='ld zcat gzip ranlib perl emacs' ++list='ld zcat ranlib emacs' + pathspace=`echo $PATH | sed -e "s/$dir_sep/ /g" | sed -e 's,\\\\,/,g'` + + for file in $list; do +@@ -49,6 +49,7 @@ for file in $list; do + esac done - OBJSGP='' --OBJSDGP='' - for f in $gp $graph; do - OBJSGP="$OBJSGP $f\$(_O)" -- OBJSDGP="$OBJSDGP $f-dyn\$(_O)" - done - for f in $inline; do - OBJS="$OBJS $f\$(_O)" -@@ -90,7 +88,7 @@ - X11) - PLOTFILE=plotX.c - PLOTCFLAGS=-I$Xincroot -- PLOTLIBS="-L$X11 -lX11 $extralib" -+ PLOTLIBS="-Wl,-R${X11BASE}/lib -L${X11BASE}/lib -lX11 $extralib" - if test "$osname" = concentrix; then PLOTLIBS="-lX11"; fi - plotrunpath=$X11 - ;; -@@ -108,27 +106,14 @@ - RUNPTH="$runpathprefix $TOP/$objdir:$tmp";; - esac - --if test -z "$DLLD"; then -- exec="gp-sta"; static=y --else -- exec="gp-sta gp-dyn" --fi - doexec="env \"LD_LIBRARY_PATH=.;\$\$LD_LIBRARY_PATH\" $src/test/dotest $sizeof_long" - case "$sizeof_long" in - 4) numbits=32;; - 8) numbits=64;; + if test -z "$zcat" -a -n "$gzip"; then zcat="$gzip -dc"; fi ++perl=${PERL5} + + ####################### CONFIGURE - ARCHITECTURE ############################ + . ./get_archos # arch, osname +@@ -101,14 +102,14 @@ fi + . ./get_static # static + # For dynamic linking, before and after installing + runpath="$libdir" +-LDDYN="-L$libdir -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 --if test -z "$emacs"; then -- install_emacs_files= -- pari_elc= --else -- install_emacs_files=install_emacs_files -- pari_elc=$emx/pari.elc --fi --case "$static" in -- n) dft=dyn; libdft=lib-dyn;; -- y) dft=sta; libdft= ;; --esac -+ -+install_emacs_files=install_emacs_files -+pari_elc= - - cat > $file << EOT - # Makefile for Pari/GP -- $pretty -@@ -142,33 +127,22 @@ - ASFLAGS = $ASFLAGS - AR = ar - --CC = $CC -+CC = \$(LIBTOOL) --mode=compile $CC - CPPFLAGS = -I. -I$src/headers - CFLAGS = $cflags --LD = $LD -+LD = \$(LIBTOOL) --mode=link $CC - LDFLAGS = $LDFLAGS --DLLD = $DLLD --DLLDFLAGS = $DLLDFLAGS - EXTRADLLDFLAGS = $EXTRADLLDFLAGS - CPP = $CPP - --_O = .o --_A = .a -+_O = .lo -+_A = .la - LIB_PREFIX = lib --LIBPARI = \$(LIB_PREFIX)$libpari_base --LIBPARI_STA= \$(LIBPARI)\$(_A) --LIBPARI_SO = \$(LIBPARI).$DLSUFFIX --LIBPARI_DYN = \$(LIBPARI_SO).$sodest --LIBPARI_SONAME= \$(LIBPARI_SO).$soname -+LIBPARI = \$(LIB_PREFIX)$libpari_base\$(_A) - - RUNPTH = $RUNPTH - RUNPTH_FINAL = $RUNPTH_FINAL --LDDYN = $LDDYN --DLCFLAGS = $DLCFLAGS - LIBS = $LIBS --DYNLIBS = $DYNLIBS --DYNFLAGS = $DYNFLAGS --DYNRELOC = $DYNRELOC - - RM = rm -f - MV = mv -f -@@ -192,8 +166,10 @@ - MISCDIR = \$(ALLDIR)/misc - - INSTALL = $cfg/install --INSTALL_PROGRAM = \$(INSTALL) --INSTALL_DATA = \$(INSTALL) -m 644 -+INSTALL_PROGRAM = \$(BSD_INSTALL_PROGRAM) -+INSTALL_SCRIPT = \$(BSD_INSTALL_SCRIPT) -+INSTALL_DATA = \$(BSD_INSTALL_DATA) -+INSTALL_MAN = \$(BSD_INSTALL_MAN) - - # Graphic library. - PLOTFILE = $PLOTFILE -@@ -223,26 +199,17 @@ - - OBJS = $OBJS - OBJSGP = $OBJSGP --OBJSDGP = $OBJSDGP -- --dft: gp $pari_elc -- - - --gp: gp-$dft ../gp$suffix$exe_suff $libdft -- - -+all: lib gp - --../gp$suffix$exe_suff: gp-$dft -- -\$(RM) \$@ -- -\$(LN) $ln_objdir/gp-$dft$exe_suff \$@ -+lib: \$(LIBPARI) - --all: $exec lib-sta -+\$(LIBPARI): \$(OBJS) -+ \$(LD) -o \$@ \$(OBJS) -rpath \$(LIBDIR) --version-info 0:0 - --lib-sta: \$(LIBPARI_STA) --lib-dyn: \$(LIBPARI_DYN) -- --\$(LIBPARI_STA): \$(OBJS) -- -\$(RM) \$@ -- \$(AR) r \$@ \$(OBJS) -+gp: \$(OBJSGP) \$(LIBPARI) -+ \$(RM) \$@ -+ \$(LD) -o \$@ \$(LDFLAGS) \$(OBJSGP) \$(RUNPTH) \$(PLOTLIBS) \$(LIBS) \$(RLLIBS) \$(LIBPARI) - - kerntest\$(_O): ../src/test/kerntest.c - \$(CC) -c \$(CFLAGS) -I$src/language \$(CPPFLAGS) -o \$@ \$< -@@ -260,12 +227,6 @@ - - EOT + ####################### CONFIGURE - CLEANUP ################################# + rm -f gmon.out # created by Configure -pg +@@ -172,14 +173,14 @@ if test "$objdir" != "$mkobjdir"; then fi --cat >> $file << EOT -- --gp-sta: \$(OBJS) \$(OBJSGP) \$(GNUPLOT_OBJS) -- \$(RM) \$@ -- \$(LD) -o \$@ \$(LDFLAGS) \$(OBJS) \$(OBJSGP) \$(GNUPLOT_OBJS) \$(RUNPTH) \$(RLLIBS) \$(PLOTLIBS) \$(LIBS) --EOT - cat >> $file << EOT - -@@ -284,14 +245,14 @@ - @$doexec -g - - cleanobj: cleantest -- -\$(RM) *\$(_O) *.s pariinl.h \$(LIBPARI_STA) libpari.* $exec -+ -\$(RM) *\$(_O) *.s pariinl.h \$(LIBPARI) libpari.* $exec - - clean: cleanobj - - .headers: $HEADERS - @touch \$@ - --install: install-lib-$dft install-include install-bin install-man install-misc install-data install-doc install-examples -+install: install-lib install-include install-bin install-man install-misc install-data install-doc install-examples - - install-include: - -mkdir -p \$(INCLUDEDIR) -@@ -300,45 +261,33 @@ - \$(INSTALL_DATA) \$\$i.h \$(INCLUDEDIR); done - -for i in $hlist; do \\ - \$(INSTALL_DATA) $src/headers/\$\$i.h \$(INCLUDEDIR); done -- -\$(RM) \$(INCLUDEDIR)/genpari.h - -\$(LN) pari.h \$(INCLUDEDIR)/genpari.h - --install-bin: install-bin-$dft -- --install-bin-dyn: gp-dyn -+install-bin: gp - -mkdir -p \$(BINDIR) -- -\$(RM) \$(BINDIR)/gp-$version \$(BINDIR)/gp$exe_suff -- -\$(LD) -o \$(BINDIR)/gp-$version \$(LDFLAGS) \$(OBJSGP) \$(RUNPTH_FINAL) \$(TOPLDDYN) \$(LDDYN) \$(PLOTLIBS) \$(LIBS) -- -\$(STRIP) \$(STRIPFLAGS) \$(BINDIR)/gp-$version -- -\$(LN) gp-$version$exe_suff \$(BINDIR)/gp$exe_suff -- --install-bin-sta: gp-sta -- -mkdir -p \$(BINDIR) -- -\$(RM) \$(BINDIR)/gp-$version \$(BINDIR)/gp$exe_suff -- \$(INSTALL_PROGRAM) gp-sta$exe_suff \$(BINDIR)/gp-$version$exe_suff -+ \$(LIBTOOL) --mode=install \$(INSTALL_PROGRAM) gp$exe_suff \$(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 Linux or OSF. - # \$(STRIP) \$(STRIPFLAGS) \$(BINDIR)/gp-$version - - install-man:: - -mkdir -p \$(MANDIR) -- \$(INSTALL_DATA) $doc/gphelp.1 \$(MANDIR) -- \$(INSTALL_DATA) $doc/gp.1 \$(MANDIR) -- -\$(RM) \$(MANDIR)/pari.1 -+ \$(INSTALL_MAN) $doc/gphelp.1 \$(MANDIR) -+ \$(INSTALL_MAN) $doc/gp.1 \$(MANDIR) - -\$(LN) gp.1 \$(MANDIR)/pari.1 - - install-misc: $install_emacs_files install-top - -mkdir -p \$(MISCDIR) \$(BINDIR) -- \$(INSTALL_PROGRAM) $misc/tex2mail \$(BINDIR) -- \$(INSTALL_DATA) $doc/tex2mail.1 \$(MANDIR) -+ \$(INSTALL_SCRIPT) $misc/tex2mail \$(BINDIR) -+ \$(INSTALL_MAN) $doc/tex2mail.1 \$(MANDIR) - \$(INSTALL_DATA) $misc/README \$(MISCDIR) - \$(INSTALL_DATA) $misc/color.dft \$(MISCDIR) - \$(INSTALL_DATA) $misc/gpalias \$(MISCDIR) -- \$(INSTALL_PROGRAM) $misc/gpflog \$(MISCDIR) -+ \$(INSTALL_SCRIPT) $misc/gpflog \$(MISCDIR) - \$(INSTALL_DATA) $misc/gprc.dft \$(MISCDIR) - \$(INSTALL_DATA) $misc/new.dic \$(MISCDIR) - \$(INSTALL_DATA) $misc/pari.xpm \$(MISCDIR) -- \$(INSTALL_PROGRAM) $misc/xgp \$(MISCDIR) -+ \$(INSTALL_SCRIPT) $misc/xgp \$(MISCDIR) - - install-top:: - -mkdir -p \$(READMEDIR) -@@ -356,7 +305,7 @@ - install-doc:: - -mkdir -p \$(BINDIR) \$(DOCDIR) - -cd $doc; \$(MAKE) all -- -\$(INSTALL_PROGRAM) $doc/gphelp \$(BINDIR) -+ -\$(INSTALL_SCRIPT) $doc/gphelp \$(BINDIR) - -\$(INSTALL_DATA) $doc/Makefile \$(DOCDIR) - -\$(INSTALL_DATA) $doc/translations \$(DOCDIR) - -\$(INSTALL_DATA) $doc/appa.tex \$(DOCDIR) -@@ -398,61 +347,11 @@ - -mkdir -p \$(DATADIR) - -for f in $data/*; do \$(INSTALL_DATA) \$\$f \$(DATADIR); done 2>/dev/null - --install-lib-sta: \$(LIBPARI_STA) -+install-lib: \$(LIBPARI) - -mkdir -p \$(LIBDIR) -- -\$(RM) \$(LIBDIR)/\$(LIBPARI_STA) -- \$(INSTALL_DATA) \$(LIBPARI_STA) \$(LIBDIR)/\$(LIBPARI_STA).$version -- -\$(LN) \$(LIBPARI_STA).$version \$(LIBDIR)/\$(LIBPARI_STA) -+ \$(LIBTOOL) --mode=install \$(BSD_INSTALL_LIB) \$(LIBPARI) \$(LIBDIR)/ - --install-lib-dyn: \$(LIBPARI_DYN) -- -mkdir -p \$(LIBDIR) -- -\$(RM) \$(LIBDIR)/\$(LIBPARI_DYN) -- \$(INSTALL_PROGRAM) \$(LIBPARI_DYN) \$(LIBDIR)/\$(LIBPARI_DYN) - EOT --if test "$soname" != "$sodest"; then -- cat >> $file << EOT -- -\$(RM) \$(LIBDIR)/\$(LIBPARI_SONAME) -- -\$(RM) \$(LIBDIR)/\$(LIBPARI_SO) -- -\$(LN) \$(LIBPARI_DYN) \$(LIBDIR)/\$(LIBPARI_SONAME) -- -\$(LN) \$(LIBPARI_DYN) \$(LIBDIR)/\$(LIBPARI_SO) -- --EOT --fi -- --if test -z "$DLLD"; then -- cat >> $file << EOT -- --\$(LIBPARI_DYN):: -- @echo "Configure could not find a way to build a shared library on this machine." -- --EOT --else -- if test -z "$DYNLIBS"; then -- cat >> $file << EOT --gp-dyn: \$(OBJSGP) \$(LIBPARI_DYN) \$(GNUPLOT_OBJS) -- \$(RM) \$@ -- \$(LD) -o \$@ \$(LDFLAGS) \$(OBJSGP) \$(GNUPLOT_OBJS) \$(RUNPTH) \$(TOPLDDYN) \$(LDDYN) \$(PLOTLIBS) \$(LIBS) -- --\$(LIBPARI_DYN): \$(OBJS) -- -\$(RM) \$(LIBPARI_DYN) -- \$(DLLD) -o \$@ \$(DLLDFLAGS) \$(OBJS) \$(EXTRADLLDFLAGS) --EOT -- if test "$soname" != "$sodest"; then -- cat >> $file << EOT -- -\$(RM) \$(LIBPARI_SONAME) -- -\$(RM) \$(LIBPARI_SO) -- -\$(LN) \$(LIBPARI_DYN) \$(LIBPARI_SONAME) -- -\$(LN) \$(LIBPARI_DYN) \$(LIBPARI_SO) --EOT -- fi -- else -- cat >> $file << EOT --gp-dyn: \$(OBJSDGP) \$(LIBPARI_DYN) -- \$(RM) \$@ -- \$(LD) -o \$@ \$(LDFLAGS) \$(OBJSDGP) \$(RUNPTH) \$(TOPLDDYN) \$(LDDYN) \$(PLOTLIBS) \$(LIBS) \$(DYNLIBS) --EOT -- fi --fi - - if test -n "$GNUPLOT_OBJS"; then - cat >> $file << EOT -@@ -462,21 +361,14 @@ - EOT - fi - --if test -n "$emacs"; then -- cat >> $file << EOT --$pari_elc: $emx/pari.el -- @echo "Byte-Compiling pari.el..." -- -cd $emx; $emacs -batch -l compile -- --$install_emacs_files: $pari_elc -+cat >> $file << EOT -+$install_emacs_files: - -mkdir -p \$(EMACSDIR) -- -\$(INSTALL_DATA) $pari_elc \$(EMACSDIR) - \$(INSTALL_DATA) $emx/pari.el \$(EMACSDIR) - \$(INSTALL_DATA) $emx/pariemacs.txt \$(EMACSDIR) - \$(INSTALL_DATA) $emx/with-syntax.el \$(EMACSDIR) - \$(INSTALL_DATA) $emx/pari-translator.el \$(EMACSDIR) - EOT --fi - - if test -s $src_dir/kernel/$ASMARCH/Makefile.SH; then - . $src_dir/kernel/$ASMARCH/Makefile.SH + case $ans in +-y) if (cd $objdir; make gp); then ++y) if (cd $objdir; ${MAKE} gp); then + echo $n "Shall we install the files where they belong (y/n)? $c" + dflt=n; rep='y n'; . $config_dir/myread + case $ans in +- y) make install;; +- n) echo "Ok. Type \"${cdobjdir}make install\" when you are ready";; ++ y) ${MAKE} install;; ++ n) echo "Ok. Type \"${cdobjdir}${MAKE} install\" when you are ready";; + esac + fi;; +-n) echo "Ok. Type \"${cdobjdir}make install\" when you are ready";; ++n) echo "Ok. Type \"${cdobjdir}${MAKE} install\" when you are ready";; + esac + echo 'Bye !' diff --git a/math/pari/patches/patch-ac b/math/pari/patches/patch-ac index 1a95959dcaf..d525a47ac84 100644 --- a/math/pari/patches/patch-ac +++ b/math/pari/patches/patch-ac @@ -1,13 +1,13 @@ -$NetBSD: patch-ac,v 1.1.1.1 2001/03/07 20:57:51 jtb Exp $ +$NetBSD: patch-ac,v 1.2 2010/02/06 10:37:06 sno Exp $ ---- src/kernel/ix86/l0asm.c.orig Fri Nov 3 21:00:25 2000 -+++ src/kernel/ix86/l0asm.c -@@ -36,7 +36,7 @@ - global variable `hiremainder'. */ - - /* This should ideally be determined at configure time. */ --#if defined(__EMX__) || defined(__DJGCC__) || defined(__GO32__) || (defined(linux) && !defined(__ELF__)) || defined(__386BSD__) || defined(__NetBSD__) || (defined(__FreeBSD__) && !defined(__ELF__)) || defined(NeXT) || defined(__CYGWIN32__) || defined(__MINGW32__) -+#if defined(__EMX__) || defined(__DJGCC__) || defined(__GO32__) || (defined(linux) && !defined(__ELF__)) || defined(__386BSD__) || defined(__NetBSD__) && !defined(__ELF__)|| (defined(__FreeBSD__) && !defined(__ELF__)) || defined(NeXT) || defined(__CYGWIN32__) || defined(__MINGW32__) - # define ASM_UNDERSCORE - #endif - +--- config/get_archos.orig 2008-01-16 15:57:13.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 hpux aix osf1 solaris sunos nextstep concentrix irix'; ++ rep='os2 freebsd netbsd cygwin linux hpux aix osf1 solaris sunos nextstep concentrix irix dragonfly'; + . ./display + echo $n ..."Any of these apply ? $c" + dflt=$osname; . ./myread diff --git a/math/pari/patches/patch-ad b/math/pari/patches/patch-ad index 9e4a71875e3..b97f5b4056e 100644 --- a/math/pari/patches/patch-ad +++ b/math/pari/patches/patch-ad @@ -1,13 +1,36 @@ -$NetBSD: patch-ad,v 1.1 2001/05/04 17:14:08 jtb Exp $ +$NetBSD: patch-ad,v 1.2 2010/02/06 10:37:06 sno Exp $ ---- src/headers/paristio.h.orig Fri Nov 3 21:00:25 2000 -+++ src/headers/paristio.h -@@ -15,6 +15,8 @@ - - /* This file contains memory and I/O management definitions */ - -+#include <fcntl.h> -+ - typedef unsigned char *byteptr; - - typedef struct stackzone +--- config/get_libpth.orig 2008-01-16 15:56:55.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/math/pari/patches/patch-ae b/math/pari/patches/patch-ae index 3ca93e0f86f..15ee3454abe 100644 --- a/math/pari/patches/patch-ae +++ b/math/pari/patches/patch-ae @@ -1,37 +1,60 @@ -$NetBSD: patch-ae,v 1.2 2003/07/07 21:57:51 jtb Exp $ +$NetBSD: patch-ae,v 1.3 2010/02/06 10:37:06 sno Exp $ ---- config/arch-osname.orig -+++ config/arch-osname -@@ -11,6 +11,32 @@ - fx2800) arch=fx2800; osname=concentrix;; - hp*) arch=hppa; osname=hpux;; - freebsd|os2) arch=ix86;; -+ netbsd) case "`uname -p`" in -+ alpha) arch=alpha;; -+ arm*) arch=arm;; -+ hppa) arch=hppa;; -+ i386) arch=ix86;; -+ m68k) arch=m68k;; -+ mips*) arch=mips;; -+ powerpc) arch=powerpc;; -+ sh3*) arch=sh3;; -+ sh5*) arch=sh5;; -+ sparc) -+ case "`/sbin/sysctl hw.model`" in -+# *SuperSparc*) arch=sparcv8_super;; -+# *TMS390Z5[05]*) arch=sparcv8_super;; # SuperSparc I or II -+# *TMS390S1[05]*) arch=sparcv8_micro;; # MicroSparc I -+# *MB86904*) arch=sparcv8_micro;; # MicroSparc II -+# *MB86907*) arch=sparcv8_micro;; # TurboSparc -+# *MB86934*) arch=sparcv8_super;; # SparcLite -+# *RT625*) arch=sparcv8_super;; # HyperSparc -+# *CY605*) arch=sparcv8_super;; -+ *) arch=sparc;; -+ esac;; -+ sparc64) arch=sparc64;; -+ vax) arch=vax;; -+ *) arch=none;; -+ esac;; - ultrix) arch=mips;; - nextstep) arch=`file /bin/sh | sed 's/.*(for architecture \(.*\))/\1/'`;; - osf1) case "$5" in alpha) arch=alpha;; esac;; +--- config/get_readline.orig 2008-01-16 15:57:14.000000000 +0000 ++++ config/get_readline +@@ -33,21 +33,11 @@ if test -n "$readline"; then + $cygtop/H-${arch}-cygwin32/${arch}-cygwin32/include\ + ";; + *) incpth="$incpth\ +- /usr/local/include/readline\ +- /usr/include/readline\ +- /opt/include/readline\ +- /opt/local/include/readline\ +- /opt/gnu/include/readline\ +- /usr/unsupported/include/readline\ +- /usr/local/include\ +- /usr/include\ +- /opt/include\ +- /opt/local/include\ +- /opt/gnu/include\ ++ $LOCALBASE/include\ + ";; + esac + pth="$with_readline_include $readline_add $incpth" +- x=`./locate 'readline.h' '' $pth` ++ x=`./locate 'readline/readline.h' '' $pth` + CPPF_defined= + case $x in + ?:/*|/*) rl_include=`dirname $x` +@@ -111,22 +101,11 @@ if test -n "$readline"; then + lib=$rl_fullname; sym=tgetent; . ./locatesymbol + need_tgetent="$try" + if test -n "$need_tgetent"; then +- opth=$pth; pth="$with_ncurses_lib $libpth" +- lib=ncurses; . ./locatelib +- if test -n "$try"; then # ncurses found. Does it contain tgetent ? +- lib=$try; . ./locatesymbol +- fi +- pth=$opth +- if test -n "$try"; then +- rl_ncurses=$ncurses +- need_tgetent= +- else # give termcap a try + lib=termcap; . ./locatelib + if test -n "$try"; then + rl_termcap=$termcap + need_tgetent= + fi +- fi + fi + # Readline -- CFLAGS + if (echo $rl_include | grep "readline$" > /dev/null); then +@@ -135,7 +114,7 @@ if test -n "$readline"; then + else # in case headers are not installed correctly + RLINCLUDE="-I$rl_include -DREADLINE_LIBRARY" + fi +- RLLIBS="-L$readline -lreadline" ++ RLLIBS="-Wl,-R$readline -L$readline -lreadline" + if test -n "$rl_ncurses"; then + echo ..."Library ncurses needed by readline" + RLLIBS="$RLLIBS -L$rl_ncurses -lncurses" diff --git a/math/pari/patches/patch-af b/math/pari/patches/patch-af index 355a96d9552..4f76b5b1aa0 100644 --- a/math/pari/patches/patch-af +++ b/math/pari/patches/patch-af @@ -1,19 +1,26 @@ -$NetBSD: patch-af,v 1.1 2003/07/07 21:57:51 jtb Exp $ +$NetBSD: patch-af,v 1.2 2010/02/06 10:37:06 sno Exp $ ---- src/kernel/none/Makefile.SH.orig -+++ src/kernel/none/Makefile.SH -@@ -4,11 +4,11 @@ - cat >> $file << EOT - pariinl.h: $src/kernel/none/level0.h $src/kernel/none/level1.h - cat $src/kernel/none/level0.h $src/kernel/none/level1.h > \$@ --kernel.o: .headers $src/kernel/none/level0.h -+kernel\$(_O): .headers $src/kernel/none/level0.h - \$(CC) -c \$(CFLAGS) \$(CPPFLAGS) -o kernel.o $src/kernel/none/level0.c --mp.o: .headers $src/kernel/none/mp.c -+mp\$(_O): .headers $src/kernel/none/mp.c - \$(CC) -c \$(CFLAGS) \$(CPPFLAGS) -o mp.o $src/kernel/none/mp.c --mpinl.o: .headers $src/kernel/none/level1.h -+mpinl\$(_O): .headers $src/kernel/none/level1.h - \$(CC) -c \$(CFLAGS) \$(CPPFLAGS) -o mpinl.o $src/kernel/none/level1.c - - EOT +--- config/get_X11.orig 2008-01-16 15:57:17.000000000 +0000 ++++ config/get_X11 +@@ -10,20 +10,7 @@ cd ..; rm -rf $tdir + # X11 -- Headers + if test ! -f $Xincroot/X11/Xos.h; then + x11pth="\ +- /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\ ++ $X11BASE/lib\ + "; + pth=`echo $x11pth | sed 's,/lib,/include,g'` + x=`./locate X11/Xos.h '' $pth` diff --git a/math/pari/patches/patch-ag b/math/pari/patches/patch-ag index 36c6d8cbdf1..43f14720ba0 100644 --- a/math/pari/patches/patch-ag +++ b/math/pari/patches/patch-ag @@ -1,28 +1,30 @@ -$NetBSD: patch-ag,v 1.1 2003/07/07 21:57:51 jtb Exp $ +$NetBSD: patch-ag,v 1.2 2010/02/06 10:37:06 sno Exp $ ---- src/kernel/sparcv7/Makefile.SH.orig -+++ src/kernel/sparcv7/Makefile.SH -@@ -3,7 +3,7 @@ - level0=$src/kernel/none/asm0.h - level1=$src/kernel/none/level1.h - kernel1=$src/kernel/$asmarch/level0.S --if test "$osname" = "nextstep" -o "$osname" = "linux" -o "$gnuas" = "yes"; -+if test "$osname" = "nextstep" -o "$osname" = "linux" -o "$osname" = "netbsd" -o "$gnuas" = "yes"; - then - cat >> $file << EOT - kernel1.s: $kernel1 -@@ -15,11 +15,11 @@ - cat >> $file << EOT - pariinl.h: $level0 $level1 - cat $level0 $level1 > \$@ --kernel.o: $kernel1 -- \$(AS) \$(ASFLAGS) -o \$@ $kernel1 -+kernel\$(_O): $kernel1 -+ \$(CC) -c \$(CFLAGS) \$(CPPFLAGS) -o \$@ $kernel1 - mp.o: .headers $src/kernel/none/mp.c - \$(CC) -c \$(CFLAGS) \$(CPPFLAGS) -o \$@ $src/kernel/none/mp.c --mpinl.o: .headers $level1 -+mpinl\$(_O): .headers $level1 - \$(CC) -c \$(CFLAGS) \$(CPPFLAGS) -o \$@ $src/kernel/none/level1.c +--- config/get_dlld.orig 2009-09-19 12:01:14.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 +@@ -67,6 +67,7 @@ if test -n "$DLLD"; then + aix) DLLDFLAGS='-r' ;; + darwin) DLLD=; DLLDFLAGS='-dylib -flat_namespace -undefined suppress' ;; + freebsd) DLLDFLAGS='-Bshareable -x' ;; ++ dragonfly*) DLLDFLAGS='-Bshareable -x' ;; + hpux) DLLDFLAGS='-b' ;; + irix) DLLDFLAGS='-shared -elf -no_unresolved -all' ;; + osf1) DLLDFLAGS='-shared' ;; +@@ -91,7 +92,7 @@ if test -n "$DLLD"; then + DLLDFLAGS="-shared $extra \$(CFLAGS) \$(DLCFLAGS) $DLLDFLAGS" + fi + case "$osname" in +- gnu*|cygwin|osf1|freebsd|linux|sunos|solaris) EXTRADLLDFLAGS='-lc ${LIBS}';; ++ dragonfly*|gnu*|cygwin|osf1|freebsd|linux|sunos|solaris) EXTRADLLDFLAGS='-lc ${LIBS}';; + esac - EOT + if test "$fastread" != yes; then diff --git a/math/pari/patches/patch-ah b/math/pari/patches/patch-ah index 0df793073c1..9d3ad882c79 100644 --- a/math/pari/patches/patch-ah +++ b/math/pari/patches/patch-ah @@ -1,29 +1,13 @@ -$NetBSD: patch-ah,v 1.1 2003/07/07 21:57:51 jtb Exp $ +$NetBSD: patch-ah,v 1.2 2010/02/06 10:37:06 sno Exp $ ---- src/kernel/sparcv7/level0.S.orig -+++ src/kernel/sparcv7/level0.S -@@ -13,7 +13,7 @@ - with the package; see the file 'COPYING'. If not, write to the Free Software - Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +--- config/get_install.orig 2008-01-16 15:57:11.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 --#if defined(NO_UNDERSCORE) || defined(linux) -+#if defined(NO_UNDERSCORE) || defined(linux) || defined(__NetBSD__) - # define C(entrypoint) entrypoint - #elif defined(sun) || defined(NeXT) - # ifdef __STDC__ -@@ -22,13 +22,13 @@ - # define C(entrypoint) _/**/entrypoint - # endif - #endif --#if defined(sun) || defined(linux) -+#if defined(sun) || defined(linux) || defined(__NetBSD__) - # define GLOBL .global - #elif defined(NeXT) - # define GLOBL .globl - #endif +-dfltman=$share_prefix/man/man1 ++dfltman=$prefix/man/man1 + dfltemacs=$share_prefix/emacs/site-lisp/pari + dfltdata=$share_prefix/pari --#if defined(sun) || defined(linux) -+#if defined(sun) || defined(linux) || defined(__NetBSD__) - .seg "text" - #elif defined(NeXT) - .text diff --git a/math/pari/patches/patch-ai b/math/pari/patches/patch-ai index a5dd517a2df..372e12b99c5 100644 --- a/math/pari/patches/patch-ai +++ b/math/pari/patches/patch-ai @@ -1,38 +1,333 @@ -$NetBSD: patch-ai,v 1.1 2003/07/07 21:57:51 jtb Exp $ +$NetBSD: patch-ai,v 1.2 2010/02/06 10:37:06 sno Exp $ ---- src/kernel/sparcv8/level0.S.orig -+++ src/kernel/sparcv8/level0.S -@@ -19,7 +19,7 @@ - /* addll addllx subll subllx shiftl shiftlr mulll addmul */ - - #ifndef __GNUC__ --#if defined(NO_UNDERSCORE) || defined(linux) -+#if defined(NO_UNDERSCORE) || defined(linux) || defined(__NetBSD__) - # define C(entrypoint) entrypoint - #elif defined(sun) || defined(NeXT) - # ifdef __STDC__ -@@ -28,13 +28,13 @@ - # define C(entrypoint) _/**/entrypoint - # endif - #endif --#if defined(sun) || defined(linux) -+#if defined(sun) || defined(linux) || defined(__NetBSD__) - # define GLOBL .global - #elif defined(NeXT) - # define GLOBL .globl - #endif - --#if defined(sun) || defined(linux) -+#if defined(sun) || defined(linux) || defined(__NetBSD__) - .seg "text" - #elif defined(NeXT) - .text -@@ -111,7 +111,7 @@ - retl - st %o4,[%o3+%lo(C(hiremainder))] - --#if defined(sun) || defined(linux) -+#if defined(sun) || defined(linux) || defined(__NetBSD__) - .seg "bss" - .align 4 - C(hiremainder): .skip 4 +--- config/Makefile.SH.orig 2010-01-09 17:59:48.000000000 +0000 ++++ config/Makefile.SH +@@ -70,7 +70,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" + ;; +@@ -110,25 +110,12 @@ if test -n "$runpathprefix"; then + RUNPTH=`$config_dir/ldflags "$LDneedsWl" "$runpathprefix$TOP/$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 \"LD_LIBRARY_PATH=.$dir_sep\$\$LD_LIBRARY_PATH\" \$(SHELL) $src/test/dotest $numbits" +-if test -z "$emacs"; then +- install_emacs_files= +-else +- install_emacs_files=install_emacs_files +-fi +-case "$static" in +- n) dft=dyn; libdft=lib-dyn;; +- y) dft=sta; libdft= ;; +-esac ++install_emacs_files=install_emacs_files + + CPPFLAGS="-I. -I$src/headers" + if test "$has_dlopen" = builtin; then +@@ -153,16 +140,14 @@ AR = ar + SIZEOF_LONG= $sizeof_long + + CC_FLAVOR = +-CC = $CC \$(CC_FLAVOR) ++CC = \$(LIBTOOL) --mode=compile $CC \$(CC_FLAVOR) + CPPFLAGS = $CPPFLAGS + CFLAGS = $CFLAGS + DLCFLAGS = $DLCFLAGS + 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) +-DLLDFLAGS = $DLLDFLAGS + EXTRADLLDFLAGS = $EXTRADLLDFLAGS + + # HIGHLY EXPERIMENTAL (only tested with gmp-4.0 on ix86 and Ultra). +@@ -179,29 +164,19 @@ EXTRADLLDFLAGS = $EXTRADLLDFLAGS + #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 = \$(LIB_PREFIX)$libpari_base\$(_A) + DL_DFLT_NAME = $DL_DFLT_NAME + + EXPORT_FILE = $export_file + EXPORT_CREATE = $export_create + EXPORT_LIB = $export_lib + EXPORT_LIB_CREATE = $export_lib_create +-DLLD_IGNORE = $dlld_ignore + + RUNPTH = $RUNPTH + RUNPTH_FINAL = $RUNPTH_FINAL +-LDDYN = $LDDYN + LIBS = $LIBS + + RM = rm -f +@@ -226,8 +201,10 @@ MISCDIR = \$(DATADIR)/misc + DOCDIR = \$(DATADIR)/doc + + INSTALL = $cfg/install +-INSTALL_PROGRAM = \$(INSTALL) +-INSTALL_DATA = \$(INSTALL) -m 644 ++INSTALL_PROGRAM = \$(BSD_INSTALL_PROGRAM) ++INSTALL_SCRIPT = \$(BSD_INSTALL_SCRIPT) ++INSTALL_DATA = \$(BSD_INSTALL_DATA) ++INSTALL_MAN = \$(BSD_INSTALL_MAN) + + # Readline + RLINCLUDE = $RLINCLUDE +@@ -239,7 +216,7 @@ QTDIR = "$QTDIR" + MOC = \$(QTDIR)/bin/moc + PLOTCFLAGS = $PLOTCFLAGS + PLOTLIBS = $PLOTLIBS +-CPLUSPLUS = g++ ++CPLUSPLUS = \$(LIBTOOL) --mode=compile $CXX \$(CXX_FLAVOR) + + FLTKDIR = "$FLTKDIR" + +@@ -254,21 +231,16 @@ DOTEST=$dotest + OBJS = $OBJS + OBJSGP = $OBJSGP + +-gp: gp-$dft ../gp$suffix$exe_suff $libdft ++all: \$(LIBPARI) + +-../gp$suffix$exe_suff: gp-$dft +- -\$(RM) \$@ +- -\$(LN) $ln_objdir/gp-$dft$exe_suff \$@ ++lib: \$(LIBPARI) + +-all: $exec lib-sta ++\$(LIBPARI): \$(OBJS) ++ \$(LD) -o \$@ \$(OBJS) -rpath \$(LIBDIR) --version-info 0:0 + +-lib-sta: \$(LIBPARI_STA) +-lib-dyn: \$(LIBPARI_DYN) +- +-\$(LIBPARI_STA): $add_funclist \$(OBJS) +- -\$(RM) \$@ +- \$(AR) r \$@ \$(OBJS) +- -$ranlib \$@ ++gp: \$(OBJSGP) \$(LIBPARI) ++ \$(RM) \$@ ++ \$(LD) -o \$@ \$(LDFLAGS) \$(OBJSGP) \$(RUNPTH_FINAL) \$(PLOTLIBS) \$(LIBS) \$(RLLIBS) \$(LIBPARI) + + kerntest\$(_O): $src/test/kerntest.c + \$(CC) -c \$(CFLAGS) -I$src/language \$(CPPFLAGS) -o \$@ $src/test/kerntest.c +@@ -297,11 +269,6 @@ tune-dyn: tune.o \$(LIBPARI_DYN) + tune-sta: tune.o \$(LIBPARI_STA) + \$(LD) \$(LDFLAGS) -o \$@ \$< \$(GMPOBJS) ./\$(LIBPARI_STA) \$(LIBS) + +-gp-sta: $add_funclist \$(OBJS) \$(OBJSGP) +- \$(RM) \$@ +- \$(LD) -o \$@ \$(LDFLAGS) \$(OBJS) \$(OBJSGP) \$(RUNPTH) \$(RLLIBS) \$(PLOTLIBS) \$(LIBS) +- $postconfig gp-sta +- + cleanemacs: + \$(RM) $emx/*.elc + cleantest: +@@ -316,7 +283,7 @@ clean: cleanobj cleantest cleanemacs cle + .headers: $HEADERS + @touch \$@ + +-install: install-lib-$dft install-include install-bin install-man install-misc install-doc install-examples install-cfg install-data ++install: install-lib install-include install-bin install-man install-misc install-doc install-examples install-cfg install-data + + install-include: + -mkdir -p \$(INCLUDEDIR)/pari +@@ -324,23 +291,11 @@ install-include: + \$(INSTALL_DATA) \$\$i \$(INCLUDEDIR)/pari; done + -for i in $headerlist; do \\ + \$(INSTALL_DATA) $src/headers/\$\$i.h \$(INCLUDEDIR)/pari; done +- -\$(RM) \$(INCLUDEDIR)/pari/genpari.h + -\$(LN) pari.h \$(INCLUDEDIR)/pari/genpari.h + +-install-bin: install-bin-$dft +- +-install-bin-dyn: gp-dyn ++install-bin: gp + -mkdir -p \$(BINDIR) +- -\$(RM) \$(BINDIR)/gp-$version$exe_suff \$(BINDIR)/gp$exe_suff +- \$(LD) -o \$(BINDIR)/gp-$version$exe_suff \$(LDFLAGS) \$(OBJSGP) \$(RUNPTH_FINAL) \$(TOPLDDYN) \$(LDDYN) \$(PLOTLIBS) \$(LIBS) +- -\$(STRIP) \$(STRIPFLAGS) \$(BINDIR)/gp-$version$exe_suff +- $postconfig \$(BINDIR)/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$exe_suff \$(BINDIR)/gp-$version$exe_suff ++ \$(LIBTOOL) --mode=install \$(INSTALL_PROGRAM) gp$exe_suff \$(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 +@@ -348,24 +303,22 @@ install-bin-sta: gp-sta + + 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 ++ \$(INSTALL_MAN) $doc/gphelp.1 \$(MANDIR) ++ \$(INSTALL_MAN) $doc/gp.1 \$(MANDIR) + -\$(LN) gp.1 \$(MANDIR)/pari.1 +- -\$(LN) gp-$version.1 \$(MANDIR)/gp.1 + + install-misc: $install_emacs_files + -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) +- \$(INSTALL_PROGRAM) $misc/gpflog \$(MISCDIR) +- \$(INSTALL_DATA) $misc/gprc.dft \$(MISCDIR) +- \$(INSTALL_DATA) $misc/new.dic \$(MISCDIR) +- \$(INSTALL_DATA) $misc/pari.xpm \$(MISCDIR) +- \$(INSTALL_PROGRAM) $misc/xgp \$(MISCDIR) ++ \$(INSTALL_SCRIPT) $misc/tex2mail \$(BINDIR) ++ \$(INSTALL_MAN) $doc/tex2mail.1 \$(MANDIR) ++ \$(INSTALL_DATA) $misc/README \$(MISCDIR) ++ \$(INSTALL_DATA) $misc/color.dft \$(MISCDIR) ++ \$(INSTALL_DATA) $misc/gpalias \$(MISCDIR) ++ \$(INSTALL_SCRIPT) $misc/gpflog \$(MISCDIR) ++ \$(INSTALL_DATA) $misc/gprc.dft \$(MISCDIR) ++ \$(INSTALL_DATA) $misc/new.dic \$(MISCDIR) ++ \$(INSTALL_DATA) $misc/pari.xpm \$(MISCDIR) ++ \$(INSTALL_SCRIPT) $misc/xgp \$(MISCDIR) + + install-cfg:: + -mkdir -p \$(SYSDATADIR) +@@ -377,8 +330,15 @@ install-cfg:: + + install-doc:: + -mkdir -p \$(BINDIR) \$(DOCDIR) ++ -\$(INSTALL_DATA) ../AUTHORS \$(DATADIR) ++ -\$(INSTALL_DATA) ../CHANGES \$(DATADIR) ++ -\$(INSTALL_DATA) ../COMPAT \$(DATADIR) ++ -\$(INSTALL_DATA) ../COPYING \$(DATADIR) ++ -\$(INSTALL_DATA) ../MACHINES \$(DATADIR) ++ -\$(INSTALL_DATA) ../NEW \$(DATADIR) ++ -\$(INSTALL_DATA) ../README \$(DATADIR) + -cd $doc; \$(MAKE) all +- -\$(INSTALL_PROGRAM) $doc/gphelp \$(BINDIR) ++ -\$(INSTALL_SCRIPT) $doc/gphelp \$(BINDIR) + -\$(INSTALL_DATA) $doc/Makefile \$(DOCDIR) + -\$(INSTALL_DATA) $doc/translations \$(DOCDIR) + -\$(INSTALL_DATA) $doc/appa.tex \$(DOCDIR) +@@ -426,20 +386,9 @@ install-data: + done; \ + fi + +-install-lib-sta: \$(LIBPARI_STA) ++install-lib: \$(LIBPARI) + -mkdir -p \$(LIBDIR) +- -\$(RM) \$(LIBDIR)/\$(LIBPARI_STA) +- \$(INSTALL_DATA) \$(LIBPARI_STA) \$(LIBDIR)/\$(LIBPARI_STA) +- +-install-lib-dyn-base: +- -mkdir -p \$(LIBDIR) +- -\$(RM) \$(LIBDIR)/\$(LIBPARI_DYN) \$(LIBDIR)/\$(LIBPARI_SONAME) \$(LIBDIR)/\$(LIBPARI_SO) +- \$(INSTALL_PROGRAM) \$(LIBPARI_DYN) \$(LIBDIR)/\$(LIBPARI_DYN) +-install-lib-dyn-link: install-lib-dyn-base +- -if test "\$(LIBPARI_SONAME)" != "\$(LIBPARI_SO)"; then \ +- \$(LN) \$(LIBPARI_DYN) \$(LIBDIR)/\$(LIBPARI_SONAME);\ +- \$(LN) \$(LIBPARI_DYN) \$(LIBDIR)/\$(LIBPARI_SO); fi +-install-lib-dyn: \$(LIBPARI_DYN) install-lib-dyn-link ++ \$(LIBTOOL) --mode=install \$(BSD_INSTALL_LIB) \$(LIBPARI) \$(LIBDIR)/ + + pariinl.h: parilvl0.h parilvl1.h + cat parilvl0.h parilvl1.h > pariinl.h +@@ -462,63 +411,13 @@ dotest-$i:: + EOT + done + +-if test -z "$DLLD"; then +- cat >> $file << EOT +- +-\$(LIBPARI_DYN):: +- @echo "Configure could not find a way to build a shared library on this machine" +- +-EOT +-else +- if test -n "$export_file"; then +- cat >> $file << EOT +- +-EXPORT_FILE_BASE = $src/systems/os2/pari.def.base +-VERSION_VERBOSE = $pari_release_verbose +- +-\$(EXPORT_FILE): \$(OBJS) \$(EXPORT_FILE_BASE) +- cat \$(EXPORT_FILE_BASE) | sed 's/<DLL_BASE>/\$(DLLIBPARI)/' | sed 's/<VENDOR>/pari.math.u-bordeaux.fr\//' | sed 's/<VERSION>/\$(VERSION_VERBOSE)/' | sed 's/<DESCR>/GP\/PARI compiled with \$(CFLAGS)/' > \$@ +- \$(EXPORT_CREATE) \$(OBJS) >> \$@ +- +-\$(DLLIBPARI)\$(_A): \$(EXPORT_FILE) +- \$(EXPORT_LIB_CREATE) -o \$@ \$(EXPORT_FILE) +- +-EOT +- fi +- cat >> $file << EOT +- +-gp-dyn: $add_funclist \$(OBJSGP) \$(LIBPARI_DYN) \$(EXPORT_LIB) +- \$(RM) \$@ +- \$(LD) -o \$@ \$(LDFLAGS) \$(OBJSGP) \$(RUNPTH) \$(TOPLDDYN) \$(LDDYN) \$(PLOTLIBS) \$(LIBS) +- $postconfig gp-dyn +- +-\$(LIBPARI_DYN): $add_funclist \$(OBJS) \$(EXPORT_FILE) +- -\$(RM) \$(LIBPARI_DYN) +- \$(DLLD_IGNORE)\$(DLLD) -o \$(LIBPARI_DYN) \$(DLLDFLAGS) \$(OBJS) \$(EXTRADLLDFLAGS) \$(EXPORT_FILE) +- -if test "\$(LIBPARI_DYN)" != "\$(LIBPARI_SO)"; then \ +- \$(RM) \$(LIBPARI_SO);\ +- \$(LN) \$(LIBPARI_DYN) \$(LIBPARI_SO); fi +- -if test "\$(LIBPARI_DYN)" != "\$(LIBPARI_SONAME)"; then \ +- \$(RM) \$(LIBPARI_SONAME);\ +- \$(LN) \$(LIBPARI_DYN) \$(LIBPARI_SONAME); fi +-EOT +-fi +- +-if test -n "$emacs"; then +- cat >> $file << EOT +-elc: +- @echo "Byte-Compiling elisp files..." +- -cd $emx; $emacs -batch \ +- --eval '(setq load-path (append (list ".") load-path))' \ +- -f batch-byte-compile *.el +- +-$install_emacs_files: elc ++cat >> $file << EOT ++$install_emacs_files: + -mkdir -p \$(EMACSDIR) + -cd $emx; for f in *.elc *.el pariemacs.txt; do \ + \$(INSTALL_DATA) \$\$f \$(EMACSDIR); \ + done + EOT +-fi + + if test -n "$add_funclist"; then + cat >> $file << EOT diff --git a/math/pari/patches/patch-aj b/math/pari/patches/patch-aj index fb7f670ca9d..96a7687b7f1 100644 --- a/math/pari/patches/patch-aj +++ b/math/pari/patches/patch-aj @@ -1,29 +1,13 @@ -$NetBSD: patch-aj,v 1.1 2003/07/07 21:57:51 jtb Exp $ +$NetBSD: patch-aj,v 1.2 2010/02/06 10:37:06 sno Exp $ ---- src/kernel/sparcv8/level0_sparcv8_micro.S.orig -+++ src/kernel/sparcv8/level0_sparcv8_micro.S -@@ -22,7 +22,7 @@ - /* If libpari.so is compiled with gcc, you should compile all */ - /* files with gcc */ +--- src/headers/paristio.h.orig 2008-01-16 15:55:40.000000000 +0000 ++++ src/headers/paristio.h +@@ -15,6 +15,8 @@ Foundation, Inc., 59 Temple Place - Suit --#if defined(NO_UNDERSCORE) || defined(linux) -+#if defined(NO_UNDERSCORE) || defined(linux) || defined(__NetBSD__) - # define C(entrypoint) entrypoint - #elif defined(sun) || defined(NeXT) - # ifdef __STDC__ -@@ -31,13 +31,13 @@ - # define C(entrypoint) _/**/entrypoint - # endif - #endif --#if defined(sun) || defined(linux) -+#if defined(sun) || defined(linux) || defined(__NetBSD__) - # define GLOBL .global - #elif defined(NeXT) - # define GLOBL .globl - #endif + /* This file contains memory and I/O management definitions */ --#if defined(sun) || defined(linux) -+#if defined(sun) || defined(linux) || defined(__NetBSD__) - .seg "data" - .align 4 - C(tabshi): .word 4,3,2,2,1,1,1,1,0,0,0,0,0,0,0,0 ++#include <fcntl.h> ++ + typedef struct { + long s, us; + } pari_timer; diff --git a/math/pari/patches/patch-ak b/math/pari/patches/patch-ak index 06b8e2cc362..e6a167aadc5 100644 --- a/math/pari/patches/patch-ak +++ b/math/pari/patches/patch-ak @@ -1,24 +1,96 @@ -$NetBSD: patch-ak,v 1.1 2003/07/07 21:57:51 jtb Exp $ +$NetBSD: patch-ak,v 1.2 2010/02/06 10:37:06 sno Exp $ ---- src/kernel/sparcv8/level0_sparcv8_super.S.orig -+++ src/kernel/sparcv8/level0_sparcv8_super.S -@@ -28,16 +28,16 @@ - # else - # define C(entrypoint) _/**/entrypoint - # endif --#elif defined(linux) -+#elif defined(linux) || defined(__NetBSD__) - # define C(entrypoint) entrypoint - #endif --#if defined(sun) || defined(linux) -+#if defined(sun) || defined(linux) || defined(__NetBSD__) - # define GLOBL .global - #elif defined(NeXT) - # define GLOBL .globl - #endif +--- src/test/dotest.orig 2010-02-05 10:43:24.000000000 +0000 ++++ src/test/dotest +@@ -44,14 +44,8 @@ else + fi + $RM -f $file_bench --#if defined(sun) || defined(linux) -+#if defined(sun) || defined(linux) || defined(__NetBSD__) - .seg "data" - .align 4 - C(tabshi): .word 4,3,2,2,1,1,1,1,0,0,0,0,0,0,0,0 +-dotestSUF=${dotestSUF:-"sta dyn"} +-for arg in $dotestSUF; do +- case "$arg" in +- sta|dyn) if test $x $execdir/gp-$arg; then SUF="$SUF $arg"; fi ;; +- esac +-done + file_test=gp.out +-for suf in $SUF; do eval time$suf=0 files$suf=; done ++eval time=0 files= + for testdata in $testlist; do + O=$IFS;IFS=_;set $testdata;IFS=$O;testname=$1;testmul=$2 + file_in=$testdir/in/$testname +@@ -65,44 +59,37 @@ for testdata in $testlist; do + + testmul=${testmul:-1000} + wr "* Testing $testname $c" +- for suf in $SUF; do +- wr " for gp-$suf..$c" +- case "$suf" in +- exe) file_diff=$testname.dif;; +- *) file_diff=$testname-$suf.dif +- gp=$execdir/gp-$suf;; +- esac ++ wr " for gp..$c" ++ file_diff=$testnamef.dif ++ gp=$execdir/gp + $gp -q --test < $file_in > $file_test 2>&1 + diff -c $file_out $file_test > $file_diff + pat=`grep "^[-+!] " $file_diff | grep -v "Total time"` + time=`${tail}2 $file_test | sed -n 's,.*Total time spent: \(.*\),\1,p'` + if test -n "$time"; then +- eval t='$'time$suf ++ eval t='$'time + if test -n "$exprbug"; then + t=`expr $time \'\*\' $testmul / 1000 + $t` + else + t=`expr $time '*' $testmul / 1000 + $t` + fi +- eval time$suf=$t ++ eval time=$t + fi + if test -z "$pat"; then + wr "TIME=$time"; + else + eval BUG$suf=BUG +- eval files$suf=\"'$'files$suf $file_diff\" ++ eval files=\"'$'files $file_diff\" + wr "BUG [${time:-0}]" + fi +- done + wrln + done + $RM -f $file_test + BUG= +-for suf in $SUF; do +- B=`eval echo '$'BUG$suf`; BUG="$BUG$B" +- t=`eval echo '$'time$suf` ++ B=`eval echo '$'BUG`; BUG="$BUG$B" ++ t=`eval echo '$'time` + if test -n "$B"; then B=' [BUG]'; fi +- wrln "+++$B Total bench for gp-$suf is $t" +-done ++ wrln "+++$B Total bench for gp is $t" + if test -z "$BUG"; then exit 0; fi + + pwd=`pwd` +@@ -110,18 +97,16 @@ wrln + wrln "PROBLEMS WERE NOTED. The following files list them in diff format: " + wrln "Directory: $pwd" + bugp=; buge=; +-for suf in $SUF; do +- B=`eval echo '$'BUG$suf`; BUG="$BUG$B" ++ B=`eval echo '$'BUG`; BUG="$BUG$B" + if test -n "$B"; then +- flist=`eval echo '$'files$suf` ++ flist=`eval echo '$'files` + for f in $flist; do + wrln " $f" + case "$f" in +- *program*) bugp="$suf$bugp";; ++ *program*) bugp="$bugp";; + esac + done + fi +-done + + case "x$bugp" in + x) file_diff=;; diff --git a/math/pari/patches/patch-al b/math/pari/patches/patch-al index cb3b9c6ff13..3295c3b6910 100644 --- a/math/pari/patches/patch-al +++ b/math/pari/patches/patch-al @@ -1,34 +1,85 @@ -$NetBSD: patch-al,v 1.2 2005/09/08 08:39:59 adam Exp $ +$NetBSD: patch-al,v 1.3 2010/02/06 10:37:06 sno Exp $ ---- src/kernel/sparcv8/Makefile.SH.orig 2003-04-25 19:08:14.000000000 +0000 -+++ src/kernel/sparcv8/Makefile.SH -@@ -5,7 +5,7 @@ - # that can (resp. cannot) be inline. - # Problem: "divll" uses "overflow", so kernel2.o is not the same when - # compiled with gcc or with cc. We should try to find a workaround. --# For NextStep or Linux -+# For NextStep, Linux, or NetBSD - # We don't accept "asm inline" since it does not work (Ptitboul) - - if test "$gnuas" = "yes"; then do_cpp=yes; fi -@@ -37,14 +37,14 @@ fi - cat >> $file << EOT - pariinl.h: $level0 $level1 - cat $level0 $level1 > \$@ --kernel.o: $kernel1 -- \$(AS) \$(ASFLAGS) -o \$@ $kernel1 --kernel2.o: $kernel2 -- \$(AS) \$(ASFLAGS) -o \$@ $kernel2 -+kernel\$(_O): $kernel1 -+ \$(CC) -c \$(CFLAGS) \$(CPPFLAGS) -o \$@ $kernel1 -+kernel2\$(_O): $kernel2 -+ \$(CC) -c \$(CFLAGS) \$(CPPFLAGS) -o \$@ $kernel2 - # Level 1 kernel is the generic one --mp.o: .headers $src/kernel/none/mp.c -+mp\$(_O): .headers $src/kernel/none/mp.c - \$(CC) -c \$(CFLAGS) \$(CPPFLAGS) -o \$@ $src/kernel/none/mp.c --mpinl.o: .headers $level1 -+mpinl\$(_O): .headers $level1 - \$(CC) -c \$(CFLAGS) \$(CPPFLAGS) -o \$@ $src/kernel/none/level1.c - - EOT +--- config/DOC_Make.SH.orig 2008-01-16 15:57:02.000000000 +0000 ++++ config/DOC_Make.SH +@@ -12,7 +12,7 @@ doc all: develop.dvi libpari.dvi users.d + docps: develop.ps libpari.ps refcard.ps tutorial.ps users.ps INSTALL.ps + docpdf: develop.pdf libpari.pdf users.pdf tutorial.pdf refcard.pdf INSTALL.pdf + +-.SUFFIXES: .tex .ipf .pod .inf .dumbpod .3 .html ++.SUFFIXES: .tex .ipf .pod .inf .dumbpod .3 .html .ps .pdf .dvi .idx .std + + paricfg.tex: paricfg.tex.in + sed -e 's/@version@/$version.$patch/'\\ +@@ -20,33 +20,33 @@ paricfg.tex: paricfg.tex.in + -e 's!@libdir@!$libdir!'\\ + -e 's!@datadir@!$datadir!' paricfg.tex.in > \$@ + +-%.pdf: %.tex \$(MACROS) ++.tex.pdf: \$*.tex \$(MACROS) + pdftex \$< + +-%.dvi: %.tex \$(MACROS) ++.tex.dvi: \$*.tex \$(MACROS) + tex \$< + + libpari.pdf: \$(PARI_TEX) \$(MACROS) + -rm -f libpari.std + pdftex libpari + pdftex libpari +- make libpari.std; pdftex libpari; rm -f libpari.std ++ \$(MAKE) libpari.std; pdftex libpari; rm -f libpari.std + libpari.dvi: \$(PARI_TEX) \$(MACROS) + -rm -f libpari.std + tex libpari + tex libpari +- make libpari.std; tex libpari; rm -f libpari.std ++ \$(MAKE) libpari.std; tex libpari; rm -f libpari.std + + develop.pdf: develop.tex \$(MACROS) + -rm -f develop.std + pdftex develop + pdftex develop +- make develop.std; pdftex develop; rm -f develop.std ++ \$(MAKE) develop.std; pdftex develop; rm -f develop.std + develop.dvi: develop.tex \$(MACROS) + -rm -f develop.std + tex develop + tex develop +- make develop.std; tex develop; rm -f develop.std ++ \$(MAKE) develop.std; tex develop; rm -f develop.std + + tutorial.pdf: tutorial.tex \$(MACROS) + -rm -f tutorial.std +@@ -57,13 +57,13 @@ tutorial.dvi: tutorial.tex \$(MACROS) + tex tutorial + tex tutorial + +-%.ps: %.dvi ++.dvi.ps: \$*.dvi + dvips \$< -o \$@ + + refcard.ps: refcard.dvi + dvips -t landscape -t a4 refcard.dvi -o \$@ + +-%.std: %.idx ++.idx.std: \$*.idx + sed -e 's/!\([1-9]\)!/!00\1!/'\\ + -e 's/!\([1-9][0-9]\)!/!0\1!/'\\ + -e 's/\\\\EFF {}/f/g'\\ +@@ -74,13 +74,13 @@ users.dvi: \$(USERS_TEX) + -rm -f users.std + tex users + tex users +- make users.std; tex users; rm -f users.std ++ \$(MAKE) users.std; tex users; rm -f users.std + + users.pdf: \$(USERS_TEX) + -rm -f users.std + pdftex users + pdftex users +- make users.std; pdftex users; rm -f users.std ++ \$(MAKE) users.std; pdftex users; rm -f users.std + + gpman: gp.1 + nroff -man gp.1 | unix2dos -ascii > gp.man diff --git a/math/pari/patches/patch-am b/math/pari/patches/patch-am index e0eec5c7302..43ec1051218 100644 --- a/math/pari/patches/patch-am +++ b/math/pari/patches/patch-am @@ -1,102 +1,13 @@ -$NetBSD: patch-am,v 1.1 2003/07/07 21:57:51 jtb Exp $ +$NetBSD: patch-am,v 1.2 2010/02/06 10:37:06 sno Exp $ ---- src/test/dotest.orig -+++ src/test/dotest -@@ -57,14 +57,8 @@ - fi - $RM -f $file_bench - --dotestSUF=${dotestSUF:-"sta dyn"} --for arg in $dotestSUF; do -- case "$arg" in -- sta|dyn) if test $x $execdir/gp-$arg; then SUF="$SUF $arg"; fi ;; -- esac --done - file_test=gp.out --for suf in $SUF; do eval time$suf=0 files$suf=; done -+eval time=0 files= - for testdata in $testlist; do - O=$IFS;IFS=_;set $testdata;IFS=$O;testname=$1;testmul=$2 - file_in=$testdir/in/$testname -@@ -74,45 +68,39 @@ - else - testmul=${testmul:-1000} - wr "* Testing $testname $c" -- for suf in $SUF; do -- wr " for gp-$suf..$c" -- case "$suf" in -- exe) file_diff=$testname.dif;; -- *) file_diff=$testname-$suf.dif -- gp=$execdir/gp-$suf;; -- esac -+ wr " for gp..$c" -+ file_diff=$testname.dif -+ gp=$execdir/gp - $gp -q -test < $file_in > $file_test 2>&1 - diff -c $file_out $file_test > $file_diff - pat=`grep "^[-+!] " $file_diff | grep -v "Total time"` - time=`tail -2 $file_test | sed -n 's,.*Total time spent: \(.*\),\1,p'` - if test -n "$time"; then -- eval t='$'time$suf -+ eval t='$'time - if test -n "$exprbug"; then - t=`expr $time \'\*\' $testmul / 1000 + $t` - else - t=`expr $time '*' $testmul / 1000 + $t` - fi -- eval time$suf=$t -+ eval time=$t - fi - if test -z "$pat"; then - wr "TIME=$time"; - else -- eval BUG$suf=BUG -- eval files$suf=\"'$'files$suf $file_diff\" -+ eval BUG=BUG -+ eval files=\"'$'files $file_diff\" - wr "BUG [${time:-0}]" - fi -- done - wrln - fi - done - $RM $file_test - BUG= --for suf in $SUF; do -- B=`eval echo '$'BUG$suf`; BUG="$BUG$B" -- t=`eval echo '$'time$suf` -- if test -n "$B"; then B=' [BUG]'; fi -- wrln "+++$B Total bench for gp-$suf is $t" --done -+B=`eval echo '$'BUG`; BUG="$BUG$B" -+t=`eval echo '$'time` -+if test -n "$B"; then B=' [BUG]'; fi -+wrln "+++$B Total bench for gp is $t" -+ - if test -z "$BUG"; then exit 0; fi - - pwd=`pwd` -@@ -120,19 +108,17 @@ - wrln "PROBLEMS WERE NOTED. The following files list them in diff format: " - wrln "Directory: $pwd" - bugp=; buge=; --for suf in $SUF; do -- B=`eval echo '$'BUG$suf`; BUG="$BUG$B" -+B=`eval echo '$'BUG`; BUG="$BUG$B" - if test -n "$B"; then -- flist=`eval echo '$'files$suf` -+ flist=`eval echo '$'files` - for f in $flist; do - wrln " $f" - case "$f" in -- *program*) bugp="$suf$bugp";; -- *elliptic*) buge="$suf$buge";; -+ *program*) bugp="$bugp";; -+ *elliptic*) buge="$buge";; - esac - done - fi --done - - case "x$buge" in - x) file_diff=;; +--- config/get_ld.orig 2008-01-16 15:56:58.000000000 +0000 ++++ config/get_ld +@@ -58,7 +58,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/math/pari/patches/patch-an b/math/pari/patches/patch-an index a65dc285be5..0cf04852172 100644 --- a/math/pari/patches/patch-an +++ b/math/pari/patches/patch-an @@ -1,19 +1,42 @@ -$NetBSD: patch-an,v 1.1 2003/07/07 21:57:52 jtb Exp $ +$NetBSD: patch-an,v 1.2 2010/02/06 10:37:06 sno Exp $ ---- src/kernel/ix86/Makefile.SH.orig -+++ src/kernel/ix86/Makefile.SH 2003-07-04 -@@ -6,11 +6,11 @@ - cat $src/kernel/ix86/level0.h $src/kernel/none/level1.h > \$@ - level0.s: ../src/kernel/ix86/l0asm.c ../src/kernel/ix86/l0asm.h - \$(CPP) ../src/kernel/ix86/l0asm.c | sed -e '/^#/d' -e '/^ *#line/d' -e 's/% */%/g' > level0.s --kernel.o: level0.s -+kernel\$(_O): level0.s - \$(CC) -c \$(CFLAGS) \$(CPPFLAGS) -o kernel.o level0.s --mp.o: .headers $src/kernel/none/mp.c -+mp\$(_O): .headers $src/kernel/none/mp.c - \$(CC) -c \$(CFLAGS) \$(CPPFLAGS) -o mp.o $src/kernel/none/mp.c --mpinl.o: .headers $src/kernel/none/level1.h -+mpinl\$(_O): .headers $src/kernel/none/level1.h - \$(CC) -c \$(CFLAGS) \$(CPPFLAGS) -o mpinl.o $src/kernel/none/level1.c +--- src/language/anal.h.orig 2010-02-05 15:33:40.000000000 +0000 ++++ src/language/anal.h +@@ -80,23 +80,15 @@ void hit_return(void); + extern char *gp_function_name; + extern int (*whatnow_fun)(char *, int); + extern void (*sigint_fun)(void); +-extern void *foreignHandler; +-extern GEN (*foreignExprHandler)(char*); +-extern char foreignExprSwitch; +-extern entree * (*foreignAutoload)(char*, long); +-extern void (*foreignFuncFree)(entree *); + extern int (*default_exception_handler)(long); - EOT + extern const long functions_tblsz; /* hashcodes table size */ + /* Variables containing the list of PARI functions */ +-extern entree **functions_hash; /* functions hashtable */ + extern entree **members_hash; /* members hashtable */ +-extern entree functions_basic[]; + + /* Variables containing the list of specific GP functions */ + extern entree functions_gp[]; + extern entree gp_member_list[]; +-extern entree functions_highlevel[]; + + /* Variables containing the list of old PARI fonctions (up to 1.39.15) */ + extern entree **funct_old_hash; /* hashtable */ +@@ -118,13 +110,6 @@ enum { RET_GEN, RET_INT, RET_LONG, RET_V + extern void *PARI_stack_limit; + #endif + +-/* entrees */ +-#define EpVALENCE(ep) ((ep)->valence & 0xFF) +-#define EpSTATIC(ep) ((ep)->valence & 0x100) +-#define EpSETSTATIC(ep) ((ep)->valence |= 0x100) +-#define EpPREDEFINED(ep) (EpVALENCE(ep) < EpUSER) +-enum { EpUSER = 100, EpNEW, EpALIAS, EpVAR, EpGVAR, EpMEMBER, EpINSTALL }; +- + /* defaults */ + char* get_sep(const char *t); + long get_int(const char *s, long dflt); diff --git a/math/pari/patches/patch-ao b/math/pari/patches/patch-ao index f0ea95a4978..33975c7ff25 100644 --- a/math/pari/patches/patch-ao +++ b/math/pari/patches/patch-ao @@ -1,20 +1,28 @@ -$NetBSD: patch-ao,v 1.1 2003/07/07 21:57:52 jtb Exp $ +$NetBSD: patch-ao,v 1.2 2010/02/06 10:37:06 sno Exp $ ---- src/kernel/alpha/Makefile.SH.orig -+++ src/kernel/alpha/Makefile.SH -@@ -4,11 +4,11 @@ - cat >> $file << EOT - pariinl.h: $src/kernel/none/asm0.h $src/kernel/none/level1.h - cat $src/kernel/none/asm0.h $src/kernel/none/level1.h > \$@ --kernel.o: $src/kernel/$asmarch/level0.s -- \$(AS) \$(ASFLAGS) -o kernel.o $src/kernel/$asmarch/level0.s --mp.o: .headers $src/kernel/none/mp.c -+kernel\$(_O): $src/kernel/$asmarch/level0.s -+ \$(CC) -c \$(CFLAGS) \$(CPPFLAGS) -o kernel.o $src/kernel/$asmarch/level0.s -+mp\$(_O): .headers $src/kernel/none/mp.c - \$(CC) -c \$(CFLAGS) \$(CPPFLAGS) -o mp.o $src/kernel/none/mp.c --mpinl.o: .headers $src/kernel/none/level1.h -+mpinl\$(_O): .headers $src/kernel/none/level1.h - \$(CC) -c \$(CFLAGS) \$(CPPFLAGS) -o mpinl.o $src/kernel/none/level1.c +--- src/headers/paripriv.h.orig 2010-02-05 15:33:33.000000000 +0000 ++++ src/headers/paripriv.h +@@ -850,4 +850,23 @@ GEN kbesselnew(GEN n, GEN z, long pr + GEN polylogd0(long m, GEN x, long flag, long prec); + GEN twistpartialzeta(GEN p, GEN q, long f, long c, GEN va, GEN cff); - EOT ++/* Something from src/languages/anal.[ch] to support Math::Pari */ ++ ++/* entrees */ ++#define EpVALENCE(ep) ((ep)->valence & 0xFF) ++#define EpSTATIC(ep) ((ep)->valence & 0x100) ++#define EpSETSTATIC(ep) ((ep)->valence |= 0x100) ++#define EpPREDEFINED(ep) (EpVALENCE(ep) < EpUSER) ++enum { EpUSER = 100, EpNEW, EpALIAS, EpVAR, EpGVAR, EpMEMBER, EpINSTALL }; ++ ++extern entree **functions_hash; /* functions hashtable */ ++extern entree functions_basic[]; ++extern entree functions_highlevel[]; ++ ++extern void *foreignHandler; ++extern GEN (*foreignExprHandler)(char*); ++extern char foreignExprSwitch; ++extern entree * (*foreignAutoload)(char*, long); ++extern void (*foreignFuncFree)(entree *); ++ + ENDEXTERN diff --git a/math/pari/patches/patch-ap b/math/pari/patches/patch-ap deleted file mode 100644 index 7f074f71ee7..00000000000 --- a/math/pari/patches/patch-ap +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-ap,v 1.1 2003/07/07 21:57:52 jtb Exp $ - ---- src/gp/gp_rl.c.orig -+++ src/gp/gp_rl.c -@@ -103,7 +103,7 @@ - } - *opt = c; - SAVE_PROMPT(); -- rl_message("%s: %s.", (long)msg, (long)(c? "on": "off")); -+ rl_message("%s: %s.", (char *)msg, (char *)(c? "on": "off")); - c = rl_read_key(); - RESTORE_PROMPT(); - rl_clear_message(); -@@ -583,7 +583,7 @@ - rl_point = 0; rl_end = 0; pari_outfile = rl_outstream; - if (count < 0) flag |= h_LONG; /* long help */ - SAVE_PROMPT(); -- rl_message("",0,0); -+ rl_message('\0',0,0); - aide(rl_line_buffer + off, flag); - RESTORE_PROMPT(); - rl_point = p; rl_end = e; pari_outfile = save; diff --git a/math/pari/patches/patch-aq b/math/pari/patches/patch-aq deleted file mode 100644 index 285604f704c..00000000000 --- a/math/pari/patches/patch-aq +++ /dev/null @@ -1,17 +0,0 @@ -$NetBSD: patch-aq,v 1.1 2003/07/07 21:57:52 jtb Exp $ - ---- src/language/init.c.orig -+++ src/language/init.c -@@ -114,9 +114,9 @@ - struct rlimit rip; - - if (getrlimit(RLIMIT_STACK, &rip) || rip.rlim_cur == RLIM_INFINITY) return; --/* DEC cc doesn't like this line: -- * PARI_stack_limit = stack_base - ((rip.rlim_cur/16)*15); */ -- PARI_stack_limit = (void*)((long)stack_base - (rip.rlim_cur/16)*15); -+/* DEC cc doesn't like this line: */ -+ PARI_stack_limit = stack_base - ((rip.rlim_cur/16)*15); -+/* PARI_stack_limit = (void*)((long)stack_base - (rip.rlim_cur/16)*15); */ - } - #endif /* STACK_CHECK */ - diff --git a/math/pari/patches/patch-ar b/math/pari/patches/patch-ar deleted file mode 100644 index b44b7096bd6..00000000000 --- a/math/pari/patches/patch-ar +++ /dev/null @@ -1,9 +0,0 @@ -$NetBSD: patch-ar,v 1.1 2005/12/03 00:54:11 joerg Exp $ - ---- config/has_exp2.c.orig 2005-12-03 00:14:25.000000000 +0000 -+++ config/has_exp2.c -@@ -1,2 +1,3 @@ - #include <math.h> --main(){double x=exp2(1.0);} -+double testval; -+main(){double x=exp2(testval);} |