CVS commit: pkgsrc/mk

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

Module Name:    pkgsrc
Committed By:   rillig
Date:           Mon Sep  2 02:23:03 UTC 2019

Modified Files:
        pkgsrc/mk: bdb.buildlink3.mk curses.buildlink3.mk libusb.buildlink3.mk
            license.mk mpi.buildlink3.mk mysql.buildlink3.mk
            readline.buildlink3.mk termcap.buildlink3.mk terminfo.buildlink3.mk
            unprivileged.mk
        pkgsrc/mk/compiler: ccache.mk
        pkgsrc/mk/configure: cmake.mk
        pkgsrc/mk/features: features-vars.mk
        pkgsrc/mk/install: bin-install.mk install.mk

Log Message:
mk: use a single form for headings in the documentation comments


To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 pkgsrc/mk/bdb.buildlink3.mk
cvs rdiff -u -r1.29 -r1.30 pkgsrc/mk/curses.buildlink3.mk
cvs rdiff -u -r1.1 -r1.2 pkgsrc/mk/libusb.buildlink3.mk
cvs rdiff -u -r1.101 -r1.102 pkgsrc/mk/license.mk
cvs rdiff -u -r1.4 -r1.5 pkgsrc/mk/mpi.buildlink3.mk
cvs rdiff -u -r1.23 -r1.24 pkgsrc/mk/mysql.buildlink3.mk
cvs rdiff -u -r1.5 -r1.6 pkgsrc/mk/readline.buildlink3.mk
cvs rdiff -u -r1.12 -r1.13 pkgsrc/mk/termcap.buildlink3.mk
cvs rdiff -u -r1.7 -r1.8 pkgsrc/mk/terminfo.buildlink3.mk
cvs rdiff -u -r1.22 -r1.23 pkgsrc/mk/unprivileged.mk
cvs rdiff -u -r1.38 -r1.39 pkgsrc/mk/compiler/ccache.mk
cvs rdiff -u -r1.16 -r1.17 pkgsrc/mk/configure/cmake.mk
cvs rdiff -u -r1.26 -r1.27 pkgsrc/mk/features/features-vars.mk
cvs rdiff -u -r1.28 -r1.29 pkgsrc/mk/install/bin-install.mk
cvs rdiff -u -r1.76 -r1.77 pkgsrc/mk/install/install.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/bdb.buildlink3.mk
diff -u pkgsrc/mk/bdb.buildlink3.mk:1.26 pkgsrc/mk/bdb.buildlink3.mk:1.27
--- pkgsrc/mk/bdb.buildlink3.mk:1.26    Mon Apr 11 04:22:34 2016
+++ pkgsrc/mk/bdb.buildlink3.mk Mon Sep  2 02:23:02 2019
@@ -1,4 +1,4 @@
-# $NetBSD: bdb.buildlink3.mk,v 1.26 2016/04/11 04:22:34 dbj Exp $
+# $NetBSD: bdb.buildlink3.mk,v 1.27 2019/09/02 02:23:02 rillig Exp $
 #
 # This Makefile fragment is meant to be included by packages that
 # require a Berkeley DB (BDB) implementation and that are not restricted
@@ -8,7 +8,7 @@
 # FIXME: This Makefile cannot handle packages that can use only a
 # subset of { db2 db3 db4 }.
 #
-# === User-settable variables ===
+# User-settable variables:
 #
 # BDB_DEFAULT
 #      This value represents the package we use when either a db-1.85
@@ -26,7 +26,7 @@
 #      It defaults to "db1" if it's built-in, or to ${BDB_DEFAULT}
 #      otherwise.
 #
-# === Package-settable variables ===
+# Package-settable variables:
 #
 # BDB_ACCEPTED
 #      The list of Berkeley DB implementations that can be used by the
@@ -35,7 +35,7 @@
 #      FIXME: If the list does not include db1 and does not include
 #      BDB_DEFAULT, the package will not build at the moment.
 #
-# === Variables set by this file ===
+# System-defined variables:
 #
 # BDB_TYPE
 #      The name of the selected BDB implementation.

