diff options
author | hans <hans@pkgsrc.org> | 2011-04-20 18:44:56 +0000 |
---|---|---|
committer | hans <hans@pkgsrc.org> | 2011-04-20 18:44:56 +0000 |
commit | 5b85f14a4d3cd5dad9b621d868bde89711f82721 (patch) | |
tree | 28eae061d72f45d0b9b1c685d44a76be6930ae56 | |
parent | b78b7b41cd183ac6d3b232f7464c9996517a723e (diff) | |
download | pkgsrc-5b85f14a4d3cd5dad9b621d868bde89711f82721.tar.gz |
Add package for pari module of lang/clisp. Remove conflicting option
pari from lang/clisp.
-rw-r--r-- | lang/clisp/options.mk | 14 | ||||
-rw-r--r-- | math/Makefile | 3 | ||||
-rw-r--r-- | math/clisp-pari/DESCR | 1 | ||||
-rw-r--r-- | math/clisp-pari/Makefile | 26 | ||||
-rw-r--r-- | math/clisp-pari/PLIST | 9 | ||||
-rw-r--r-- | math/clisp-pari/distinfo | 7 | ||||
-rw-r--r-- | math/clisp-pari/patches/patch-aa | 26 | ||||
-rw-r--r-- | math/clisp-pari/patches/patch-ab | 21 |
8 files changed, 99 insertions, 8 deletions
diff --git a/lang/clisp/options.mk b/lang/clisp/options.mk index a3c98d2b297..42ea2524694 100644 --- a/lang/clisp/options.mk +++ b/lang/clisp/options.mk @@ -1,11 +1,11 @@ -# $NetBSD: options.mk,v 1.7 2011/04/20 18:40:43 hans Exp $ +# $NetBSD: options.mk,v 1.8 2011/04/20 18:44:56 hans Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.clisp # this option is essential for some others to work: PKG_SUPPORTED_OPTIONS+= ffcall -PKG_SUPPORTED_OPTIONS+= pari wildcard +PKG_SUPPORTED_OPTIONS+= wildcard PKG_SUPPORTED_OPTIONS+= readline PKG_SUPPORTED_OPTIONS+= gmalloc @@ -39,11 +39,6 @@ CONFIGURE_ARGS+= --with-dynamic-ffi . include "../../devel/ffcall/buildlink3.mk" .endif -.if !empty(PKG_OPTIONS:Mpari) -CONFIGURE_ARGS+= --with-module=pari -. include "../../math/pari/buildlink3.mk" -.endif - .if !empty(PKG_OPTIONS:Mwildcard) CONFIGURE_ARGS+= --with-module=wildcard .endif @@ -57,6 +52,11 @@ CONFIGURE_ARGS+= --with-readline # Options for those who wishes to build "static" CLISP: +#.if !empty(PKG_OPTIONS:Mpari) +#CONFIGURE_ARGS+= --with-module=pari +#. include "../../math/pari/buildlink3.mk" +#.endif + #.if !empty(PKG_OPTIONS:Mmit-clx) #CONFIGURE_ARGS+= --with-module=clx/mit-clx #. include "../../x11/libX11/buildlink3.mk" diff --git a/math/Makefile b/math/Makefile index 875375441d1..44647fe4ff1 100644 --- a/math/Makefile +++ b/math/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.215 2011/04/13 13:17:59 obache Exp $ +# $NetBSD: Makefile,v 1.216 2011/04/20 18:44:56 hans Exp $ COMMENT= Mathematics @@ -52,6 +52,7 @@ SUBDIR+= blitz++ SUBDIR+= calc SUBDIR+= calcoo SUBDIR+= capc-calc +SUBDIR+= clisp-pari SUBDIR+= cln SUBDIR+= dcdflib.c SUBDIR+= dcdflib.f diff --git a/math/clisp-pari/DESCR b/math/clisp-pari/DESCR new file mode 100644 index 00000000000..588a1c249ef --- /dev/null +++ b/math/clisp-pari/DESCR @@ -0,0 +1 @@ +CLISP pari module diff --git a/math/clisp-pari/Makefile b/math/clisp-pari/Makefile new file mode 100644 index 00000000000..e70c6943b56 --- /dev/null +++ b/math/clisp-pari/Makefile @@ -0,0 +1,26 @@ +# $NetBSD: Makefile,v 1.1 2011/04/20 18:44:56 hans Exp $ +# + +CLISP_MODULE= pari + +PKGNAME= clisp-$(CLISP_MODULE)-$(CLISP_VERSION) +CATEGORIES= devel +MASTER_SITES= $(MASTER_SITE_SOURCEFORGE:=clisp/) + +MAINTAINER= hans@netbsd.org +HOMEPAGE= http://clisp.cons.org/ +COMMENT= CLISP pari module + +MAKE_JOBS_SAFE= no + +.include "../../lang/clisp/module.mk" +.include "../../math/pari/buildlink3.mk" + +ac_cv_libpari_libs= -l${PARI_LIB} +.if ${PARI_LIB} == "pari-gmp" +ac_cv_libpari_libs+= -lgmp +.endif + +CONFIGURE_ENV+= "ac_cv_libpari_libs=${ac_cv_libpari_libs}" + +.include "../../mk/bsd.pkg.mk" diff --git a/math/clisp-pari/PLIST b/math/clisp-pari/PLIST new file mode 100644 index 00000000000..1c8c22f39d7 --- /dev/null +++ b/math/clisp-pari/PLIST @@ -0,0 +1,9 @@ +lib/clisp/dynmod/lib-pari.so +lib/clisp/dynmod/pari.lisp +lib/clisp/pari/Makefile +lib/clisp/pari/cpari.o +lib/clisp/pari/link.sh +lib/clisp/pari/pari.fas +lib/clisp/pari/pari.lisp +lib/clisp/pari/pari.o +lib/clisp/pari/preload.lisp diff --git a/math/clisp-pari/distinfo b/math/clisp-pari/distinfo new file mode 100644 index 00000000000..aef11b9b10a --- /dev/null +++ b/math/clisp-pari/distinfo @@ -0,0 +1,7 @@ +$NetBSD: distinfo,v 1.1 2011/04/20 18:44:57 hans Exp $ + +SHA1 (clisp-2.49.tar.gz) = 1743e7917013162400c955af441e991db43b3323 +RMD160 (clisp-2.49.tar.gz) = ae30f3b681cb023e885c6e4ed12210ee5ba14c76 +Size (clisp-2.49.tar.gz) = 9823111 bytes +SHA1 (patch-aa) = 545de0c3a441a901f2fe10738ab13fcc3707b5dc +SHA1 (patch-ab) = 3c6b3a6c10b6acce70411a78a329e340690c33f1 diff --git a/math/clisp-pari/patches/patch-aa b/math/clisp-pari/patches/patch-aa new file mode 100644 index 00000000000..78a18c44773 --- /dev/null +++ b/math/clisp-pari/patches/patch-aa @@ -0,0 +1,26 @@ +$NetBSD: patch-aa,v 1.1 2011/04/20 18:44:57 hans Exp $ + +Override ac_install_sh. + +--- modules/pari/configure.orig 2010-06-24 22:09:41.000000000 +0400 ++++ modules/pari/configure 2010-07-09 15:07:41.000000000 +0400 +@@ -2295,19 +2295,6 @@ + $as_echo "$cl_cv_clisp_FFI" >&6; } + ${required} && test $cl_cv_clisp_FFI = no && \ + as_fn_error "no FFI in CLISP" "$LINENO" 5 +-ac_aux_dir= +-for ac_dir in $cl_cv_clisp_libdir/build-aux "$srcdir"/$cl_cv_clisp_libdir/build-aux; do +- for ac_t in install-sh install.sh shtool; do +- if test -f "$ac_dir/$ac_t"; then +- ac_aux_dir=$ac_dir +- ac_install_sh="$ac_aux_dir/$ac_t -c" +- break 2 +- fi +- done +-done +-if test -z "$ac_aux_dir"; then +- as_fn_error "cannot find install-sh, install.sh, or shtool in $cl_cv_clisp_libdir/build-aux \"$srcdir\"/$cl_cv_clisp_libdir/build-aux" "$LINENO" 5 +-fi + + # These three variables are undocumented and unsupported, + # and are intended to be withdrawn in a future Autoconf release. diff --git a/math/clisp-pari/patches/patch-ab b/math/clisp-pari/patches/patch-ab new file mode 100644 index 00000000000..f94519990aa --- /dev/null +++ b/math/clisp-pari/patches/patch-ab @@ -0,0 +1,21 @@ +$NetBSD: patch-ab,v 1.1 2011/04/20 18:44:57 hans Exp $ + +--- modules/pari/Makefile.in.orig 2010-05-21 22:53:02.000000000 +0200 ++++ modules/pari/Makefile.in 2011-04-20 20:39:48.106302044 +0200 +@@ -5,6 +5,7 @@ CC = @CC@ + PARICPPFLAGS = @CPPFLAGS@ + CFLAGS = @CFLAGS@ + CLISP = @CLISP@ -norc -q ++CLISP_CFLAGS = @CLISP_CFLAGS@ + CLISP_LINKKIT = @CLISP_LINKKIT@ + + LN = @LN@ +@@ -14,7 +15,7 @@ MAKE = make + + SHELL = /bin/sh + +-ALL_CFLAGS = $(CPPFLAGS) $(PARICPPFLAGS) $(CFLAGS) -I$(CLISP_LINKKIT) \ ++ALL_CFLAGS = $(CPPFLAGS) $(PARICPPFLAGS) $(CFLAGS) $(CLISP_CFLAGS) -I$(CLISP_LINKKIT) \ + -I$(srcdir) # for cpari.h + + GENERATED = pari.o cpari.o pari.fas preload.lisp |