3 files changed, 6 insertions, 56 deletions

diff --git a/science/meep/Makefile b/science/meep/Makefile
index 3c6b9aab8f77..f87ab96a8409 100644
--- a/science/meep/Makefile
+++ b/science/meep/Makefile
@@ -3,30 +3,26 @@
 
 PORTNAME=	meep
 PORTVERSION=	1.2
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	science
 MASTER_SITES=	http://ab-initio.mit.edu/meep/
 
 MAINTAINER=	devel@stasyan.com
 COMMENT=	FDTD simulation software to model electromagnetic systems
 
-BUILD_DEPENDS+=	bash:${PORTSDIR}/shells/bash \
-		harminv:${PORTSDIR}/science/harminv \
+BUILD_DEPENDS=	harminv:${PORTSDIR}/science/harminv \
 		gsed:${PORTSDIR}/textproc/gsed
-LIB_DEPENDS+=	libguile.so:${PORTSDIR}/lang/guile \
+LIB_DEPENDS=	libguile.so:${PORTSDIR}/lang/guile \
 		libblas.so:${PORTSDIR}/math/blas \
 		libctl.so:${PORTSDIR}/science/libctl \
 		libhdf5.so:${PORTSDIR}/science/hdf5
-RUN_DEPENDS+=	harminv:${PORTSDIR}/science/harminv
+RUN_DEPENDS=	harminv:${PORTSDIR}/science/harminv
 
 GNU_CONFIGURE=	yes
 USE_GCC=	yes
-USES=		fortran gettext gmake iconv pathfix
-USE_AUTOTOOLS+=	libltdl
+USES=		fortran gettext gmake iconv libtool pathfix pkgconfig
 CPPFLAGS+=	-I${LOCALBASE}/include
-LD_LIBRARY_PATH=	-L${LOCALBASE}/lib -L/usr/lib
 LDFLAGS+=	-L${LOCALBASE}/lib
-CONFIGURE_ENV+=	LD_LIBRARY_PATH="${LD_LIBRARY_PATH}"
 MAKE_ARGS+=	CC="${CC}" CXX="${CXX}"
 
 OPTIONS_DEFINE=		OPENMPI
@@ -47,8 +43,4 @@ CONFIGURE_ARGS+=--without-mpi
 PLIST_SUB+=	MPI="@comment " NOMPI=""
 .endif
 
-post-patch:
-	@${REINPLACE_CMD} -e 's+\#\! /bin/sh+\#\! ${PREFIX}/bin/bash+' \
-		-e s+\$$\(SHELL\)+${PREFIX}/bin/bash+ ${WRKSRC}/configure
-
 .include <bsd.port.mk>
diff --git a/science/meep/files/patch-configure b/science/meep/files/patch-configure
index 210bcaaad71c..d81b2b9b9adf 100644
--- a/science/meep/files/patch-configure
+++ b/science/meep/files/patch-configure
@@ -1,46 +1,6 @@
 --- configure.orig	2012-07-20 08:29:15.000000000 +0700
 +++ configure	2013-04-18 23:46:39.000000000 +0700
-@@ -1,4 +1,4 @@
--#! /bin/sh
-+#! /usr/local/bin/bash
- # Guess values for system-dependent variables and create Makefiles.
- # Generated by GNU Autoconf 2.69 for meep 1.2.
- #
-@@ -772,6 +772,7 @@
- datadir
- datarootdir
- libexecdir
-+libdatadir
- sbindir
- bindir
- program_transform_name
-@@ -856,6 +857,7 @@
- bindir='${exec_prefix}/bin'
- sbindir='${exec_prefix}/sbin'
- libexecdir='${exec_prefix}/libexec'
-+libdatadir='${exec_prefix}/libdata'
- datarootdir='${prefix}/share'
- datadir='${datarootdir}'
- sysconfdir='${prefix}/etc'
-@@ -1247,7 +1249,7 @@
- fi
- 
- # Check all directory arguments for consistency.
--for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
-+for ac_var in	exec_prefix prefix bindir sbindir libexecdir libdatadir datarootdir \
- 		datadir sysconfdir sharedstatedir localstatedir includedir \
- 		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
- 		libdir localedir mandir
-@@ -9622,7 +9624,7 @@
- LIBTOOL_DEPS="$ltmain"
- 
- # Always use our own libtool.
--LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-+LIBTOOL='/usr/local/bin/bash $(top_builddir)/libtool'
- 
- 
- 
-@@ -25552,7 +25554,7 @@
+@@ -25552,7 +25552,7 @@
  	ACTIVATE_READLINE="$ractivate"
  else
  	ractivate="(use-modules (ice-9 readline)) (activate-readline)"
diff --git a/science/meep/pkg-plist b/science/meep/pkg-plist
index 598fbdd51293..0ec650730cd9 100644
--- a/science/meep/pkg-plist
+++ b/science/meep/pkg-plist
@@ -5,8 +5,6 @@ include/meep/mympi.hpp
 include/meep/vec.hpp
 %%NOMPI%%lib/libmeep.a
 %%MPI%%lib/libmeep_mpi.a
-%%NOMPI%%lib/libmeep.la
-%%MPI%%lib/libmeep_mpi.la
 %%NOMPI%%libdata/pkgconfig/meep.pc
 %%MPI%%libdata/pkgconfig/meep_mpi.pc
 %%DATADIR%%/casimir.scm