dcm2niix: Fix openjpeg usage; add batch tool.

macports · Dec 10, 2024 · 6c71c48 · 6c71c48
1 parent 69668d0
commit 6c71c48
Showing 1 changed file with 7 additions and 5 deletions.
diff --git a/science/dcm2niix/Portfile b/science/dcm2niix/Portfile
@@ -7,7 +7,7 @@ PortGroup           github 1.0
 github.setup        rordenlab dcm2niix 1.0.20241208 v
 version             ${github.version}
 
-revision            0
+revision            1
 
 categories          science
 maintainers         {eborisch @eborisch} openmaintainer
@@ -38,7 +38,8 @@ variant docs description {Install man pages} {
 
 default_variants        +docs
 
-depends_lib-append      port:openjpeg \
+depends_lib-append      port:yaml-cpp \
+                        port:openjpeg \
                         port:zlib
 
 depends_build-append    port:pkgconfig
@@ -52,10 +53,11 @@ compiler.cxx_standard   2011
 
 # Linking with yaml-cpp currently broken; haven't chased down; revisit later.
 # Disabling BATCH_VERSION until this is resolved.
-configure.args-append   -DUSE_OPENJPEG=ON \
+configure.args-append   -DUSE_OPENJPEG=System \
                         -DBATCH_VERSION=OFF \
-                        -DZLIB_IMPLEMENTATION=custom \
-                        -DZLIB_ROOT=${prefix}
+                        -DZLIB_IMPLEMENTATION=System \
+                        -DYAML-CPP_IMPLEMENTATION=System \
+                        -DBATCH_VERSION=ON
 
 
 # cmake re-runs during build; retain configured CC and CXX (Only an issue in