From 1f5fcdd1d73ee6439cba249fba23072afb317c2a Mon Sep 17 00:00:00 2001
From: Jonas 'Sortie' Termansen <sortie@maxsi.org>
Date: Mon, 31 Jan 2022 00:41:33 +0100
Subject: [PATCH] fixup! Add ports to the Sortix repository.

---
 build-aux/upgrade-port.sh      | 64 -----------------------------
 ports/ag/ag.info               |  1 +
 ports/binutils/binutils.info   |  1 +
 ports/bochs/bochs.info         |  3 ++
 ports/e2fsprogs/e2fsprogs.info |  3 ++
 ports/gcc/gcc.info             |  1 +
 ports/grub/grub.info           |  1 +
 ports/libcurses/libcurses.info |  1 +
 ports/libevent/libevent.info   |  3 ++
 ports/libexpat/libexpat.info   |  1 +
 ports/libgmp/libgmp.info       |  2 +
 ports/libjpeg/libjpeg.info     |  5 +++
 ports/libpcre/libpcre.info     |  3 ++
 ports/libpng/libpng.info       |  1 +
 ports/libstdc++/libstdc++.info |  1 +
 ports/nasm/nasm.info           |  3 ++
 ports/nyancat/nyancat.info     |  1 +
 ports/python/python.info       |  3 ++
 portsify.sh                    | 75 ++++++++++++++++++++++++++++++++++
 19 files changed, 109 insertions(+), 64 deletions(-)

diff --git a/build-aux/upgrade-port.sh b/build-aux/upgrade-port.sh
index 20b89287..d081e19e 100755
--- a/build-aux/upgrade-port.sh
+++ b/build-aux/upgrade-port.sh
@@ -5,70 +5,6 @@ set -e
 
 if [ -z "$UPSTREAM_ARCHIVE" ]; then exit; fi
 
