Tue Nov 15 15:42:21 2016 UTC ()
pkgtools/pkg: Follow recent PKG_DBDIR changes in bootstrap script

The default for PKG_DBDIR changed from /var/db/pkg to ${LOCALBASE}/pkgdb
Accordingly, the pkgng location is changing from /var/db/pkgng to
${LOCALBASE}/pkgng-db


(marino)
diff -r1.14 -r1.15 pkgsrc/pkgtools/pkg/Makefile
cvs diff -r1.14 -r1.15 pkgsrc/pkgtools/pkg/Makefile (expand / switch to unified diff)

--- pkgsrc/pkgtools/pkg/Makefile 2016/11/14 19:38:11 1.14
+++ pkgsrc/pkgtools/pkg/Makefile 2016/11/15 15:42:21 1.15
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.14 2016/11/14 19:38:11 marino Exp $ 1# $NetBSD: Makefile,v 1.15 2016/11/15 15:42:21 marino Exp $
2 2
3DISTNAME= pkg-1.8.7 3DISTNAME= pkg-1.8.7
4PKGREVISION= 7 4PKGREVISION= 7
5CATEGORIES= pkgtools 5CATEGORIES= pkgtools
6MASTER_SITES= http://files.etoilebsd.net/pkg/ 6MASTER_SITES= http://files.etoilebsd.net/pkg/
7EXTRACT_SUFX= .tar.xz 7EXTRACT_SUFX= .tar.xz
8 8
9MAINTAINER= khorben@defora.org 9MAINTAINER= khorben@defora.org
10HOMEPAGE= https://wiki.freebsd.org/pkgng 10HOMEPAGE= https://wiki.freebsd.org/pkgng
11COMMENT= Package management tool for FreeBSD 11COMMENT= Package management tool for FreeBSD
12LICENSE= 2-clause-bsd 12LICENSE= 2-clause-bsd
13 13
14BOOTSTRAP_PKG= yes 14BOOTSTRAP_PKG= yes
@@ -135,20 +135,20 @@ post-install: @@ -135,20 +135,20 @@ post-install:
135 ${RM} -rf ${DESTDIR}${EGDIR}/periodic 135 ${RM} -rf ${DESTDIR}${EGDIR}/periodic
136 ${MV} ${DESTDIR}${PREFIX}/etc/bash_completion.d \ 136 ${MV} ${DESTDIR}${PREFIX}/etc/bash_completion.d \
137 ${DESTDIR}${EGDIR}/ 137 ${DESTDIR}${EGDIR}/
138 ${MV} ${DESTDIR}${PREFIX}/etc/periodic \ 138 ${MV} ${DESTDIR}${PREFIX}/etc/periodic \
139 ${DESTDIR}${EGDIR}/ 139 ${DESTDIR}${EGDIR}/
140 ${MV} ${DESTDIR}${PREFIX}/etc/pkg.conf.sample \ 140 ${MV} ${DESTDIR}${PREFIX}/etc/pkg.conf.sample \
141 ${DESTDIR}${EGDIR}/ 141 ${DESTDIR}${EGDIR}/
142 142
143.include "../../mk/bsd.prefs.mk" 143.include "../../mk/bsd.prefs.mk"
144 144
145.if defined (PKG_DBDIR) 145.if defined (PKG_DBDIR)
146PKGNG_DBDIR?= ${PKG_DBDIR} 146PKGNG_DBDIR?= ${PKG_DBDIR}
147.else 147.else
148PKGNG_DBDIR?= /var/db/pkgng 148PKGNG_DBDIR?= ${PREFIX}/pkgng-db
149.endif 149.endif
150 150
151.if ${OPSYS} != "FreeBSD" && ${OPSYS} != "DragonFly" && ${OPSYS} != "NetBSD" 151.if ${OPSYS} != "FreeBSD" && ${OPSYS} != "DragonFly" && ${OPSYS} != "NetBSD"
152.include "../../archivers/libarchive/buildlink3.mk" 152.include "../../archivers/libarchive/buildlink3.mk"
153.endif 153.endif
154.include "../../mk/bsd.pkg.mk" 154.include "../../mk/bsd.pkg.mk"