Back out lots of the last commit that was committed by accident.

(It's my test rig for some CVSUP,SUP code).

Spotted by:	Michael G. Petry <petry@NetMasters.Com>

1 files changed, 0 insertions, 36 deletions

diff --git a/Makefile.inc1 b/Makefile.inc1
index f2d7397..e7f4749 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -114,46 +114,12 @@ CLEANDIR=	clean cleandepend
 CLEANDIR=	cleandir
 .endif
 
-CVSUP_COLLECTION_BASE?=	src-all
-CVSUP_BRANCH_BASE?=	.
-CVSUP_COLLECTION_PORTS?=ports-all
-CVSUP_BRANCH_PORTS?=	.
-CVSUP_COLLECTION_DOC?=	doc-all
-CVSUP_BRANCH_DOC?=	.
-CVSUP_COMPRESS?=	yes
-CVSUP_BASE?=		/usr
-CVSUP_PREFIX?=		/usr
-
-CVSUP_HOST?=		cvsup.freebsd.org
-
 CVS?=		cvs
 SUP?=		/usr/local/bin/cvsup
 SUPFLAGS?=	-g -L 2 -P -
 .if defined(SUPHOST)
 SUPFLAGS+=	-h ${SUPHOST}
 .endif
-.if defined(CVSUP_COMPRESS)
-SUPFLAGS+=	-z
-.else
-SUPFLAGS+=	-Z
-.endif
-.if !defined(CVSUP_HOST)
-	echo "Please set CVSUP_HOST to your nearest cvsup mirror."
-	exit
-.endif
-
-SUPFILE?=	/usr/share/examples/cvsup/standard-supfile
-SUPFILE1?=	/usr/share/examples/cvsup/secure-supfile
-SUPFILE2?=	/usr/share/examples/cvsup/secure-supfile
-PORTSSUPFILE?=	/usr/share/examples/cvsup/ports-supfile
-DOCSUPFILE?=	/usr/share/examples/cvsup/doc-supfile
-
-foo:
-	echo "*default base=${CVSUP_BASE}"
-	echo "*default prefix=${CVSUP_PREFIX}"
-	echo "*default release=cvs tag=${CVSUP_BRANCH_FOO}"
-	echo "*default delete use-rel-suffix"
-	echo "${CVSUP_COLLECTION_FOO}"
 
 MAKEOBJDIRPREFIX?=	/usr/obj
 TARGET_ARCH?=	${MACHINE_ARCH}
@@ -509,8 +475,6 @@ kernel: buildkernel installkernel
 # Update the source tree, by running sup and/or running cvs to update to the
 # latest copy.
 #
-SUP_UPDATE=1
-SUP=echo
 update:
 .if defined(SUP_UPDATE)
 	@echo "--------------------------------------------------------------"