From owner-svn-ports-head@freebsd.org Sun Oct 4 17:59:32 2015 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id B6A6EA0F04D; Sun, 4 Oct 2015 17:59:32 +0000 (UTC) (envelope-from sunpoet@FreeBSD.org) Received: from repo.freebsd.org (repo.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 A6BF31230; Sun, 4 Oct 2015 17:59:32 +0000 (UTC) (envelope-from sunpoet@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t94HxWbs040529; Sun, 4 Oct 2015 17:59:32 GMT (envelope-from sunpoet@FreeBSD.org) Received: (from sunpoet@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t94HxWDS040528; Sun, 4 Oct 2015 17:59:32 GMT (envelope-from sunpoet@FreeBSD.org) Message-Id: <201510041759.t94HxWDS040528@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: sunpoet set sender to sunpoet@FreeBSD.org using -f From: Sunpoet Po-Chuan Hsieh Date: Sun, 4 Oct 2015 17:59:32 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r398586 - 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-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 04 Oct 2015 17:59:32 -0000 Author: sunpoet Date: Sun Oct 4 17:59:31 2015 New Revision: 398586 URL: https://svnweb.freebsd.org/changeset/ports/398586 Log: - Convert to new options target helper - Cosmetic change Modified: head/math/py-numpy/Makefile Modified: head/math/py-numpy/Makefile ============================================================================== --- head/math/py-numpy/Makefile Sun Oct 4 17:59:27 2015 (r398585) +++ head/math/py-numpy/Makefile Sun Oct 4 17:59:31 2015 (r398586) @@ -18,6 +18,8 @@ COMMENT= The New Numeric Extension to Py LICENSE= BSD3CLAUSE +PYDISTUTILS_BUILDARGS= --fcompiler=gnu95 +PYDISTUTILS_CONFIGUREARGS= --fcompiler=gnu95 USES= fortran python USE_PYTHON= concurrent distutils py3kplist LDFLAGS+= -shared @@ -29,66 +31,67 @@ OPTIONS_SINGLE_BLASLIB= ATLAS NETLIB OPE SUITESPARSE_DESC= Use AMD and UMFPACK in SuiteSparse TESTS_DESC= Install test suite requirements -PYDISTUTILS_CONFIGUREARGS+= --fcompiler=gnu95 -PYDISTUTILS_BUILDARGS+= --fcompiler=gnu95 - +PLIST_SUB= PYTHON_VER=${PYTHON_VER} PORTDOCS= * WRKSRC= ${WRKDIR}/${DISTNAME:S/r/rc/} DOCVERSION= 1.9.1 +GCCLIBDIR_CMDS= ${FC} -print-file-name=libgfortran.so | ${SED} -e s/libgfortran.so// + ATLAS_USES= blaslapack:atlas NETLIB_USES= blaslapack:netlib OPENBLAS_USES= blaslapack:openblas SUITESPARSE_LIB_DEPENDS=libumfpack.so:${PORTSDIR}/math/suitesparse -TESTS_RUN_DEPENDS= ${PYTHON_SITELIBDIR}/nose/__init__.py:${PORTSDIR}/devel/py-nose +TESTS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>=0:${PORTSDIR}/devel/py-nose .include -PLIST_SUB+= PYTHON_VER=${PYTHON_VER} .if ${PYTHON_VERSION} == ${PYTHON_DEFAULT_VERSION} PLIST_FILES+= man/man1/f2py.1.gz .endif post-patch: - ${REINPLACE_CMD} -e "s+%%FC%%+${FC}+" ${WRKSRC}/numpy/distutils/fcompiler/gnu.py + ${REINPLACE_CMD} -e "s|%%FC%%|${FC}|" ${WRKSRC}/numpy/distutils/fcompiler/gnu.py ${CP} ${FILESDIR}/site.cfg ${WRKSRC}/site.cfg -GCCLIBDIR_CMDS= ${FC} -print-file-name=libgfortran.so|${SED} -e s/libgfortran.so// - pre-configure: -.if ${PORT_OPTIONS:MOPENBLAS} - @${REINPLACE_CMD} -e "s+%%BLASNAME%%+openblas+" \ - -e "s+%%LIBRARIES%%+libraries+" \ - -e "s+%%LAPACKLIBS%%+%%BLASLIBS%%+" \ - -e "s+%%BLASLIBS%%+openblasp, gfortran+" \ + @${REINPLACE_CMD} -e "s|%%GCCLIBDIR%%|$$(${GCCLIBDIR_CMDS})|" \ + -e "s|%%LOCALBASE%%|${LOCALBASE}|g" \ + ${WRKSRC}/site.cfg + @${REINPLACE_CMD} -e "s|%%GCCLIBDIR%%|$$(${GCCLIBDIR_CMDS})|" ${WRKSRC}/numpy/distutils/system_info.py + +pre-configure-ATLAS-on: + @${REINPLACE_CMD} -e "s|%%BLASNAME%%|atlas|" \ + -e "s|%%LIBRARIES%%|atlas_libs|" \ + -e "s|%%BLASLIBS%%|%%ATLASLIBS%%|" \ + -e "s|%%LAPACKLIBS%%|alapack|" \ + -e "s|%%ATLASLIBS%%|ptf77blas, ptcblas|" \ ${WRKSRC}/site.cfg -.elif ${PORT_OPTIONS:MATLAS} - @${REINPLACE_CMD} -e "s+%%BLASNAME%%+atlas+" \ - -e "s+%%LIBRARIES%%+atlas_libs+" \ - -e "s+%%BLASLIBS%%+%%ATLASLIBS%%+" \ - -e "s+%%LAPACKLIBS%%+alapack+" \ - -e "s+%%ATLASLIBS%%+ptf77blas, ptcblas+" \ + +pre-configure-NETLIB-on: + @${REINPLACE_CMD} -e "s|%%BLASNAME%%|atlas|" \ + -e "s|%%LIBRARIES%%|atlas_libs|" \ + -e "s|%%BLASLIBS%%|blas|" \ + -e "s|%%LAPACKLIBS%%|lapack|" \ ${WRKSRC}/site.cfg -.else - @${REINPLACE_CMD} -e "s+%%BLASNAME%%+atlas+" \ - -e "s+%%LIBRARIES%%+atlas_libs+" \ - -e "s+%%BLASLIBS%%+blas+" \ - -e "s+%%LAPACKLIBS%%+lapack+" \ + +pre-configure-OPENBLAS-on: + @${REINPLACE_CMD} -e "s|%%BLASNAME%%|openblas|" \ + -e "s|%%LIBRARIES%%|libraries|" \ + -e "s|%%LAPACKLIBS%%|%%BLASLIBS%%|" \ + -e "s|%%BLASLIBS%%|openblasp, gfortran|" \ ${WRKSRC}/site.cfg -.endif -.if !${PORT_OPTIONS:MSUITESPARSE} - @${REINPLACE_CMD} -e "s+:%%LOCALBASE%%/include/suitesparse++" ${WRKSRC}/site.cfg -.endif - @${REINPLACE_CMD} -e "s+%%GCCLIBDIR%%+$$(${GCCLIBDIR_CMDS})+" \ - -e "s+%%LOCALBASE%%+${LOCALBASE}+g" \ - ${WRKSRC}/site.cfg - @${REINPLACE_CMD} -e "s+%%GCCLIBDIR%%+$$(${GCCLIBDIR_CMDS})+" ${WRKSRC}/numpy/distutils/system_info.py + +pre-configure-SUITESPARSE-off: + @${REINPLACE_CMD} -e "s|:%%LOCALBASE%%/include/suitesparse||" ${WRKSRC}/site.cfg post-install: ${INSTALL_MAN} ${WRKSRC}/doc/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 + +post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${DISTDIR}/numpy-ref-${DOCVERSION}.pdf ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${DISTDIR}/numpy-user-${DOCVERSION}.pdf ${STAGEDIR}${DOCSDIR}