icon: Update to 9.5.25a, fix x11 variant

lang/icon/Portfile

@@ -1,9 +1,16 @@
 # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
 
 PortSystem          1.0
+PortGroup           github 1.0
+PortGroup           makefile 1.0
 
-name                icon
-version             9.5.1
+# The MacPorts tracked "version number" for this port includes the
+# tag suffix, e.g. 9.5.24b.  This matches the upstream tag labeling.
+
+github.setup        gtownsend icon 9.5.25 v a
+revision            0
+version             ${github.version}${github.tag_suffix}
+github.tarball_from archive
 
 categories          lang
 maintainers         laposte.net:michael.grunewald openmaintainer
@@ -17,22 +24,38 @@ long_description    Icon is a high-level, general-purpose programming \
                     syntax reminiscent of C and Pascal, but with \
                     semantics at a much higher level.
 
-homepage            http://www.cs.arizona.edu/icon/
-platforms           darwin
-master_sites        ${homepage}ftp/packages/unix/
-distname            icon-v[strsed ${version} {g/\.//}]src
-extract.suffix      .tgz
+homepage            https://www.cs.arizona.edu/icon/
 
-checksums           rmd160  b72481675a6961e609ad6adabc9abd37474eebc3 \
-                    sha256  062a680862b1c10c21789c0c7c7687c970a720186918d5ed1f7aad9fdc6fa9b9
+checksums           rmd160  7dd9f0905694292053a835f3929744abb281c91a \
+                    sha256  ab15b7fc5a96e8b4da1b76cc6c7935400879f8a54b0fcf94a947c02815f21006 \
+                    size    3086255
 
 universal_variant   no
 use_parallel_build  no
 
+# Create a custom MacPorts "Makedefs" file for the Icon build system.
+# Overwrite the original version in icon-source/config/macintosh/Makedefs.
+
+set SYS_NAME        macintosh
+
+post-extract {
+    ui_debug "Create custom config/${SYS_NAME}/Makedefs file for MacPorts."
+    set makedefs [open ${worksrcpath}/config/${SYS_NAME}/Makedefs "w"]
+    puts ${makedefs} "CC     = ${configure.cc}"
+    puts ${makedefs} "CFLAGS = ${configure.cflags}"
+    puts ${makedefs} "CFDYN  ="
+    puts ${makedefs} "RLINK  = ${configure.ldflags}"
+    puts ${makedefs} "RLIBS  ="
+    puts ${makedefs} "TLIBS  ="
+    puts ${makedefs} "XLIBS  = -lXpm -lX11"
+    puts ${makedefs} "SFLAGS ="
+    close ${makedefs}
+}
+
+use_configure       yes
 configure.cmd       make
 configure.pre_args
-
-configure.args      Configure name=macintosh
+configure.args      Configure name=${SYS_NAME}
 
 build.target        All
 
@@ -55,11 +78,11 @@ post-destroot {
 default_variants    +x11
 
 variant x11 {
-    configure.args X-Configure name=macintosh
-    depends_lib-append    port:xorg-libXt
+    depends_lib-append          port:xorg-libXt \
+                                port:xpm
+    configure.args              X-Configure name=${SYS_NAME}
 }
 
-livecheck.type      regex
-livecheck.url       [lindex ${master_sites} 0]
-livecheck.version   [strsed ${version} {g/\.//}]
-livecheck.regex     ${name}-v(\[0-9.\]+)src${extract.suffix}
+# Version has a letter suffix, so include letter on both sides of livecheck.
+livecheck.version   ${version}
+livecheck.regex     /tags/v(\[0-9a-z.\]+)\\.tar\\.gz