diff options
| author | rillig <rillig@pkgsrc.org> | 2020-04-28 02:43:21 +0000 |
|---|---|---|
| committer | rillig <rillig@pkgsrc.org> | 2020-04-28 02:43:21 +0000 |
| commit | 4c8489165d36f016a5841234d0e240dea0bb5204 (patch) | |
| tree | ff277533f4cb3e018f2c5c72b43992d9e9bc9c38 /pkgtools | |
| parent | b61c84a86f909006397280331360e19881e38c55 (diff) | |
| download | pkgsrc-4c8489165d36f016a5841234d0e240dea0bb5204.tar.gz | |
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 (limited to 'pkgtools')
| -rw-r--r-- | pkgtools/pkgin/Makefile | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/pkgtools/pkgin/Makefile b/pkgtools/pkgin/Makefile index 9d6ada00313..38751f4d6d1 100644 --- a/pkgtools/pkgin/Makefile +++ b/pkgtools/pkgin/Makefile @@ -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_TOOLS_BIN}|g" 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 |