From 85a241a8d4513bfa704af2d5d0c0f2e785437ff9 Mon Sep 17 00:00:00 2001
From: Jonas 'Sortie' Termansen <sortie@maxsi.org>
Date: Sat, 29 Jan 2022 12:02:14 +0100
Subject: [PATCH] fixup! Add ports to the Sortix repository.

---
 ports/nyancat/nyancat.patch | 22 +++++++++++-----------
 ports/xargs/xargs.patch     |  2 +-
 portsify.sh                 |  2 +-
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/ports/nyancat/nyancat.patch b/ports/nyancat/nyancat.patch
index a047b968..f2386e5e 100644
--- a/ports/nyancat/nyancat.patch
+++ b/ports/nyancat/nyancat.patch
@@ -1,6 +1,6 @@
 diff --no-dereference -Naur -- nyancat.normalized/Makefile nyancat.srctix/Makefile
---- nyancat.normalized/Makefile	2018-08-18 16:40:20.000000000 +0300
-+++ nyancat.srctix/Makefile	2022-01-26 23:52:37.586129412 +0200
+--- nyancat.normalized/Makefile	2018-08-18 15:40:20.000000000 +0200
++++ nyancat.srctix/Makefile	2020-02-22 23:53:15.702136508 +0100
 @@ -1,39 +1,26 @@
 -package = nyancat
 -version = 1.5.2
@@ -35,9 +35,9 @@ diff --no-dereference -Naur -- nyancat.normalized/Makefile nyancat.srctix/Makefi
 -	cd $(distdir) && $(MAKE) clean
 -	rm -rf $(distdir)
 -	@echo "*** Package $(distdir).tar.gz is ready for distribution."
-+include ../../../build-aux/compiler.mak
-+include ../../../build-aux/version.mak
-+include ../../../build-aux/dirs.mak
++include ../../build-aux/compiler.mak
++include ../../build-aux/version.mak
++include ../../build-aux/dirs.mak
 +
 +OPTLEVEL?=-g -O2
 +CFLAGS?=$(OPTLEVEL)
@@ -65,8 +65,8 @@ diff --no-dereference -Naur -- nyancat.normalized/Makefile nyancat.srctix/Makefi
 +clean:
 +	rm -f src/nyancat src/nyancat.o
 diff --no-dereference -Naur -- nyancat.normalized/src/Makefile nyancat.srctix/src/Makefile
---- nyancat.normalized/src/Makefile	2018-08-18 16:40:20.000000000 +0300
-+++ nyancat.srctix/src/Makefile	1970-01-01 02:00:00.000000000 +0200
+--- nyancat.normalized/src/Makefile	2018-08-18 15:40:20.000000000 +0200
++++ nyancat.srctix/src/Makefile	1970-01-01 01:00:00.000000000 +0100
 @@ -1,20 +0,0 @@
 -OBJECTS = nyancat.o
 -
@@ -89,8 +89,8 @@ diff --no-dereference -Naur -- nyancat.normalized/src/Makefile nyancat.srctix/sr
 -
 -.PHONY: all clean check
 diff --no-dereference -Naur -- nyancat.normalized/src/nyancat.c nyancat.srctix/src/nyancat.c
---- nyancat.normalized/src/nyancat.c	2018-08-18 16:40:20.000000000 +0300
-+++ nyancat.srctix/src/nyancat.c	2022-01-26 23:47:11.370298351 +0200
+--- nyancat.normalized/src/nyancat.c	2018-08-18 15:40:20.000000000 +0200
++++ nyancat.srctix/src/nyancat.c	2020-02-23 16:27:36.461123269 +0100
 @@ -54,6 +54,7 @@
  #define _BSD_SOURCE
  #define _DEFAULT_SOURCE
@@ -118,8 +118,8 @@ diff --no-dereference -Naur -- nyancat.normalized/src/nyancat.c nyancat.srctix/s
  		/* Reset the last color so that the escape sequences rewrite */
  		last = 0;
 diff --no-dereference -Naur -- nyancat.normalized/tixbuildinfo nyancat.srctix/tixbuildinfo
---- nyancat.normalized/tixbuildinfo	1970-01-01 02:00:00.000000000 +0200
-+++ nyancat.srctix/tixbuildinfo	2022-01-26 23:47:11.370298351 +0200
+--- nyancat.normalized/tixbuildinfo	1970-01-01 01:00:00.000000000 +0100
++++ nyancat.srctix/tixbuildinfo	2017-02-12 00:52:20.285170797 +0100
 @@ -0,0 +1,5 @@
 +tix.version=1
 +tix.class=srctix
diff --git a/ports/xargs/xargs.patch b/ports/xargs/xargs.patch
index 02c888c1..ba9eb089 100644
--- a/ports/xargs/xargs.patch
+++ b/ports/xargs/xargs.patch
@@ -1,6 +1,6 @@
 diff --no-dereference -Naur xargs.normalized/Makefile xargs.srctix/Makefile
 --- xargs.normalized/Makefile	1970-01-01 01:00:00.000000000 +0100
-+++ xargs.srctix/Makefile	2021-11-29 23:41:31.061600956 +0100
++++ xargs.srctix/Makefile	2022-01-29 11:59:04.820848566 +0100
 @@ -0,0 +1,25 @@
 +include ../../../build-aux/compiler.mak
 +include ../../../build-aux/version.mak
diff --git a/portsify.sh b/portsify.sh
index 42d2eb9b..123dcb7d 100755
--- a/portsify.sh
+++ b/portsify.sh
@@ -15,7 +15,7 @@ for port in $ports; do
   case "$port" in quake|quake-shareware) continue;; esac
   # TODO: Publish imported OpenBSD stuff as Sortix provided tarballs.
   case "$port" in
-  cut|ed|nyancat|video-player|xargs) no_upstream=true;;
+  cut|ed|video-player|xargs) no_upstream=true;;
   *) no_upstream=false;;
   esac
   if [ -e "$portsdir/$port/$port.info" ]; then