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.509
retrieving revision 1.559
diff -u -p -r1.509 -r1.559
--- pkgsrc/pkgtools/pkglint/Makefile	2017/01/17 22:37:27	1.509
+++ pkgsrc/pkgtools/pkglint/Makefile	2018/12/02 01:57:48	1.559
@@ -1,54 +1,76 @@
-# $NetBSD: Makefile,v 1.509 2017/01/17 22:37:27 rillig Exp $
+# $NetBSD: Makefile,v 1.559 2018/12/02 01:57:48 rillig Exp $
 
-PKGNAME=	pkglint-5.4.16
-DISTFILES=	# none
+PKGNAME=	pkglint-5.6.7
 CATEGORIES=	pkgtools
+DISTNAME=	tools
+MASTER_SITES=	${MASTER_SITE_GITHUB:=golang/}
+GITHUB_PROJECT=	tools
+GITHUB_TAG=	92d8274bd7b8a4c65f24bafe401a029e58392704
 
 MAINTAINER=	rillig@NetBSD.org
-HOMEPAGE=	http://www.NetBSD.org/docs/pkgsrc/
+HOMEPAGE=	https://github.com/rillig/pkglint
 COMMENT=	Verifier for NetBSD packages
 LICENSE=	2-clause-bsd
 CONFLICTS+=	pkglint4-[0-9]*
 
-NO_CHECKSUM=	yes
-USE_LANGUAGES=	c
-USE_TOOLS+=	pax
-AUTO_MKDIRS=	yes
-GO_SRCPATH=	netbsd.org/pkglint
+USE_TOOLS+=		pax
+AUTO_MKDIRS=		yes
+GO_SRCPATH=		golang.org/x/tools
+GO_DIST_BASE=		${GO_SRCPATH}
+GO_BUILD_PATTERN=	netbsd.org/pkglint/...
+
+CHECK_RELRO_SKIP+=	bin/pkglint
 
 SUBST_CLASSES+=		pkglint
 SUBST_STAGE.pkglint=	post-configure
-SUBST_FILES.pkglint+=	pkglint.go package_test.go
-SUBST_SED.pkglint+=	-e s\|@VERSION@\|${PKGNAME:S/pkglint-//}\|g
-SUBST_SED.pkglint+=	-e s\|@BMAKE@\|${MAKE:Q}\|g
-
-do-extract:
-	${RUN} ${MKDIR} ${WRKDIR}/pkglint
-	${RUN} cd ${FILESDIR} && ${PAX} -rw . ${WRKDIR}/pkglint
+SUBST_FILES.pkglint+=	${WRKSRC.pkglint}/pkglint.go
+SUBST_SED.pkglint+=	-e s\|@VERSION@\|${PKGVERSION}\|g
+SUBST_SED.pkglint+=	-e s\|@BMAKE@\|${MAKE:T:Q}\|g
+
+EXTRACT_PAX_ARGS=	${"${PKGSRC_RUN_TEST:M[yY][eE][sS]}" :?: -s '|.*/intqa/.*||'}
+
+WRKSRC.tools=		${WRKSRC}/golang.org/x/tools
+WRKSRC.pkglint=		${WRKSRC}/netbsd.org/pkglint
+
+PREPEND_PATH+=		${WRKDIR}/bin	# for goyacc
+
+post-extract:
+	${RUN} ${MKDIR} ${WRKSRC.pkglint}
+	${RUN} cd ${FILESDIR} && ${PAX} -rw ${EXTRACT_PAX_ARGS} . ${WRKSRC.pkglint}
+
+	${RUN} ${MKDIR} ${WRKSRC.tools}
+	${RUN} ${MV} ${WRKDIR}/tools-*/* ${WRKSRC.tools}
 
 pre-build:
-	${RUN} env GOPATH=${WRKDIR}:${BUILDLINK_DIR}/gopkg go generate ${GO_BUILD_PATTERN}
+	${RUN} ${PKGSRC_SETENV} ${MAKE_ENV} ${GO} install -v golang.org/x/tools/cmd/goyacc
+	${RUN} ${PKGSRC_SETENV} ${MAKE_ENV} ${GO} generate ${GO_BUILD_PATTERN}
+
+do-test:
+	${RUN} ${PKGSRC_SETENV} ${MAKE_ENV} ${GO} test -vet=off -v ${GO_BUILD_PATTERN}
 
-pre-install:
-	${RUN} rm -rf ${WRKDIR}/pkg
+do-install:
+	${RUN} cd ${WRKDIR} && pax -rw bin/pkglint ${DESTDIR}/${PREFIX}
 
-do-install: do-install-man
+post-install: do-install-man
+
+# This needs to come before bsd.prefs.mk so that SSP_SUPPORTED is properly set.
+.include "../../lang/go/go-package.mk"
+WRKSRC=		${WRKDIR}/src	# Is set unconditionally by go-package.mk
 
 .include "../../mk/bsd.prefs.mk"
 
 do-install-man: .PHONY
 .if ${MANINSTALL:Mcatinstall}
 .  if ${CATMAN_SECTION_SUFFIX:M[Yy][Ee][Ss]}
-	${INSTALL_MAN} ${WRKSRC}/pkglint.0 ${DESTDIR}${PREFIX}/${PKGMANDIR}/cat1/pkglint.1
+	${INSTALL_MAN} ${WRKSRC.pkglint}/pkglint.0 ${DESTDIR}${PREFIX}/${PKGMANDIR}/cat1/pkglint.1
 .  else
-	${INSTALL_MAN} ${WRKSRC}/pkglint.0 ${DESTDIR}${PREFIX}/${PKGMANDIR}/cat1
+	${INSTALL_MAN} ${WRKSRC.pkglint}/pkglint.0 ${DESTDIR}${PREFIX}/${PKGMANDIR}/cat1
 .  endif
 .endif
 .if ${MANINSTALL:Mmaninstall}
-	${INSTALL_MAN} ${WRKSRC}/pkglint.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
+	${INSTALL_MAN} ${WRKSRC.pkglint}/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