Thu Mar 16 20:03:22 2017 UTC ()
pkglint 5.4.18.

Changes:
 - go tool yacc -> goyacc to fix building with Go 1.8 (PR pkg/52081).


(bsiegert)
diff -r1.510 -r1.511 pkgsrc/pkgtools/pkglint/Makefile
diff -r1.4 -r1.5 pkgsrc/pkgtools/pkglint/files/shtypes.go
diff -r1.1 -r1.2 pkgsrc/pkgtools/pkglint/files/licenses/licenses.go
cvs diff -r1.510 -r1.511 pkgsrc/pkgtools/pkglint/Makefile (expand / switch to unified diff)

--- pkgsrc/pkgtools/pkglint/Makefile 2017/01/18 23:05:43 1.510
+++ pkgsrc/pkgtools/pkglint/Makefile 2017/03/16 20:03:22 1.511
@@ -1,24 +1,25 @@ @@ -1,24 +1,25 @@
1# $NetBSD: Makefile,v 1.510 2017/01/18 23:05:43 rillig Exp $ 1# $NetBSD: Makefile,v 1.511 2017/03/16 20:03:22 bsiegert Exp $
2 2
3PKGNAME= pkglint-5.4.17 3PKGNAME= pkglint-5.4.18
4DISTFILES= # none 4DISTFILES= # none
5CATEGORIES= pkgtools 5CATEGORIES= pkgtools
6 6
7MAINTAINER= rillig@NetBSD.org 7MAINTAINER= rillig@NetBSD.org
8HOMEPAGE= http://www.NetBSD.org/docs/pkgsrc/ 8HOMEPAGE= http://www.NetBSD.org/docs/pkgsrc/
9COMMENT= Verifier for NetBSD packages 9COMMENT= Verifier for NetBSD packages
10LICENSE= 2-clause-bsd 10LICENSE= 2-clause-bsd
11CONFLICTS+= pkglint4-[0-9]* 11CONFLICTS+= pkglint4-[0-9]*
 12BUILD_DEPENDS+= go-tools>=1.8:../../devel/go-tools
12 13
13NO_CHECKSUM= yes 14NO_CHECKSUM= yes
14USE_LANGUAGES= c 15USE_LANGUAGES= c
15USE_TOOLS+= pax 16USE_TOOLS+= pax
16AUTO_MKDIRS= yes 17AUTO_MKDIRS= yes
17GO_SRCPATH= netbsd.org/pkglint 18GO_SRCPATH= netbsd.org/pkglint
18 19
19SUBST_CLASSES+= pkglint 20SUBST_CLASSES+= pkglint
20SUBST_STAGE.pkglint= post-configure 21SUBST_STAGE.pkglint= post-configure
21SUBST_FILES.pkglint+= pkglint.go package_test.go 22SUBST_FILES.pkglint+= pkglint.go package_test.go
22SUBST_SED.pkglint+= -e s\|@VERSION@\|${PKGNAME:S/pkglint-//}\|g 23SUBST_SED.pkglint+= -e s\|@VERSION@\|${PKGNAME:S/pkglint-//}\|g
23SUBST_SED.pkglint+= -e s\|@BMAKE@\|${MAKE:Q}\|g 24SUBST_SED.pkglint+= -e s\|@BMAKE@\|${MAKE:Q}\|g
24 25
cvs diff -r1.4 -r1.5 pkgsrc/pkgtools/pkglint/files/Attic/shtypes.go (expand / switch to unified diff)

--- pkgsrc/pkgtools/pkglint/files/Attic/shtypes.go 2016/07/10 21:24:47 1.4
+++ pkgsrc/pkgtools/pkglint/files/Attic/shtypes.go 2017/03/16 20:03:22 1.5
@@ -1,20 +1,20 @@ @@ -1,20 +1,20 @@
1package main 1package main
2 2
3import ( 3import (
4 "fmt" 4 "fmt"
5) 5)
6 6
7//go:generate go tool yacc -o shellyacc.go -v shellyacc.log -p shyy shell.y 7//go:generate goyacc -o shellyacc.go -v shellyacc.log -p shyy shell.y
8 8
9type ShAtomType uint8 9type ShAtomType uint8
10 10
11const ( 11const (
12 shtSpace ShAtomType = iota 12 shtSpace ShAtomType = iota
13 shtVaruse // ${PREFIX} 13 shtVaruse // ${PREFIX}
14 shtWord // 14 shtWord //
15 shtOperator 15 shtOperator
16 shtComment // # ... 16 shtComment // # ...
17 shtSubshell // $$( 17 shtSubshell // $$(
18) 18)
19 19
20func (t ShAtomType) String() string { 20func (t ShAtomType) String() string {
cvs diff -r1.1 -r1.2 pkgsrc/pkgtools/pkglint/files/licenses/Attic/licenses.go (expand / switch to unified diff)

--- pkgsrc/pkgtools/pkglint/files/licenses/Attic/licenses.go 2017/01/17 22:37:28 1.1
+++ pkgsrc/pkgtools/pkglint/files/licenses/Attic/licenses.go 2017/03/16 20:03:22 1.2
@@ -41,27 +41,27 @@ func (cond *Condition) String() string { @@ -41,27 +41,27 @@ func (cond *Condition) String() string {
41 return s 41 return s
42} 42}
43 43
44func (cond *Condition) Walk(callback func(*Condition)) { 44func (cond *Condition) Walk(callback func(*Condition)) {
45 if cond.Paren != nil { 45 if cond.Paren != nil {
46 cond.Paren.Walk(callback) 46 cond.Paren.Walk(callback)
47 } 47 }
48 for _, child := range cond.Children { 48 for _, child := range cond.Children {
49 child.Walk(callback) 49 child.Walk(callback)
50 } 50 }
51 callback(cond) 51 callback(cond)
52} 52}
53 53
54//go:generate go tool yacc -p liyy -o licensesyacc.go -v licensesyacc.log licenses.y 54//go:generate goyacc -p liyy -o licensesyacc.go -v licensesyacc.log licenses.y
55 55
56type licenseLexer struct { 56type licenseLexer struct {
57 repl *textproc.PrefixReplacer 57 repl *textproc.PrefixReplacer
58 result *Condition 58 result *Condition
59 error string 59 error string
60} 60}
61 61
62func (lexer *licenseLexer) Lex(llval *liyySymType) int { 62func (lexer *licenseLexer) Lex(llval *liyySymType) int {
63 repl := lexer.repl 63 repl := lexer.repl
64 repl.AdvanceHspace() 64 repl.AdvanceHspace()
65 switch { 65 switch {
66 case repl.EOF(): 66 case repl.EOF():
67 return 0 67 return 0