Sat Feb 13 16:30:05 2016 UTC ()

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


(bsiegert)

diff -r1.1.2.2 -r1.1.2.3 pkgsrc/pkgtools/pkglint/select.mk

--- pkgsrc/pkgtools/pkglint/select.mk 2016/01/30 13:35:26 1.1.2.2
+++ pkgsrc/pkgtools/pkglint/select.mk 2016/02/13 16:30:05 1.1.2.3

 @@ -1,14 +1,14 @@
-# $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.
+#
 .include "../../mk/bsd.fast.prefs.mk"
 # See lang/go/version.mk
-.if !empty(MACHINE_ARCH:Ni386:Nx86_64:Nevbarm) && !empty(MACHINE_PLATFORM:NSunOS-*-i386)
+.if ${MACHINE_ARCH:Ni386:Nx86_64:Nevbarm} || ${MACHINE_PLATFORM:MSunOS-*-i386}
-DEPENDS+=	pkglint>=4.82<5:../../pkgtools/pkglint4
+DEPENDS+=	pkglint4>=4.82<5:../../pkgtools/pkglint4
 .else
 DEPENDS+=	pkglint>=5:../../pkgtools/pkglint
 .endif