diff options
| author | marino <marino@pkgsrc.org> | 2016-10-28 15:35:08 +0000 |
|---|---|---|
| committer | marino <marino@pkgsrc.org> | 2016-10-28 15:35:08 +0000 |
| commit | 35e2a8990f579c25da71e2799ebedb4ebf2dff83 (patch) | |
| tree | 72c2c27261c08c4a51f2b4810928bd5528d015b7 /pkgtools | |
| parent | a10d27eaeb9702060b779c2727cb6e42d18c3868 (diff) | |
| download | pkgsrc-35e2a8990f579c25da71e2799ebedb4ebf2dff83.tar.gz | |
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 (limited to 'pkgtools')
| -rw-r--r-- | pkgtools/pkg/Makefile | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/pkgtools/pkg/Makefile b/pkgtools/pkg/Makefile index ee0744bc699..869e58390c9 100644 --- a/pkgtools/pkg/Makefile +++ b/pkgtools/pkg/Makefile @@ -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.c \ 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 |