Index: pkgsrc/mk/curses.buildlink3.mk
diff -u pkgsrc/mk/curses.buildlink3.mk:1.29 pkgsrc/mk/curses.buildlink3.mk:1.30
--- pkgsrc/mk/curses.buildlink3.mk:1.29 Sun Dec 16 23:21:52 2018
+++ pkgsrc/mk/curses.buildlink3.mk      Mon Sep  2 02:23:02 2019
@@ -1,4 +1,4 @@
-# $NetBSD: curses.buildlink3.mk,v 1.29 2018/12/16 23:21:52 rillig Exp $
+# $NetBSD: curses.buildlink3.mk,v 1.30 2019/09/02 02:23:02 rillig Exp $
 #
 # This Makefile fragment is meant to be included by packages that require
 # any curses implementation instead of one particular one.  The available
@@ -9,7 +9,7 @@
 # directly include the appropriate buildlink3.mk instead of this file in
 # the package Makefile.
 #
-# === User-settable variables ===
+# User-settable variables:
 #
 # CURSES_DEFAULT
 #      This value represents the type of curses we wish to use on the
@@ -19,7 +19,7 @@
 #      Possible: curses, ncurses, ncursesw, pdcurses
 #      Default: (depends)
 #
-# === Package-settable variables ===
+# Package-settable variables:
 #
 # USE_CURSES
 #      This value represents the features the package needs from curses.
@@ -47,7 +47,7 @@
 #
 #      Default: (unset)
 #
-# === Variables set by this file ===
+# System-defined variables:
 #
 # CURSES_TYPE
 #      The name of the selected curses implementation.

Index: pkgsrc/mk/libusb.buildlink3.mk
diff -u pkgsrc/mk/libusb.buildlink3.mk:1.1 pkgsrc/mk/libusb.buildlink3.mk:1.2
--- pkgsrc/mk/libusb.buildlink3.mk:1.1  Sat Feb 10 13:45:45 2018
+++ pkgsrc/mk/libusb.buildlink3.mk      Mon Sep  2 02:23:02 2019
@@ -1,4 +1,4 @@
-# $NetBSD: libusb.buildlink3.mk,v 1.1 2018/02/10 13:45:45 khorben Exp $
+# $NetBSD: libusb.buildlink3.mk,v 1.2 2019/09/02 02:23:02 rillig Exp $
 #
 # This Makefile is meant to be included by packages that require an
 # implementation of the former libusb (still found in devel/libusb). The
@@ -9,7 +9,7 @@
 # LIBUSB_TYPE to "compat". On NetBSD, it has the advantage of not requiring root
 # privileges to locate and use USB devices without a kernel driver.
 #
-# === User-settable variables ===
+# User-settable variables:
 #
 # LIBUSB_TYPE
 #      The name of the libusb implementation to default to, native or compat.

Index: pkgsrc/mk/license.mk
diff -u pkgsrc/mk/license.mk:1.101 pkgsrc/mk/license.mk:1.102
--- pkgsrc/mk/license.mk:1.101  Wed Aug 14 18:12:00 2019
+++ pkgsrc/mk/license.mk        Mon Sep  2 02:23:02 2019
@@ -1,4 +1,4 @@
-# $NetBSD: license.mk,v 1.101 2019/08/14 18:12:00 brook Exp $
+# $NetBSD: license.mk,v 1.102 2019/09/02 02:23:02 rillig Exp $
 #
 # This file handles everything about the LICENSE variable. It is
 # included automatically by bsd.pkg.mk.
@@ -10,7 +10,7 @@
 # XXX: Some of this content arguably belongs in the pkgsrc guide
 # instead.
 #
-# === User-settable variables ===
+# User-settable variables:
 #
 # ACCEPTABLE_LICENSES
 #
@@ -25,7 +25,7 @@
 #
 #      Default value: ${DEFAULT_ACCEPTABLE_LICENSES}
 #
-# === Package-settable variables ===
+# Package-settable variables:
 #
 # LICENSE
 #

