CVS commit: pkgsrc/pkgtools/pkgin

["Roland Illig" <rillig%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   rillig
Date:           Tue Apr 28 02:43:21 UTC 2020

Modified Files:
        pkgsrc/pkgtools/pkgin: Makefile

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


To generate a diff of this commit:
cvs rdiff -u -r1.97 -r1.98 pkgsrc/pkgtools/pkgin/Makefile

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

Modified files:

Index: pkgsrc/pkgtools/pkgin/Makefile
diff -u pkgsrc/pkgtools/pkgin/Makefile:1.97 pkgsrc/pkgtools/pkgin/Makefile:1.98
--- pkgsrc/pkgtools/pkgin/Makefile:1.97 Mon Apr 27 14:54:47 2020
+++ pkgsrc/pkgtools/pkgin/Makefile      Tue Apr 28 02:43:21 2020
@@ -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|/usr/sbin|${PKG_T
 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