use USE_PYTHON

5 files changed, 17 insertions, 63 deletions

diff --git a/math/py-Numeric/Makefile b/math/py-Numeric/Makefile
index e02e8072c49..ddc2b9617d4 100644
--- a/math/py-Numeric/Makefile
+++ b/math/py-Numeric/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2001/04/09 11:50:51 drochner Exp $
+# $NetBSD: Makefile,v 1.21 2001/05/14 16:22:35 drochner Exp $
 
 DISTNAME=	Numeric-19.0.0
 PKGNAME=	py-Numeric-19.0.0
@@ -9,24 +9,9 @@ MAINTAINER=	tsarna@netbsd.org
 HOMEPAGE=	http://numpy.sourceforge.net/
 COMMENT=	Adds multidimensional numeric arrays to Python
 
-DEPENDS+=	python>=2.0:../../lang/python
-
-.if ${MACHINE_ARCH} == "powerpc" || ${MACHINE_ARCH} == "mips" || ${MACHINE_ARCH} == "vax"
-IGNORE="${PKGNAME} needs dynamic loading"
-.endif
-
-PLIST_SRC=	${WRKDIR}/.PLIST_SRC
-EVAL_PREFIX+=	PYPREFIX=python
-
-do-build:
-	(cd ${WRKSRC} && ${PYPREFIX}/bin/python setup_all.py build)
-
-post-build:
-	(eval `${PYPREFIX}/bin/python ${FILESDIR}/printpypath.py` && \
-	${SED} "s|PYINC|$${PYINC}|g;s|PYSITELIB|$${PYSITELIB}|g" \
-	<${PKGDIR}/PLIST >${PLIST_SRC})
-
-do-install:
-	(cd ${WRKSRC} && ${PYPREFIX}/bin/python setup_all.py install)
+USE_PYTHON=	yes
+PYDISTUTILSPKG=	yes
+PYBINMODULE=	yes
+PYSETUP=	setup_all.py
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/math/py-Numeric/files/printpypath.py b/math/py-Numeric/files/printpypath.py
deleted file mode 100644
index aa53572f19c..00000000000
--- a/math/py-Numeric/files/printpypath.py
+++ /dev/null
@@ -1,5 +0,0 @@
-from distutils.sysconfig import get_python_inc
-from distutils.sysconfig import get_python_lib
-
-print "PYINC=" + get_python_inc(0, "")
-print "PYSITELIB=" + get_python_lib(0, 0, "")
diff --git a/math/py-Scientific/Makefile b/math/py-Scientific/Makefile
index b6bf3a206cf..51f399fbdb6 100644
--- a/math/py-Scientific/Makefile
+++ b/math/py-Scientific/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2001/04/22 20:15:46 jtb Exp $
+# $NetBSD: Makefile,v 1.9 2001/05/14 16:22:35 drochner Exp $
 
 DISTNAME=	ScientificPython-2.2
 PKGNAME=	py-Scientific-2.2
@@ -10,21 +10,17 @@ MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://starship.python.net/crew/hinsen/scientific.html
 COMMENT=	Python modules for scientific computing
 
-DEPENDS+=	python>=1.5:../../lang/python
 DEPENDS+=	netcdf>=3.0:../../devel/netcdf
 DEPENDS+=	mpich>=1.2.1:../../parallel/mpi-ch
 DEPENDS+=	py-Numeric-[0-9]*:../../math/py-Numeric
 
-.if ${MACHINE_ARCH} == "powerpc" || ${MACHINE_ARCH} == "mips" || ${MACHINE_ARCH} == "vax"
-IGNORE="${PKGNAME} needs dynamic loading"
-.endif
+USE_PYTHON=	yes
+PYDISTUTILSPKG=	yes
+PYBINMODULE=	yes
 
-PLIST_SRC=	${WRKDIR}/.PLIST_SRC
-
-PYPREFIX_DEFAULT=${LOCALBASE}
 NETCDFPREFIX_DEFAULT=${LOCALBASE}
 MPICHPREFIX_DEFAULT=${LOCALBASE}
