diff options
author | bf <bf@FreeBSD.org> | 2013-08-27 00:06:37 +0800 |
---|---|---|
committer | bf <bf@FreeBSD.org> | 2013-08-27 00:06:37 +0800 |
commit | 1851b95b9492315bfd099d4f65c9edda47271bb4 (patch) | |
tree | 347697fba4162ae0c60ff32a1a87d6d7f894c389 /math | |
parent | d20958189a812014914778007f4aabed5f350cea (diff) | |
download | freebsd-ports-gnome-1851b95b9492315bfd099d4f65c9edda47271bb4.tar.gz freebsd-ports-gnome-1851b95b9492315bfd099d4f65c9edda47271bb4.tar.zst freebsd-ports-gnome-1851b95b9492315bfd099d4f65c9edda47271bb4.zip |
Update math/gsl to 1.16 and adjust some dependent ports
Diffstat (limited to 'math')
-rw-r--r-- | math/asymptote/Makefile | 2 | ||||
-rw-r--r-- | math/dieharder/Makefile | 1 | ||||
-rw-r--r-- | math/fflas-ffpack/Makefile | 1 | ||||
-rw-r--r-- | math/giacxcas/Makefile | 1 | ||||
-rw-r--r-- | math/gsl/Makefile | 19 | ||||
-rw-r--r-- | math/gsl/distinfo | 4 | ||||
-rw-r--r-- | math/gsl/pkg-plist | 2 | ||||
-rw-r--r-- | math/labplot/Makefile | 1 | ||||
-rw-r--r-- | math/ocamlgsl/Makefile | 2 | ||||
-rw-r--r-- | math/octave-forge-gsl/Makefile | 2 | ||||
-rw-r--r-- | math/orpie/Makefile | 4 | ||||
-rw-r--r-- | math/p5-Math-GSL/Makefile | 7 | ||||
-rw-r--r-- | math/p5-Math-GSL/pkg-descr | 3 | ||||
-rw-r--r-- | math/pspp/Makefile | 4 | ||||
-rw-r--r-- | math/py-gsl/Makefile | 4 | ||||
-rw-r--r-- | math/qtiplot/Makefile | 4 | ||||
-rw-r--r-- | math/ruby-gsl/Makefile | 8 |
17 files changed, 44 insertions, 25 deletions
diff --git a/math/asymptote/Makefile b/math/asymptote/Makefile index a31b98e27552..8f9cd7f4f3f8 100644 --- a/math/asymptote/Makefile +++ b/math/asymptote/Makefile @@ -3,7 +3,7 @@ PORTNAME= asymptote PORTVERSION= 2.16 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= math MASTER_SITES= SF MASTER_SITE_SUBDIR= ${PORTNAME}/${PORTVERSION} diff --git a/math/dieharder/Makefile b/math/dieharder/Makefile index 40103624e819..c90b4919b5dd 100644 --- a/math/dieharder/Makefile +++ b/math/dieharder/Makefile @@ -7,6 +7,7 @@ PORTNAME= dieharder PORTVERSION= 3.31.1 +PORTREVISION= 1 CATEGORIES= math MASTER_SITES= http://www.phy.duke.edu/~rgb/General/dieharder/ LOCAL/bf EXTRACT_SUFX= .tgz diff --git a/math/fflas-ffpack/Makefile b/math/fflas-ffpack/Makefile index f91b7c586976..1a33391e5bda 100644 --- a/math/fflas-ffpack/Makefile +++ b/math/fflas-ffpack/Makefile @@ -3,6 +3,7 @@ PORTNAME= fflas-ffpack PORTVERSION= 1.4.3 +PORTREVISION= 1 CATEGORIES= math MASTER_SITES= http://linalg.org/ LOCAL/bf diff --git a/math/giacxcas/Makefile b/math/giacxcas/Makefile index 2404f2bf6242..fe012335cbb3 100644 --- a/math/giacxcas/Makefile +++ b/math/giacxcas/Makefile @@ -3,6 +3,7 @@ PORTNAME= giacxcas PORTVERSION= 1.0.0 +PORTREVISION= 1 CATEGORIES= math MASTER_SITES= http://www-fourier.ujf-grenoble.fr/~parisse/giac/freebsd/ \ http://people.math.jussieu.fr/~han/xcas/sources/ diff --git a/math/gsl/Makefile b/math/gsl/Makefile index 315942d97fe8..24eb9d47e872 100644 --- a/math/gsl/Makefile +++ b/math/gsl/Makefile @@ -1,13 +1,8 @@ -# New ports collection makefile for: gsl -# Date created: 15 Feb 2000 -# Whom: Andrew L. Neporada <andrew@chg.ru> -# +# Created by: Andrew L. Neporada <andrew@chg.ru> # $FreeBSD$ -# PORTNAME= gsl -PORTVERSION= 1.15 -PORTREVISION= 1 +PORTVERSION= 1.16 CATEGORIES= math MASTER_SITES= GNU @@ -27,9 +22,15 @@ INFO= gsl-ref post-extract: @${RM} -f ${WRKSRC}/doc/gsl-ref.info* +#prevent regression test coredumps from causing failures on the +#package-building cluster: +.ifndef(MAINTAINER_MODE) +CORELIMIT?= /usr/bin/limits -Sc 0 +.endif + check regression-test test: build - @(cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE} ${_MAKE_JOBS} \ - ${MAKE_ARGS} check) + @cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${CORELIMIT} ${MAKE_CMD} \ + ${MAKE_ARGS} check .include <bsd.port.pre.mk> diff --git a/math/gsl/distinfo b/math/gsl/distinfo index a29a961f9f4b..4de762b80637 100644 --- a/math/gsl/distinfo +++ b/math/gsl/distinfo @@ -1,2 +1,2 @@ -SHA256 (gsl-1.15.tar.gz) = 85b907e57902e2b7606ef3aef960302ffdd13bd9dc5b8fcbfa75e4f0bf340ea3 -SIZE (gsl-1.15.tar.gz) = 3281134 +SHA256 (gsl-1.16.tar.gz) = 73bc2f51b90d2a780e6d266d43e487b3dbd78945dd0b04b14ca5980fe28d2f53 +SIZE (gsl-1.16.tar.gz) = 3534080 diff --git a/math/gsl/pkg-plist b/math/gsl/pkg-plist index 9cb20e79ff73..3eb7e61b7bbc 100644 --- a/math/gsl/pkg-plist +++ b/math/gsl/pkg-plist @@ -223,7 +223,7 @@ include/gsl/gsl_wavelet2d.h lib/libgsl.a lib/libgsl.la lib/libgsl.so -lib/libgsl.so.16 +lib/libgsl.so.17 lib/libgslcblas.a lib/libgslcblas.la lib/libgslcblas.so diff --git a/math/labplot/Makefile b/math/labplot/Makefile index 6d5601127086..a182a6940813 100644 --- a/math/labplot/Makefile +++ b/math/labplot/Makefile @@ -3,6 +3,7 @@ PORTNAME= labplot DISTVERSION= 2.0.0.alpha3 +PORTREVISION= 1 CATEGORIES= math kde MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION:R} diff --git a/math/ocamlgsl/Makefile b/math/ocamlgsl/Makefile index c73ee700bca1..86ac3e983650 100644 --- a/math/ocamlgsl/Makefile +++ b/math/ocamlgsl/Makefile @@ -7,6 +7,7 @@ PORTNAME= ocamlgsl PORTVERSION= 0.6.0 +PORTREVISION= 1 CATEGORIES= math MASTER_SITES= http://oandrieu.nerim.net/ocaml/gsl/ @@ -27,6 +28,7 @@ USE_GMAKE= YES USE_GCC= 4.2+ USE_OCAML= YES MAKE_ENV+= OCAMLDIR=${OCAML_LIBDIR} +MAKE_JOBS_UNSAFE= yes NO_OCAML_BUILDDEPENDS= yes USE_OCAML_LDCONFIG= yes diff --git a/math/octave-forge-gsl/Makefile b/math/octave-forge-gsl/Makefile index 775c6ea407df..c0e6d2ee00bd 100644 --- a/math/octave-forge-gsl/Makefile +++ b/math/octave-forge-gsl/Makefile @@ -3,7 +3,7 @@ PORTNAME= octave-forge-gsl PORTVERSION= 1.0.8 -PORTREVISION= 10 +PORTREVISION= 11 CATEGORIES= math MAINTAINER= stephen@FreeBSD.org diff --git a/math/orpie/Makefile b/math/orpie/Makefile index fa5704352f81..92bdb7be8bfd 100644 --- a/math/orpie/Makefile +++ b/math/orpie/Makefile @@ -7,7 +7,7 @@ PORTNAME= orpie PORTVERSION= 1.5.1 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES+= math MASTER_SITES= http://pessimization.com/software/orpie/ @@ -15,7 +15,7 @@ MAINTAINER= dylan@dylex.net COMMENT= A fullscreen RPN calculator for the console BUILD_DEPENDS= ocamlc:${PORTSDIR}/lang/ocaml -LIB_DEPENDS= gsl.16:${PORTSDIR}/math/gsl +LIB_DEPENDS= gsl:${PORTSDIR}/math/gsl GNU_CONFIGURE= yes USE_GMAKE= yes diff --git a/math/p5-Math-GSL/Makefile b/math/p5-Math-GSL/Makefile index 47315be658d5..d34e66b948d2 100644 --- a/math/p5-Math-GSL/Makefile +++ b/math/p5-Math-GSL/Makefile @@ -3,6 +3,7 @@ PORTNAME= Math-GSL PORTVERSION= 0.27 +PORTREVISION= 1 CATEGORIES= math perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- @@ -82,4 +83,10 @@ MAN3= Math::GSL.3 \ BROKEN= Does not compile on sparc64 .endif +post-patch: + @${REINPLACE_CMD} -Ee 's/(\()(back|for)(ward\))/\1gsl_fft_\2\3/' \ + ${WRKSRC}/xs/FFT_wrap.1.15.c + @${REINPLACE_CMD} -Ee 's/(\()(back|for)(ward\))/\1gsl_wavelet_\2\3/' \ + ${WRKSRC}/xs/Wavelet_wrap.1.15.c + .include <bsd.port.post.mk> diff --git a/math/p5-Math-GSL/pkg-descr b/math/p5-Math-GSL/pkg-descr index 903b8110c90b..ba47b9bfff52 100644 --- a/math/p5-Math-GSL/pkg-descr +++ b/math/p5-Math-GSL/pkg-descr @@ -4,5 +4,4 @@ The GSL is itself distributed under GPL and is available from: Only the routines relating the solving of polynomials are exported. It exists to provide that function to "tkscope" in Audio::Data. -WWW: http://sources.redhat.com/gsl/ - http://search.cpan.org/dist/Math-GSL/ +WWW: http://search.cpan.org/dist/Math-GSL/ diff --git a/math/pspp/Makefile b/math/pspp/Makefile index afc1f6598230..30992668a8ac 100644 --- a/math/pspp/Makefile +++ b/math/pspp/Makefile @@ -3,7 +3,7 @@ PORTNAME= pspp PORTVERSION= 0.6.2 -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES= math MASTER_SITES= GNU @@ -11,7 +11,7 @@ MAINTAINER= sylvio@FreeBSD.org COMMENT= Program for statistical analysis of sampled data LIB_DEPENDS= plot.4:${PORTSDIR}/graphics/plotutils \ - gslcblas.0:${PORTSDIR}/math/gsl + gslcblas:${PORTSDIR}/math/gsl OPTIONS_DEFINE= GUI PGSQL diff --git a/math/py-gsl/Makefile b/math/py-gsl/Makefile index 9c88b1463e7d..83d99f842ed5 100644 --- a/math/py-gsl/Makefile +++ b/math/py-gsl/Makefile @@ -7,7 +7,7 @@ PORTNAME= gsl PORTVERSION= 0.9.5 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= math python MASTER_SITES= SF/py${PORTNAME}/py${PORTNAME}/py${PORTNAME}-${PORTVERSION} PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -19,7 +19,7 @@ COMMENT= Python interface to GNU Scientific Library BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/numpy/core/include/numpy/arrayobject.h:${PORTSDIR}/math/py-numpy RUN_DEPENDS= ${PYTHON_SITELIBDIR}/numpy/__init__.py:${PORTSDIR}/math/py-numpy -LIB_DEPENDS= gsl.16:${PORTSDIR}/math/gsl +LIB_DEPENDS= gsl:${PORTSDIR}/math/gsl PLIST_SUB= PYTHON_SITELIBDIR=${PYTHON_SITELIBDIR:S,^${LOCALBASE}/,,g} USE_PYTHON= yes diff --git a/math/qtiplot/Makefile b/math/qtiplot/Makefile index 1280d7f94ada..004e59899084 100644 --- a/math/qtiplot/Makefile +++ b/math/qtiplot/Makefile @@ -3,7 +3,7 @@ PORTNAME= qtiplot DISTVERSION= 0.9.8.9 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= math science MASTER_SITES= BERLIOS http://soft.proindependent.com/src/ @@ -11,7 +11,7 @@ MAINTAINER= makc@FreeBSD.org COMMENT= Data analysis and scientific plotting BUILD_DEPENDS= ${LOCALBASE}/lib/libmuparser.a:${PORTSDIR}/math/muparser -LIB_DEPENDS= gsl.16:${PORTSDIR}/math/gsl \ +LIB_DEPENDS= gsl:${PORTSDIR}/math/gsl \ png15:${PORTSDIR}/graphics/png # use bundled modified libraries # qwt.5:${PORTSDIR}/x11-toolkits/qwt5 \ diff --git a/math/ruby-gsl/Makefile b/math/ruby-gsl/Makefile index 3258eabe755e..ad1ab6aba263 100644 --- a/math/ruby-gsl/Makefile +++ b/math/ruby-gsl/Makefile @@ -7,6 +7,7 @@ PORTNAME= gsl PORTVERSION= 1.14.7 +PORTREVISION= 1 CATEGORIES= math ruby MASTER_SITES= RF MASTER_SITE_SUBDIR= rb-${PORTNAME} @@ -18,7 +19,7 @@ DIST_SUBDIR= ruby MAINTAINER= clsung@FreeBSD.org COMMENT= A Ruby extension library for GSL (GNU Scientific Library) -LIB_DEPENDS= gsl.16:${PORTSDIR}/math/gsl +LIB_DEPENDS= gsl:${PORTSDIR}/math/gsl USE_RUBY= yes USE_RUBY_SETUP= yes @@ -35,6 +36,11 @@ post-patch: ${WRKSRC}/ext/matrix_complex.c ${REINPLACE_CMD} -e 's|gsl_vector_complex_equal|rb_&|g' \ ${WRKSRC}/ext/vector_complex.c + ${REINPLACE_CMD} -Ee \ + '/(gsl_wavelet_direction|INT2FIX)/s/(for|back)ward/gsl_wavelet_&/' \ + ${WRKSRC}/ext/wavelet.c + ${REINPLACE_CMD} -Ee '/INT2FIX/s/(for|back)ward/gsl_fft_&/' \ + ${WRKSRC}/ext/fft.c post-install: .if !defined(NOPORTEXAMPLES) |