Ticket #51623: Portfile-nds2-client.diff

Portfile

@@ -3 +3 @@
 PortSystem        1.0
 
 name              nds2-client
-version           0.11.6
-revision          2
+version           0.12.2
+revision          1
 categories        science
 platforms         darwin
 license           GPL-2
-maintainers       ligo.org:ed.maros openmaintainer
+maintainers       ligo.org:ed.maros ram openmaintainer
 
 description       Network Data Server Client
 long_description \
   Client tool for accessing streamed LIGO data using the Network \
   Data Server version 2.
 
-homepage          https://www.lsc-group.phys.uwm.edu/daswg/projects/nds-client.html
-master_sites      https://www.lsc-group.phys.uwm.edu/daswg/download/software/source/
+homepage          https://wiki.ligo.org/DASWG/NDSClient
+master_sites      http://software.ligo.org/lscsoft/source/
 
-checksums         rmd160  ca470079f3d908cb95b379d257374e3b91863034 \
-                  sha256  3abc8ec2ca58fc3184e46b14b81b1b87882b1abe4e739c7c0ae35e1ad77b5f20
+checksums         rmd160  3c853077c9bf2508866e603470aadbe1dec09e86 \
+                  sha256  fc67bf36a34c5c8b9d1f422ce2b1442f04bb56b467cbecb8c86391575c4e0787
 
 depends_build-append \
                   port:pkgconfig
 
-default_variants  +doc +gssapi +swig_python27 +swig_java
+default_variants  +doc +gssapi +swig_java
 
 configure.javac   /usr/bin/javac -source 1.5 -target 1.5
 configure.args    --disable-silent-rules \
@@ -35 +35 @@
                   --without-sasl \
                   --without-gssapi
 
-set pythons_suffixes {27 34}
+set pythons_suffixes {27}
 
 set pythons_ports {}
 foreach s ${pythons_suffixes} {
@@ -46 +46 @@
 
     depends_build-append            port:docbook-xsl \
                                     port:libxslt
-    configure.args-strsed           s/--disable-doc/--enable-doc/
-
+    configure.args-replace          --disable-doc --enable-doc
 }
 
 foreach s ${pythons_suffixes} {
@@ -61 +60 @@
 
             depends_build-append    port:swig-python
             depends_lib-append      port:${p} port:py${s}-numpy
-            configure.args-strsed   s/--disable-swig-python/--enable-swig-python/
             destroot.args-append    pythondir="${d}" pyexecdir="${d}"
-
+            configure.args-replace  --disable-swig-python --enable-swig-python
+            configure.python        ${prefix}/bin/python${v}
         }
     }]
 }
 
+if {![variant_isset swig_python34]} {
+    default_variants +swig_python27
+}
+
 variant swig_octave description "Enable SWIG Octave interface" {
 
     depends_build-append            port:swig-octave
-    configure.args-strsed           s/--disable-swig-octave/--enable-swig-octave/
+    configure.args-replace          --disable-swig-octave --enable-swig-octave
+
+    # At least as of Octave 3.2.4, the Octave C++ API does not work with clang.
+    compiler.blacklist-append       *clang*
 
 }
 
@@ -80 +86 @@
     # Need GNU Classpath to get jni.h header
     depends_build-append            bin:javac:gcc48 port:swig-java port:gnu-classpath
     depends_lib-append              bin:java:kaffe
-    configure.args-strsed           s/--disable-swig-java/--enable-swig-java/
+    configure.args-replace          --disable-swig-java --enable-swig-java
 
 }
 
 variant sasl description "Use cyrus-sasl2 for authentication" conflicts gssapi {
 
-    configure.args-strsed           s/--without-sasl/--with-sasl=${prefix}/
+    configure.args-replace          --without-sasl --with-sasl=${prefix}
     depends_lib-append              port:cyrus-sasl2
 
 }
 
 variant gssapi description "Use kerberos5 gssapi for authentication" conflicts sasl {
 
-    configure.args-strsed           s/--without-gssapi/--with-gssapi=${prefix}/
+    configure.args-replace          --without-gssapi --with-gssapi=${prefix}
     depends_lib-append              port:kerberos5
 
 }