===================================================================
RCS file: /cvs/openbsd/update_openbsd/update_openbsd,v
retrieving revision 1.94
retrieving revision 1.96
diff -u -r1.94 -r1.96
--- openbsd/update_openbsd/update_openbsd	2017/12/10 21:16:05	1.94
+++ openbsd/update_openbsd/update_openbsd	2017/12/10 21:20:53	1.96
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $AFresh1: update_openbsd,v 1.93 2017/11/28 03:54:31 andrew Exp $
+# $AFresh1: update_openbsd,v 1.95 2017/12/10 21:19:11 andrew Exp $
 #
 # Copyright (c) 2012 Andrew Fresh <andrew@afresh1.com>
 #
@@ -61,18 +61,14 @@
             _file=`echo ${_list} | awk '/base[0-9][0-9].tgz/ { print $9 }'`
 
         elif [ X"http" == X"${_proto}" -o X"https" == X"${_proto}" ]; then
-            local _list=`${FTP_CMD} -V -o - ${FTP}/`
-            _file=`echo ${_list} | awk '/[^x]base[0-9][0-9]*\.tgz/ { 
-                    sub("^.*base","base");
-                    sub("\.tgz.*",".tgz"); 
-                    print $0;
-                }'`
+            _file=`${FTP_CMD} -V -o - ${FTP}/index.txt |
+		sed -ne 's/.*\(base[0-9][0-9].tgz\).*/\1/p'`
 
         elif [ X"scp" == X"${_proto}" ]; then
             echo SCP is not yet supported >&2
             return 2
 
-        else 
+        else
             echo Unsupported FTP ${FTP} >&2
             return 2
 
@@ -525,8 +521,12 @@
 
 set_version
 
-PKG_PATH=${PKG_PATH:=${MIRROR}/${FORCE_DIR:=$NEW_VER}/packages/`machine -a`/}
-TRUSTED_PKG_PATH=${TRUSTED_PKG_PATH:=/usr/ports/packages/`machine -a`/all/}
+TRUSTED_PKG_PATH=${TRUSTED_PKG_PATH:=/usr/ports/packages/`machine -a`/all}
+if [ "$FORCE_DIR" = "No" ]; then
+	PKG_PATH=${PKG_PATH:=${MIRROR}/$NEW_VER/packages/`machine -a`}
+else
+	PKG_PATH=${PKG_PATH:=${MIRROR}/$FORCE_DIR/packages/`machine -a`}
+fi
 
 INSTALLED_SETS=${INSTALLED_SETS:=`installed_sets`}