From owner-svn-ports-all@FreeBSD.ORG Mon Aug 18 17:23:38 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id D9F4080B; Mon, 18 Aug 2014 17:23:37 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id B9A3D3EE1; Mon, 18 Aug 2014 17:23:37 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7IHNbZv090849; Mon, 18 Aug 2014 17:23:37 GMT (envelope-from mva@FreeBSD.org) Received: (from mva@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7IHNb7V090847; Mon, 18 Aug 2014 17:23:37 GMT (envelope-from mva@FreeBSD.org) Message-Id: <201408181723.s7IHNb7V090847@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: mva set sender to mva@FreeBSD.org using -f From: Marcus von Appen Date: Mon, 18 Aug 2014 17:23:37 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r365328 - head/math/py-numpy X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 18 Aug 2014 17:23:38 -0000 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 +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