svn commit: r380961 - in head/science: harminv meep

[Thierry Thomas]

Author: thierry
Date: Tue Mar 10 20:45:19 2015
New Revision: 380961
URL: https://svnweb.freebsd.org/changeset/ports/380961
QAT: https://qat.redports.org/buildarchive/r380961/

Log:
  - Switch to guile2
  
  - Upgrade meep to 1.2.1 and unbreak.
  
  Submitted by:	Stas Timokhin <devel (at) stasyan.com>

Modified:
  head/science/harminv/Makefile
  head/science/meep/Makefile
  head/science/meep/distinfo

Modified: head/science/harminv/Makefile
==============================================================================
--- head/science/harminv/Makefile	Tue Mar 10 20:20:38 2015	(r380960)
+++ head/science/harminv/Makefile	Tue Mar 10 20:45:19 2015	(r380961)
@@ -3,7 +3,7 @@
 
 PORTNAME=	harminv
 PORTVERSION=	1.3.1
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	science
 MASTER_SITES=	http://ab-initio.mit.edu/harminv/
 
@@ -19,6 +19,6 @@ LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ENV+=	LD_LIBRARY_PATH="${LD_LIBRARY_PATH}"
 USE_LDCONFIG=	yes
 
-LIB_DEPENDS+=	libguile.so:${PORTSDIR}/lang/guile
+LIB_DEPENDS+=	libguile-2.0.so:${PORTSDIR}/lang/guile2
 
 .include <bsd.port.mk>

Modified: head/science/meep/Makefile
==============================================================================
--- head/science/meep/Makefile	Tue Mar 10 20:20:38 2015	(r380960)
+++ head/science/meep/Makefile	Tue Mar 10 20:45:19 2015	(r380961)
@@ -2,19 +2,16 @@
 # $FreeBSD$
 
 PORTNAME=	meep
-PORTVERSION=	1.2
-PORTREVISION=	12
+PORTVERSION=	1.2.1
 CATEGORIES=	science
 MASTER_SITES=	http://ab-initio.mit.edu/meep/
 
 MAINTAINER=	devel at stasyan.com
 COMMENT=	FDTD simulation software to model electromagnetic systems
 
-BROKEN=		Depends on conflicting guile and guile2 (via libctl)
-
 BUILD_DEPENDS=	harminv:${PORTSDIR}/science/harminv \
 		gsed:${PORTSDIR}/textproc/gsed
-LIB_DEPENDS=	libguile.so:${PORTSDIR}/lang/guile \
+LIB_DEPENDS=	libguile-2.0.so:${PORTSDIR}/lang/guile2 \
 		libblas.so:${PORTSDIR}/math/blas \
 		libctl.so:${PORTSDIR}/science/libctl \
 		libhdf5.so:${PORTSDIR}/science/hdf5

Modified: head/science/meep/distinfo
==============================================================================
--- head/science/meep/distinfo	Tue Mar 10 20:20:38 2015	(r380960)
+++ head/science/meep/distinfo	Tue Mar 10 20:45:19 2015	(r380961)
@@ -1,2 +1,2 @@
-SHA256 (meep-1.2.tar.gz) = 2734737b8053a45942bc1a50933d63b6fd18c7dc3cf33e92e0815ece93138942
-SIZE (meep-1.2.tar.gz) = 807522
+SHA256 (meep-1.2.1.tar.gz) = f1f0683e5688d231f7dd1863939677148fc27a6744c03510e030c85d6c518ea5
+SIZE (meep-1.2.1.tar.gz) = 731272