From 27da732b259708371c883fe26c1c567095760a20 Mon Sep 17 00:00:00 2001
From: espie <espie@openbsd.org>
Date: Thu, 29 Jun 2017 16:51:35 +0000
Subject: [PATCH] put SYSTEM_SWAP_DEP out of its misery, it died in 1997, along
 with config.old "go for it" deraadt@

---
 sys/arch/alpha/conf/Makefile.alpha       | 4 ++--
 sys/arch/amd64/conf/Makefile.amd64       | 4 ++--
 sys/arch/arm64/conf/Makefile.arm64       | 4 ++--
 sys/arch/armv7/conf/Makefile.armv7       | 4 ++--
 sys/arch/hppa/conf/Makefile.hppa         | 4 ++--
 sys/arch/i386/conf/Makefile.i386         | 4 ++--
 sys/arch/landisk/conf/Makefile.landisk   | 4 ++--
 sys/arch/loongson/conf/Makefile.loongson | 4 ++--
 sys/arch/luna88k/conf/Makefile.luna88k   | 4 ++--
 sys/arch/macppc/conf/Makefile.macppc     | 4 ++--
 sys/arch/octeon/conf/Makefile.octeon     | 4 ++--
 sys/arch/sgi/conf/Makefile.sgi           | 4 ++--
 sys/arch/socppc/conf/Makefile.socppc     | 4 ++--
 sys/arch/sparc64/conf/Makefile.sparc64   | 4 ++--
 14 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/sys/arch/alpha/conf/Makefile.alpha b/sys/arch/alpha/conf/Makefile.alpha
index a5b73525bfd..a28d475768b 100644
--- a/sys/arch/alpha/conf/Makefile.alpha
+++ b/sys/arch/alpha/conf/Makefile.alpha
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.alpha,v 1.103 2017/06/25 14:02:21 deraadt Exp $
+#	$OpenBSD: Makefile.alpha,v 1.104 2017/06/29 16:51:35 espie Exp $
 
 # For instructions on building kernels consult the config(8) and options(4)
 # manual pages.
@@ -127,7 +127,7 @@ makegap.sh:
 gap.o:	Makefile makegap.sh
 	sh makegap.sh 0x00000000
 
-vers.o: ${SYSTEM_DEP:Ngap.o} ${SYSTEM_SWAP_DEP}
+vers.o: ${SYSTEM_DEP:Ngap.o}
 	sh $S/conf/newvers.sh
 	${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} -c vers.c
 
diff --git a/sys/arch/amd64/conf/Makefile.amd64 b/sys/arch/amd64/conf/Makefile.amd64
index fd831d3c6ff..9234ad69f20 100644
--- a/sys/arch/amd64/conf/Makefile.amd64
+++ b/sys/arch/amd64/conf/Makefile.amd64
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.amd64,v 1.86 2017/06/25 14:02:23 deraadt Exp $
+#	$OpenBSD: Makefile.amd64,v 1.87 2017/06/29 16:51:35 espie Exp $
 
 # For instructions on building kernels consult the config(8) and options(4)
 # manual pages.
@@ -130,7 +130,7 @@ makegap.sh:
 gap.o:	Makefile makegap.sh
 	sh makegap.sh 0xcccccccc
 
-vers.o: ${SYSTEM_DEP:Ngap.o} ${SYSTEM_SWAP_DEP}
+vers.o: ${SYSTEM_DEP:Ngap.o}
 	sh $S/conf/newvers.sh
 	${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} -c vers.c
 
diff --git a/sys/arch/arm64/conf/Makefile.arm64 b/sys/arch/arm64/conf/Makefile.arm64
index 582a2564f2e..0a6cfc4dc84 100644
--- a/sys/arch/arm64/conf/Makefile.arm64
+++ b/sys/arch/arm64/conf/Makefile.arm64
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.arm64,v 1.17 2017/06/29 05:40:37 deraadt Exp $
+#	$OpenBSD: Makefile.arm64,v 1.18 2017/06/29 16:51:35 espie Exp $
 
 # For instructions on building kernels consult the config(8) and options(4)
 # manual pages.
