2 files changed, 15 insertions, 136 deletions

diff --git a/math/py-numeric/Makefile b/math/py-numeric/Makefile
index fc4345a40fcc..83f4859d7165 100644
--- a/math/py-numeric/Makefile
+++ b/math/py-numeric/Makefile
@@ -17,44 +17,18 @@ COMMENT=	The Numeric Extension to Python
 
 USE_PYTHON=		yes
 USE_PYDISTUTILS=	yes
-PYDISTUTILS_PKGNAME=	Numeric
-PYDISTUTILS_EGGINFODIR=	${PYTHONPREFIX_SITELIBDIR}/Numeric
-
-# PYDISTUTILS_NOEGGINFO is used as a temporary workaround to fix the plist
-PYDISTUTILS_NOEGGINFO=	yes
+PYDISTUTILS_AUTOPLIST=	yes
 
 WRKSRC=		${WRKDIR}/Numeric-${PORTVERSION}
 
 DOCSDIR=	${PREFIX}/share/doc/py-numeric
 EXAMPLESDIR=	${PREFIX}/share/examples/py-numeric
+PORTDOCS=	*
+PORTEXAMPLES=	*
 
-NO_STAGE=	yes
-.include <bsd.port.pre.mk>
-
-.if exists(${LOCALBASE}/bin/easy_install-${PYTHON_VER})
-# py-setuptools is installed - adjust pkg-plist to work with
-# implicit usage in setup.py
-EASY=""
-NOTEASY="@comment "
-.else
-# py-setuptools is not installed - adjust pkg-plist
-EASY="@comment "
-NOTEASY=""
-.endif
+OPTIONS_DEFINE=	DOCS EXAMPLES
 
-# Adjusting pkg-plist gets weirder here. Python 2.5+ incorporates
-# install_egg_info functionality into distutils, so if py-numeric
-# is installed into a lesser Python version, make sure all egg-related
-# pkg-plist entries are omitted
-.if ${PYTHON_SUFFIX} < 25
-NOEGGINFO="@comment "
-.else
-NOEGGINFO=""
-.endif
-
-PLIST_SUB+=	EASY=${EASY} NOTEASY=${NOTEASY} \
-		PYDISTUTILS_EGGINFO=${PYDISTUTILS_EGGINFO} \
-		NOEGGINFO=${NOEGGINFO}
+.include <bsd.port.pre.mk>
 
 post-extract:
 	@${CP} ${DISTDIR}/numpy.pdf ${WRKDIR}
@@ -64,18 +38,17 @@ post-extract:
 # the correct one, because if one has setuptools and another
 # doesn't, that could mess with how pkg-plist is constructed.
 #
-	@${REINPLACE_CMD} -e "s|/usr/bin/env python|/usr/bin/env python${PYTHON_VER}|" ${WRKSRC}/setup.py
+	@${REINPLACE_CMD} \
+		-e "s|/usr/bin/env python|/usr/bin/env python${PYTHON_VER}|" \
+		-e 's,distutils\.command\.install ,setuptools\.command\.install ,' \
+		${WRKSRC}/setup.py
 
 post-install:
