Thu Nov 8 19:41:32 2018 UTC ()
pkgtools/pkglint: fix build when PKGSRC_RUN_TEST is not set


(rillig)
diff -r1.554 -r1.555 pkgsrc/pkgtools/pkglint/Makefile
cvs diff -r1.554 -r1.555 pkgsrc/pkgtools/pkglint/Makefile (expand / switch to unified diff)

--- pkgsrc/pkgtools/pkglint/Makefile 2018/11/07 20:58:22 1.554
+++ pkgsrc/pkgtools/pkglint/Makefile 2018/11/08 19:41:32 1.555
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.554 2018/11/07 20:58:22 rillig Exp $ 1# $NetBSD: Makefile,v 1.555 2018/11/08 19:41:32 rillig Exp $
2 2
3PKGNAME= pkglint-5.6.6 3PKGNAME= pkglint-5.6.6
4DISTFILES= # none 4DISTFILES= # none
5CATEGORIES= pkgtools 5CATEGORIES= pkgtools
6 6
7MAINTAINER= rillig@NetBSD.org 7MAINTAINER= rillig@NetBSD.org
8HOMEPAGE= https://github.com/rillig/pkglint 8HOMEPAGE= https://github.com/rillig/pkglint
9COMMENT= Verifier for NetBSD packages 9COMMENT= Verifier for NetBSD packages
10LICENSE= 2-clause-bsd 10LICENSE= 2-clause-bsd
11CONFLICTS+= pkglint4-[0-9]* 11CONFLICTS+= pkglint4-[0-9]*
12 12
13NO_CHECKSUM= yes 13NO_CHECKSUM= yes
14USE_TOOLS+= pax 14USE_TOOLS+= pax
@@ -17,46 +17,49 @@ GO_SRCPATH= netbsd.org/pkglint @@ -17,46 +17,49 @@ GO_SRCPATH= netbsd.org/pkglint
17 17
18CHECK_RELRO_SKIP+= bin/pkglint 18CHECK_RELRO_SKIP+= bin/pkglint
19 19
20SUBST_CLASSES+= pkglint 20SUBST_CLASSES+= pkglint
21SUBST_STAGE.pkglint= post-configure 21SUBST_STAGE.pkglint= post-configure
22SUBST_FILES.pkglint+= pkglint.go 22SUBST_FILES.pkglint+= pkglint.go
23SUBST_SED.pkglint+= -e s\|@VERSION@\|${PKGNAME:S/pkglint-//}\|g 23SUBST_SED.pkglint+= -e s\|@VERSION@\|${PKGNAME:S/pkglint-//}\|g
24SUBST_SED.pkglint+= -e s\|@BMAKE@\|${MAKE:T:Q}\|g 24SUBST_SED.pkglint+= -e s\|@BMAKE@\|${MAKE:T:Q}\|g
25 25
26TOOLS_CREATE+= goyacc 26TOOLS_CREATE+= goyacc
27TOOLS_PATH.goyacc= ${WRKDIR}/bin/goyacc 27TOOLS_PATH.goyacc= ${WRKDIR}/bin/goyacc
28USE_TOOLS+= goyacc 28USE_TOOLS+= goyacc
29 29
 30# This needs to come before bsd.prefs.mk so that SSP_SUPPORTED is properly set.
 31.include "../../lang/go/go-package.mk"
 32
 33.include "../../mk/bsd.prefs.mk"
 34
30do-extract: 35do-extract:
31 ${RUN} ${MKDIR} ${WRKDIR}/pkglint 36 ${RUN} ${MKDIR} ${WRKDIR}/pkglint
32 ${RUN} cd ${FILESDIR} && ${PAX} -rw . ${WRKDIR}/pkglint 37 ${RUN} cd ${FILESDIR} && ${PAX} -rw . ${WRKDIR}/pkglint
 38.if !${PKGSRC_RUN_TEST:M[yY][eE][sS]}
 39 ${RUN} rm -rf ${WRKDIR}/pkglint/intqa
 40.endif
33 ${RUN} ${PKGSRC_SETENV} ${MAKE_ENV} ${GO} get golang.org/x/tools/cmd/goyacc 41 ${RUN} ${PKGSRC_SETENV} ${MAKE_ENV} ${GO} get golang.org/x/tools/cmd/goyacc
34 ${RUN} ${PKGSRC_SETENV} ${MAKE_ENV} ${GO} install golang.org/x/tools/cmd/goyacc 42 ${RUN} ${PKGSRC_SETENV} ${MAKE_ENV} ${GO} install golang.org/x/tools/cmd/goyacc
35 43
36pre-build: 44pre-build:
37 ${RUN} ${PKGSRC_SETENV} ${MAKE_ENV} ${GO} generate ${GO_BUILD_PATTERN} 45 ${RUN} ${PKGSRC_SETENV} ${MAKE_ENV} ${GO} generate ${GO_BUILD_PATTERN}
38 46
39pre-install: 47pre-install:
40 ${RUN} rm -f ${WRKDIR}/bin/goyacc 48 ${RUN} rm -f ${WRKDIR}/bin/goyacc
41 ${RUN} rm -rf ${WRKDIR}/pkg 49 ${RUN} rm -rf ${WRKDIR}/pkg
42 50
43post-install: do-install-man 51post-install: do-install-man
44 52
45# This needs to come before bsd.prefs.mk so that SSP_SUPPORTED is properly set. 
46.include "../../lang/go/go-package.mk" 
47 
48.include "../../mk/bsd.prefs.mk" 
49 
50do-install-man: .PHONY 53do-install-man: .PHONY
51.if ${MANINSTALL:Mcatinstall} 54.if ${MANINSTALL:Mcatinstall}
52. if ${CATMAN_SECTION_SUFFIX:M[Yy][Ee][Ss]} 55. if ${CATMAN_SECTION_SUFFIX:M[Yy][Ee][Ss]}
53 ${INSTALL_MAN} ${WRKSRC}/pkglint.0 ${DESTDIR}${PREFIX}/${PKGMANDIR}/cat1/pkglint.1 56 ${INSTALL_MAN} ${WRKSRC}/pkglint.0 ${DESTDIR}${PREFIX}/${PKGMANDIR}/cat1/pkglint.1
54. else 57. else
55 ${INSTALL_MAN} ${WRKSRC}/pkglint.0 ${DESTDIR}${PREFIX}/${PKGMANDIR}/cat1 58 ${INSTALL_MAN} ${WRKSRC}/pkglint.0 ${DESTDIR}${PREFIX}/${PKGMANDIR}/cat1
56. endif 59. endif
57.endif 60.endif
58.if ${MANINSTALL:Mmaninstall} 61.if ${MANINSTALL:Mmaninstall}
59 ${INSTALL_MAN} ${WRKSRC}/pkglint.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 62 ${INSTALL_MAN} ${WRKSRC}/pkglint.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
60.endif 63.endif
61 64
62.if !empty(PKGSRC_RUN_TEST:M[yY][eE][sS]) 65.if !empty(PKGSRC_RUN_TEST:M[yY][eE][sS])