Index: pkgsrc/mk/mpi.buildlink3.mk
diff -u pkgsrc/mk/mpi.buildlink3.mk:1.4 pkgsrc/mk/mpi.buildlink3.mk:1.5
--- pkgsrc/mk/mpi.buildlink3.mk:1.4     Sat Apr 20 16:32:42 2019
+++ pkgsrc/mk/mpi.buildlink3.mk Mon Sep  2 02:23:02 2019
@@ -1,10 +1,10 @@
-# $NetBSD: mpi.buildlink3.mk,v 1.4 2019/04/20 16:32:42 rillig Exp $
+# $NetBSD: mpi.buildlink3.mk,v 1.5 2019/09/02 02:23:02 rillig Exp $
 #
 # This Makefile fragment is meant to be included by packages
 # that use any MPI implementation instead of one particular one.
 # The available MPI implementations are "mpich" and "openmpi".
 #
-# === User-settable variables ===
+# User-settable variables:
 #
 # MPI_TYPE
 #      This value represents the type of MPI we wish to use on the system.

Index: pkgsrc/mk/mysql.buildlink3.mk
diff -u pkgsrc/mk/mysql.buildlink3.mk:1.23 pkgsrc/mk/mysql.buildlink3.mk:1.24
--- pkgsrc/mk/mysql.buildlink3.mk:1.23  Mon Sep  2 02:14:58 2019
+++ pkgsrc/mk/mysql.buildlink3.mk       Mon Sep  2 02:23:02 2019
@@ -1,9 +1,9 @@
-# $NetBSD: mysql.buildlink3.mk,v 1.23 2019/09/02 02:14:58 rillig Exp $
+# $NetBSD: mysql.buildlink3.mk,v 1.24 2019/09/02 02:23:02 rillig Exp $
 #
 # This file is included by packages that require some version of the
 # MySQL database client.
 #
-# === User-settable variables ===
+# User-settable variables:
 #
 # MYSQL_VERSION_DEFAULT
 #      The preferred MySQL version.
@@ -11,7 +11,7 @@
 #      Possible: 57 56 55 51 MARIADB55
 #      Default: 57
 #
-# === Package-settable variables ===
+# Package-settable variables:
 #
 # MYSQL_VERSIONS_ACCEPTED
 #      The list of MySQL versions that the package accepts.

Index: pkgsrc/mk/readline.buildlink3.mk
diff -u pkgsrc/mk/readline.buildlink3.mk:1.5 pkgsrc/mk/readline.buildlink3.mk:1.6
--- pkgsrc/mk/readline.buildlink3.mk:1.5        Mon Apr 11 04:22:34 2016
+++ pkgsrc/mk/readline.buildlink3.mk    Mon Sep  2 02:23:02 2019
@@ -1,4 +1,4 @@
-# $NetBSD: readline.buildlink3.mk,v 1.5 2016/04/11 04:22:34 dbj Exp $
+# $NetBSD: readline.buildlink3.mk,v 1.6 2019/09/02 02:23:02 rillig Exp $
 #
 # This Makefile fragment is meant to be included by packages that require
 # any readline implementation instead of one particular one.  The available
@@ -8,7 +8,7 @@
 # directly include the appropriate buildlink3.mk instead of this file in
 # the package Makefile.
 #
-# === User-settable variables ===
+# User-settable variables:
 #
 # READLINE_DEFAULT
 #      This value represents the type of readline we wish to use on the
@@ -18,7 +18,7 @@
 #      Possible: editline readline
 #      Default: (depends)
 #
-# === Variables set by this file ===
+# System-defined variables:
 #
 # READLINE_TYPE
 #      The name of the selected readline implementation, editline or

Index: pkgsrc/mk/termcap.buildlink3.mk
diff -u pkgsrc/mk/termcap.buildlink3.mk:1.12 pkgsrc/mk/termcap.buildlink3.mk:1.13
--- pkgsrc/mk/termcap.buildlink3.mk:1.12        Thu Dec 20 17:08:27 2018
+++ pkgsrc/mk/termcap.buildlink3.mk     Mon Sep  2 02:23:02 2019
@@ -1,11 +1,11 @@
-# $NetBSD: termcap.buildlink3.mk,v 1.12 2018/12/20 17:08:27 rillig Exp $
+# $NetBSD: termcap.buildlink3.mk,v 1.13 2019/09/02 02:23:02 rillig Exp $
 #
 # This Makefile fragment is meant to be included by packages that require
 # a termcap implementation that supports the basic termcap functions:
 #
 #      tgetent, tgetstr, tgetflag, tgetnum, tgoto, tputs
 #