-.if !defined(NOPORTEXAMPLES)
-	@${INSTALL} -d ${EXAMPLESDIR}
-	${INSTALL_DATA} ${WRKSRC}/Demo/*.py ${EXAMPLESDIR}
-	@${INSTALL} -d ${EXAMPLESDIR}/NumTut
-	${INSTALL_DATA} ${WRKSRC}/Demo/NumTut/* ${EXAMPLESDIR}/NumTut
-.endif
-.if !defined(NOPORTDOCS)
-	@${INSTALL} -d ${DOCSDIR}
-	${INSTALL_DATA} ${WRKDIR}/numpy.pdf ${DOCSDIR}
-.endif
+	@${INSTALL} -d ${STAGEDIR}${EXAMPLESDIR}
+	${INSTALL_DATA} ${WRKSRC}/Demo/*.py ${STAGEDIR}${EXAMPLESDIR}
+	@${INSTALL} -d ${STAGEDIR}${EXAMPLESDIR}/NumTut
+	${INSTALL_DATA} ${WRKSRC}/Demo/NumTut/* ${STAGEDIR}${EXAMPLESDIR}/NumTut
+	@${INSTALL} -d ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKDIR}/numpy.pdf ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.post.mk>
diff --git a/math/py-numeric/pkg-plist b/math/py-numeric/pkg-plist
deleted file mode 100644
index 781163d16acf..000000000000
--- a/math/py-numeric/pkg-plist
+++ /dev/null
@@ -1,94 +0,0 @@
-%%PYTHON_INCLUDEDIR%%/Numeric/arrayobject.h
-%%PYTHON_INCLUDEDIR%%/Numeric/f2c.h
-%%PYTHON_INCLUDEDIR%%/Numeric/ranlib.h
-%%PYTHON_INCLUDEDIR%%/Numeric/ufuncobject.h
-%%PYTHON_SITELIBDIR%%/Numeric.pth
-%%PYTHON_SITELIBDIR%%/Numeric/ArrayPrinter.py
-%%PYTHON_SITELIBDIR%%/Numeric/ArrayPrinter.pyc
-%%PYTHON_SITELIBDIR%%/Numeric/ArrayPrinter.pyo
-%%PYTHON_SITELIBDIR%%/Numeric/FFT/FFT.py
-%%PYTHON_SITELIBDIR%%/Numeric/FFT/FFT.pyc
-%%PYTHON_SITELIBDIR%%/Numeric/FFT/FFT.pyo
-%%PYTHON_SITELIBDIR%%/Numeric/FFT/__init__.py
-%%PYTHON_SITELIBDIR%%/Numeric/FFT/__init__.pyc
-%%PYTHON_SITELIBDIR%%/Numeric/FFT/__init__.pyo
-%%PYTHON_SITELIBDIR%%/Numeric/FFT/fftpack.so
-%%PYTHON_SITELIBDIR%%/Numeric/LinearAlgebra.py
-%%PYTHON_SITELIBDIR%%/Numeric/LinearAlgebra.pyc
-%%PYTHON_SITELIBDIR%%/Numeric/LinearAlgebra.pyo
-%%PYTHON_SITELIBDIR%%/Numeric/MA/MA.py
-%%PYTHON_SITELIBDIR%%/Numeric/MA/MA.pyc
-%%PYTHON_SITELIBDIR%%/Numeric/MA/MA.pyo
-%%PYTHON_SITELIBDIR%%/Numeric/MA/MA_version.py
-%%PYTHON_SITELIBDIR%%/Numeric/MA/MA_version.pyc
-%%PYTHON_SITELIBDIR%%/Numeric/MA/MA_version.pyo
-%%PYTHON_SITELIBDIR%%/Numeric/MA/__init__.py
-%%PYTHON_SITELIBDIR%%/Numeric/MA/__init__.pyc
-%%PYTHON_SITELIBDIR%%/Numeric/MA/__init__.pyo
-%%PYTHON_SITELIBDIR%%/Numeric/MLab.py
-%%PYTHON_SITELIBDIR%%/Numeric/MLab.pyc
-%%PYTHON_SITELIBDIR%%/Numeric/MLab.pyo
-%%PYTHON_SITELIBDIR%%/Numeric/Matrix.py
-%%PYTHON_SITELIBDIR%%/Numeric/Matrix.pyc
-%%PYTHON_SITELIBDIR%%/Numeric/Matrix.pyo
-%%NOEGGINFO%%%%NOTEASY%%%%PYTHON_SITELIBDIR%%/Numeric/%%PYDISTUTILS_EGGINFO%%
-%%NOEGGINFO%%%%EASY%%%%PYTHON_SITELIBDIR%%/Numeric/%%PYDISTUTILS_EGGINFO%%/PKG-INFO
-%%NOEGGINFO%%%%EASY%%%%PYTHON_SITELIBDIR%%/Numeric/%%PYDISTUTILS_EGGINFO%%/SOURCES.txt
-%%NOEGGINFO%%%%EASY%%%%PYTHON_SITELIBDIR%%/Numeric/%%PYDISTUTILS_EGGINFO%%/dependency_links.txt
-%%NOEGGINFO%%%%EASY%%%%PYTHON_SITELIBDIR%%/Numeric/%%PYDISTUTILS_EGGINFO%%/not-zip-safe
-%%NOEGGINFO%%%%EASY%%%%PYTHON_SITELIBDIR%%/Numeric/%%PYDISTUTILS_EGGINFO%%/top_level.txt
-%%PYTHON_SITELIBDIR%%/Numeric/Numeric.py
-%%PYTHON_SITELIBDIR%%/Numeric/Numeric.pyc
-%%PYTHON_SITELIBDIR%%/Numeric/Numeric.pyo
-%%EASY%%%%PYTHON_SITELIBDIR%%/Numeric/Numeric_headers/Numeric/arrayobject.h
-%%EASY%%%%PYTHON_SITELIBDIR%%/Numeric/Numeric_headers/Numeric/f2c.h
-%%EASY%%%%PYTHON_SITELIBDIR%%/Numeric/Numeric_headers/Numeric/ranlib.h
-%%EASY%%%%PYTHON_SITELIBDIR%%/Numeric/Numeric_headers/Numeric/ufuncobject.h
-%%PYTHON_SITELIBDIR%%/Numeric/Numeric_headers/__init__.py
-%%PYTHON_SITELIBDIR%%/Numeric/Numeric_headers/__init__.pyc
-%%PYTHON_SITELIBDIR%%/Numeric/Numeric_headers/__init__.pyo
-%%PYTHON_SITELIBDIR%%/Numeric/Precision.py
-%%PYTHON_SITELIBDIR%%/Numeric/Precision.pyc
-%%PYTHON_SITELIBDIR%%/Numeric/Precision.pyo
-%%PYTHON_SITELIBDIR%%/Numeric/RNG/RNG.so
-%%PYTHON_SITELIBDIR%%/Numeric/RNG/Statistics.py
-%%PYTHON_SITELIBDIR%%/Numeric/RNG/Statistics.pyc
-%%PYTHON_SITELIBDIR%%/Numeric/RNG/Statistics.pyo
-%%PYTHON_SITELIBDIR%%/Numeric/RNG/__init__.py
-%%PYTHON_SITELIBDIR%%/Numeric/RNG/__init__.pyc
-%%PYTHON_SITELIBDIR%%/Numeric/RNG/__init__.pyo
-%%PYTHON_SITELIBDIR%%/Numeric/RandomArray.py
-%%PYTHON_SITELIBDIR%%/Numeric/RandomArray.pyc
-%%PYTHON_SITELIBDIR%%/Numeric/RandomArray.pyo
-%%PYTHON_SITELIBDIR%%/Numeric/UserArray.py
-%%PYTHON_SITELIBDIR%%/Numeric/UserArray.pyc
-%%PYTHON_SITELIBDIR%%/Numeric/UserArray.pyo
-%%PYTHON_SITELIBDIR%%/Numeric/_numpy.so
-%%PYTHON_SITELIBDIR%%/Numeric/arrayfns.so
-%%PYTHON_SITELIBDIR%%/Numeric/lapack_lite.so
-%%PYTHON_SITELIBDIR%%/Numeric/multiarray.so
-%%PYTHON_SITELIBDIR%%/Numeric/numeric_version.py
-%%PYTHON_SITELIBDIR%%/Numeric/numeric_version.pyc
-%%PYTHON_SITELIBDIR%%/Numeric/numeric_version.pyo
-%%PYTHON_SITELIBDIR%%/Numeric/ranlib.so
-%%PYTHON_SITELIBDIR%%/Numeric/umath.so
-%%PORTDOCS%%%%DOCSDIR%%/numpy.pdf
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/NumTut/__init__.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/NumTut/greece.pik
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/NumTut/mkpic.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/NumTut/testview.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/NumTut/view.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/life.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/mandelbrot.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sieve.py
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/NumTut
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm %%PYTHON_SITELIBDIR%%/Numeric/RNG
-%%EASY%%@dirrm %%PYTHON_SITELIBDIR%%/Numeric/Numeric_headers/Numeric
-@dirrm %%PYTHON_SITELIBDIR%%/Numeric/Numeric_headers
-%%NOEGGINFO%%%%EASY%%@dirrm %%PYTHON_SITELIBDIR%%/Numeric/%%PYDISTUTILS_EGGINFO%%
-@dirrm %%PYTHON_SITELIBDIR%%/Numeric/MA
-@dirrm %%PYTHON_SITELIBDIR%%/Numeric/FFT
-@dirrm %%PYTHON_SITELIBDIR%%/Numeric
-@dirrm %%PYTHON_INCLUDEDIR%%/Numeric