From bedd1da4f697c509582246e285e628844e77e140 Mon Sep 17 00:00:00 2001
From: Cameron Katri <me@cameronkatri.com>
Date: Tue, 13 Apr 2021 15:33:30 -0400
Subject: Simplify syncing with upstream

---
 Makefile        | 16 +++++++++++++++-
 upstream-commit |  1 +
 2 files changed, 16 insertions(+), 1 deletion(-)
 create mode 100644 upstream-commit

diff --git a/Makefile b/Makefile
index b3c9d43e..fbb0be58 100644
--- a/Makefile
+++ b/Makefile
@@ -28,7 +28,21 @@ config.h:
 	@echo "#define LOCALSTATEDIR \"$(LOCALSTATEDIR)\"" >> config.h
 	@echo "#define SYSCONFDIR \"$(SYSCONFDIR)\"" >> config.h
 
+update:
+	TEMP=$$(mktemp -d); \
+	cd ~/Documents/BSD/NetBSD; \
+	git format-patch -o $$TEMP $(shell cat upstream-commit) games; \
+	git rev-list HEAD -1 games/ > $(ROOT)/upstream-commit; \
+	cd $(ROOT); \
+	for patch in $$TEMP/*.patch; do \
+		if [ "$$(filterdiff -x '*/Makefile' --strip=1 $$patch --clean)" = "" ]; then \
+			echo "Skipping $$(basename $$patch) because it's empty"; \
+		else \
+			filterdiff -x '*/Makefile' --strip=1 $$patch | git am; \
+		fi; \
+	done
+
 clean:
 	rm -f config.h
 
-.PHONY: $(TOPTARGETS) $(SUBDIR)
+.PHONY: $(TOPTARGETS) $(SUBDIR) update
diff --git a/upstream-commit b/upstream-commit
new file mode 100644
index 00000000..f9e4e775
--- /dev/null
+++ b/upstream-commit
@@ -0,0 +1 @@
+349df3fc42d56c343bcc12b6c33784a3492395c4
-- 
cgit v1.2.3-56-ge451