===================================================================
RCS file: /cvs/openbsd/update_openbsd/release.sh,v
retrieving revision 1.1
retrieving revision 1.6
diff -u -r1.1 -r1.6
--- openbsd/update_openbsd/release.sh	2006/10/11 00:41:42	1.1
+++ openbsd/update_openbsd/release.sh	2006/11/07 17:09:19	1.6
@@ -1,5 +1,5 @@
 #!/bin/sh
-#
+# $RedRiver: release.sh,v 1.5 2006/10/13 18:18:51 andrew Exp $
 # Copyright (c) 2002 - 2006, FenderQ
 # All rights reserved.
 #
@@ -36,24 +36,31 @@
 # SEE ALSO release(8)
 #
 
-DEST="/home/destdir"
-RELEASE="/home/releasedir"
-CVSTAG="OPENBSD_3_9"
+DEST="/usr/dest"
+RELEASE="/usr/release"
+CVSTAG=`uname -r | awk '{ sub("\\\.","_"); print "OPENBSD_" $0 }'`
+#SOURCES="src ports XF4"
+#SOURCES="src ports"
+SOURCES="src XF4"
 
 # Anonymous CVS - http://www.openbsd.org/anoncvs.html
-CVSROOT="anoncvs@openbsd.sunsite.ualberta.ca:/cvs"
+CVSROOT="anoncvs@anoncvs3.usa.openbsd.org:/cvs"
 export CVSROOT
 
 install_sources() {
 	echo "********** Install sources **********"
 	cd /usr
-	rm -rf src/* XF4 ports
-	cvs -q -z6 checkout -r$CVSTAG -P src XF4 ports
+	for d in $SOURCES; do
+		rm -rf $d/*
+		cvs -q -z6 checkout -r$CVSTAG -P $d
+	done
 }
 
 update_sources() {
 	echo "********** Update sources **********"
-	cd /usr && cvs -q -z6 update -r$CVSTAG -Pd src XF4 ports
+	for d in $SOURCES; do
+		cd /usr && cvs -q -z6 update -r$CVSTAG -Pd $d
+	done
 }
 
 build_kernel() {
@@ -77,7 +84,7 @@
 	echo "********** Make and validate the system release **********"
 	cd /usr/src/distrib/crunch && make obj depend all install
 	export DESTDIR=$DEST RELEASEDIR=$RELEASE
-	rm -rf $DESTDIR
+	rm -rf $DESTDIR/*
 	mkdir -p $DESTDIR $RELEASEDIR
 	cd /usr/src/etc && nice make release
 	cd /usr/src/distrib/sets && sh checkflist
@@ -96,15 +103,16 @@
 make_release_XF4() {
 	echo "********** Make and validate the XF4 release **********"
 	export DESTDIR=$DEST RELEASEDIR=$RELEASE
-	rm -rf $DESTDIR
+	rm -rf $DESTDIR/*
 	mkdir -p $DESTDIR $RELEASEDIR
-	nice make release
+	cd /usr/Xbuild && nice make release
+	cd /usr/Xbuild/distrib/sets && sh checkflist
 	unset DESTDIR RELEASEDIR
 }
 
 clean_everything() {
 	echo "********** Clean everything **********"
-	rm -rf /usr/obj/* $DEST /usr/Xbuild
+	rm -rf /usr/obj/* $DEST/* /usr/Xbuild
 }
 
 usage() {