[116966] trunk/dports/textproc/expgram

[hum at macports.org]

Revision: 116966
          https://trac.macports.org/changeset/116966
Author:   hum at macports.org
Date:     2014-02-11 05:53:32 -0800 (Tue, 11 Feb 2014)
Log Message:
-----------
expgram: replace with openmpi-default; add optflags; fix expressions.

Modified Paths:
--------------
    trunk/dports/textproc/expgram/Portfile
    trunk/dports/textproc/expgram/files/patch-configure.diff

Modified: trunk/dports/textproc/expgram/Portfile
===================================================================
--- trunk/dports/textproc/expgram/Portfile	2014-02-11 12:54:43 UTC (rev 116965)
+++ trunk/dports/textproc/expgram/Portfile	2014-02-11 13:53:32 UTC (rev 116966)
@@ -5,6 +5,7 @@
 
 name                expgram
 version             0.2.0
+revision            1
 categories          textproc
 maintainers         hum openmaintainer
 
@@ -20,34 +21,36 @@
                     sha256  f02df34cd975164561d019e45a52c97639f68cdceafde92271df195b970f38f9
 
 depends_lib         port:boost \
-                    port:openmpi
+                    port:openmpi-default
 
 depends_build       port:py27-docutils \
                     port:py27-pygments
 
 patchfiles          patch-configure.diff
 
+configure.optflags  -O3
+
 post-build {
     system -W ${worksrcpath}/doc "${build.cmd} index.html"
 }
 
 post-destroot {
     # install additional documents.
-    set dest_doc ${destroot}${prefix}/share/doc/${name}
-    xinstall -d ${dest_doc}
+    set docdir ${prefix}/share/doc/${name}
+    xinstall -d ${destroot}${docdir}
     xinstall -m 644 -W ${worksrcpath} \
         COPYING.GPL COPYING.LGPL FAQ LICENSE NEWS.rst README.rst TODO.rst \
         doc/index.html \
-        ${dest_doc}
+        ${destroot}${docdir}
     # install sample scripts.
-    set dest_ex ${destroot}${prefix}/share/examples/${name}
-    xinstall -d ${dest_ex}
+    set exdir ${prefix}/share/examples/${name}
+    xinstall -d ${destroot}${exdir}
     foreach sh {web1t-en.sh web1t-ja.sh web1t-zh.sh} {
-        xinstall -m 644 ${worksrcpath}/sample/${sh} ${dest_ex}
-        reinplace "s|expgram-directory|${prefix}/bin|" ${dest_ex}/${sh}
+        xinstall -m 644 ${worksrcpath}/sample/${sh} ${destroot}${exdir}
+        reinplace "s|expgram-directory|${prefix}/bin|" ${destroot}${exdir}/${sh}
     }
 }
 
 livecheck.type      regex
 livecheck.url       [lindex ${master_sites} 0]
-livecheck.regex     ${name}-(\[0-9.\]+)\\.tar
+livecheck.regex     "${name}-(\\d+(?:\\.\\d+)*)${extract.suffix}"

Modified: trunk/dports/textproc/expgram/files/patch-configure.diff
===================================================================
--- trunk/dports/textproc/expgram/files/patch-configure.diff	2014-02-11 12:54:43 UTC (rev 116965)
+++ trunk/dports/textproc/expgram/files/patch-configure.diff	2014-02-11 13:53:32 UTC (rev 116966)
@@ -1,5 +1,5 @@
 --- configure.orig	2013-10-26 06:41:18.000000000 +0900
-+++ configure	2013-10-26 16:44:10.000000000 +0900
++++ configure	2014-02-11 17:00:41.000000000 +0900
 @@ -15774,7 +15774,7 @@
  
  # Check for binaries...
@@ -18,3 +18,12 @@
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  $as_echo_n "checking for $ac_word... " >&6; }
  if ${ac_cv_path_RST2HTML+:} false; then :
+@@ -18842,7 +18842,7 @@
+ 
+ 
+ ### check for MPI
+-for ac_prog in openmpic++ openmpicxx openmpiCC mpic++ mpicxx mpiCC
++for ac_prog in mpicxx-openmpi-mp openmpic++ openmpicxx openmpiCC mpic++ mpicxx mpiCC
+ do
+   # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140211/105b9857/attachment.html>