diff -ru0 pkgtools-20020405/ChangeLog pkgtools-20020429/ChangeLog
--- pkgtools-20020405/ChangeLog	Wed Apr 10 07:47:53 2002
+++ pkgtools-20020429/ChangeLog	Mon Apr 29 21:00:00 2002
@@ -0,0 +1,15 @@
+2002-04-29 04:56  knu
+
+	* bin/make_describe_pass1, lib/portsdb.rb: Make portsdb -U respect
+	PORTS_DBDIR even when it is different than PORTS_DIR.
+	
+	Reported by:	Shigeto TAJIMA <tajima@ics.es.osaka-u.ac.jp>
+
+2002-04-29 04:52  knu
+
+	* etc/pkgtools.conf, lib/pkgtools.rb: Do not set PKG_PATH in
+	init_pkgtools_global() because that spoils the user-defined value
+	in pkgtools.conf.
+	
+	Reported by:	The Anarcat <anarcat@anarcat.dyndns.org>
+
diff -ru0 pkgtools-20020405/bin/make_describe_pass1 pkgtools-20020429/bin/make_describe_pass1
--- pkgtools-20020405/bin/make_describe_pass1	Mon Oct 22 07:25:10 2001
+++ pkgtools-20020429/bin/make_describe_pass1	Mon Apr 29 04:56:50 2002
@@ -5,0 +6,2 @@
+load_config
+
diff -ru0 pkgtools-20020405/etc/pkgtools.conf pkgtools-20020429/etc/pkgtools.conf
--- pkgtools-20020405/etc/pkgtools.conf	Wed Feb 27 06:22:43 2002
+++ pkgtools-20020429/etc/pkgtools.conf	Mon Apr 29 04:52:12 2002
@@ -5 +5 @@
-# $Idaemons: /home/cvs/pkgtools/etc/pkgtools.conf,v 1.13 2002/02/26 21:22:43 knu Exp $
+# $Idaemons: /home/cvs/pkgtools/etc/pkgtools.conf,v 1.14 2002/04/28 19:52:12 knu Exp $
@@ -88,0 +89,2 @@
+  ENV['PORTSDIR'] ||= '/usr/ports'
+  ENV['PACKAGES'] ||= ENV['PORTSDIR'] + '/packages'
diff -ru0 pkgtools-20020405/lib/pkgtools.rb pkgtools-20020429/lib/pkgtools.rb
--- pkgtools-20020405/lib/pkgtools.rb	Wed Feb 20 03:30:40 2002
+++ pkgtools-20020429/lib/pkgtools.rb	Mon Apr 29 04:52:50 2002
@@ -1 +1 @@
-# $Idaemons: /home/cvs/pkgtools/lib/pkgtools.rb,v 1.69 2002/02/19 18:30:40 knu Exp $
+# $Idaemons: /home/cvs/pkgtools/lib/pkgtools.rb,v 1.70 2002/04/28 19:52:50 knu Exp $
@@ -181,3 +181 @@
-
-  ENV['PKG_PATH'] ||= $packages_dir
-  $pkg_path = ENV['PKG_PATH']
+  $pkg_path = ENV['PKG_PATH'] || $packages_dir
diff -ru0 pkgtools-20020405/lib/portsdb.rb pkgtools-20020429/lib/portsdb.rb
--- pkgtools-20020405/lib/portsdb.rb	Wed Mar 13 05:14:29 2002
+++ pkgtools-20020429/lib/portsdb.rb	Mon Apr 29 04:56:59 2002
@@ -1 +1 @@
-# $Idaemons: /home/cvs/pkgtools/lib/portsdb.rb,v 1.64 2002/03/12 20:14:29 knu Exp $
+# $Idaemons: /home/cvs/pkgtools/lib/portsdb.rb,v 1.65 2002/04/28 19:56:59 knu Exp $
@@ -278,2 +277,0 @@
-    dir = abs_ports_dir()
-
@@ -298 +296 @@
-	(cd #{dir} && perl Tools/make_index) |
+	(cd #{abs_ports_dir} && perl Tools/make_index) |
@@ -305 +303 @@
-	cd #{dir} && (make describe ECHO_MSG='echo > /dev/null' 2> /dev/null |
+	cd #{abs_ports_dir} && (make describe ECHO_MSG='echo > /dev/null' 2> /dev/null |