The rc files have been repo-copied to a separate subdirectory.

10 files changed, 15 insertions, 104 deletions

diff --git a/tools/tools/tinderbox/Makefile b/tools/tools/tinderbox/Makefile
index 837c58a..a20a32c 100644
--- a/tools/tools/tinderbox/Makefile
+++ b/tools/tools/tinderbox/Makefile
@@ -10,16 +10,6 @@ MANOWN		?= ${USER}
 MANGRP		?= ${USER}
 MAN		 = tbmaster.1 tinderbox.1
 
-SUBDIR		 = www
-
-RCFILES		 = default.rc releng_4.rc current.rc experimental.rc
-RCFILES		+= ada.rc dsa.rc dwp.rc stanley.rc
-ETCDIR		?= ${HOME}/etc
-ETCOWN		?= ${USER}
-ETCGRP		?= ${USER}
-
-beforeinstall:
-	(cd ${.CURDIR} &&\
-	    ${INSTALL} -m 0644 -o ${ETCOWN} -g ${ETCGRP} ${RCFILES} ${ETCDIR})
+SUBDIR		 = etc www
 
 .include <bsd.prog.mk>
diff --git a/tools/tools/tinderbox/ada.rc b/tools/tools/tinderbox/ada.rc
deleted file mode 100644
index 566a75a..0000000
--- a/tools/tools/tinderbox/ada.rc
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# Tinderbox setup for ada.des.no
-#
-# $FreeBSD$
-#
-
-comment		= Tinderbox development
-branches	= RELENG_4
-targets		= update, world, lint, release
-platforms	= i386
diff --git a/tools/tools/tinderbox/current.rc b/tools/tools/tinderbox/current.rc
deleted file mode 100644
index 6a8a7c2..0000000
--- a/tools/tools/tinderbox/current.rc
+++ /dev/null
@@ -1,9 +0,0 @@
-#
-# CURRENT tinderbox setup
-#
-# $FreeBSD$
-#
-
-branches	= CURRENT
-platforms	= alpha, amd64, i386/i386, i386/pc98, ia64, sparc64
-recipient	= current@freebsd.org,%%arch%%@freebsd.org
diff --git a/tools/tools/tinderbox/default.rc b/tools/tools/tinderbox/default.rc
deleted file mode 100644
index 6477064..0000000
--- a/tools/tools/tinderbox/default.rc
+++ /dev/null
@@ -1,21 +0,0 @@
-#
-# Tinderbox defaults
-#
-# $FreeBSD$
-#
-
-comment		= %%branch%% tinderbox
-
-# Paths
-sandbox		= /home/des/tinderbox
-logdir		= /home/des/public_html
-
-# Tinderbox options
-tinderbox	= /home/des/bin/tinderbox
-options		= --verbose
-targets		= update, world, generic, lint
-
-# Reporting
-sender		= Tinderbox <des+tinderbox@freebsd.org>
-recipient	= des+%%arch%%-%%branch%%@freebsd.org
-subject		= [%%COMMENT%%] failure on %%arch%%/%%machine%%
diff --git a/tools/tools/tinderbox/dsa.rc b/tools/tools/tinderbox/dsa.rc
deleted file mode 100644
index d5dbf91..0000000
--- a/tools/tools/tinderbox/dsa.rc
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# Tinderbox setup for dsa.des.no
-#
-# $FreeBSD$
-#
-
-comment		= Tinderbox development
-branches	= CURRENT
-targets		= update, world, lint, release
-platforms	= alpha
diff --git a/tools/tools/tinderbox/dwp.rc b/tools/tools/tinderbox/dwp.rc
deleted file mode 100644
index c37fdcd..0000000
--- a/tools/tools/tinderbox/dwp.rc
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# Tinderbox setup for dwp.des.no
-#
-# $FreeBSD$
-#
-
-comment		= Tinderbox development
-branches	= CURRENT
-targets		= update, world, lint, release
-platforms	= i386
diff --git a/tools/tools/tinderbox/etc/Makefile b/tools/tools/tinderbox/etc/Makefile
new file mode 100644
index 0000000..b3e3d0b
--- /dev/null
+++ b/tools/tools/tinderbox/etc/Makefile
@@ -0,0 +1,14 @@
+# $FreeBSD$
+
+ETCFILES	 = default.rc releng_4.rc current.rc experimental.rc
+ETCFILES	+= ada.rc dsa.rc dwp.rc stanley.rc
+ETCDIR		?= ${HOME}/etc
+ETCOWN		?= ${USER}
+ETCGRP		?= ${USER}
+
+realinstall:
+.for FILE in ${ETCFILES}
+	${INSTALL} -m0644 -o${ETCOWN} -g${ETCGRP} ${.CURDIR}/${FILE} ${ETCDIR}
+.endfor
+
+.include <bsd.prog.mk>
diff --git a/tools/tools/tinderbox/experimental.rc b/tools/tools/tinderbox/experimental.rc
deleted file mode 100644
index 8396a00..0000000
--- a/tools/tools/tinderbox/experimental.rc
+++ /dev/null
@@ -1,11 +0,0 @@
-#
-# Tinderbox setup for experimental platforms.
-#
-# $FreeBSD$
-#
-
-comment		= Experimental platforms
-branches	= CURRENT
-env		= NOLIBC_R=YES, NOFORTH=YES
-platforms	= powerpc
-options		= --verbose, --verbose
diff --git a/tools/tools/tinderbox/releng_4.rc b/tools/tools/tinderbox/releng_4.rc
deleted file mode 100644
index 542e5db..0000000
--- a/tools/tools/tinderbox/releng_4.rc
+++ /dev/null
@@ -1,9 +0,0 @@
-#
-# RELENG_4 tinderbox setup
-#
-# $FreeBSD$
-#
-
-branches	= RELENG_4
-platforms	= alpha, i386/i386, i386/pc98
-recipient	= stable@freebsd.org,%%arch%%@freebsd.org
diff --git a/tools/tools/tinderbox/stanley.rc b/tools/tools/tinderbox/stanley.rc
deleted file mode 100644
index ddabcbb..0000000
--- a/tools/tools/tinderbox/stanley.rc
+++ /dev/null
@@ -1,13 +0,0 @@
-#
-# Tinderbox setup for stanley.rtp.freebsd.org
-#
-# $FreeBSD$
-#
-
-comment		= Tinderbox stress test
-sandbox		= /vol/vol1/users/des/tinderbox
-logdir		= /home/des/public_html/stanley
-branches	= CURRENT
-targets		= update, world, generic, lint
-platforms	= alpha, amd64, i386/i386, i386/pc98, ia64, powerpc, sparc64
-recipient	=