From cb8f66aef9af638ef779a85a6fff68107b3bc15c Mon Sep 17 00:00:00 2001 From: Greg Larkin Date: Thu, 23 Oct 2008 04:17:28 +0000 Subject: [PATCH] - Updated Makefile to handle installation differently based on whether devel/py-setuptools is present or not. The setup.py installer modifies the packing list based on that, so we have to modify pkg-plist in kind. - Added code to handle NOPORTEXAMPLES - Take maintainership PR: ports/122434 Submitted by: "Eugene M. Kim" --- math/py-numeric/Makefile | 29 +++++++++++++++++++------- math/py-numeric/pkg-plist | 43 ++++++++++++++++++++------------------- 2 files changed, 44 insertions(+), 28 deletions(-) diff --git a/math/py-numeric/Makefile b/math/py-numeric/Makefile index d6ecdbc2c469..f8d1973dfa2c 100644 --- a/math/py-numeric/Makefile +++ b/math/py-numeric/Makefile @@ -7,7 +7,7 @@ PORTNAME= numeric PORTVERSION= 24.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= math python MASTER_SITES= http://numpy.scipy.org/:doc \ ${MASTER_SITE_SOURCEFORGE:S/$/:source/} @@ -17,16 +17,16 @@ DISTFILES= Numeric-${PORTVERSION}${EXTRACT_SUFX}:source \ numpy.pdf:doc EXTRACT_ONLY= Numeric-${PORTVERSION}${EXTRACT_SUFX} -MAINTAINER= ports@FreeBSD.org +MAINTAINER= glarkin@FreeBSD.org COMMENT= The Numeric Extension to Python -USE_PYTHON= yes -USE_PYDISTUTILS=yes +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_NOEGGINFO= yes WRKSRC= ${WRKDIR}/Numeric-${PORTVERSION} @@ -35,6 +35,19 @@ EXAMPLESDIR= ${PREFIX}/share/examples/py-numeric .include +.if exists(${LOCALBASE}/bin/easy_install) +# 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 + +PLIST_SUB+= EASY=${EASY} NOTEASY=${NOTEASY} + pre-fetch: .if ${PYTHON_REL} < 200 @${ECHO} "Py-numeric doesn't work with Python versions < 2.0." @@ -46,12 +59,14 @@ post-extract: @${CP} ${DISTDIR}/numpy.pdf ${WRKDIR} post-install: - @${MKDIR} ${EXAMPLESDIR} +.if !defined(NOPORTEXAMPLES) + @${INSTALL} -d ${EXAMPLESDIR} ${INSTALL_DATA} ${WRKSRC}/Demo/*.py ${EXAMPLESDIR} @${MKDIR} ${EXAMPLESDIR}/NumTut ${INSTALL_DATA} ${WRKSRC}/Demo/NumTut/* ${EXAMPLESDIR}/NumTut +.endif .if !defined(NOPORTDOCS) - @${MKDIR} ${DOCSDIR} + @${INSTALL} -d ${DOCSDIR} ${INSTALL_DATA} ${WRKDIR}/numpy.pdf ${DOCSDIR} .endif diff --git a/math/py-numeric/pkg-plist b/math/py-numeric/pkg-plist index e94018ce977d..66b94db2162f 100644 --- a/math/py-numeric/pkg-plist +++ b/math/py-numeric/pkg-plist @@ -31,18 +31,19 @@ %%PYTHON_SITELIBDIR%%/Numeric/Matrix.py %%PYTHON_SITELIBDIR%%/Numeric/Matrix.pyc %%PYTHON_SITELIBDIR%%/Numeric/Matrix.pyo -%%PYTHON_SITELIBDIR%%/Numeric/Numeric-24.2-py2.5.egg-info/PKG-INFO -%%PYTHON_SITELIBDIR%%/Numeric/Numeric-24.2-py2.5.egg-info/SOURCES.txt -%%PYTHON_SITELIBDIR%%/Numeric/Numeric-24.2-py2.5.egg-info/dependency_links.txt -%%PYTHON_SITELIBDIR%%/Numeric/Numeric-24.2-py2.5.egg-info/not-zip-safe -%%PYTHON_SITELIBDIR%%/Numeric/Numeric-24.2-py2.5.egg-info/top_level.txt +%%NOTEASY%%%%PYTHON_SITELIBDIR%%/Numeric/Numeric-24.2-py2.5.egg-info +%%EASY%%%%PYTHON_SITELIBDIR%%/Numeric/Numeric-24.2-py2.5.egg-info/PKG-INFO +%%EASY%%%%PYTHON_SITELIBDIR%%/Numeric/Numeric-24.2-py2.5.egg-info/SOURCES.txt +%%EASY%%%%PYTHON_SITELIBDIR%%/Numeric/Numeric-24.2-py2.5.egg-info/dependency_links.txt +%%EASY%%%%PYTHON_SITELIBDIR%%/Numeric/Numeric-24.2-py2.5.egg-info/not-zip-safe +%%EASY%%%%PYTHON_SITELIBDIR%%/Numeric/Numeric-24.2-py2.5.egg-info/top_level.txt %%PYTHON_SITELIBDIR%%/Numeric/Numeric.py %%PYTHON_SITELIBDIR%%/Numeric/Numeric.pyc %%PYTHON_SITELIBDIR%%/Numeric/Numeric.pyo -%%PYTHON_SITELIBDIR%%/Numeric/Numeric_headers/Numeric/arrayobject.h -%%PYTHON_SITELIBDIR%%/Numeric/Numeric_headers/Numeric/f2c.h -%%PYTHON_SITELIBDIR%%/Numeric/Numeric_headers/Numeric/ranlib.h -%%PYTHON_SITELIBDIR%%/Numeric/Numeric_headers/Numeric/ufuncobject.h +%%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 @@ -72,21 +73,21 @@ %%PYTHON_SITELIBDIR%%/Numeric/ranlib.so %%PYTHON_SITELIBDIR%%/Numeric/umath.so %%PORTDOCS%%%%DOCSDIR%%/numpy.pdf -%%EXAMPLESDIR%%/NumTut/__init__.py -%%EXAMPLESDIR%%/NumTut/greece.pik -%%EXAMPLESDIR%%/NumTut/mkpic.py -%%EXAMPLESDIR%%/NumTut/testview.py -%%EXAMPLESDIR%%/NumTut/view.py -%%EXAMPLESDIR%%/life.py -%%EXAMPLESDIR%%/mandelbrot.py -%%EXAMPLESDIR%%/sieve.py -@dirrm %%EXAMPLESDIR%%/NumTut -@dirrm %%EXAMPLESDIR%% +%%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 -@dirrm %%PYTHON_SITELIBDIR%%/Numeric/Numeric_headers/Numeric +%%EASY%%@dirrm %%PYTHON_SITELIBDIR%%/Numeric/Numeric_headers/Numeric @dirrm %%PYTHON_SITELIBDIR%%/Numeric/Numeric_headers -@dirrm %%PYTHON_SITELIBDIR%%/Numeric/Numeric-24.2-py2.5.egg-info +%%EASY%%@dirrm %%PYTHON_SITELIBDIR%%/Numeric/Numeric-24.2-py2.5.egg-info @dirrm %%PYTHON_SITELIBDIR%%/Numeric/MA @dirrm %%PYTHON_SITELIBDIR%%/Numeric/FFT @dirrm %%PYTHON_SITELIBDIR%%/Numeric