diff --git a/lang/icon/Portfile b/lang/icon/Portfile
index bfcac7b8adbab..58236f9f34419 100644
--- a/lang/icon/Portfile
+++ b/lang/icon/Portfile
@@ -1,9 +1,11 @@
 # -*- 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
 
-name                icon
-version             9.5.1
+github.setup        gtownsend icon 9.5.24b
+github.tarball_from archive
+revision            0
 
 categories          lang
 maintainers         laposte.net:michael.grunewald openmaintainer
@@ -17,17 +19,17 @@ 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/
+homepage            https://www.cs.arizona.edu/icon/
 platforms           darwin
-master_sites        ${homepage}ftp/packages/unix/
-distname            icon-v[strsed ${version} {g/\.//}]src
-extract.suffix      .tgz
+#distname            icon-v[strsed ${version} {g/\.//}]src
+#extract.suffix      .tgz
 
-checksums           rmd160  b72481675a6961e609ad6adabc9abd37474eebc3 \
-                    sha256  062a680862b1c10c21789c0c7c7687c970a720186918d5ed1f7aad9fdc6fa9b9
+checksums           rmd160  4aa95dc9816aa174b59629eb1e54123582be840e \
+                    sha256  85d695ab34d62f86d5b08f5bde91200026c1fc5a67f33f47c498f96e72543c62 \
+                    size    3086266
 
-universal_variant   no
-use_parallel_build  no
+#universal_variant   no
+#use_parallel_build  no
 
 configure.cmd       make
 configure.pre_args
@@ -59,7 +61,7 @@ variant x11 {
     depends_lib-append    port:xorg-libXt
 }
 
-livecheck.type      regex
-livecheck.url       [lindex ${master_sites} 0]
-livecheck.version   [strsed ${version} {g/\.//}]
-livecheck.regex     ${name}-v(\[0-9.\]+)src${extract.suffix}
+#livecheck.type      regex
+#livecheck.url       [lindex ${master_sites} 0]
+#livecheck.version   [strsed ${version} {g/\.//}]
+#livecheck.regex     ${name}-v(\[0-9.\]+)src${extract.suffix}