Use $PYNUMERIC in the dependencies.

10 files changed, 17 insertions, 34 deletions

diff --git a/biology/py-biopython/Makefile b/biology/py-biopython/Makefile
index bc3406a..baddf20 100644
--- a/biology/py-biopython/Makefile
+++ b/biology/py-biopython/Makefile
@@ -16,8 +16,8 @@ DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
 MAINTAINER=	wjv@FreeBSD.org
 
 BUILD_DEPENDS=	${PYDISTUTILS}
-RUN_DEPENDS=	${PYTHON_SITELIBDIR}/Martel/__init__.py:${PORTSDIR}/textproc/py-martel \
-		${PYTHON_SITELIBDIR}/Numeric/Numeric.py:${PORTSDIR}/math/py-numeric \
+RUN_DEPENDS=	${PYNUMERIC} \
+		${PYTHON_SITELIBDIR}/Martel/__init__.py:${PORTSDIR}/textproc/py-martel \
 		${PYTHON_SITELIBDIR}/mx/TextTools/__init__.py:${PORTSDIR}/lang/py-mx-base
 
 USE_PYTHON=	yes
diff --git a/devel/py-game/Makefile b/devel/py-game/Makefile
index 576f21b..3e75d11 100644
--- a/devel/py-game/Makefile
+++ b/devel/py-game/Makefile
@@ -26,14 +26,6 @@ USE_PYTHON=	yes
 USE_PYDISTUTILS=	yes
 MAKE_ENV=	SDL_CONFIG="${SDL_CONFIG}"
 
-.include <bsd.port.pre.mk>
-
-.if (${PYTHON_VERSION} == "python2.1" || ${PYTHON_VERSION} == "python2.2")
-PYNUMERIC=	${PYTHON_SITELIBDIR}/Numeric/Numeric.py:${PORTSDIR}/math/py-numeric
-.else
-PYNUMERIC=	${PYTHON_SITELIBDIR}/Numeric/Numeric.py:${PORTSDIR}/math/py-numeric17
-.endif
-
 do-configure:
 	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} config.py
 
@@ -47,4 +39,4 @@ post-install:
 		${TAR} --unlink -C ${PREFIX}/share/doc/py-game -xf -
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/graphics/py-opengl/Makefile b/graphics/py-opengl/Makefile
index e8452d0..e93b952 100644
--- a/graphics/py-opengl/Makefile
+++ b/graphics/py-opengl/Makefile
@@ -15,10 +15,10 @@ DISTNAME=	PyOpenGL-${PORTVERSION:S/.b/b/}
 
 MAINTAINER=	sobomax@FreeBSD.org
 
-BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/Numeric/Numeric.py:${PORTSDIR}/math/py-numeric \
+BUILD_DEPENDS=	${PYNUMERIC} \
 		${PYTHON_SITELIBDIR}/_tkinter.so:${PORTSDIR}/x11-toolkits/py-tkinter \
 		${PYTHON_SITELIBDIR}/PIL.pth:${PORTSDIR}/graphics/py-imaging
-RUN_DEPENDS=	${PYTHON_SITELIBDIR}/Numeric/Numeric.py:${PORTSDIR}/math/py-numeric \
+RUN_DEPENDS=	${PYNUMERIC} \
 		${PYTHON_SITELIBDIR}/_tkinter.so:${PORTSDIR}/x11-toolkits/py-tkinter \
 		${PYTHON_SITELIBDIR}/PIL.pth:${PORTSDIR}/graphics/py-imaging
 
