From owner-svn-ports-all@FreeBSD.ORG Sat Apr 4 13:30:21 2015 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 6002FFE9; Sat, 4 Apr 2015 13:30:21 +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 30FE097E; Sat, 4 Apr 2015 13:30:21 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t34DUKjx051689; Sat, 4 Apr 2015 13:30:20 GMT (envelope-from demon@FreeBSD.org) Received: (from demon@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t34DUKhd051688; Sat, 4 Apr 2015 13:30:20 GMT (envelope-from demon@FreeBSD.org) Message-Id: <201504041330.t34DUKhd051688@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: demon set sender to demon@FreeBSD.org using -f From: Dmitry Sivachenko Date: Sat, 4 Apr 2015 13:30:20 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r383223 - head/science/py-scipy 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: Sat, 04 Apr 2015 13:30:21 -0000 Author: demon Date: Sat Apr 4 13:30:20 2015 New Revision: 383223 URL: https://svnweb.freebsd.org/changeset/ports/383223 Log: As noted by thierry@ in D2086, scipy inherits blas library to use from numpy (via site.cfg). So remove unused OPTIONs from here. Remove check for static ATLAS lib because now ATLAS always builds static version. Remove obsoleted malloc.h --> stdlib.h conversion. Modified: head/science/py-scipy/Makefile Modified: head/science/py-scipy/Makefile ============================================================================== --- head/science/py-scipy/Makefile Sat Apr 4 13:22:30 2015 (r383222) +++ head/science/py-scipy/Makefile Sat Apr 4 13:30:20 2015 (r383223) @@ -17,7 +17,8 @@ COMMENT= Scientific tools for Python LICENSE= BSD3CLAUSE BUILD_DEPENDS= ${PYNUMPY} -RUN_DEPENDS= ${PYNUMPY} +RUN_DEPENDS= ${PYNUMPY} \ + swig:${PORTSDIR}/devel/swig13 USES= fortran python USE_PYTHON= distutils autoplist concurrent @@ -27,33 +28,15 @@ PYDISTUTILS_BUILDARGS+= --fcompiler=gnu9 LDFLAGS+= -shared -OPTIONS_DEFINE= ATLAS DOCS SUITESPARSE -OPTIONS_DEFAULT=SUITESPARSE -ATLAS_DESC= Use optimized blas library -SUITESPARSE_DESC= Use AMD and UMFPACK in SuiteSparse - -ATLAS_USES= blaslapack:atlas -ATLAS_USES_OFF= blaslapack:netlib -SUITESPARSE_LIB_DEPENDS= libumfpack.so:${PORTSDIR}/math/suitesparse -SUITESPARSE_BUILD_DEPENDS= swig:${PORTSDIR}/devel/swig13 +OPTIONS_DEFINE= DOCS PORTDOCS= scipy-ref-${PORTVERSION}.pdf .include -.if ${PORT_OPTIONS:MATLAS} -.if !exists(${LOCALBASE}/lib/libalapack.a) -IGNORE= atlas needs to be built with WITH_STATIC for scipy to function properly -.endif -.endif - post-extract: @${CP} ${DISTDIR}/scipy-ref-${PORTVERSION}.pdf ${WRKDIR} -post-patch: - @${GREP} -lR "malloc\.h" ${WRKSRC} | ${XARGS} ${REINPLACE_CMD} \ - -e "s@malloc\.h@stdlib.h@" - post-install: .if ${PORT_OPTIONS:MDOCS} @${MKDIR} ${STAGEDIR}${DOCSDIR}