From owner-svn-ports-all@FreeBSD.ORG Fri Dec 27 21:28:48 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 8BC86A0B; Fri, 27 Dec 2013 21:28:48 +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)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 5DE631131; Fri, 27 Dec 2013 21:28:48 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBRLSmln029339; Fri, 27 Dec 2013 21:28:48 GMT (envelope-from tijl@svn.freebsd.org) Received: (from tijl@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBRLSmwq029337; Fri, 27 Dec 2013 21:28:48 GMT (envelope-from tijl@svn.freebsd.org) Message-Id: <201312272128.rBRLSmwq029337@svn.freebsd.org> From: Tijl Coosemans Date: Fri, 27 Dec 2013 21:28:48 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r337810 - head/science/mpb 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.17 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: Fri, 27 Dec 2013 21:28:48 -0000 Author: tijl Date: Fri Dec 27 21:28:47 2013 New Revision: 337810 URL: http://svnweb.freebsd.org/changeset/ports/337810 Log: - New LIB_DEPENDS syntax. - USES=fortran. - Replace WITH_ATLAS with ATLAS option. - Staging. Modified: head/science/mpb/Makefile (contents, props changed) head/science/mpb/pkg-plist (contents, props changed) Modified: head/science/mpb/Makefile ============================================================================== --- head/science/mpb/Makefile Fri Dec 27 21:16:03 2013 (r337809) +++ head/science/mpb/Makefile Fri Dec 27 21:28:47 2013 (r337810) @@ -12,38 +12,39 @@ COMMENT= MIT Photonic-Bands LICENSE= GPLv2 -MAKE_JOBS_UNSAFE= yes - BUILD_DEPENDS= bash:${PORTSDIR}/shells/bash -LIB_DEPENDS= fftw:${PORTSDIR}/math/fftw \ - hdf5:${PORTSDIR}/science/hdf5 \ - ctl:${PORTSDIR}/science/libctl \ - guile:${PORTSDIR}/lang/guile +LIB_DEPENDS= libfftw.so:${PORTSDIR}/math/fftw \ + libhdf5.so:${PORTSDIR}/science/hdf5 \ + libctl.so:${PORTSDIR}/science/libctl \ + libguile.so:${PORTSDIR}/lang/guile -USE_FORTRAN= yes +OPTIONS_DEFINE= ATLAS +ATLAS_DESC= Use math/atlas instead of math/lapack -NO_STAGE= yes -.include +USES= fortran GNU_CONFIGURE= yes +MAKE_JOBS_UNSAFE= yes + CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -.if exists(${LOCALBASE}/lib/libatlas.so) && !defined(WITH_BLAS) -WITH_ATLAS= yes -.endif -.if defined(WITH_ATLAS) -LIB_DEPENDS+= atlas:${PORTSDIR}/math/atlas +.include + +.if ${PORT_OPTIONS:MATLAS} +LIB_DEPENDS+= libatlas.so:${PORTSDIR}/math/atlas CONFIGURE_ARGS+= --with-lapack=-lalapack .else -LIB_DEPENDS+= blas:${PORTSDIR}/math/blas -LIB_DEPENDS+= lapack:${PORTSDIR}/math/lapack +LIB_DEPENDS+= libblas.so:${PORTSDIR}/math/blas \ + liblapack.so:${PORTSDIR}/math/lapack CONFIGURE_ARGS+= --with-lapack=-llapack .endif -MAN1= mpb.1 mpb-data.1 mpb-split.1 - post-patch: @${REINPLACE_CMD} -e 's|-lhdf5 |-lhdf5 ${PTHREAD_LIBS} |g' \ ${WRKSRC}/configure + @${REINPLACE_CMD} \ + -e '/INSTALL/s/$$(prefix)/$$(DESTDIR)$$(prefix)/' \ + -e '/INSTALL/s/$$(mandir)/$$(DESTDIR)$$(mandir)/' \ + ${WRKSRC}/mpb-ctl/Makefile.in ${WRKSRC}/utils/Makefile.in -.include +.include Modified: head/science/mpb/pkg-plist ============================================================================== --- head/science/mpb/pkg-plist Fri Dec 27 21:16:03 2013 (r337809) +++ head/science/mpb/pkg-plist Fri Dec 27 21:28:47 2013 (r337810) @@ -1,5 +1,8 @@ bin/mpb bin/mpb-split bin/mpb-data +man/man1/mpb.1.gz +man/man1/mpb-data.1.gz +man/man1/mpb-split.1.gz share/libctl/specs/mpb.scm @dirrmtry share/libctl/specs