Ticket #65194: Portfile.diff

games/godot/Portfile

@@ -104 +104 @@
 #                       port:minizip \
 #                       port:embree
 
-patchfiles-append       add-external_libs-support.diff
+patchfiles-append       add-external_libs-support.diff \
+                        compiler.diff
 
 if {$subport eq "${name}-3.2" && \
     ${os.platform} eq "darwin" && ${os.major} <= 15} \
@@ -246 +247 @@
 #                   builtin_mbedtls=no \
 #                   builtin_embree=no
 
+compiler.cxx_standard   2014
+# Configure the compiler
+if {[string match macports-clang-* ${configure.compiler}]} {
+    set clang_v [string range ${configure.compiler} [string length macports-clang-] end]
+    build.args-append       macports_clang=${clang_v}
+    build.env-append        MACPORTS_PREFIX=${prefix}
+}
+
 destroot {
     if {$subport eq "${name}-3.2"} {
         set app_name "Godot 3.2"
@@ -268 +277 @@
 } else {
     livecheck.type  none
 }
-
-### The following code was adapted from the portfiles
-### of ports such as openvdb and openimageio
-
-# Get major version from version string
-proc get_major {version} { return [lindex [split ${version} .] 0] }
-
-set clang_versions {5.0 6.0 7.0 8.0 9.0 10 11 12 13}
-set clang_variants {}
-foreach v $clang_versions {
-    lappend clang_variants clang[get_major $v]
-}
-
-# this default version should stay synchronized with
-# the default macports_clang option in the SConstruct
-# file that is part of the Godot source code
-set sconstruct_default_mp_clang 5
-
-# On older macOS versions, use clang variant by default
-if {[string match macports-clang-* ${configure.compiler}] || \
-    ${os.platform} eq "darwin" && ${os.major} <= 14} \
-{
-    set has_clang_variant no
-    foreach v $clang_versions {
-        if {[variant_isset clang[get_major $v]]} {
-            set has_clang_variant yes
-        }
-    }
-    if {!$has_clang_variant} {
-        if {[regexp {macports-clang-([0-9]+(?:\.[0-9]+)*)} \
-             ${configure.compiler} result clang_version]} \
-        {
-            default_variants-append +clang[get_major $clang_version]
-        } else {
-            # Unable to determine $clang_version,
-            # so use most recent clang
-            default_variants-append +clang[get_major [
-                lindex $clang_versions end
-            ]]
-        }
-    }
-}
-
-# Configure the variants
-foreach clang_ver $clang_versions {
-    set clang_ver_major [get_major $clang_ver]
-    
-    set i [lsearch -exact $clang_variants clang$clang_ver_major]
-    set c [lreplace $clang_variants $i $i]
-    
-    variant clang$clang_ver_major conflicts {*}${c} \
-        description "Build using MacPorts Clang $clang_ver" {}
-    if {[variant_isset clang$clang_ver_major]} {
-        set selected_clang_v    $clang_ver
-        depends_build-append    port:clang-$selected_clang_v
-        compiler.whitelist      macports-clang-$selected_clang_v
-        build.args-append       macports_clang=$selected_clang_v
-        post-configure {
-            if {[get_major $selected_clang_v] != \
-                $sconstruct_default_mp_clang} \
-            {
-                if {$subport eq "${name}-3.2"} {
-                    set f ${worksrcpath}/SConstruct
-                } else {
-                    set f ${worksrcpath}/platform/osx/detect.py
-                }
-                reinplace \
-                    s|$sconstruct_default_mp_clang\.0|$selected_clang_v|g \
-                    $f
-            }
-        }
-    }
-}