CVS commit: pkgsrc/mk

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

Module Name:    pkgsrc
Committed By:   rillig
Date:           Sun Jan  7 11:23:37 UTC 2018

Modified Files:
        pkgsrc/mk/checksum: bsd.checksum-vars.mk bsd.checksum.mk
        pkgsrc/mk/help: help.mk
        pkgsrc/mk/misc: category.mk
        pkgsrc/mk/tools: replace.mk

Log Message:
Improved documentation for "make help".

The check for target(help) prevents a warning when "make help" is run from
a category directory.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 pkgsrc/mk/checksum/bsd.checksum-vars.mk
cvs rdiff -u -r1.10 -r1.11 pkgsrc/mk/checksum/bsd.checksum.mk
cvs rdiff -u -r1.13 -r1.14 pkgsrc/mk/help/help.mk
cvs rdiff -u -r1.2 -r1.3 pkgsrc/mk/misc/category.mk
cvs rdiff -u -r1.280 -r1.281 pkgsrc/mk/tools/replace.mk

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

Modified files:

Index: pkgsrc/mk/checksum/bsd.checksum-vars.mk
diff -u pkgsrc/mk/checksum/bsd.checksum-vars.mk:1.2 pkgsrc/mk/checksum/bsd.checksum-vars.mk:1.3
--- pkgsrc/mk/checksum/bsd.checksum-vars.mk:1.2 Thu May 22 16:27:22 2008
+++ pkgsrc/mk/checksum/bsd.checksum-vars.mk     Sun Jan  7 11:23:37 2018
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.checksum-vars.mk,v 1.2 2008/05/22 16:27:22 joerg Exp $
+# $NetBSD: bsd.checksum-vars.mk,v 1.3 2018/01/07 11:23:37 rillig Exp $
 #
 # This Makefile fragment is included separately by bsd.pkg.mk and
 # defines some variables which must be defined earlier than where
@@ -8,6 +8,7 @@
 #
 #    DISTINFO_FILE is the path to file containing the checksums.
 #
+# Keywords: distinfo
 
 DISTINFO_FILE?=                ${PKGDIR}/distinfo
 

Index: pkgsrc/mk/checksum/bsd.checksum.mk
diff -u pkgsrc/mk/checksum/bsd.checksum.mk:1.10 pkgsrc/mk/checksum/bsd.checksum.mk:1.11
--- pkgsrc/mk/checksum/bsd.checksum.mk:1.10     Wed Jul 15 09:40:30 2009
+++ pkgsrc/mk/checksum/bsd.checksum.mk  Sun Jan  7 11:23:37 2018
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.checksum.mk,v 1.10 2009/07/15 09:40:30 joerg Exp $
+# $NetBSD: bsd.checksum.mk,v 1.11 2018/01/07 11:23:37 rillig Exp $
 #
 # This Makefile fragment is included by bsd.pkg.mk and defines the
 # relevant variables and targets for the "checksum" phase.
@@ -40,6 +40,7 @@
 #
 #      Default value: undefined
 #
+# Keywords: distinfo
 
 .PHONY: checksum checksum-phase
 .PHONY: makesum makepatchsum mps mdi makedistinfo distinfo

Index: pkgsrc/mk/help/help.mk
diff -u pkgsrc/mk/help/help.mk:1.13 pkgsrc/mk/help/help.mk:1.14
--- pkgsrc/mk/help/help.mk:1.13 Tue Oct 31 16:24:42 2017
+++ pkgsrc/mk/help/help.mk      Sun Jan  7 11:23:37 2018
@@ -1,4 +1,4 @@
-# $NetBSD: help.mk,v 1.13 2017/10/31 16:24:42 rillig Exp $
+# $NetBSD: help.mk,v 1.14 2018/01/07 11:23:37 rillig Exp $
 #
 
 # This is the integrated pkgsrc online help system. To query for the
@@ -25,9 +25,10 @@ TOPIC?=              ${VARNAME}
 TOPIC?=                ${topic}
 .endif
 
+.if !target(help)
 .PHONY: help
 help:
-.if !defined(TOPIC)
+.  if !defined(TOPIC)
        @${ECHO} "usage: "${MAKE:Q}" help topic=<topic>"
        @${ECHO} ""
        @${ECHO} "      <topic> may be a variable name or a make target,"
@@ -38,7 +39,8 @@ help:
        @${ECHO} ""
        @${ECHO} "      The special topic :index lists all available topics."
        @${ECHO} ""
-.else
+.  else
        ${RUN} cd ${PKGSRCDIR};                                         \
        env TOPIC=${TOPIC:Q} ${AWK} -f ${PKGSRCDIR}/mk/help/help.awk ${_HELP_FILES}
+.  endif
 .endif

Index: pkgsrc/mk/misc/category.mk
diff -u pkgsrc/mk/misc/category.mk:1.2 pkgsrc/mk/misc/category.mk:1.3
--- pkgsrc/mk/misc/category.mk:1.2      Sat Oct 13 11:04:18 2007
+++ pkgsrc/mk/misc/category.mk  Sun Jan  7 11:23:37 2018
@@ -1,6 +1,7 @@
-# $NetBSD: category.mk,v 1.2 2007/10/13 11:04:18 dsl Exp $
+# $NetBSD: category.mk,v 1.3 2018/01/07 11:23:37 rillig Exp $
 #
-# This file contains the variables and targets for category Makefiles.
+# This file contains the variables and targets for category Makefiles,
+# e.g. x11/Makefile.
 #
 
 .include "common.mk"

Index: pkgsrc/mk/tools/replace.mk
diff -u pkgsrc/mk/tools/replace.mk:1.280 pkgsrc/mk/tools/replace.mk:1.281
--- pkgsrc/mk/tools/replace.mk:1.280    Tue Aug  1 15:09:52 2017
+++ pkgsrc/mk/tools/replace.mk  Sun Jan  7 11:23:37 2018
@@ -1,4 +1,4 @@
-# $NetBSD: replace.mk,v 1.280 2017/08/01 15:09:52 wiz Exp $
+# $NetBSD: replace.mk,v 1.281 2018/01/07 11:23:37 rillig Exp $
 #
 # Copyright (c) 2005 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -78,6 +78,7 @@
 #
 #      USE_TOOLS+=     perl:run
 #
+# Keywords: USE_TOOLS tool tools
 
 # bison implies "bison-yacc"
 .if !empty(USE_TOOLS:Mbison) || !empty(USE_TOOLS:Mbison\:*)