pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/math/pari Updating math/pari from 2.1.6nb3 to 2.3.5 (n...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/40e7cfc5c80b
branches:  trunk
changeset: 570980:40e7cfc5c80b
user:      sno <sno%pkgsrc.org@localhost>
date:      Sat Feb 06 10:37:06 2010 +0000

description:
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:

 math/pari/Makefile         |   30 ++-
 math/pari/PLIST            |   34 ++-
 math/pari/buildlink3.mk    |   16 +-
 math/pari/distinfo         |   41 ++--
 math/pari/options.mk       |   19 ++
 math/pari/patches/patch-aa |  279 +---------------------------------
 math/pari/patches/patch-ab |  367 ++++++--------------------------------------
 math/pari/patches/patch-ac |   24 +-
 math/pari/patches/patch-ad |   47 ++++-
 math/pari/patches/patch-ae |   95 +++++++----
 math/pari/patches/patch-af |   43 +++--
 math/pari/patches/patch-ag |   54 +++---
 math/pari/patches/patch-ah |   36 +---
 math/pari/patches/patch-ai |  365 ++++++++++++++++++++++++++++++++++++++++----
 math/pari/patches/patch-aj |   36 +---
 math/pari/patches/patch-ak |  116 +++++++++++--
 math/pari/patches/patch-al |  113 ++++++++++---
 math/pari/patches/patch-am |  113 +------------
 math/pari/patches/patch-an |   57 ++++--
 math/pari/patches/patch-ao |   44 +++--
 math/pari/patches/patch-ap |   22 --
 math/pari/patches/patch-aq |   17 --
 math/pari/patches/patch-ar |    9 -
 23 files changed, 910 insertions(+), 1067 deletions(-)

diffs (truncated from 2198 to 300 lines):

diff -r 733bab78c338 -r 40e7cfc5c80b math/pari/Makefile
--- a/math/pari/Makefile        Sat Feb 06 10:28:54 2010 +0000
+++ b/math/pari/Makefile        Sat Feb 06 10:37:06 2010 +0000
@@ -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@localhost
 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 @@
 TEX_ACCEPTED=  teTeX3
 TEX_DEPMETHOD= build
 
+USE_LIBTOOL=           yes
+USE_TOOLS+=            perl:run imake
+USE_LANGUAGES+=                c c++
 USE_GNU_READLINE=      yes     # rl_save_prompt()
-USE_LIBTOOL=           yes
-USE_TOOLS+=            perl:run
 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 -r 733bab78c338 -r 40e7cfc5c80b math/pari/PLIST
--- a/math/pari/PLIST   Sat Feb 06 10:28:54 2010 +0000
+++ b/math/pari/PLIST   Sat Feb 06 10:37:06 2010 +0000
@@ -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/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/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/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/new.dic
 share/pari/misc/pari.xpm
 share/pari/misc/xgp
-@pkgdir share/pari/galdata
+share/pari/pari.desc
diff -r 733bab78c338 -r 40e7cfc5c80b math/pari/buildlink3.mk
--- a/math/pari/buildlink3.mk   Sat Feb 06 10:28:54 2010 +0000
+++ b/math/pari/buildlink3.mk   Sat Feb 06 10:37:06 2010 +0000
@@ -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 -r 733bab78c338 -r 40e7cfc5c80b math/pari/distinfo
--- a/math/pari/distinfo        Sat Feb 06 10:28:54 2010 +0000
+++ b/math/pari/distinfo        Sat Feb 06 10:37:06 2010 +0000
@@ -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 -r 733bab78c338 -r 40e7cfc5c80b math/pari/options.mk
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/math/pari/options.mk      Sat Feb 06 10:37:06 2010 +0000
@@ -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 -r 733bab78c338 -r 40e7cfc5c80b math/pari/patches/patch-aa
--- a/math/pari/patches/patch-aa        Sat Feb 06 10:28:54 2010 +0000
+++ b/math/pari/patches/patch-aa        Sat Feb 06 10:37:06 2010 +0000
@@ -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 @@
  "
  # /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



Home | Main Index | Thread Index | Old Index