From 91a19780bae5b4961cb91f6c1267e688962edcfd Mon Sep 17 00:00:00 2001
From: Emery Hemingway <ehmry@posteo.net>
Date: Wed, 24 Apr 2019 16:32:36 +0200
Subject: [PATCH] Tup refactor, fix package Make rules

---
 Tupfile           | 2 +-
 errata/pkg.mk.awk | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Tupfile b/Tupfile
index fcfd69b..03b6681 100644
--- a/Tupfile
+++ b/Tupfile
@@ -25,7 +25,7 @@ SHORT_SUM = b2sum -l24
 : $(DEPOT_DIR)/<packages> |> ^ generate package version sed script^ \
 	for d in `dirname %<packages> | tr ' ' '\n' | sort -u`; do \
 		echo $d/`cat $d/.ARCHIVES $d/runtime | $(SHORT_SUM)` | awk -F '/' \
-			'{print "s|local/pkg/"$4"/current|@(PUBLIC_USER)/pkg/"$4"/"substr($6,0,6)"|"}' >> %o; \
+			'{print "s|local/pkg/"$3"/current|@(PUBLIC_USER)/pkg/"$3"/"substr($5,0,6)"|"}' >> %o; \
 	done \
 |> $(PKG_SED_FILE)
 	# Generate sed commands for replacing package versions
diff --git a/errata/pkg.mk.awk b/errata/pkg.mk.awk
index 67d99b9..b5104f6 100644
--- a/errata/pkg.mk.awk
+++ b/errata/pkg.mk.awk
@@ -4,7 +4,7 @@
 
 { print "all: " tar ".sig" }
 
-{ print tar": depot/local/pkg/"$6"/current/.ARCHIVES" }
+{ print tar": depot/pkg/"$6"/current/.ARCHIVES" }
 { print "	@echo tar  $@" }
 { print "	@mkdir -p $(dir $@) "ver }
 { print "	@sed -f pkg.sed $< > "ver"/archives" }