-# === Variables set by this file ===
+# System-defined variables:
 #
 # TERMCAP_TYPE
 #      The name of the selected termcap implementation.

Index: pkgsrc/mk/terminfo.buildlink3.mk
diff -u pkgsrc/mk/terminfo.buildlink3.mk:1.7 pkgsrc/mk/terminfo.buildlink3.mk:1.8
--- pkgsrc/mk/terminfo.buildlink3.mk:1.7        Mon Apr 11 04:22:34 2016
+++ pkgsrc/mk/terminfo.buildlink3.mk    Mon Sep  2 02:23:02 2019
@@ -1,4 +1,4 @@
-# $NetBSD: terminfo.buildlink3.mk,v 1.7 2016/04/11 04:22:34 dbj Exp $
+# $NetBSD: terminfo.buildlink3.mk,v 1.8 2019/09/02 02:23:02 rillig Exp $
 #
 # This Makefile fragment is meant to be included by packages that require
 # any terminfo implementation instead of one particular one.  The available
@@ -9,7 +9,7 @@
 # directly include the appropriate buildlink3.mk instead of this file in
 # the package Makefile.
 #
-# === User-settable variables ===
+# User-settable variables:
 #
 # TERMINFO_DEFAULT
 #      This value represents the type of terminfo we wish to use on the
@@ -19,7 +19,7 @@
 #      Possible: terminfo, ncurses, pdcurses
 #      Default: (depends)
 #
-# === Variables set by this file ===
+# System-defined variables:
 #
 # TERMINFO_TYPE
 #      The name of the selected terminfo implementation.

Index: pkgsrc/mk/unprivileged.mk
diff -u pkgsrc/mk/unprivileged.mk:1.22 pkgsrc/mk/unprivileged.mk:1.23
--- pkgsrc/mk/unprivileged.mk:1.22      Sat Apr 21 19:29:47 2012
+++ pkgsrc/mk/unprivileged.mk   Mon Sep  2 02:23:02 2019
@@ -1,10 +1,10 @@
-# $NetBSD: unprivileged.mk,v 1.22 2012/04/21 19:29:47 cheusov Exp $
+# $NetBSD: unprivileged.mk,v 1.23 2019/09/02 02:23:02 rillig Exp $
 #
 # This file collects definitions that are useful when using pkgsrc as an
 # unprivileged (non-root) user. It is included automatically by the
 # pkgsrc infrastructure.
 #
-# === User-settable variables ===
+# User-settable variables:
 #
 # UNPRIVILEGED
 #      Whether to build packages as unprivileged user.
@@ -34,7 +34,7 @@
 #       Default: The complete group membership of the user building
 #       the package
 #
-# === Package-settable variables ===
+# Package-settable variables:
 #
 # PKG_USERS_VARS
 #      A list of variables that hold bare user names, e.g APACHE_USER, etc.

Index: pkgsrc/mk/compiler/ccache.mk
diff -u pkgsrc/mk/compiler/ccache.mk:1.38 pkgsrc/mk/compiler/ccache.mk:1.39
--- pkgsrc/mk/compiler/ccache.mk:1.38   Wed Aug 22 20:48:37 2018
+++ pkgsrc/mk/compiler/ccache.mk        Mon Sep  2 02:23:02 2019
@@ -1,4 +1,4 @@
-# $NetBSD: ccache.mk,v 1.38 2018/08/22 20:48:37 maya Exp $
+# $NetBSD: ccache.mk,v 1.39 2019/09/02 02:23:02 rillig Exp $
 #
 # Copyright (c) 2004 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -28,7 +28,7 @@
 # POSSIBILITY OF SUCH DAMAGE.
 #
 
-# === User-settable variables ===
+# User-settable variables:
 #
 # CCACHE_BASE
 #      The directory where ccache is installed. The build dependency on
@@ -46,7 +46,7 @@
 #       doing to the specified file. This is useful for tracking down
 #       problems.
 #
-# === Package-settable variables ===
+# Package-settable variables:
 #
 # IGNORE_CCACHE
 #      Can be set to "yes" for packages that have problems with ccache.

