aboutsummaryrefslogtreecommitdiff
path: root/math/py-gsl
diff options
context:
space:
mode:
authorMax Brazhnikov <makc@FreeBSD.org>2009-12-01 20:33:45 +0000
committerMax Brazhnikov <makc@FreeBSD.org>2009-12-01 20:33:45 +0000
commit7cb3294da78ddd596f197b8f599a9bc3f3c83eac (patch)
tree1c72184bc6e535e324c3903ec7138b0daceaed97 /math/py-gsl
parent8b1dce6212c686a1fbedd71ad7127d0dfc2cb54e (diff)
Notes
Diffstat (limited to 'math/py-gsl')
-rw-r--r--math/py-gsl/Makefile4
-rw-r--r--math/py-gsl/files/patch-src__const_cgs_array.c23
-rw-r--r--math/py-gsl/files/patch-src__const_cgsm_array.c10
3 files changed, 35 insertions, 2 deletions
diff --git a/math/py-gsl/Makefile b/math/py-gsl/Makefile
index 98cb50868b96..7bc07ae5025c 100644
--- a/math/py-gsl/Makefile
+++ b/math/py-gsl/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gsl
PORTVERSION= 0.9.4
-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.13:${PORTSDIR}/math/gsl
+LIB_DEPENDS= gsl.14:${PORTSDIR}/math/gsl
PLIST_SUB= PYTHON_SITELIBDIR=${PYTHON_SITELIBDIR:S,^${LOCALBASE}/,,g}
USE_PYTHON= yes
diff --git a/math/py-gsl/files/patch-src__const_cgs_array.c b/math/py-gsl/files/patch-src__const_cgs_array.c
new file mode 100644
index 000000000000..cd102349341e
--- /dev/null
+++ b/math/py-gsl/files/patch-src__const_cgs_array.c
@@ -0,0 +1,23 @@
+--- ./src/const_cgs_array.c.orig 2005-04-27 11:53:37.000000000 +0400
++++ ./src/const_cgs_array.c 2009-11-28 23:12:12.000000000 +0300
+@@ -14,10 +14,6 @@
+ {"mass_neutron",GSL_CONST_CGS_MASS_NEUTRON,"g"},
+ {"rydberg",GSL_CONST_CGS_RYDBERG,"g cm^2 / s^2"},
+ {"boltzmann",GSL_CONST_CGS_BOLTZMANN,"g cm^2 / K s^2"},
+-{"bohr_magneton",GSL_CONST_CGS_BOHR_MAGNETON,"A cm^2"},
+-{"nuclear_magneton",GSL_CONST_CGS_NUCLEAR_MAGNETON,"A cm^2"},
+-{"electron_magnetic_moment",GSL_CONST_CGS_ELECTRON_MAGNETIC_MOMENT,"A cm^2"},
+-{"proton_magnetic_moment",GSL_CONST_CGS_PROTON_MAGNETIC_MOMENT,"A cm^2"},
+ {"molar_gas",GSL_CONST_CGS_MOLAR_GAS,"g cm^2 / K mol s^2"},
+ {"standard_gas_volume",GSL_CONST_CGS_STANDARD_GAS_VOLUME,"cm^3 / mol"},
+ {"minute",GSL_CONST_CGS_MINUTE,"s"},
+@@ -76,9 +72,6 @@
+ {"psi",GSL_CONST_CGS_PSI,"g / cm s^2"},
+ {"poise",GSL_CONST_CGS_POISE,"g / cm s"},
+ {"stokes",GSL_CONST_CGS_STOKES,"cm^2 / s"},
+-{"faraday",GSL_CONST_CGS_FARADAY,"A s / mol"},
+-{"electron_charge",GSL_CONST_CGS_ELECTRON_CHARGE,"A s"},
+-{"gauss",GSL_CONST_CGS_GAUSS,"g / A s^2"},
+ {"stilb",GSL_CONST_CGS_STILB,"cd / cm^2"},
+ {"lumen",GSL_CONST_CGS_LUMEN,"cd sr"},
+ {"lux",GSL_CONST_CGS_LUX,"cd sr / cm^2"},
diff --git a/math/py-gsl/files/patch-src__const_cgsm_array.c b/math/py-gsl/files/patch-src__const_cgsm_array.c
new file mode 100644
index 000000000000..1c86846b5ce2
--- /dev/null
+++ b/math/py-gsl/files/patch-src__const_cgsm_array.c
@@ -0,0 +1,10 @@
+--- ./src/const_cgsm_array.c.orig 2006-12-21 15:20:15.000000000 +0300
++++ ./src/const_cgsm_array.c 2009-11-28 23:12:26.000000000 +0300
+@@ -77,7 +77,6 @@
+ {"stokes",GSL_CONST_CGSM_STOKES,"cm^2 / s"},
+ {"faraday",GSL_CONST_CGSM_FARADAY,"abamp s / mol"},
+ {"electron_charge",GSL_CONST_CGSM_ELECTRON_CHARGE,"abamp s"},
+-{"gauss",GSL_CONST_CGSM_GAUSS,"g / abamp s^2"},
+ {"stilb",GSL_CONST_CGSM_STILB,"cd / cm^2"},
+ {"lumen",GSL_CONST_CGSM_LUMEN,"cd sr"},
+ {"lux",GSL_CONST_CGSM_LUX,"cd sr / cm^2"},