pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/pkgtools/pkglint pkgtools/pkglint: fix build



details:   https://anonhg.NetBSD.org/pkgsrc/rev/587e3566afb2
branches:  trunk
changeset: 387148:587e3566afb2
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Sat Nov 10 11:45:29 2018 +0000

description:
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.

diffstat:

 pkgtools/pkglint/Makefile |  14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

diffs (35 lines):

diff -r 820ff5933028 -r 587e3566afb2 pkgtools/pkglint/Makefile
--- a/pkgtools/pkglint/Makefile Sat Nov 10 11:45:27 2018 +0000
+++ b/pkgtools/pkglint/Makefile Sat Nov 10 11:45:29 2018 +0000
@@ -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_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 @@
 
 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]}



Home | Main Index | Thread Index | Old Index