[pkgsrc/trunk]: pkgsrc/pkgtools/pkg pkgtools/pkg: Honor existing PKG_DBDIR de...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/1ff4a95eed30
branches:  trunk
changeset: 354397:1ff4a95eed30
user:      marino <marino%pkgsrc.org@localhost>
date:      Fri Oct 28 15:35:08 2016 +0000

description:
pkgtools/pkg: Honor existing PKG_DBDIR definition

Rather than defaulting to /var/db/pkgng, use the variable that exists
already for this purpose.  Similarly, change cache directory definition
from /var/cache/pkgng to ${VARBASE}/cache/pkgng

diffstat:

 pkgtools/pkg/Makefile |  8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diffs (24 lines):

diff -r 2ba5accaaea1 -r 1ff4a95eed30 pkgtools/pkg/Makefile
--- a/pkgtools/pkg/Makefile     Fri Oct 28 10:40:51 2016 +0000
+++ b/pkgtools/pkg/Makefile     Fri Oct 28 15:35:08 2016 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.9 2016/10/27 13:22:44 marino Exp $
+# $NetBSD: Makefile,v 1.10 2016/10/28 15:35:08 marino Exp $
 
 DISTNAME=      pkg-1.8.7
-PKGREVISION=   3
+PKGREVISION=   4
 CATEGORIES=    pkgtools
 MASTER_SITES=  http://files.etoilebsd.net/pkg/
 EXTRACT_SUFX=  .tar.xz
@@ -62,8 +62,8 @@
                                docs/pkg-version.8 \
                                docs/pkg.8
 SUBST_SED.portsdir=            -e "s|/usr/ports|${PKG.portsdir}|g" \
-                               -e "s|/var/db/pkg|/var/db/pkgng|g" \
-                               -e "s|/var/cache/pkg|/var/cache/pkgng|g"
+                               -e "s|/var/db/pkg|${PKG_DBDIR}|g" \
+                               -e "s|/var/cache/pkg|${VARBASE}/cache/pkgng|g"
 SUBST_MESSAGE.portsdir=                Correct reference to FreeBSD portsdir.
 
 .if defined(PACKAGE_BUILDING) # set by Synth which has custom location, so use default path