From 68ae23d18cea1b4a0bc6f05d51df8a282057c9e2 Mon Sep 17 00:00:00 2001
From: Jonas 'Sortie' Termansen <sortie@maxsi.org>
Date: Sun, 13 Feb 2022 23:52:53 +0100
Subject: [PATCH] fixup! Add ports to the Sortix repository.

---
 build-aux/build-ports.sh | 19 +++++++++++++------
 build-aux/clean-ports.sh | 23 +++++++++++++++--------
 2 files changed, 28 insertions(+), 14 deletions(-)

diff --git a/build-aux/build-ports.sh b/build-aux/build-ports.sh
index fb385db4..884b52f3 100755
--- a/build-aux/build-ports.sh
+++ b/build-aux/build-ports.sh
@@ -56,8 +56,15 @@ mkdir -p "$SORTIX_MIRROR_DIR"
 SORTIX_REPOSITORY_DIR="$SORTIX_REPOSITORY_DIR/$HOST"
 mkdir -p "$SORTIX_REPOSITORY_DIR"
 
+# Create the system root if absent.
+if [ "$OPERATION" = build ]; then
+  mkdir -p "$SYSROOT"
+fi
+
 # Make paths absolute for later use.
-SYSROOT=$(make_dir_path_absolute "$SYSROOT")
+if [ "$OPERATION" = build ]; then
+  SYSROOT=$(make_dir_path_absolute "$SYSROOT")
+fi
 SORTIX_MIRROR_DIR=$(make_dir_path_absolute "$SORTIX_MIRROR_DIR")
 SORTIX_PORTS_DIR=$(make_dir_path_absolute "$SORTIX_PORTS_DIR")
 SORTIX_REPOSITORY_DIR=$(make_dir_path_absolute "$SORTIX_REPOSITORY_DIR")
@@ -74,12 +81,12 @@ CXXFLAGS="$CXXFLAGS -Werror=format -Wno-error=format-contains-nul"
 export CFLAGS
 export CXXFLAGS
 
-# Create the system root if absent.
-mkdir -p "$SYSROOT"
-
 # Initialize Tix package management in the system root if absent.
-[ -e "$SYSROOT/tix/collection.conf" ] ||
-tix-collection "$SYSROOT" create --platform=$HOST --prefix= --generation=2
+if [ "$OPERATION" = build ]; then
+  if [ !-e "$SYSROOT/tix/collection.conf" ]; then
+    tix-collection "$SYSROOT" create --platform=$HOST --prefix= --generation=2
+  fi
+fi
 
 # Detect all packages.
 get_all_packages() {
diff --git a/build-aux/clean-ports.sh b/build-aux/clean-ports.sh
index f76b9b89..aa27ef8a 100755
--- a/build-aux/clean-ports.sh
+++ b/build-aux/clean-ports.sh
@@ -34,19 +34,26 @@ get_all_packages() {
 
 # Clean all the packages.
 for PACKAGE in $(get_all_packages); do
+  SOURCE_PACKAGE=$( (SOURCE_PACKAGE= &&
+                     . $SORTIX_PORTS_DIR/$PACKAGE/$PACKAGE.info &&
+                     echo "$SOURCE_PACKAGE") )
   DEVELOPMENT=$( (DEVELOPMENT= &&
                   . $SORTIX_PORTS_DIR/$PACKAGE/$PACKAGE.info &&
                   echo "$DEVELOPMENT") )
   if [ -e "$SORTIX_PORTS_DIR/$PACKAGE/$PACKAGE.version" -o \
        -e "$SORTIX_PORTS_DIR/$PACKAGE/$PACKAGE.version.new" ]; then
-    tix-build \
-      --sysroot="/" \
-      --host=$HOST \
-      --prefix= \
-      --destination="/" \
-      --start=clean \
-      --end=clean \
-      "$SORTIX_PORTS_DIR/$PACKAGE/$PACKAGE"
+    if [ -z "$SOURCE_PACKAGE" ] ||
+       [ -e "$SORTIX_PORTS_DIR/$SOURCE_PACKAGE/$SOURCE_PACKAGE" ]; then
+      tix-build \
+        --sysroot="/" \
+        --host=$HOST \
+        --prefix= \
+        --destination="/" \
+        --start=clean \
+        --end=clean \
+        ${SOURCE_PACKAGE:+--source-package "$SORTIX_PORTS_DIR/$SOURCE_PACKAGE/$SOURCE_PACKAGE"} \
+        "$SORTIX_PORTS_DIR/$PACKAGE/$PACKAGE"
+    fi
     if [ "$DEVELOPMENT" = true ]; then
       case "$SORTIX_PORTS_DIR/$PACKAGE/$PACKAGE.version" in
       *.development)