Index: pkgsrc/mk/configure/cmake.mk
diff -u pkgsrc/mk/configure/cmake.mk:1.16 pkgsrc/mk/configure/cmake.mk:1.17
--- pkgsrc/mk/configure/cmake.mk:1.16   Sun Apr  8 19:11:27 2018
+++ pkgsrc/mk/configure/cmake.mk        Mon Sep  2 02:23:03 2019
@@ -1,9 +1,9 @@
-# $NetBSD: cmake.mk,v 1.16 2018/04/08 19:11:27 chuck Exp $
+# $NetBSD: cmake.mk,v 1.17 2019/09/02 02:23:03 rillig Exp $
 #
 # This file handles packages that use CMake as their primary build
 # system. For more information about CMake, see http://www.cmake.org/.
 #
-# === Package-settable variables ===
+# Package-settable variables:
 #
 # CMAKE_DEPENDENCIES_REWRITE
 #      A list of files (XXX: variable name) relative to WRKSRC in

Index: pkgsrc/mk/features/features-vars.mk
diff -u pkgsrc/mk/features/features-vars.mk:1.26 pkgsrc/mk/features/features-vars.mk:1.27
--- pkgsrc/mk/features/features-vars.mk:1.26    Wed Jul 10 17:15:27 2019
+++ pkgsrc/mk/features/features-vars.mk Mon Sep  2 02:23:03 2019
@@ -1,4 +1,4 @@
-# $NetBSD: features-vars.mk,v 1.26 2019/07/10 17:15:27 sevan Exp $
+# $NetBSD: features-vars.mk,v 1.27 2019/09/02 02:23:03 rillig Exp $
 #
 # The platforms that are supported by pkgsrc differ in the amount of
 # functions they provide in the C library (libc). Functions that are
@@ -29,7 +29,7 @@
 #      #include <err.h>
 #      #endif
 #
-# === Package-settable variables ===
+# Package-settable variables:
 #
 # USE_FEATURES
 #      Lists the system features required by the package.
@@ -52,7 +52,7 @@
 #
 #      Default value: undefined
 #
-# === Variables defined by this file ===
+# System-defined variables:
 #
 # MISSING_FEATURES
 #      The features listed in USE_FEATURES that are missing on the

Index: pkgsrc/mk/install/bin-install.mk
diff -u pkgsrc/mk/install/bin-install.mk:1.28 pkgsrc/mk/install/bin-install.mk:1.29
--- pkgsrc/mk/install/bin-install.mk:1.28       Thu Nov 15 01:40:52 2018
+++ pkgsrc/mk/install/bin-install.mk    Mon Sep  2 02:23:03 2019
@@ -1,4 +1,4 @@
-# $NetBSD: bin-install.mk,v 1.28 2018/11/15 01:40:52 sevan Exp $
+# $NetBSD: bin-install.mk,v 1.29 2019/09/02 02:23:03 rillig Exp $
 #
 
 # This file provides the following targets:
@@ -7,7 +7,7 @@
 #      Tries to install a package from a prebuilt binary package, and
 #      if that doesn't work, builds the package from source.
 #
-# === User-settable variables ===
+# User-settable variables:
 #
 # PACKAGES
 #      This directory is searched before BINPKG_SITES when trying to

Index: pkgsrc/mk/install/install.mk
diff -u pkgsrc/mk/install/install.mk:1.76 pkgsrc/mk/install/install.mk:1.77
--- pkgsrc/mk/install/install.mk:1.76   Tue May  7 19:36:44 2019
+++ pkgsrc/mk/install/install.mk        Mon Sep  2 02:23:03 2019
@@ -1,4 +1,4 @@
-# $NetBSD: install.mk,v 1.76 2019/05/07 19:36:44 rillig Exp $
+# $NetBSD: install.mk,v 1.77 2019/09/02 02:23:03 rillig Exp $
 #
 # This file provides the code for the "install" phase.
 #
@@ -21,7 +21,7 @@
 #      in order to install the package.
 #
 
-# === User-settable variables ===
+# User-settable variables:
 #
 # INSTALL_UNSTRIPPED
 #      If "yes", all binaries and shared libraries are installed
@@ -34,7 +34,7 @@
 #
 # Keywords: strip unstripped
 #
-# === Package-settable variables ===
+# Package-settable variables:
 #
 # INSTALLATION_DIRS
 #      A list of directories that should be created at the very