@@ -133,7 +133,7 @@ makegap.sh:
 gap.o:	Makefile makegap.sh gapdummy.o
 	sh makegap.sh 0xd4d4d4d4 gapdummy.o
 
-vers.o: ${SYSTEM_DEP:Ngap.o} ${SYSTEM_SWAP_DEP}
+vers.o: ${SYSTEM_DEP:Ngap.o}
 	sh $S/conf/newvers.sh
 	${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} -c vers.c
 
diff --git a/sys/arch/armv7/conf/Makefile.armv7 b/sys/arch/armv7/conf/Makefile.armv7
index 1c0d7df9740..3d874f06593 100644
--- a/sys/arch/armv7/conf/Makefile.armv7
+++ b/sys/arch/armv7/conf/Makefile.armv7
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.armv7,v 1.30 2017/06/29 13:04:09 deraadt Exp $
+#	$OpenBSD: Makefile.armv7,v 1.31 2017/06/29 16:51:35 espie Exp $
 
 # For instructions on building kernels consult the config(8) and options(4)
 # manual pages.
@@ -132,7 +132,7 @@ makegap.sh:
 gap.o:	Makefile makegap.sh gapdummy.o
 	sh makegap.sh 0xffffffff gapdummy.o
 
-vers.o: ${SYSTEM_DEP:Ngap.o} ${SYSTEM_SWAP_DEP}
+vers.o: ${SYSTEM_DEP:Ngap.o}
 	sh $S/conf/newvers.sh
 	${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} -c vers.c
 
diff --git a/sys/arch/hppa/conf/Makefile.hppa b/sys/arch/hppa/conf/Makefile.hppa
index dbe32e70f70..1adf3ed9d69 100644
--- a/sys/arch/hppa/conf/Makefile.hppa
+++ b/sys/arch/hppa/conf/Makefile.hppa
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.hppa,v 1.97 2017/06/25 14:02:23 deraadt Exp $
+#	$OpenBSD: Makefile.hppa,v 1.98 2017/06/29 16:51:35 espie Exp $
 
 # For instructions on building kernels consult the config(8) and options(4)
 # manual pages.
@@ -135,7 +135,7 @@ makegap.sh:
 gap.o:	Makefile makegap.sh
 	sh makegap.sh 0x00000000	# BREAK 0,0 -> trap
 
-vers.o: ${SYSTEM_DEP:Ngap.o} ${SYSTEM_SWAP_DEP}
+vers.o: ${SYSTEM_DEP:Ngap.o}
 	sh $S/conf/newvers.sh
 	${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} -c vers.c
 
diff --git a/sys/arch/i386/conf/Makefile.i386 b/sys/arch/i386/conf/Makefile.i386
index 02707bc0778..94dd6994fb8 100644
--- a/sys/arch/i386/conf/Makefile.i386
+++ b/sys/arch/i386/conf/Makefile.i386
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.i386,v 1.112 2017/06/25 14:02:23 deraadt Exp $
+#	$OpenBSD: Makefile.i386,v 1.113 2017/06/29 16:51:35 espie Exp $
 
 # For instructions on building kernels consult the config(8) and options(4)
 # manual pages.
@@ -131,7 +131,7 @@ makegap.sh:
 gap.o:	Makefile makegap.sh
 	sh makegap.sh 0xcccccccc
 
-vers.o: ${SYSTEM_DEP:Ngap.o} ${SYSTEM_SWAP_DEP}
+vers.o: ${SYSTEM_DEP:Ngap.o}
 	sh $S/conf/newvers.sh
 	${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} -c vers.c
 
diff --git a/sys/arch/landisk/conf/Makefile.landisk b/sys/arch/landisk/conf/Makefile.landisk
index 94e7b09075b..fa91da42118 100644
--- a/sys/arch/landisk/conf/Makefile.landisk
+++ b/sys/arch/landisk/conf/Makefile.landisk
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.landisk,v 1.69 2017/06/25 14:02:23 deraadt Exp $
+#	$OpenBSD: Makefile.landisk,v 1.70 2017/06/29 16:51:35 espie Exp $
 
 # For instructions on building kernels consult the config(8) and options(4)
 # manual pages.
