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/substcontext.go,v
rcsdiff: /ftp/cvs/cvsroot/pkgsrc/pkgtools/pkglint/files/Attic/substcontext.go,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- pkgsrc/pkgtools/pkglint/files/Attic/substcontext.go	2019/10/26 09:51:48	1.29
+++ pkgsrc/pkgtools/pkglint/files/Attic/substcontext.go	2019/11/27 22:10:07	1.30
@@ -142,6 +142,7 @@ func (ctx *SubstContext) Varassign(mklin
 			fix.Replace("pre-patch", "post-extract")
 			fix.Replace("post-patch", "pre-configure")
 			fix.Apply()
+			// FIXME: Add test that has "SUBST_STAGE.id=pre-patch # or rather post-patch?"
 		}
 
 		if G.Pkg != nil && (value == "pre-configure" || value == "post-configure") {
@@ -270,7 +271,6 @@ func (ctx *SubstContext) suggestSubstVar
 		if !mkline.HasComment() && len(tokens) == 2 && tokens[0] == "-e" {
 			fix.Replace(mkline.Text, alignWith(varop, mkline.ValueAlign())+varname)
 		}
-		fix.Anyway()
 		fix.Apply()
 
 		ctx.curr.seenVars = true
@@ -280,7 +280,7 @@ func (ctx *SubstContext) suggestSubstVar
 // extractVarname extracts the variable name from a sed command of the form
 // s,@VARNAME@,${VARNAME}, and some related variants thereof.
 func (*SubstContext) extractVarname(token string) string {
-	parser := NewMkParser(nil, token)
+	parser := NewMkLexer(token, nil)
 	lexer := parser.lexer
 	if !lexer.SkipByte('s') {
 		return ""