Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 27 Dec 2013 21:28:48 +0000 (UTC)
From:      Tijl Coosemans <tijl@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r337810 - head/science/mpb
Message-ID:  <201312272128.rBRLSmwq029337@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
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 <bsd.port.pre.mk>
+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 <bsd.port.options.mk>
+
+.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 <bsd.port.post.mk>
+.include <bsd.port.mk>

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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201312272128.rBRLSmwq029337>