===================================================================
RCS file: /cvs/openbsd/update_openbsd/update_openbsd,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- openbsd/update_openbsd/update_openbsd	2008/11/19 22:35:56	1.13
+++ openbsd/update_openbsd/update_openbsd	2008/11/19 22:38:00	1.14
@@ -1,22 +1,6 @@
 #!/bin/sh
-# $RedRiver: update_openbsd,v 1.12 2008/11/12 06:07:42 andrew Exp $
+# $RedRiver: update_openbsd,v 1.13 2008/11/19 22:35:56 andrew Exp $
 
-if [ -e /etc/update_openbsd.conf ]; then
-    . /etc/update_openbsd.conf
-fi
-
-if [ -e ${HOME}/.update_openbsdrc ]; then
-    . ${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}
-FORCE_DIR=${FORCE_DIR:=No}
-
 installed_sets() {
     local misc=/usr/share/doc/README
     local man=/usr/share/man/cat1/intro.0
@@ -40,7 +24,6 @@
         fi
     done
 }
-INSTALLED_SETS=${INSTALLED_SETS:=`installed_sets`}
 
 sets_exist () {
         local _proto=${FTP%%://*}
@@ -358,6 +341,24 @@
         fi
     fi
 }
+
+if [ -e /etc/update_openbsd.conf ]; then
+    . /etc/update_openbsd.conf
+fi
+
+if [ -e ${HOME}/.update_openbsdrc ]; then
+    . ${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}
+FORCE_DIR=${FORCE_DIR:=No}
+
+INSTALLED_SETS=${INSTALLED_SETS:=`installed_sets`}
 
 set_version
 local _error=$?