CVS commit: pkgsrc/pkgtools/pkglint

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

Module Name:    pkgsrc
Committed By:   rillig
Date:           Sat Nov 10 11:45:29 UTC 2018

Modified Files:
        pkgsrc/pkgtools/pkglint: Makefile

Log Message:
pkgtools/pkglint: fix build

go-package.mk needs to be included at the bottom of the package Makefile
since it defines several make targets that pkglint also defines.


To generate a diff of this commit:
cvs rdiff -u -r1.556 -r1.557 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.556 pkgsrc/pkgtools/pkglint/Makefile:1.557
--- pkgsrc/pkgtools/pkglint/Makefile:1.556      Sat Nov 10 11:41:40 2018
+++ pkgsrc/pkgtools/pkglint/Makefile    Sat Nov 10 11:45:29 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.556 2018/11/10 11:41:40 rillig Exp $
+# $NetBSD: Makefile,v 1.557 2018/11/10 11:45:29 rillig Exp $
 
 PKGNAME=       pkglint-5.6.6
 CATEGORIES=    pkgtools
@@ -27,12 +27,6 @@ SUBST_FILES.pkglint+=        ${WRKSRC.pkglint}/
 SUBST_SED.pkglint+=    -e s\|@VERSION@\|${PKGVERSION}\|g
 SUBST_SED.pkglint+=    -e s\|@BMAKE@\|${MAKE:T:Q}\|g
 
-# 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"
-
 EXTRACT_PAX_ARGS=      ${"${PKGSRC_RUN_TEST:M[yY][eE][sS]}" :?: -s '|.*/intqa/.*||'}
 
 WRKSRC.tools=          ${WRKSRC}/golang.org/x/tools
@@ -57,6 +51,12 @@ do-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"
+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]}