[pkgsrc/trunk]: pkgsrc/pkgtools/pkgdepgraph Actually use PKG_DBDIR and PKGSRC...

[atatat <atatat%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/66df2948bd0d
branches:  trunk
changeset: 496352:66df2948bd0d
user:      atatat <atatat%pkgsrc.org@localhost>
date:      Sun Jun 26 17:34:19 2005 +0000

description:
Actually use PKG_DBDIR and PKGSRCDIR values from the build process,
rather than just pretending to.  I know I meant this to work, but
somehow I forgot actually to make it work a long time ago.

Addresses a problem pointed out in private email.

diffstat:

 pkgtools/pkgdepgraph/Makefile             |  4 ++--
 pkgtools/pkgdepgraph/files/pkgdepgraph.pl |  6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diffs (36 lines):

diff -r 4cd1c921b5b0 -r 66df2948bd0d pkgtools/pkgdepgraph/Makefile
--- a/pkgtools/pkgdepgraph/Makefile     Sun Jun 26 16:58:39 2005 +0000
+++ b/pkgtools/pkgdepgraph/Makefile     Sun Jun 26 17:34:19 2005 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.20 2005/06/17 03:50:29 jlam Exp $
+# $NetBSD: Makefile,v 1.21 2005/06/26 17:34:19 atatat Exp $
 #
 
-DISTNAME=      pkgdepgraph-2.7
+DISTNAME=      pkgdepgraph-2.8
 CATEGORIES=    pkgtools devel
 MASTER_SITES=  # empty
 DISTFILES=     # empty
diff -r 4cd1c921b5b0 -r 66df2948bd0d pkgtools/pkgdepgraph/files/pkgdepgraph.pl
--- a/pkgtools/pkgdepgraph/files/pkgdepgraph.pl Sun Jun 26 16:58:39 2005 +0000
+++ b/pkgtools/pkgdepgraph/files/pkgdepgraph.pl Sun Jun 26 17:34:19 2005 +0000
@@ -3,7 +3,7 @@
 # Copyright (c) 2002, 2003, 2004 by Andrew Brown <atatat%netbsd.org@localhost>
 # Absolutely no warranty.
 
-# $NetBSD: pkgdepgraph.pl,v 1.10 2004/07/28 01:42:43 atatat Exp $
+# $NetBSD: pkgdepgraph.pl,v 1.11 2005/06/26 17:34:19 atatat Exp $
 # pkgdepgraph: @DISTVER@
 
 use strict;
@@ -66,8 +66,8 @@
        ($target ne "") +
        ($rebuild ne "") > 1);
 
-$pkg_dbdir ||= $ENV{'PKG_DBDIR'} || "/var/db/pkg";
-$pkgsrcdir ||= $ENV{'PKGSRCDIR'} || "/usr/pkgsrc";
+$pkg_dbdir ||= $ENV{'PKG_DBDIR'} || "@PKG_DBDIR@";
+$pkgsrcdir ||= $ENV{'PKGSRCDIR'} || "@PKGSRCDIR@";
 $packages = $ENV{'PKG_PATH'} if (!$packages);
 $packages = $ENV{'PACKAGES'} . "/All" if (!$packages && $ENV{'PACKAGES'});
 $packages = $pkgsrcdir . "/packages/All" if (!$packages);