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/Makefile,v
rcsdiff: /ftp/cvs/cvsroot/pkgsrc/pkgtools/pkglint/Makefile,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.542
retrieving revision 1.555
diff -u -p -r1.542 -r1.555
--- pkgsrc/pkgtools/pkglint/Makefile	2018/07/19 06:38:15	1.542
+++ pkgsrc/pkgtools/pkglint/Makefile	2018/11/08 19:41:32	1.555
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.542 2018/07/19 06:38:15 rillig Exp $
+# $NetBSD: Makefile,v 1.555 2018/11/08 19:41:32 rillig Exp $
 
-PKGNAME=	pkglint-5.5.14
+PKGNAME=	pkglint-5.6.6
 DISTFILES=	# none
 CATEGORIES=	pkgtools
 
@@ -16,25 +16,40 @@ AUTO_MKDIRS=	yes
 GO_SRCPATH=	netbsd.org/pkglint
 
 CHECK_RELRO_SKIP+=	bin/pkglint
-CHECK_RELRO_SKIP+=	bin/plist-clash
 
 SUBST_CLASSES+=		pkglint
 SUBST_STAGE.pkglint=	post-configure
 SUBST_FILES.pkglint+=	pkglint.go
 SUBST_SED.pkglint+=	-e s\|@VERSION@\|${PKGNAME:S/pkglint-//}\|g
-SUBST_SED.pkglint+=	-e s\|@BMAKE@\|${MAKE:Q}\|g
+SUBST_SED.pkglint+=	-e s\|@BMAKE@\|${MAKE:T:Q}\|g
+
+TOOLS_CREATE+=		goyacc
+TOOLS_PATH.goyacc=	${WRKDIR}/bin/goyacc
+USE_TOOLS+=		goyacc
+
+# This needs to come before bsd.prefs.mk so that SSP_SUPPORTED is properly set.
+.include "../../lang/go/go-package.mk"
+
+.include "../../mk/bsd.prefs.mk"
 
 do-extract:
 	${RUN} ${MKDIR} ${WRKDIR}/pkglint
 	${RUN} cd ${FILESDIR} && ${PAX} -rw . ${WRKDIR}/pkglint
+.if !${PKGSRC_RUN_TEST:M[yY][eE][sS]}
+	${RUN} rm -rf ${WRKDIR}/pkglint/intqa
+.endif
+	${RUN} ${PKGSRC_SETENV} ${MAKE_ENV} ${GO} get golang.org/x/tools/cmd/goyacc
+	${RUN} ${PKGSRC_SETENV} ${MAKE_ENV} ${GO} install golang.org/x/tools/cmd/goyacc
+
+pre-build:
+	${RUN} ${PKGSRC_SETENV} ${MAKE_ENV} ${GO} generate ${GO_BUILD_PATTERN}
 
 pre-install:
+	${RUN} rm -f ${WRKDIR}/bin/goyacc
 	${RUN} rm -rf ${WRKDIR}/pkg
 
 post-install: do-install-man
 
-.include "../../mk/bsd.prefs.mk"
-
 do-install-man: .PHONY
 .if ${MANINSTALL:Mcatinstall}
 .  if ${CATMAN_SECTION_SUFFIX:M[Yy][Ee][Ss]}
@@ -47,7 +62,6 @@ do-install-man: .PHONY
 	${INSTALL_MAN} ${WRKSRC}/pkglint.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
 .endif
 
-.include "../../lang/go/go-package.mk"
 .if !empty(PKGSRC_RUN_TEST:M[yY][eE][sS])
 .  include "../../devel/go-check/buildlink3.mk"
 .endif