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

===================================================================
RCS file: /ftp/cvs/cvsroot/pkgsrc/pkgtools/pkglint/files/Attic/mkline.go,v
rcsdiff: /ftp/cvs/cvsroot/pkgsrc/pkgtools/pkglint/files/Attic/mkline.go,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- pkgsrc/pkgtools/pkglint/files/Attic/mkline.go	2015/12/05 15:51:15	1.5
+++ pkgsrc/pkgtools/pkglint/files/Attic/mkline.go	2015/12/05 21:00:42	1.6
@@ -68,7 +68,7 @@ func (ml *MkLine) checkVaruse(varname st
 	if G.opts.WarnExtra &&
 		(vartype == nil || vartype.guessed == guGuessed) &&
 		!varIsUsed(varname) &&
-		(G.mkContext == nil || !G.mkContext.forVars[varname]) {
+		!(G.mkContext != nil && G.mkContext.forVars[varname]) {
 		line.warnf("%s is used but not defined. Spelling mistake?", varname)
 	}
 
@@ -541,7 +541,7 @@ func (ml *MkLine) checkVartype(varname, 
 		for _, word := range words {
 			ml.checkVartypePrimitive(varname, vartype.checker, op, word, comment, true, vartype.guessed)
 			if vartype.kindOfList != lkSpace {
-				checklineMkShellword(line, word, true)
+				NewMkShellLine(ml.line).checkShellword(word, true)
 			}
 		}
 	}