pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/mk/platform Simplify check, trust the user's PKGDB_DIR...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/77cc2d4be2dd
branches:  trunk
changeset: 443754:77cc2d4be2dd
user:      maya <maya%pkgsrc.org@localhost>
date:      Sun Dec 20 19:44:16 2020 +0000

description:
Simplify check, trust the user's PKGDB_DIR instead of second guessing it.
Fixes bootstrapping a second prefix with /var/db/pkg existing.

In a bootstrap scenario, PKGDB_DIR is defined, so this should just work.

diffstat:

 mk/platform/NetBSD.mk |  6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)

diffs (20 lines):

diff -r 824e382b47e1 -r 77cc2d4be2dd mk/platform/NetBSD.mk
--- a/mk/platform/NetBSD.mk     Sun Dec 20 19:07:05 2020 +0000
+++ b/mk/platform/NetBSD.mk     Sun Dec 20 19:44:16 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: NetBSD.mk,v 1.62 2020/12/18 17:14:58 maya Exp $
+# $NetBSD: NetBSD.mk,v 1.63 2020/12/20 19:44:16 maya Exp $
 #
 # Variable definitions for the NetBSD operating system.
 
@@ -165,9 +165,7 @@
 _OPSYS_SUPPORTS_STACK_CHECK=   yes
 .endif
 
-_OLD_DEFAULT_PKGDB_DIR=        /var/db/pkg
-.if exists(${_OLD_DEFAULT_PKGDB_DIR}) && \
-    (${PKG_DBDIR:U${OLD_DEFAULT_PKGDB_DIR}} != ${_OLD_DEFAULT_PKGDB_DIR})
+.if !defined(PKG_DBDIR) && exists(/var/db/pkg)
 PKG_DBDIR_ERROR=       Compatibility pkgdb location exists, but PKG_DBDIR not specified. \
                        This may cause unexpected issues. To avoid problems, add \
                        PKG_DBDIR=${_OLD_DEFAULT_PKGDB_DIR} to /etc/mk.conf.



Home | Main Index | Thread Index | Old Index