Ticket #50424: Portfile.diff

Portfile

@@ -181 +181 @@
         select.file         ${filespath}/${subport}
 
         configure.args-append -DGEANT4_USE_SYSTEM_EXPAT=ON \
+                              -DGEANT4_USE_SYSTEM_ZLIB=ON \
                               -DGEANT4_USE_SYSTEM_CLHEP=OFF
 
+        if {[vercmp ${geant.version} 10.2] >= 0} {
+            depends_lib-append    port:freetype
+            configure.args-append -DGEANT4_USE_FREETYPE=ON
+        }
+
+        if {[vercmp ${geant.version} 10.0] < 0} {
+            # according to cmake/Modules/Geant4OptionalComponents.cmake, internal zlib must be used
+            configure.args-delete -DGEANT4_USE_SYSTEM_ZLIB=ON
+            depends_lib-delete    port:zlib
+        }
+
         # - patch-upstream-source-interfaces-common-src-G4Qt.cc:
         #       http://bugzilla-geant4.kek.jp/show_bug.cgi?id=1487
         # - patch-upstream-examples-advanced-xray_fluorescence:
@@ -225 +237 @@
                               -DCMAKE_INSTALL_BINDIR=${prefix}/libexec/Geant4/Geant${geant.version_simple} \
                               -DCMAKE_INSTALL_DATAROOTDIR=${prefix}/share/Geant4 \
                               -DCMAKE_INSTALL_INCLUDEDIR=${prefix}/include/Geant4/Geant${geant.version_simple} \
-                              -DCMAKE_INSTALL_LIBDIR=${prefix}/lib/Geant4/Geant${geant.version_simple}
-
-        if {${geant.version} != "9.5"} {
-            configure.args-append -DGEANT4_INSTALL_DATADIR=${geant.datadir} \
-        }
+                              -DCMAKE_INSTALL_LIBDIR=${prefix}/lib/Geant4/Geant${geant.version_simple} \
+                              -DGEANT4_INSTALL_DATADIR=${geant.datadir}
 
         # this is only needed when +examples is used
         post-destroot {
@@ -250 +259 @@
       Otherwise source ${prefix}/libexec/Geant4/Geant${geant.version_simple}/geant4.(c)sh
 "
 
-        variant qt conflicts qt5 description {Build with Qt 4 support} {
+        variant qt4 conflicts qt5 description {Build with Qt 4 support} {
             PortGroup qt4         1.0
-            configure.args-append -DGEANT4_USE_QT=ON
+            configure.args-append  \
+                -DGEANT4_USE_QT=ON \
+                -DGEANT4_FORCE_QT4=ON
         }
-        # TODO: figure out which versions of Geant4 are compatible with Qt 5
-        variant qt5 conflicts qt description {Build with Qt 5 support} {
+
+        variant qt5 conflicts qt4 description {Build with Qt 5 support} {
             PortGroup qt5         1.0
             configure.args-append -DGEANT4_USE_QT=ON
         }
 
+        if {[vercmp ${geant.version} 10.1] <= 0} {
+            patchfiles-append \
+                patch-choose_qt.diff
+
+            variant qt requires qt4 description {Obsolete variant; use qt4 or qt5 instead} {}
+        }
+
         # From installation notes:
         #
         # It is recommended that Windows and Mac users prefer the Geant4 Qt4 GUI. Note
@@ -329 +347 @@
                                   -DCLHEP_LIBRARY=${prefix}/lib/libCLHEP.dylib
         }
 
-        if {${geant.version} >= "10.0"} {
+        if {[vercmp ${geant.version} 10.0] >= 0} {
             variant threads description {Build with multi-threading support} {
                 configure.args-append -DGEANT4_BUILD_MULTITHREADED=ON
             }
         }
 
         default_variants-append +gdml
-        if {![variant_isset qt5]} {
-            default_variants-append +qt
+        if {![variant_isset qt4] && ![variant_isset qt5]} {
+            # not Qt variant set, so try to find a good default one
+
+            set   just_want_qt5_version_info yes
+            PortGroup qt5 1.0
+            unset just_want_qt5_version_info
+
+            if { ${os.major} < ${qt5_min_tested_version} } {
+                default_variants-append +qt4
+            } else {
+                default_variants-append +qt5
+            }
         }
 
         set geant.version_full_no_patch [join [lrange [split ${geant.version_full} .] 0 2] \\.]