CVS commit: pkgsrc/pkgtools/pkglint

["Roland Illig" <rillig%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   rillig
Date:           Thu Nov  8 19:41:32 UTC 2018

Modified Files:
        pkgsrc/pkgtools/pkglint: Makefile

Log Message:
pkgtools/pkglint: fix build when PKGSRC_RUN_TEST is not set


To generate a diff of this commit:
cvs rdiff -u -r1.554 -r1.555 pkgsrc/pkgtools/pkglint/Makefile

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

Modified files:

Index: pkgsrc/pkgtools/pkglint/Makefile
diff -u pkgsrc/pkgtools/pkglint/Makefile:1.554 pkgsrc/pkgtools/pkglint/Makefile:1.555
--- pkgsrc/pkgtools/pkglint/Makefile:1.554      Wed Nov  7 20:58:22 2018
+++ pkgsrc/pkgtools/pkglint/Makefile    Thu Nov  8 19:41:32 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.554 2018/11/07 20:58:22 rillig Exp $
+# $NetBSD: Makefile,v 1.555 2018/11/08 19:41:32 rillig Exp $
 
 PKGNAME=       pkglint-5.6.6
 DISTFILES=     # none
@@ -27,9 +27,17 @@ 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
 
@@ -42,11 +50,6 @@ pre-install:
 
 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"
-
-.include "../../mk/bsd.prefs.mk"
-
 do-install-man: .PHONY
 .if ${MANINSTALL:Mcatinstall}
 .  if ${CATMAN_SECTION_SUFFIX:M[Yy][Ee][Ss]}