-NAME_REGEXP="$(echo "$NAME" | sed -E 's,\+,\\+,g')"
-
-case "$NAME" in
-ag)
-  RELEASE_SEARCH_PAGE="https://geoff.greer.fm/ag/"
-  ;;
-bochs)
-  RELEASE_SEARCH_PAGE="https://sourceforge.net/projects/bochs/files/bochs/"
-  RELEASE_SEARCH_REGEX="([0-9]+\.[0-9]+(\.[0-9]+)*)/"
-  UPSTREAM_SITE_TEMPLATE="https://sourceforge.net/projects/bochs/files/bochs/%v"
-  ;;
-e2fsprogs)
-  RELEASE_SEARCH_PAGE="https://mirrors.edge.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/"
-  RELEASE_SEARCH_REGEX="v([0-9]+\.[0-9]+(\.[0-9]+)*)/"
-  UPSTREAM_SITE_TEMPLATE="https://mirrors.edge.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v%v"
-  ;;
-binutils|gcc|grub|libstdc++)
-  VERSION_REGEX="([0-9]+\.[0-9]+(\.[0-9]+)*(-rc[0-9]+)?)"
-  ;;
-libcurses)
-  UPSTREAM_SITE="https://ftp.barfooze.de/pub/sabotage/tarballs"
-  ;;
-libevent)
-  VERSION_REGEX="([0-9]+\\.[0-9]+(\\.[0-9]+)*-stable)"
-  UPSTREAM_SITE_TEMPLATE="https://github.com/libevent/libevent/releases/download/release-%v"
-  UPSTREAM_ARCHIVE_TEMPLATE="libevent-%v%e"
-  ;;
-libexpat)
-  UPSTREAM_SITE_TEMPLATE="https://github.com/libexpat/libexpat/releases/download/R_%M_%m_%p"
-  ;;
-libjpeg)
-  UPSTREAM_SITE="https://www.ijg.org/files"
-  # TODO: The last letter is optional but sort -V before the first release.
-  VERSION_REGEX="([0-9]+[a-z])"
-  RELEASE_REGEX="jpegsrc\.v$VERSION_REGEX"
-  UPSTREAM_ARCHIVE_TEMPLATE="jpegsrc.v%v%e"
-  ;;
-libgmp)
-  # TODO: Remove after upgrading past 6.0.0a.
-  VERSION_REGEX="([0-9]+\.[0-9]+(\.[0-9]+)*a?)"
-  ;;
-libpcre)
-  RELEASE_SEARCH_PAGE="https://sourceforge.net/projects/pcre/files/pcre/"
-  RELEASE_SEARCH_REGEX="([0-9]+\.[0-9]+(\.[0-9]+)*)/"
-  UPSTREAM_SITE_TEMPLATE="https://sourceforge.net/projects/pcre/files/pcre/%v"
-  ;;
-libpng)
-  RELEASE_SEARCH_PAGE="http://libpng.org/pub/png/libpng.html"
-  ;;
-nasm)
-  RELEASE_SEARCH_PAGE="https://www.nasm.us/pub/nasm/releasebuilds/"
-  RELEASE_SEARCH_REGEX="([0-9]+\.[0-9]+(\.[0-9]+)*)/"
-  UPSTREAM_SITE_TEMPLATE="https://www.nasm.us/pub/nasm/releasebuilds/%v"
-  ;;
-nyancat)
-  RELEASE_SEARCH_PAGE="https://github.com/klange/nyancat/tags"
-  ;;
-python)
-  RELEASE_SEARCH_PAGE="https://www.python.org/downloads/source/"
-  RELEASE_SEARCH_REGEX="Python-([0-9]+\.[0-9]+(\.[0-9]+)*)(\.tar(\.(gz|bz2|xz)))"
-  UPSTREAM_SITE_TEMPLATE="https://www.python.org/ftp/python/%v"
-  ;;
-esac
-
 # TODO: Inaccurate.
 escape_regex() {
   echo "$1" | sed -E 's,[\\+*?.{}<>],\\\0,g'
diff --git a/ports/ag/ag.info b/ports/ag/ag.info
index 40e9b1c6..b4d5a5b8 100644
--- a/ports/ag/ag.info
+++ b/ports/ag/ag.info
@@ -6,3 +6,4 @@ ARCHIVE='the_silver_searcher-0.33.0.tar.gz'
 SHA256SUM='8ca680399df5ee8846a509c8a67c10ee1d5fc1a94456806a0ff9dd913b961db3'
 UPSTREAM_SITE='https://geoff.greer.fm/ag/releases'
 UPSTREAM_ARCHIVE='the_silver_searcher-0.33.0.tar.gz'
+RELEASE_SEARCH_PAGE="https://geoff.greer.fm/ag/"
diff --git a/ports/binutils/binutils.info b/ports/binutils/binutils.info
index 17071313..c6702b72 100644
--- a/ports/binutils/binutils.info
+++ b/ports/binutils/binutils.info
@@ -6,3 +6,4 @@ ARCHIVE='sortix-binutils-1.1-rc1.tar.xz'
 SHA256SUM='c7ee1a05728882a2da6c2658d3cd3099e45525e3d3d0d9b29477ed0486f59f30'
 UPSTREAM_SITE='https://pub.sortix.org/sortix/toolchain'
 UPSTREAM_ARCHIVE='sortix-binutils-1.1-rc1.tar.xz'
+VERSION_REGEX="([0-9]+\.[0-9]+(\.[0-9]+)*(-rc[0-9]+)?)"
diff --git a/ports/bochs/bochs.info b/ports/bochs/bochs.info
index b409fd7e..b5581fc6 100644
--- a/ports/bochs/bochs.info
+++ b/ports/bochs/bochs.info
@@ -6,3 +6,6 @@ ARCHIVE='bochs-2.6.tar.gz'
 SHA256SUM='65123e44a6d2c1148d741da025d16311b9ccd600ef268b911aba73c67eaf86e1'
 UPSTREAM_SITE='https://sourceforge.net/projects/bochs/files/bochs/2.6'
 UPSTREAM_ARCHIVE='bochs-2.6.tar.gz'
+RELEASE_SEARCH_PAGE="https://sourceforge.net/projects/bochs/files/bochs/"
+RELEASE_SEARCH_REGEX="([0-9]+\.[0-9]+(\.[0-9]+)*)/"
+UPSTREAM_SITE_TEMPLATE="https://sourceforge.net/projects/bochs/files/bochs/%v"
diff --git a/ports/e2fsprogs/e2fsprogs.info b/ports/e2fsprogs/e2fsprogs.info
index ca7ed0f8..5abc8bdd 100644
--- a/ports/e2fsprogs/e2fsprogs.info
+++ b/ports/e2fsprogs/e2fsprogs.info
@@ -6,3 +6,6 @@ ARCHIVE='e2fsprogs-1.42.13.tar.xz'
 SHA256SUM='e16474b5a3a30f9197160c4b91bd48d5a463583049c0fcc405b6f0f7075aa0c7'
 UPSTREAM_SITE='https://kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v1.42.13'
 UPSTREAM_ARCHIVE='e2fsprogs-1.42.13.tar.xz'
+RELEASE_SEARCH_PAGE="https://mirrors.edge.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/"
+RELEASE_SEARCH_REGEX="v([0-9]+\.[0-9]+(\.[0-9]+)*)/"
+UPSTREAM_SITE_TEMPLATE="https://mirrors.edge.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v%v"
diff --git a/ports/gcc/gcc.info b/ports/gcc/gcc.info
index ec2aef55..ff6ebd7b 100644
--- a/ports/gcc/gcc.info
+++ b/ports/gcc/gcc.info
@@ -6,3 +6,4 @@ ARCHIVE='sortix-gcc-1.1-rc3.tar.xz'
 SHA256SUM='4d90fe38a67cddab81dc34265009cde508338072ec9b0083010d46647f9c6320'
 UPSTREAM_SITE='https://pub.sortix.org/sortix/toolchain'
 UPSTREAM_ARCHIVE='sortix-gcc-1.1-rc3.tar.xz'
+VERSION_REGEX="([0-9]+\.[0-9]+(\.[0-9]+)*(-rc[0-9]+)?)"
diff --git a/ports/grub/grub.info b/ports/grub/grub.info
index 84501ada..19fc4bcf 100644
--- a/ports/grub/grub.info
+++ b/ports/grub/grub.info
@@ -6,3 +6,4 @@ ARCHIVE='sortix-grub-1.0-rc1.tar.gz'
 SHA256SUM='82ac8faf257fb3476969a0b79a0b5fd53d4cdefb2e2aa5941381477e38c5f9c5'
 UPSTREAM_SITE='https://pub.sortix.org/sortix/toolchain'
 UPSTREAM_ARCHIVE='sortix-grub-1.0-rc1.tar.gz'
+VERSION_REGEX="([0-9]+\.[0-9]+(\.[0-9]+)*(-rc[0-9]+)?)"
diff --git a/ports/libcurses/libcurses.info b/ports/libcurses/libcurses.info
index b229baab..2aeb912f 100644
--- a/ports/libcurses/libcurses.info
+++ b/ports/libcurses/libcurses.info
@@ -6,3 +6,4 @@ ARCHIVE='netbsd-curses-0.1.0.tar.xz'
 SHA256SUM='bea4a945c8d0ec6e923bb43882b1d261c544601c3510b73818a6c431dec7756a'
 UPSTREAM_SITE='https://github.com/sabotage-linux/netbsd-curses/releases/download/v0.1.0'
 UPSTREAM_ARCHIVE='netbsd-curses-0.1.0.tar.xz'
+UPSTREAM_SITE="https://ftp.barfooze.de/pub/sabotage/tarballs"
diff --git a/ports/libevent/libevent.info b/ports/libevent/libevent.info
index e0d62b7e..44f2cbd6 100644
--- a/ports/libevent/libevent.info
+++ b/ports/libevent/libevent.info
@@ -6,3 +6,6 @@ ARCHIVE='libevent-2.0.22-stable.tar.gz'
 SHA256SUM='71c2c49f0adadacfdbe6332a372c38cf9c8b7895bb73dabeaa53cdcc1d4e1fa3'
 UPSTREAM_SITE='https://github.com/libevent/libevent/releases/download/release-2.0.22-stable'
 UPSTREAM_ARCHIVE='libevent-2.0.22-stable.tar.gz'
+VERSION_REGEX="([0-9]+\\.[0-9]+(\\.[0-9]+)*-stable)"
+UPSTREAM_SITE_TEMPLATE="https://github.com/libevent/libevent/releases/download/release-%v"
+UPSTREAM_ARCHIVE_TEMPLATE="libevent-%v%e"
diff --git a/ports/libexpat/libexpat.info b/ports/libexpat/libexpat.info
index 1c01aa7a..8efd8474 100644
--- a/ports/libexpat/libexpat.info
+++ b/ports/libexpat/libexpat.info
@@ -6,3 +6,4 @@ ARCHIVE='expat-2.1.0.tar.gz'
 SHA256SUM='823705472f816df21c8f6aa026dd162b280806838bb55b3432b0fb1fcca7eb86'
 UPSTREAM_SITE='https://github.com/libexpat/libexpat/releases/download/R_2_1_0'
 UPSTREAM_ARCHIVE='expat-2.1.0.tar.gz'
+UPSTREAM_SITE_TEMPLATE="https://github.com/libexpat/libexpat/releases/download/R_%M_%m_%p"
diff --git a/ports/libgmp/libgmp.info b/ports/libgmp/libgmp.info
index f48508d7..68b7a730 100644
--- a/ports/libgmp/libgmp.info
+++ b/ports/libgmp/libgmp.info
@@ -6,3 +6,5 @@ ARCHIVE='gmp-6.0.0a.tar.xz'
 SHA256SUM='9156d32edac6955bc53b0218f5f3763facb890b73a835d5e1b901dcf8eb8b764'
 UPSTREAM_SITE='https://ftp.gnu.org/gnu/gmp'
 UPSTREAM_ARCHIVE='gmp-6.0.0a.tar.xz'
+# TODO: Remove after upgrading past 6.0.0a.
+VERSION_REGEX="([0-9]+\.[0-9]+(\.[0-9]+)*a?)"
diff --git a/ports/libjpeg/libjpeg.info b/ports/libjpeg/libjpeg.info
index 2d08eefc..af8c3314 100644
--- a/ports/libjpeg/libjpeg.info
+++ b/ports/libjpeg/libjpeg.info
@@ -6,3 +6,8 @@ ARCHIVE='jpegsrc.v9.tar.gz'
 SHA256SUM='c4e29e9375aaf60b4b79db87a58b063fb5b84f923bee97a88280b3d159e7e535'
 UPSTREAM_SITE='https://pub.sortix.org/mirror/libjpeg'
 UPSTREAM_ARCHIVE='jpegsrc.v9.tar.gz'
+UPSTREAM_SITE="https://www.ijg.org/files"
+# TODO: The last letter is optional but sort -V before the first release.
+VERSION_REGEX="([0-9]+[a-z])"
+RELEASE_REGEX="jpegsrc\.v$VERSION_REGEX"
+UPSTREAM_ARCHIVE_TEMPLATE="jpegsrc.v%v%e"
diff --git a/ports/libpcre/libpcre.info b/ports/libpcre/libpcre.info
index 36305f8a..ebced1f1 100644
--- a/ports/libpcre/libpcre.info
+++ b/ports/libpcre/libpcre.info
@@ -6,3 +6,6 @@ ARCHIVE='pcre-8.39.tar.bz2'
 SHA256SUM='b858099f82483031ee02092711689e7245586ada49e534a06e678b8ea9549e8b'
 UPSTREAM_SITE='https://sourceforge.net/projects/pcre/files/pcre/8.39'
 UPSTREAM_ARCHIVE='pcre-8.39.tar.bz2'
+RELEASE_SEARCH_PAGE="https://sourceforge.net/projects/pcre/files/pcre/"
+RELEASE_SEARCH_REGEX="([0-9]+\.[0-9]+(\.[0-9]+)*)/"
+UPSTREAM_SITE_TEMPLATE="https://sourceforge.net/projects/pcre/files/pcre/%v"
diff --git a/ports/libpng/libpng.info b/ports/libpng/libpng.info
index 9d611a16..e5c4462a 100644
--- a/ports/libpng/libpng.info
+++ b/ports/libpng/libpng.info
@@ -6,3 +6,4 @@ ARCHIVE='libpng-1.5.13.tar.xz'
 SHA256SUM='b843f9cb01d10ae22acd9aaf58aceaa4a6aeb9cf78943b41588004b271257aee'
 UPSTREAM_SITE='https://download.sourceforge.net/libpng'
 UPSTREAM_ARCHIVE='libpng-1.5.13.tar.xz'
+RELEASE_SEARCH_PAGE="http://libpng.org/pub/png/libpng.html"
diff --git a/ports/libstdc++/libstdc++.info b/ports/libstdc++/libstdc++.info
index f28f6bc9..77313362 100644
--- a/ports/libstdc++/libstdc++.info
+++ b/ports/libstdc++/libstdc++.info
@@ -6,3 +6,4 @@ ARCHIVE='sortix-libstdc++-1.1-rc1.tar.xz'
 SHA256SUM='0669b1344d969453a01d041ec9671e32fae25f89373d205bb172a8f7a267a10e'
 UPSTREAM_SITE='https://pub.sortix.org/sortix/toolchain'
 UPSTREAM_ARCHIVE='sortix-libstdc++-1.1-rc1.tar.xz'
+VERSION_REGEX="([0-9]+\.[0-9]+(\.[0-9]+)*(-rc[0-9]+)?)"
diff --git a/ports/nasm/nasm.info b/ports/nasm/nasm.info
index 94852a0e..5b06e727 100644
--- a/ports/nasm/nasm.info
+++ b/ports/nasm/nasm.info
@@ -6,3 +6,6 @@ ARCHIVE='nasm-2.11.02.tar.xz'
 SHA256SUM='233c574f2c068c0256f9b3653220ceb247c72b671085595259529156c6cfa55d'
 UPSTREAM_SITE='https://www.nasm.us/pub/nasm/releasebuilds/2.11.02'
 UPSTREAM_ARCHIVE='nasm-2.11.02.tar.xz'
+RELEASE_SEARCH_PAGE="https://www.nasm.us/pub/nasm/releasebuilds/"
+RELEASE_SEARCH_REGEX="([0-9]+\.[0-9]+(\.[0-9]+)*)/"
+UPSTREAM_SITE_TEMPLATE="https://www.nasm.us/pub/nasm/releasebuilds/%v"
diff --git a/ports/nyancat/nyancat.info b/ports/nyancat/nyancat.info
index febee038..974727fc 100644
--- a/ports/nyancat/nyancat.info
+++ b/ports/nyancat/nyancat.info
@@ -6,3 +6,4 @@ ARCHIVE='nyancat-1.5.2.tar.gz'
 SHA256SUM='88cdcaa9c7134503dd0364a97fa860da3381a09cb555c3aae9918360827c2032'
 UPSTREAM_SITE='https://github.com/klange/nyancat/archive/refs/tags'
 UPSTREAM_ARCHIVE='1.5.2.tar.gz'
+RELEASE_SEARCH_PAGE="https://github.com/klange/nyancat/tags"
diff --git a/ports/python/python.info b/ports/python/python.info
index 087a65b9..c566f622 100644
--- a/ports/python/python.info
+++ b/ports/python/python.info
@@ -6,4 +6,7 @@ ARCHIVE='Python-3.6.0.tar.xz'
 SHA256SUM='b0c5f904f685e32d9232f7bdcbece9819a892929063b6e385414ad2dd6a23622'
 UPSTREAM_SITE='https://www.python.org/ftp/python/3.6.0'
 UPSTREAM_ARCHIVE='Python-3.6.0.tar.xz'
+RELEASE_SEARCH_PAGE="https://www.python.org/downloads/source/"
+RELEASE_SEARCH_REGEX="Python-([0-9]+\.[0-9]+(\.[0-9]+)*)(\.tar(\.(gz|bz2|xz)))"
+UPSTREAM_SITE_TEMPLATE="https://www.python.org/ftp/python/%v"
 NEED_WRITABLE=true
diff --git a/portsify.sh b/portsify.sh
index d24bfde3..454bc317 100755
--- a/portsify.sh
+++ b/portsify.sh
@@ -204,6 +204,81 @@ for port in $ports; do
       touch -r "$mirrordir/$port/$file" "$mirrordir/$port"
     fi
   done
+  case "$port" in
+  ag) cat << \EOF
+RELEASE_SEARCH_PAGE="https://geoff.greer.fm/ag/"
+EOF
+    ;;
+  bochs) cat << \EOF
+RELEASE_SEARCH_PAGE="https://sourceforge.net/projects/bochs/files/bochs/"
+RELEASE_SEARCH_REGEX="([0-9]+\.[0-9]+(\.[0-9]+)*)/"
+UPSTREAM_SITE_TEMPLATE="https://sourceforge.net/projects/bochs/files/bochs/%v"
+EOF
+    ;;
+  e2fsprogs) cat << \EOF
+RELEASE_SEARCH_PAGE="https://mirrors.edge.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/"
+RELEASE_SEARCH_REGEX="v([0-9]+\.[0-9]+(\.[0-9]+)*)/"
+UPSTREAM_SITE_TEMPLATE="https://mirrors.edge.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v%v"
+EOF
+    ;;
+  binutils|gcc|grub|libstdc++) cat << \EOF
+VERSION_REGEX="([0-9]+\.[0-9]+(\.[0-9]+)*(-rc[0-9]+)?)"
+EOF
+    ;;
+  libcurses) cat << \EOF
+UPSTREAM_SITE="https://ftp.barfooze.de/pub/sabotage/tarballs"
+EOF
+    ;;
+  libevent) cat << \EOF
+VERSION_REGEX="([0-9]+\\.[0-9]+(\\.[0-9]+)*-stable)"
+UPSTREAM_SITE_TEMPLATE="https://github.com/libevent/libevent/releases/download/release-%v"
+UPSTREAM_ARCHIVE_TEMPLATE="libevent-%v%e"
+EOF
+    ;;
+  libexpat) cat << \EOF
+UPSTREAM_SITE_TEMPLATE="https://github.com/libexpat/libexpat/releases/download/R_%M_%m_%p"
+EOF
+    ;;
+  libjpeg) cat << \EOF
+UPSTREAM_SITE="https://www.ijg.org/files"
+# TODO: The last letter is optional but sort -V before the first release.
+VERSION_REGEX="([0-9]+[a-z])"
+RELEASE_REGEX="jpegsrc\.v$VERSION_REGEX"
+UPSTREAM_ARCHIVE_TEMPLATE="jpegsrc.v%v%e"
+EOF
+    ;;
+  libgmp) cat << \EOF
+# TODO: Remove after upgrading past 6.0.0a.
+VERSION_REGEX="([0-9]+\.[0-9]+(\.[0-9]+)*a?)"
+EOF
+    ;;
+  libpcre) cat << \EOF
+RELEASE_SEARCH_PAGE="https://sourceforge.net/projects/pcre/files/pcre/"
+RELEASE_SEARCH_REGEX="([0-9]+\.[0-9]+(\.[0-9]+)*)/"
+UPSTREAM_SITE_TEMPLATE="https://sourceforge.net/projects/pcre/files/pcre/%v"
+EOF
+    ;;
+  libpng) cat << \EOF
+RELEASE_SEARCH_PAGE="http://libpng.org/pub/png/libpng.html"
+EOF
+    ;;
+  nasm) cat << \EOF
+RELEASE_SEARCH_PAGE="https://www.nasm.us/pub/nasm/releasebuilds/"
+RELEASE_SEARCH_REGEX="([0-9]+\.[0-9]+(\.[0-9]+)*)/"
+UPSTREAM_SITE_TEMPLATE="https://www.nasm.us/pub/nasm/releasebuilds/%v"
+EOF
+    ;;
+  nyancat) cat << \EOF
+RELEASE_SEARCH_PAGE="https://github.com/klange/nyancat/tags"
+EOF
+    ;;
+  python) cat << \EOF
+RELEASE_SEARCH_PAGE="https://www.python.org/downloads/source/"
+RELEASE_SEARCH_REGEX="Python-([0-9]+\.[0-9]+(\.[0-9]+)*)(\.tar(\.(gz|bz2|xz)))"
+UPSTREAM_SITE_TEMPLATE="https://www.python.org/ftp/python/%v"
+EOF
+    ;;
+  esac >> "$port.info.new"
   if [ -n "$NEED_WRITABLE" ]; then
     echo "NEED_WRITABLE=$NEED_WRITABLE" >> "$port.info.new"
   fi