@@ -127,7 +127,7 @@ makegap.sh:
 gap.o:	Makefile makegap.sh
 	sh makegap.sh 0xc3c3c3c3
 
-vers.o: ${SYSTEM_DEP:Ngap.o} ${SYSTEM_SWAP_DEP}
+vers.o: ${SYSTEM_DEP:Ngap.o}
 	sh $S/conf/newvers.sh
 	${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} -c vers.c
 
diff --git a/sys/arch/loongson/conf/Makefile.loongson b/sys/arch/loongson/conf/Makefile.loongson
index 762d8065a3d..83c83ade9b4 100644
--- a/sys/arch/loongson/conf/Makefile.loongson
+++ b/sys/arch/loongson/conf/Makefile.loongson
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.loongson,v 1.62 2017/06/25 14:02:23 deraadt Exp $
+#	$OpenBSD: Makefile.loongson,v 1.63 2017/06/29 16:51:35 espie Exp $
 
 # For instructions on building kernels consult the config(8) and options(4)
 # manual pages.
@@ -136,7 +136,7 @@ makegap.sh:
 gap.o:	Makefile makegap.sh gapdummy.o
 	sh makegap.sh 0xefefefef gapdummy.o
 
-vers.o: ${SYSTEM_DEP:Ngap.o} ${SYSTEM_SWAP_DEP}
+vers.o: ${SYSTEM_DEP:Ngap.o}
 	sh $S/conf/newvers.sh
 	${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} -c vers.c
 
diff --git a/sys/arch/luna88k/conf/Makefile.luna88k b/sys/arch/luna88k/conf/Makefile.luna88k
index 6a62f5a58da..c426fa42271 100644
--- a/sys/arch/luna88k/conf/Makefile.luna88k
+++ b/sys/arch/luna88k/conf/Makefile.luna88k
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.luna88k,v 1.70 2017/06/11 22:51:21 deraadt Exp $
+#	$OpenBSD: Makefile.luna88k,v 1.71 2017/06/29 16:51:35 espie Exp $
 
 # For instructions on building kernels consult the config(8) and options(4)
 # manual pages.
@@ -120,7 +120,7 @@ ioconf.o: ioconf.c
 ld.script: ${_machdir}/conf/ld.script
 	cp ${_machdir}/conf/ld.script $@
 
-vers.o: ${SYSTEM_DEP:Ngap.o} ${SYSTEM_SWAP_DEP}
+vers.o: ${SYSTEM_DEP:Ngap.o}
 	sh $S/conf/newvers.sh
 	${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} -c vers.c
 
diff --git a/sys/arch/macppc/conf/Makefile.macppc b/sys/arch/macppc/conf/Makefile.macppc
index 63a48293426..5f9766063b1 100644
--- a/sys/arch/macppc/conf/Makefile.macppc
+++ b/sys/arch/macppc/conf/Makefile.macppc
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.macppc,v 1.86 2017/06/27 04:22:13 deraadt Exp $
+#	$OpenBSD: Makefile.macppc,v 1.87 2017/06/29 16:51:35 espie Exp $
 
 # For instructions on building kernels consult the config(8) and options(4)
 # manual pages.
@@ -127,7 +127,7 @@ makegap.sh:
 gap.o:	Makefile makegap.sh
 	sh makegap.sh 0x00000000	# gauranteed illegal
 
-vers.o: ${SYSTEM_DEP:Ngap.o} ${SYSTEM_SWAP_DEP}
+vers.o: ${SYSTEM_DEP:Ngap.o}
 	sh $S/conf/newvers.sh
 	${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} -c vers.c
 
