===================================================================
RCS file: /cvs/openbsd/sxxu/Attic/install.sxxu,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- openbsd/sxxu/Attic/install.sxxu	2010/04/23 22:27:27	1.18
+++ openbsd/sxxu/Attic/install.sxxu	2013/04/20 22:34:57	1.19
@@ -1,5 +1,5 @@
 #!/bin/ksh -
-# $Id: install.sxxu,v 1.18 2010/04/23 21:27:27 andrew Exp $
+# $Id: install.sxxu,v 1.19 2013/04/20 21:34:57 andrew Exp $
 
 # Copyright (c) 2010 Andrew Fresh <andrew@afresh1.com>
 #
@@ -62,21 +62,19 @@
 
 
 append_pkg_path() {
-    [ ! -e pkg_path ] && return
+    [ -e pkg_path -o -d packages ] || return
 
     echo ' ==> Setting PKG_PATH'
+    [ -d packages ] && PKG_PATH="${PKG_PATH}:${PWD}/packages"
+    [ -e pkg_path ] || return;
     local _line
     while read _line; do
         _line=${_line%%#*}              # strip comments
-        test -z "$_line" && continue
-        if [ -z "${PKG_PATH}" ]; then
-            PKG_PATH="$_line"
-        else
-            PKG_PATH="${PKG_PATH}:${_line}"
-        fi
+        [ -z "$_line" ] && continue
+        PKG_PATH="${PKG_PATH}:${_line}"
     done < pkg_path
 
-    PKG_PATH=`eval echo $PKG_PATH`
+    PKG_PATH=`eval echo $PKG_PATH | sed -e 's/^:*//'`
 }
 
 run_command_lists() {