From 15e88a82cdf5095c2461c5c163ed541068ef5bf8 Mon Sep 17 00:00:00 2001
From: bsiegert <bsiegert>
Date: Sat, 13 Feb 2016 16:30:05 +0000
Subject: Pullup ticket #4921 - requested by rillig pkgtools/pkglint: bugfix

Revisions pulled up:
- pkgtools/pkglint/select.mk                                    1.2-1.3

---
   Module Name:    pkgsrc
   Committed By:   rillig
   Date:           Mon Feb  1 21:40:39 UTC 2016

   Modified Files:
           pkgsrc/pkgtools/pkglint: select.mk

   Log Message:
   Fixed boolean expression for selecting the proper pkglint version

   It had been wrong for SunOS-*-i386, which is not supported by the Go
   programming language, but was forced to use the Go version nevertheless.

---
   Module Name:    pkgsrc
   Committed By:   rillig
   Date:           Tue Feb  2 08:00:10 UTC 2016

   Modified Files:
           pkgsrc/pkgtools/pkglint: select.mk

   Log Message:
   Fixed dependency pattern for pkglint4
---
 pkgtools/pkglint/select.mk | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgtools/pkglint/select.mk b/pkgtools/pkglint/select.mk
index bba39ae74c5..d5e5299bbdf 100644
--- a/pkgtools/pkglint/select.mk
+++ b/pkgtools/pkglint/select.mk
@@ -1,4 +1,4 @@
-# $NetBSD: select.mk,v 1.1.2.2 2016/01/30 13:35:26 bsiegert Exp $
+# $NetBSD: select.mk,v 1.1.2.3 2016/02/13 16:30:05 bsiegert Exp $
 #
 # Selects the proper version of pkglint, depending on whether the
 # platform supports the Go programming language.
@@ -7,8 +7,8 @@
 .include "../../mk/bsd.fast.prefs.mk"
 
 # See lang/go/version.mk
-.if !empty(MACHINE_ARCH:Ni386:Nx86_64:Nevbarm) && !empty(MACHINE_PLATFORM:NSunOS-*-i386)
-DEPENDS+=	pkglint>=4.82<5:../../pkgtools/pkglint4
+.if ${MACHINE_ARCH:Ni386:Nx86_64:Nevbarm} || ${MACHINE_PLATFORM:MSunOS-*-i386}
+DEPENDS+=	pkglint4>=4.82<5:../../pkgtools/pkglint4
 .else
 DEPENDS+=	pkglint>=5:../../pkgtools/pkglint
 .endif
-- 
cgit v1.2.3