diff options
| author | Steven Kreuzer <skreuzer@FreeBSD.org> | 2013-09-03 17:06:48 +0000 |
|---|---|---|
| committer | Steven Kreuzer <skreuzer@FreeBSD.org> | 2013-09-03 17:06:48 +0000 |
| commit | 65fa7813b201d2ab2703400cf82354626e1247c0 (patch) | |
| tree | ca56bd690edb0d5c05296ff13f268857c2dd6cb2 /science | |
| parent | Add an explicit dependency on pkgconf (diff) | |
Update to 1.2
PR: ports/178240
Submitted by: Stas Timokhin <devel@stasyan.com>
Notes
Notes:
svn path=/head/; revision=326176
Diffstat (limited to 'science')
| -rw-r--r-- | science/meep/Makefile | 7 | ||||
| -rw-r--r-- | science/meep/distinfo | 4 | ||||
| -rw-r--r-- | science/meep/files/patch-configure | 34 |
3 files changed, 34 insertions, 11 deletions
diff --git a/science/meep/Makefile b/science/meep/Makefile index b4f3ffe9d96e..500a1a5ec442 100644 --- a/science/meep/Makefile +++ b/science/meep/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= meep -PORTVERSION= 1.1.1 -PORTREVISION= 4 +PORTVERSION= 1.2 CATEGORIES= science MASTER_SITES= http://ab-initio.mit.edu/meep/ @@ -15,8 +14,8 @@ BUILD_DEPENDS+= bash:${PORTSDIR}/shells/bash \ gsed:${PORTSDIR}/textproc/gsed LIB_DEPENDS+= guile.21:${PORTSDIR}/lang/guile \ blas.2:${PORTSDIR}/math/blas \ - ctl.4:${PORTSDIR}/science/libctl \ - hdf5.0:${PORTSDIR}/science/hdf5 + ctl.5:${PORTSDIR}/science/libctl \ + hdf5.7:${PORTSDIR}/science/hdf5-18 RUN_DEPENDS+= harminv:${PORTSDIR}/science/harminv USE_GMAKE= yes diff --git a/science/meep/distinfo b/science/meep/distinfo index 4c7e391373eb..7370b36a4493 100644 --- a/science/meep/distinfo +++ b/science/meep/distinfo @@ -1,2 +1,2 @@ -SHA256 (meep-1.1.1.tar.gz) = 7a97b5555da1f9ea2ec6eed5c45bd97bcd6ddbd54bdfc181f46c696dffc169f2 -SIZE (meep-1.1.1.tar.gz) = 751244 +SHA256 (meep-1.2.tar.gz) = 2734737b8053a45942bc1a50933d63b6fd18c7dc3cf33e92e0815ece93138942 +SIZE (meep-1.2.tar.gz) = 807522 diff --git a/science/meep/files/patch-configure b/science/meep/files/patch-configure index 32598264b014..210bcaaad71c 100644 --- a/science/meep/files/patch-configure +++ b/science/meep/files/patch-configure @@ -1,6 +1,12 @@ ---- configure.orig 2009-08-21 16:35:00.000000000 +0000 -+++ configure 2011-06-19 22:08:46.000000000 +0000 -@@ -920,6 +920,7 @@ +--- 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 @@ -8,7 +14,7 @@ sbindir bindir program_transform_name -@@ -1002,6 +1003,7 @@ +@@ -856,6 +857,7 @@ bindir='${exec_prefix}/bin' sbindir='${exec_prefix}/sbin' libexecdir='${exec_prefix}/libexec' @@ -16,7 +22,7 @@ datarootdir='${prefix}/share' datadir='${datarootdir}' sysconfdir='${prefix}/etc' -@@ -1398,7 +1400,7 @@ +@@ -1247,7 +1249,7 @@ fi # Check all directory arguments for consistency. @@ -25,3 +31,21 @@ 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 @@ + ACTIVATE_READLINE="$ractivate" + else + ractivate="(use-modules (ice-9 readline)) (activate-readline)" +- if guile -c "$ractivate" >& /dev/null; then ++ if guile -c "$ractivate" > /dev/null 2>&1; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ice-9 readline" >&5 + $as_echo "ice-9 readline" >&6; } + ACTIVATE_READLINE="$ractivate" |