svn commit: r376234 - in head: . science science/mpb

[Rene Ladan]

Author: rene
Date: Sun Jan  4 13:55:52 2015
New Revision: 376234
URL: https://svnweb.freebsd.org/changeset/ports/376234
QAT: https://qat.redports.org/buildarchive/r376234/

Log:
  Resurrect science/mpb, pass maintainership to PR submitter.
  - update to 1.5
  - change to lang/guile2
  - fix up USES and post-patch
  - add optional dependency on math/nlopt
  - install header files
  
  PR:		196179
  Submitted by:	Rainer Hurling

Added:
  head/science/mpb/
     - copied from r375663, head/science/mpb/
Modified:
  head/MOVED
  head/science/Makefile
  head/science/mpb/Makefile
  head/science/mpb/distinfo
  head/science/mpb/pkg-plist

Modified: head/MOVED
==============================================================================
--- head/MOVED	Sun Jan  4 13:50:41 2015	(r376233)
+++ head/MOVED	Sun Jan  4 13:55:52 2015	(r376234)
@@ -7344,7 +7344,6 @@ x11-toolkits/fpc-gnome1||2014-12-25|Depe
 graphics/fpc-imlib||2014-12-25|Depends on imlib
 graphics/imlib||2014-12-25|Does not handle modern graphics libraries
 games/secretmaryochronicles-music||2014-12-27|Has expired: Depends on expiring games/secretmaryochronicles
-science/mpb||2014-12-27|Has expired: Broken for more than 6 months
 x11-fm/pbi-thumbnailer||2014-12-27|Has expired: Broken for more than 6 months
 games/secretmaryochronicles||2014-12-27|Has expired: does not run, cegui 0.8 support still in development
 multimedia/ffmpeg24|multimedia/ffmpeg25|2014-12-27|ffmpeg upstream now points to 2.5.x series

Modified: head/science/Makefile
==============================================================================
--- head/science/Makefile	Sun Jan  4 13:50:41 2015	(r376233)
+++ head/science/Makefile	Sun Jan  4 13:55:52 2015	(r376234)
@@ -85,6 +85,7 @@
     SUBDIR += metaf2xml
     SUBDIR += minc2
     SUBDIR += mol2ps
+    SUBDIR += mpb
     SUBDIR += mpqc
     SUBDIR += mpqc-mpich
     SUBDIR += ncs

Modified: head/science/mpb/Makefile
==============================================================================
--- head/science/mpb/Makefile	Sat Dec 27 00:09:02 2014	(r375663)
+++ head/science/mpb/Makefile	Sun Jan  4 13:55:52 2015	(r376234)
@@ -2,30 +2,26 @@
 # $FreeBSD$
 
 PORTNAME=	mpb
-PORTVERSION=	1.4.2
-PORTREVISION=	17
+PORTVERSION=	1.5
 CATEGORIES=	science
 MASTER_SITES=	http://ab-initio.mit.edu/mpb/
 
-MAINTAINER=	ports at FreeBSD.org
+MAINTAINER=	rhurlin at gwdg.de
 COMMENT=	MIT Photonic-Bands
 
 LICENSE=	GPLv2
 
-BROKEN=		Fails to build
-DEPRECATED=	Broken for more than 6 months
-EXPIRATION_DATE=	2014-12-27
-
 BUILD_DEPENDS=	bash:${PORTSDIR}/shells/bash
 LIB_DEPENDS=	libfftw.so:${PORTSDIR}/math/fftw \
 		libhdf5.so:${PORTSDIR}/science/hdf5 \
 		libctl.so:${PORTSDIR}/science/libctl \
-		libguile.so:${PORTSDIR}/lang/guile
+		libguile-2.0.so:${PORTSDIR}/lang/guile2
 
-OPTIONS_DEFINE=	ATLAS
+OPTIONS_DEFINE=	ATLAS NLOPT
 ATLAS_DESC=	Use math/atlas instead of math/lapack
+NLOPT_DESC=	Use math/nlopt (check also in science/libctl)
 
-USES=		fortran
+USES=		fortran libtool pkgconfig
 GNU_CONFIGURE=	yes
 MAKE_JOBS_UNSAFE=	yes
 
@@ -43,12 +39,14 @@ LIB_DEPENDS+=	libblas.so:${PORTSDIR}/mat
 CONFIGURE_ARGS+=	--with-lapack=-llapack
 .endif
 
+NLOPT_LIB_DEPENDS=	libnlopt.so:${PORTSDIR}/math/nlopt
+
 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
+		${WRKSRC}/mpb/Makefile.in ${WRKSRC}/utils/Makefile.in
 
 .include <bsd.port.mk>

Modified: head/science/mpb/distinfo
==============================================================================
--- head/science/mpb/distinfo	Sat Dec 27 00:09:02 2014	(r375663)
+++ head/science/mpb/distinfo	Sun Jan  4 13:55:52 2015	(r376234)
@@ -1,2 +1,2 @@
-SHA256 (mpb-1.4.2.tar.gz) = e44c0720a5969a879fb93e48f6098d4d87e2f99d6ef49711d822f4c2249ccd61
-SIZE (mpb-1.4.2.tar.gz) = 686488
+SHA256 (mpb-1.5.tar.gz) = 3deafe79185eb9eb8a8fe97d9fe51624221f51c1cf4baff4b4a7242c51130bd7
+SIZE (mpb-1.5.tar.gz) = 1056327

Modified: head/science/mpb/pkg-plist
==============================================================================
--- head/science/mpb/pkg-plist	Sat Dec 27 00:09:02 2014	(r375663)
+++ head/science/mpb/pkg-plist	Sun Jan  4 13:55:52 2015	(r376234)
@@ -1,7 +1,13 @@
 bin/mpb
-bin/mpb-split
 bin/mpb-data
-man/man1/mpb.1.gz
+bin/mpb-split
+include/mpb.h
+include/mpb/eigensolver.h
+include/mpb/matrices.h
+include/mpb/maxwell.h
+include/mpb/scalar.h
+lib/libmpb.a
 man/man1/mpb-data.1.gz
 man/man1/mpb-split.1.gz
-share/libctl/specs/mpb.scm
+man/man1/mpb.1.gz
+%%DATADIR%%/mpb.scm