MacPorts port: update to 2.12.0

Author: jmroot

sysutils/MacPorts/Portfile

@@ -1,7 +1,7 @@
 PortSystem          1.0
 PortGroup           github 1.0
 
-github.setup        macports macports-base 2.12.0-rc2 v
+github.setup        macports macports-base 2.12.0 v
 name                MacPorts
 
 categories          sysutils macports
@@ -21,17 +21,19 @@ homepage            https://www.macports.org/
 distname            ${name}-${version}
 github.tarball_from releases
 # testing subdir is for non-final releases only
-dist_subdir         ${name}/testing
+#dist_subdir         ${name}/testing
 use_bzip2           yes
 
-checksums           rmd160 d4b61615cddbbe032a8af374541b86181e8b7c48 \
-                    sha256 40c2f26f5fb152156fa67e2b66e931a856818080b6545e040eb7b3944e2c7456
+checksums           rmd160 26d3b70472eef8e1c638701bf552288b6ccf3d64 \
+                    sha256 a3e0b4a1cdcc76e7c144b94fb913676bb97a3c73fa69da8622eb004373d8e3d3
 
 variant keep_prefix description "Use configured prefix instead of enforcing /opt/local" {}
 if {![variant_isset keep_prefix]} {
     prefix          /opt/local
 }
 
+patchfiles          codesign.patch
+
 # Readline is disabled by default to avoid support issues with people who
 # have a readline in /usr/local. Since this portfile is presumably used in a
 # clean environment, enable it here.

sysutils/MacPorts/files/codesign.patch

@@ -0,0 +1,18 @@
+Retry failed codesign commands to work around Apple's flaky secure
+timestamp service.
+
+--- src/codesign.sh.orig
++++ src/codesign.sh
+@@ -23,8 +23,10 @@ for f in "$@"; do
+         chown "$SUDO_USER" "$f" "$DIR"
+     fi
+ 
+-    $SUDO /usr/bin/codesign --sign "$CODESIGN_ID" --identifier=org.macports.base --options=runtime --timestamp --verbose "$f"
+-
++    while ! $SUDO /usr/bin/codesign --sign "$CODESIGN_ID" --identifier=org.macports.base --options=runtime --timestamp --verbose "$f"
++    do
++        sleep 1
++    done
+     if [ -n "$SUDO" ]; then
+         chown "$FILE_OWNER" "$f"
+         chown "$DIR_OWNER" "$DIR"