CVS commit: pkgsrc/pkgtools/pkg

["John Marino" <marino%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   marino
Date:           Fri Oct 28 15:35:08 UTC 2016

Modified Files:
        pkgsrc/pkgtools/pkg: Makefile

Log Message:
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


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 pkgsrc/pkgtools/pkg/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/pkgtools/pkg/Makefile
diff -u pkgsrc/pkgtools/pkg/Makefile:1.9 pkgsrc/pkgtools/pkg/Makefile:1.10
--- pkgsrc/pkgtools/pkg/Makefile:1.9    Thu Oct 27 13:22:44 2016
+++ pkgsrc/pkgtools/pkg/Makefile        Fri Oct 28 15:35:08 2016
@@ -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 @@ SUBST_FILES.portsdir=         libpkg/pkg_config
                                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