Thu Dec 3 10:04:48 2020 UTC ()
mk: use LOCALBASE instead of PREFIX

I don't understand why this fixes problems, but it does fix the build
of mail/neomutt for me.

>From ryoon.


(wiz)
diff -r1.9 -r1.10 pkgsrc/mk/pkgformat/pkg/pkgformat-vars.mk
cvs diff -r1.9 -r1.10 pkgsrc/mk/pkgformat/pkg/pkgformat-vars.mk (expand / switch to unified diff)

--- pkgsrc/mk/pkgformat/pkg/pkgformat-vars.mk 2020/12/02 10:22:39 1.9
+++ pkgsrc/mk/pkgformat/pkg/pkgformat-vars.mk 2020/12/03 10:04:48 1.10
@@ -1,32 +1,32 @@ @@ -1,32 +1,32 @@
1# $NetBSD: pkgformat-vars.mk,v 1.9 2020/12/02 10:22:39 wiz Exp $ 1# $NetBSD: pkgformat-vars.mk,v 1.10 2020/12/03 10:04:48 wiz Exp $
2# 2#
3# This Makefile fragment is included indirectly by bsd.prefs.mk and 3# This Makefile fragment is included indirectly by bsd.prefs.mk and
4# defines some variables which must be defined earlier than where 4# defines some variables which must be defined earlier than where
5# pkgformat.mk is included. 5# pkgformat.mk is included.
6# 6#
7 7
8PKGSRC_MESSAGE_RECIPIENTS?= # empty 8PKGSRC_MESSAGE_RECIPIENTS?= # empty
9 9
10.if !empty(PKGSRC_MESSAGE_RECIPIENTS) 10.if !empty(PKGSRC_MESSAGE_RECIPIENTS)
11USE_TOOLS+= mail 11USE_TOOLS+= mail
12.endif 12.endif
13 13
14.if defined(PKG_PRESERVE) 14.if defined(PKG_PRESERVE)
15USE_TOOLS+= date 15USE_TOOLS+= date
16.endif 16.endif
17 17
18# This is the package database directory for the default view. 18# This is the package database directory for the default view.
19PKG_DBDIR?= ${PREFIX}/pkgdb 19PKG_DBDIR?= ${LOCALBASE}/pkgdb
20 20
21.if exists(/var/db/pkg) && !exists(${PKG_DBDIR}) 21.if exists(/var/db/pkg) && !exists(${PKG_DBDIR})
22PKG_DBDIR_ERROR= The default package database directory has changed. Please run: mv /var/db/pkg ${PKG_DBDIR} 22PKG_DBDIR_ERROR= The default package database directory has changed. Please run: mv /var/db/pkg ${PKG_DBDIR}
23.endif 23.endif
24 24
25# _PKG_DBDIR is the actual packages database directory where we register 25# _PKG_DBDIR is the actual packages database directory where we register
26# packages. 26# packages.
27# 27#
28_PKG_DBDIR= ${_CROSS_DESTDIR}${PKG_DBDIR} 28_PKG_DBDIR= ${_CROSS_DESTDIR}${PKG_DBDIR}
29_HOST_PKG_DBDIR= ${HOST_PKG_DBDIR:U${PKG_DBDIR}} 29_HOST_PKG_DBDIR= ${HOST_PKG_DBDIR:U${PKG_DBDIR}}
30 30
31PKG_ADD_CMD?= ${PKG_TOOLS_BIN}/pkg_add 31PKG_ADD_CMD?= ${PKG_TOOLS_BIN}/pkg_add
32PKG_ADMIN_CMD?= ${PKG_TOOLS_BIN}/pkg_admin 32PKG_ADMIN_CMD?= ${PKG_TOOLS_BIN}/pkg_admin