Date: Mon, 18 Aug 2014 17:23:37 +0000 (UTC) From: Marcus von Appen <mva@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r365328 - head/math/py-numpy Message-ID: <201408181723.s7IHNb7V090847@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mva Date: Mon Aug 18 17:23:37 2014 New Revision: 365328 URL: http://svnweb.freebsd.org/changeset/ports/365328 QAT: https://qat.redports.org/buildarchive/r365328/ Log: - Convert USE_PYTHON to USES=python - Enable math/py-numpy to be installed for different Python versions concurrently Phabric: D599 Reviewed by: db With hat: python@ Modified: head/math/py-numpy/Makefile head/math/py-numpy/pkg-plist Modified: head/math/py-numpy/Makefile ============================================================================== --- head/math/py-numpy/Makefile Mon Aug 18 17:20:58 2014 (r365327) +++ head/math/py-numpy/Makefile Mon Aug 18 17:23:37 2014 (r365328) @@ -3,7 +3,7 @@ PORTNAME= numpy PORTVERSION= 1.8.1 -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 1 CATEGORIES= math python MASTER_SITES= http://docs.scipy.org/doc/${PORTNAME}/:doc \ @@ -21,24 +21,27 @@ LICENSE= BSD3CLAUSE RUN_DEPENDS= nosetests:${PORTSDIR}/devel/py-nose +USES= fortran python +USE_PYTHON= concurrent distutils py3kplist + OPTIONS_DEFINE= ATLAS SUITESPARSE OPTIONS_DEFAULT= SUITESPARSE ATLAS_DESC= Use optimized blas library SUITESPARSE_DESC= Use AMD and UMFPACK in SuiteSparse -USES= fortran -USE_PYTHON= yes -USE_PYDISTUTILS= yes PYDISTUTILS_CONFIGUREARGS+= --fcompiler=gnu95 PYDISTUTILS_BUILDARGS+= --fcompiler=gnu95 -PYTHON_PY3K_PLIST_HACK= yes -INSTALLS_EGGINFO= yes PORTDOCS= * WRKSRC= ${WRKDIR}/${DISTNAME:S/r/rc/} .include <bsd.port.pre.mk> +PLIST_SUB+= PYTHON_VER=${PYTHON_VER} +.if ${PYTHON_VERSION} == ${PYTHON_DEFAULT_VERSION} +PLIST_FILES+= man/man1/f2py.1.gz +.endif + .if ${PORT_OPTIONS:MATLAS} LIB_DEPENDS+= libatlas.so:${PORTSDIR}/math/atlas .else @@ -77,7 +80,10 @@ pre-configure: @${REINPLACE_CMD} -e "s+%%GCCLIBDIR%%+$$(${GCCLIBDIR_CMDS})+" ${WRKSRC}/numpy/distutils/system_info.py post-install: - ${INSTALL_MAN} ${WRKSRC}/numpy/f2py/f2py.1 ${STAGEDIR}${MANPREFIX}/man/man1 + ${INSTALL_MAN} ${WRKSRC}/numpy/f2py/f2py.1 ${STAGEDIR}${MANPREFIX}/man/man1/f2py-${PYTHON_VER}.1 +.if ${PYTHON_VERSION} == ${PYTHON_DEFAULT_VERSION} + ${LN} -sf ${MANPREFIX}/man/man1/f2py-${PYTHON_VER}.1 ${STAGEDIR}${MANPREFIX}/man/man1/f2py.1 +.endif @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKDIR}/numpy-ref-${PORTVERSION}.pdf ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKDIR}/numpy-user-${PORTVERSION}.pdf ${STAGEDIR}${DOCSDIR} Modified: head/math/py-numpy/pkg-plist ============================================================================== --- head/math/py-numpy/pkg-plist Mon Aug 18 17:20:58 2014 (r365327) +++ head/math/py-numpy/pkg-plist Mon Aug 18 17:23:37 2014 (r365328) @@ -942,7 +942,7 @@ bin/f2py %%PYTHON_SITELIBDIR%%/numpy/version.py %%PYTHON_SITELIBDIR%%/numpy/version.pyc %%PYTHON_SITELIBDIR%%/numpy/version.pyo -man/man1/f2py.1.gz +man/man1/f2py-%%PYTHON_VER%%.1.gz @dirrm %%PYTHON_SITELIBDIR%%/numpy/tests @dirrm %%PYTHON_SITELIBDIR%%/numpy/testing/tests @dirrm %%PYTHON_SITELIBDIR%%/numpy/testing
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201408181723.s7IHNb7V090847>