[pkgsrc/trunk]: pkgsrc/pkgtools/pkgin pkgtools/pkgin: define PKGPATH before i...

[rillig <rillig%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/847fec4b45cb
branches:  trunk
changeset: 430135:847fec4b45cb
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Tue Apr 28 02:43:21 2020 +0000

description:
pkgtools/pkgin: define PKGPATH before including mk.conf

PKGPATH is one of the few variables that is guaranteed to be defined when
mk.conf is included. Conditions like ".if ${PKGPATH} == category/package"
trigger a "Malformed conditional" when this variable is not defined.

diffstat:

 pkgtools/pkgin/Makefile |  4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diffs (20 lines):

diff -r 329f7affe1c6 -r 847fec4b45cb pkgtools/pkgin/Makefile
--- a/pkgtools/pkgin/Makefile   Tue Apr 28 01:19:13 2020 +0000
+++ b/pkgtools/pkgin/Makefile   Tue Apr 28 02:43:21 2020 +0000
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.97 2020/04/27 14:54:47 jperkin Exp $
+# $NetBSD: Makefile,v 1.98 2020/04/28 02:43:21 rillig Exp $
 
 DISTNAME=              pkgin-0.16.0
+PKGREVISION=           1
 CATEGORIES=            pkgtools
 MASTER_SITES=          ${MASTER_SITE_GITHUB:=NetBSDfr/}
 GITHUB_TAG=            v${PKGVERSION_NOREV}
@@ -31,6 +32,7 @@
 SUBST_SED.path+=       -e "s|/var|${VARBASE}|g"
 SUBST_SED.path+=       -e "s|/usr/pkg|${PREFIX}|g"
 SUBST_SED.path+=       -e "s|!=.*uname -p|=    ${MACHINE_ARCH}|g"
+SUBST_SED.path+=       -e '/^BSD_PKG_MK/a\${.newline}PKGPATH=  ${PKGPATH}'
 
 GNU_CONFIGURE=         yes
 USE_FEATURES=          nbcompat