diff --git a/math/biggles/Makefile b/math/biggles/Makefile
index 11fce68..9173e33 100644
--- a/math/biggles/Makefile
+++ b/math/biggles/Makefile
@@ -15,7 +15,7 @@ DISTNAME=	python-${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 
-BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/Numeric.pth:${PORTSDIR}/math/py-numeric
+BUILD_DEPENDS=	${PYNUMERIC}
 LIB_DEPENDS=	plot:${PORTSDIR}/graphics/plotutils
 
 USE_PYTHON=	yes
diff --git a/math/py-gnuplot/Makefile b/math/py-gnuplot/Makefile
index dc0941b..92ca39c 100644
--- a/math/py-gnuplot/Makefile
+++ b/math/py-gnuplot/Makefile
@@ -14,9 +14,9 @@ DISTNAME=	Gnuplot-${PORTVERSION}
 
 MAINTAINER=	sobomax@FreeBSD.org
 
-BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/Numeric/_numpy.so:${PORTSDIR}/math/py-numeric
+BUILD_DEPENDS=	${PYNUMERIC}
 RUN_DEPENDS=	gnuplot:${PORTSDIR}/math/gnuplot \
-		${PYTHON_SITELIBDIR}/Numeric/_numpy.so:${PORTSDIR}/math/py-numeric
+		${PYNUMERIC}
 
 USE_PYTHON=	yes
 USE_PYDISTUTILS=	yes
diff --git a/math/py-scientific/Makefile b/math/py-scientific/Makefile
index 7774773..db9f234 100644
--- a/math/py-scientific/Makefile
+++ b/math/py-scientific/Makefile
@@ -15,14 +15,13 @@ DISTNAME=	ScientificPython-${PORTVERSION}
 
 MAINTAINER=	tg@FreeBSD.org
 
-BUILD_DEPENDS=	${NUMPYDIR}/Numeric.py:${PORTSDIR}/math/py-numeric
+BUILD_DEPENDS=	${PYNUMERIC}
 LIB_DEPENDS=	netcdf.1:${PORTSDIR}/math/netcdf
-RUN_DEPENDS=	${NUMPYDIR}/Numeric.py:${PORTSDIR}/math/py-numeric
+RUN_DEPENDS=	${PYNUMERIC}
 
 USE_PYTHON=	yes
 USE_PYDISTUTILS=yes
 
-NUMPYDIR=	${PYTHON_SITELIBDIR}/Numeric
 DOCDIR=		${PREFIX}/share/doc/py-scientific
 EXAMPLEDIR=	${PREFIX}/share/examples/py-scientific
 
diff --git a/math/scigraphica/Makefile b/math/scigraphica/Makefile
index fdf4437..96bc95b 100644
--- a/math/scigraphica/Makefile
+++ b/math/scigraphica/Makefile
@@ -29,14 +29,6 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 MAKE_ENV=	PTHREAD_LIBS="${PTHREAD_LIBS}"
 
-.include <bsd.port.pre.mk>
-
-.if ${PYTHON_VERSION} == "python2.0" || ${PYTHON_VERSION} == "python2.1"
-PYNUMERIC=      ${LOCALBASE}/include/${PYTHON_VERSION}/Numeric/arrayobject.h:${PORTSDIR}/math/py-numeric
-.else
-PYNUMERIC=      ${LOCALBASE}/include/${PYTHON_VERSION}/Numeric/arrayobject.h:${PORTSDIR}/math/py-numeric17
-.endif
-
 pre-patch:
 	@${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
 		 s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
@@ -48,4 +40,4 @@ post-install:
 	@${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${PREFIX}/share/gnome/scigraphica
 	@${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py ${PREFIX}/share/gnome/scigraphica
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/print/py-fonttools/Makefile b/print/py-fonttools/Makefile
index 6f899ca..f9ee916 100644
--- a/print/py-fonttools/Makefile
+++ b/print/py-fonttools/Makefile
@@ -17,9 +17,9 @@ DISTNAME=	fonttools-${PORTVERSION}
 MAINTAINER=	jkoshy@freebsd.org
 
 BUILD_DEPENDS=	xmlproc_val:${PORTSDIR}/textproc/py-xml \
-		${PYTHON_SITELIBDIR}/Numeric/Numeric.py:${PORTSDIR}/math/py-numeric
+		${PYNUMERIC}
 RUN_DEPENDS=	xmlproc_val:${PORTSDIR}/textproc/py-xml \
-		${PYTHON_SITELIBDIR}/Numeric/Numeric.py:${PORTSDIR}/math/py-numeric
+		${PYNUMERIC}
 
 WRKSRC=		${WRKDIR}/fonttools
 
diff --git a/x11-toolkits/py-gtk/Makefile b/x11-toolkits/py-gtk/Makefile
index ac9947d..ce731d5 100644
--- a/x11-toolkits/py-gtk/Makefile
+++ b/x11-toolkits/py-gtk/Makefile
@@ -14,9 +14,9 @@ DISTNAME=	gnome-python-1.4.2
 
 MAINTAINER=	gnome@FreeBSD.org
 
-BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/Numeric/Numeric.py:${PORTSDIR}/math/py-numeric
+BUILD_DEPENDS=	${PYNUMERIC}
 LIB_DEPENDS=	gtkgl.5:${PORTSDIR}/x11-toolkits/gtkglarea
-RUN_DEPENDS=	${PYTHON_SITELIBDIR}/Numeric/Numeric.py:${PORTSDIR}/math/py-numeric
+RUN_DEPENDS=	${PYNUMERIC}
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/pygtk
 
diff --git a/x11-toolkits/py-gtk2/Makefile b/x11-toolkits/py-gtk2/Makefile
index ac9947d..ce731d5 100644
--- a/x11-toolkits/py-gtk2/Makefile
+++ b/x11-toolkits/py-gtk2/Makefile
@@ -14,9 +14,9 @@ DISTNAME=	gnome-python-1.4.2
 
 MAINTAINER=	gnome@FreeBSD.org
 
-BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/Numeric/Numeric.py:${PORTSDIR}/math/py-numeric
+BUILD_DEPENDS=	${PYNUMERIC}
 LIB_DEPENDS=	gtkgl.5:${PORTSDIR}/x11-toolkits/gtkglarea
-RUN_DEPENDS=	${PYTHON_SITELIBDIR}/Numeric/Numeric.py:${PORTSDIR}/math/py-numeric
+RUN_DEPENDS=	${PYNUMERIC}
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/pygtk