-EVAL_PREFIX+=	PYPREFIX=python NETCDFPREFIX=netcdf MPICHPREFIX=mpich
+EVAL_PREFIX+=	NETCDFPREFIX=netcdf MPICHPREFIX=mpich
 
 do-configure:
 	${SED} -e "s|@NETCDFPREFIX@|${NETCDFPREFIX}|g"			\
@@ -34,17 +30,10 @@ do-configure:
 	${SED} -e "s|@MPICHPREFIX@|${MPICHPREFIX}|g"			\
 	${FILESDIR}/Setup.in > ${WRKSRC}/Src/MPI/Setup.in
 
-do-build:
-	cd ${WRKSRC} && ${PYPREFIX}/bin/python setup.py build
-	cd ${WRKSRC}/Src/MPI && ${PYPREFIX}/bin/python compile.py
-
 post-build:
-	(eval `${PYPREFIX}/bin/python ${FILESDIR}/printpypath.py` && 	\
-	${SED} "s|PYINC|$${PYINC}|g;s|PYSITELIB|$${PYSITELIB}|g" 	\
-	${PKGDIR}/PLIST > ${PLIST_SRC})
+	cd ${WRKSRC}/Src/MPI && ${PYTHON} compile.py
 
-do-install:
-	cd ${WRKSRC} && ${PYPREFIX}/bin/python setup.py install
+post-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/Src/MPI/mpipython ${PREFIX}/bin
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/py-Scientific
 	cd ${WRKSRC} && ${INSTALL_DATA} README COPYRIGHT 		\
diff --git a/math/py-Scientific/files/printpypath.py b/math/py-Scientific/files/printpypath.py
deleted file mode 100644
index aa53572f19c..00000000000
--- a/math/py-Scientific/files/printpypath.py
+++ /dev/null
@@ -1,5 +0,0 @@
-from distutils.sysconfig import get_python_inc
-from distutils.sysconfig import get_python_lib
-
-print "PYINC=" + get_python_inc(0, "")
-print "PYSITELIB=" + get_python_lib(0, 0, "")
diff --git a/security/py-amkCrypto/Makefile b/security/py-amkCrypto/Makefile
index b88c1617a99..d89cc2e6cfb 100644
--- a/security/py-amkCrypto/Makefile
+++ b/security/py-amkCrypto/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2001/05/07 00:56:48 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2001/05/14 16:22:36 drochner Exp $
 #
 
 DISTNAME=	amkCrypto-0.1.3
@@ -14,9 +14,10 @@ COMMENT=	cryptographic and hash functions for Python
 DEPENDS+= 	python-2.*:../../lang/python
 
 USE_SSL=	YES
-PLIST_SRC=	${WRKDIR}/PLIST
-# we borrow py-Scientific's printpypath
-FILESDIR=	${.CURDIR}/../../math/py-Scientific/files
+USE_PYTHON=	yes
+PYBINMODULE=	yes
+PYDISTUTILSPKG=	yes
+
 MAKE_ENV+=	SSLBASE="${SSLBASE}"
 
 do-configure:
@@ -24,15 +25,4 @@ do-configure:
 		${WRKSRC}/setup.py > ${WRKSRC}/setup.py.tmp
 	${MV} -f ${WRKSRC}/setup.py.tmp ${WRKSRC}/setup.py
 
-do-build:
-	cd ${WRKSRC} && ${LOCALBASE}/bin/python setup.py build
-
-post-build:
-	eval `${LOCALBASE}/bin/python ${FILESDIR}/printpypath.py` && \
-	${SED} "s|PYINC|$${PYINC}|g;s|PYSITELIB|$${PYSITELIB}|g" \
-	${PKGDIR}/PLIST >${PLIST_SRC}
-
-do-install:
-	cd ${WRKSRC} && ${LOCALBASE}/bin/python setup.py install
-
 .include "../../mk/bsd.pkg.mk"