diff --git a/sys/arch/octeon/conf/Makefile.octeon b/sys/arch/octeon/conf/Makefile.octeon
index 3de82942c60..39a9c825bee 100644
--- a/sys/arch/octeon/conf/Makefile.octeon
+++ b/sys/arch/octeon/conf/Makefile.octeon
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.octeon,v 1.38 2017/06/25 14:02:23 deraadt Exp $
+#	$OpenBSD: Makefile.octeon,v 1.39 2017/06/29 16:51:35 espie Exp $
 
 # For instructions on building kernels consult the config(8) and options(4)
 # manual pages.
@@ -137,7 +137,7 @@ makegap.sh:
 gap.o:	Makefile makegap.sh gapdummy.o
 	sh makegap.sh 0xefefefef gapdummy.o
 
-vers.o: ${SYSTEM_DEP:Ngap.o} ${SYSTEM_SWAP_DEP}
+vers.o: ${SYSTEM_DEP:Ngap.o}
 	sh $S/conf/newvers.sh
 	${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} -c vers.c
 
diff --git a/sys/arch/sgi/conf/Makefile.sgi b/sys/arch/sgi/conf/Makefile.sgi
index b9ede557153..c0a5c6d9c9b 100644
--- a/sys/arch/sgi/conf/Makefile.sgi
+++ b/sys/arch/sgi/conf/Makefile.sgi
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.sgi,v 1.86 2017/06/25 14:02:23 deraadt Exp $
+#	$OpenBSD: Makefile.sgi,v 1.87 2017/06/29 16:51:35 espie Exp $
 
 # For instructions on building kernels consult the config(8) and options(4)
 # manual pages.
@@ -136,7 +136,7 @@ makegap.sh:
 gap.o:	Makefile makegap.sh gapdummy.o
 	sh makegap.sh 0xefefefef gapdummy.o
 
-vers.o: ${SYSTEM_DEP:Ngap.o} ${SYSTEM_SWAP_DEP}
+vers.o: ${SYSTEM_DEP:Ngap.o}
 	sh $S/conf/newvers.sh
 	${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} -c vers.c
 
diff --git a/sys/arch/socppc/conf/Makefile.socppc b/sys/arch/socppc/conf/Makefile.socppc
index 5f036159342..db46fd816ab 100644
--- a/sys/arch/socppc/conf/Makefile.socppc
+++ b/sys/arch/socppc/conf/Makefile.socppc
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.socppc,v 1.53 2017/06/11 22:51:21 deraadt Exp $
+#	$OpenBSD: Makefile.socppc,v 1.54 2017/06/29 16:51:35 espie Exp $
 
 # For instructions on building kernels consult the config(8) and options(4)
 # manual pages.
@@ -113,7 +113,7 @@ mcount.o: $S/lib/libkern/mcount.c Makefile
 ioconf.o: ioconf.c
 	${NORMAL_C}
 
-vers.o: ${SYSTEM_DEP:Ngap.o} ${SYSTEM_SWAP_DEP}
+vers.o: ${SYSTEM_DEP:Ngap.o}
 	sh $S/conf/newvers.sh
 	${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} -c vers.c
 
diff --git a/sys/arch/sparc64/conf/Makefile.sparc64 b/sys/arch/sparc64/conf/Makefile.sparc64
index 1a3de321cac..e9c8732b755 100644
--- a/sys/arch/sparc64/conf/Makefile.sparc64
+++ b/sys/arch/sparc64/conf/Makefile.sparc64
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.sparc64,v 1.89 2017/06/25 14:02:23 deraadt Exp $
+#	$OpenBSD: Makefile.sparc64,v 1.90 2017/06/29 16:51:35 espie Exp $
 
 # For instructions on building kernels consult the config(8) and options(4)
 # manual pages.
@@ -125,7 +125,7 @@ makegap.sh:
 gap.o:	Makefile makegap.sh
 	sh makegap.sh 0x00000000
 
-vers.o: ${SYSTEM_DEP:Ngap.o} ${SYSTEM_SWAP_DEP}
+vers.o: ${SYSTEM_DEP:Ngap.o}
 	sh $S/conf/newvers.sh
 	${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} -c vers.c
 
-- 
2.20.1