summaryrefslogtreecommitdiff
path: root/pkgtools
diff options
context:
space:
mode:
authoratatat <atatat@pkgsrc.org>2005-06-26 17:34:19 +0000
committeratatat <atatat@pkgsrc.org>2005-06-26 17:34:19 +0000
commitb1f7ff373aa69539d31da3e8f656fbbcef809dc5 (patch)
treee9639c6e2f127b3480a4540bea6e5b05d72c1e3f /pkgtools
parent0c5da5c61549b03805de2fa596c9a99bd42e2cea (diff)
downloadpkgsrc-b1f7ff373aa69539d31da3e8f656fbbcef809dc5.tar.gz
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 (limited to 'pkgtools')
-rw-r--r--pkgtools/pkgdepgraph/Makefile4
-rwxr-xr-xpkgtools/pkgdepgraph/files/pkgdepgraph.pl6
2 files changed, 5 insertions, 5 deletions
diff --git a/pkgtools/pkgdepgraph/Makefile b/pkgtools/pkgdepgraph/Makefile
index acf95c806a9..ca112f80b65 100644
--- a/pkgtools/pkgdepgraph/Makefile
+++ b/pkgtools/pkgdepgraph/Makefile
@@ -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 --git a/pkgtools/pkgdepgraph/files/pkgdepgraph.pl b/pkgtools/pkgdepgraph/files/pkgdepgraph.pl
index 08d1f99f51c..3b399f28920 100755
--- a/pkgtools/pkgdepgraph/files/pkgdepgraph.pl
+++ b/pkgtools/pkgdepgraph/files/pkgdepgraph.pl
@@ -3,7 +3,7 @@
# Copyright (c) 2002, 2003, 2004 by Andrew Brown <atatat@netbsd.org>
# 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 @@ die("$iam: -D, -F, -m, and -R are mutually exclusive -- please pick one\n")
($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);