CVS commit: pkgsrc/mk/platform

["Maya Rashish" <maya%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   maya
Date:           Sun Dec 20 19:44:16 UTC 2020

Modified Files:
        pkgsrc/mk/platform: NetBSD.mk

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


To generate a diff of this commit:
cvs rdiff -u -r1.62 -r1.63 pkgsrc/mk/platform/NetBSD.mk

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

Modified files:

Index: pkgsrc/mk/platform/NetBSD.mk
diff -u pkgsrc/mk/platform/NetBSD.mk:1.62 pkgsrc/mk/platform/NetBSD.mk:1.63
--- pkgsrc/mk/platform/NetBSD.mk:1.62   Fri Dec 18 17:14:58 2020
+++ pkgsrc/mk/platform/NetBSD.mk        Sun Dec 20 19:44:16 2020
@@ -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_SSP=        yes
 _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.