===================================================================
RCS file: /cvs/openbsd/update_openbsd/update_openbsd,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- openbsd/update_openbsd/update_openbsd	2008/10/11 23:14:25	1.6
+++ openbsd/update_openbsd/update_openbsd	2008/10/11 23:19:52	1.7
@@ -1,10 +1,6 @@
 #!/bin/sh
-# $RedRiver: update_openbsd,v 1.5 2008/10/11 22:12:33 andrew Exp $
+# $RedRiver: update_openbsd,v 1.6 2008/10/11 22:14:25 andrew Exp $
 
-SYSMERGE=/usr/sbin/sysmerge
-MIRROR=ftp://ftp.openbsd.org/pub/OpenBSD
-FTP_CMD='ftp -V'
-
 if [ -e /etc/update_openbsd.conf ]; then
     . /etc/update_openbsd.conf
 fi
@@ -13,6 +9,16 @@
     . ${HOME}/.update_openbsdrc
 fi
 
+MIRROR=${MIRROR:=ftp://ftp.openbsd.org/pub/OpenBSD}
+FTP_CMD=${FTP_CMD:=ftp -V}
+PKG_PATH=${PKG_PATH:=/usr/ports/packages/`machine`/all/:${MIRROR}/`uname -r`/packages/`machine`/}
+
+DESTDIR=${DESTDIR:=/}
+SYSMERGE=${SYSMERGE:=/usr/sbin/sysmerge}
+if [ ! -e $SYSMERGE ]; then
+    SYSMERGE=
+fi
+
 installed_sets() {
     local misc=/usr/share/doc/README
     local man=/usr/share/man/cat1/intro.0
@@ -36,7 +42,9 @@
         fi
     done
 }
+INSTALLED_SETS=${INSTALLED_SETS:=`installed_sets`}
 
+
 set_version() {
     CUR_VER=`uname -r`
     NEW_VER=`dc -e "$CUR_VER 0.1 + p"`
@@ -309,16 +317,6 @@
         fi
     fi
 }
-
-DESTDIR=${DESTDIR:=/}
-PKG_PATH=${PKG_PATH:=/usr/ports/packages/`machine`/all/:${MIRROR}/`uname -r`/packages/`machine`/}
-INSTALLED_SETS=${INSTALLED_SETS:=`installed_sets`}
-
-if [ X"" != X"$SYSMERGE" ]; then
-    if [ ! -e $SYSMERGE ]; then
-        SYSMERGE=
-    fi
-fi
 
 set_version