Received: from mail.netbsd.org (mail.netbsd.org [199.233.217.200]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mail.NetBSD.org", Issuer "mail.NetBSD.org CA" (not verified)) by mollari.NetBSD.org (Postfix) with ESMTPS id 961F01A9217 for ; Thu, 3 Dec 2020 10:04:50 +0000 (UTC) Received: by mail.netbsd.org (Postfix, from userid 605) id 0D6B2850DF; Thu, 3 Dec 2020 10:04:50 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 491F2850C1 for ; Thu, 3 Dec 2020 10:04:49 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id PkQ5MXvRbxKS for ; Thu, 3 Dec 2020 10:04:48 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 9CA3C84DDA for ; Thu, 3 Dec 2020 10:04:48 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 95B62FA9D; Thu, 3 Dec 2020 10:04:48 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1606989888239790" MIME-Version: 1.0 Date: Thu, 3 Dec 2020 10:04:48 +0000 From: "Thomas Klausner" Subject: CVS commit: pkgsrc/mk/pkgformat/pkg To: pkgsrc-changes@NetBSD.org Reply-To: wiz@netbsd.org X-Mailer: log_accum Message-Id: <20201203100448.95B62FA9D@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1606989888239790 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: wiz Date: Thu Dec 3 10:04:48 UTC 2020 Modified Files: pkgsrc/mk/pkgformat/pkg: pkgformat-vars.mk Log Message: 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. To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 pkgsrc/mk/pkgformat/pkg/pkgformat-vars.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1606989888239790 Content-Disposition: inline Content-Length: 936 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/mk/pkgformat/pkg/pkgformat-vars.mk diff -u pkgsrc/mk/pkgformat/pkg/pkgformat-vars.mk:1.9 pkgsrc/mk/pkgformat/pkg/pkgformat-vars.mk:1.10 --- pkgsrc/mk/pkgformat/pkg/pkgformat-vars.mk:1.9 Wed Dec 2 10:22:39 2020 +++ pkgsrc/mk/pkgformat/pkg/pkgformat-vars.mk Thu Dec 3 10:04:48 2020 @@ -1,4 +1,4 @@ -# $NetBSD: pkgformat-vars.mk,v 1.9 2020/12/02 10:22:39 wiz Exp $ +# $NetBSD: pkgformat-vars.mk,v 1.10 2020/12/03 10:04:48 wiz Exp $ # # This Makefile fragment is included indirectly by bsd.prefs.mk and # defines some variables which must be defined earlier than where @@ -16,7 +16,7 @@ USE_TOOLS+= date .endif # This is the package database directory for the default view. -PKG_DBDIR?= ${PREFIX}/pkgdb +PKG_DBDIR?= ${LOCALBASE}/pkgdb .if exists(/var/db/pkg) && !exists(${PKG_DBDIR}) PKG_DBDIR_ERROR= The default package database directory has changed. Please run: mv /var/db/pkg ${PKG_DBDIR} --_----------=_1606989888239790--