Update Portfile generation scripts

neurodroid · Sep 29, 2017 · b44d6bd · b44d6bd
1 parent 9325eb1
commit b44d6bd
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 7 deletions.
diff --git a/dist/macosx/macports/insert_checksums.sh b/dist/macosx/macports/insert_checksums.sh
@@ -38,7 +38,7 @@ sudo port uninstall py-stfio
 sudo port clean --all py-stfio
 sudo port uninstall py27-stfio
 sudo port clean --all py27-stfio
-sudo port uninstall py34-stfio
-sudo port clean --all py34-stfio
 sudo port uninstall py35-stfio
 sudo port clean --all py35-stfio
+sudo port uninstall py36-stfio
+sudo port clean --all py36-stfio
diff --git a/dist/macosx/macports/python/py-stfio/Portfile.in b/dist/macosx/macports/python/py-stfio/Portfile.in
@@ -19,7 +19,7 @@ distname            stimfit-${version}
 checksums           rmd160  RMD160 \
                     sha256  SHA256
 
-python.versions     27 34 35
+python.versions     27 35 36
 
 if { ${name} ne ${subport} } {
     depends_build   port:swig-python
@@ -50,7 +50,7 @@ if { ${name} ne ${subport} } {
             ${worksrcpath}/COPYING ${docdir}
     }
 
-    variant biosig description {Use biosig library for file I/O.} {
+    variant biosig conflicts biosiglite description {Use external biosig library for file I/O.} {
         depends_lib-append \
             port:libbiosig
 
@@ -59,5 +59,11 @@ if { ${name} ne ${subport} } {
             --with-biosig2
     }
 
-    default_variants    +biosig
+    variant biosiglite conflicts biosig description {Use internal biosiglite library for file I/O.} {
+        configure.args-replace \
+            --without-biosig \
+            --with-biosiglite
+    }
+
+    default_variants    +biosiglite
 }
diff --git a/dist/macosx/macports/science/stimfit/Portfile.in b/dist/macosx/macports/science/stimfit/Portfile.in
@@ -57,7 +57,7 @@ variant atlas description {Use MacPorts ATLAS libraries.} {
         --with-lapack-lib=${prefix}/lib/libatlas.a
 }
 
-variant biosig description {Use biosig library for file I/O.} {
+variant biosig conflicts biosiglite description {Use external biosig library for file I/O.} {
     depends_lib-append \
         port:libbiosig
 
@@ -66,6 +66,12 @@ variant biosig description {Use biosig library for file I/O.} {
         --with-biosig2
 }
 
+variant biosiglite conflicts biosig description {Use internal biosiglite library for file I/O.} {
+    configure.args-replace \
+        --without-biosig \
+        --with-biosiglite
+}
+
 configure.ldflags-append \
                     -headerpad_max_install_names
 
@@ -74,7 +80,7 @@ configure.ldflags-append \
 default_variants    +python27
 # }
 default_variants-append \
-                    +biosig
+                    +biosiglite
 
 destroot.destdir    DESTDIR=${destroot}${applications_dir}