Retire 'djbware-errno-hack' and associated options.mk cleverness.

Instead:

1. Package makefiles including their own options.mk
2. Packages say "SUBST_CLASSES+=djberrno" to get the hack, if needed
3. Packages adjust SUBST_FILES.djberrno, if needed

Should fix bulk build failures due to multiple inclusions of options.mk
and/or incorrect definitions of DJB_ERRNO_HACK.

Approved during the freeze by wiz@.

8 files changed, 19 insertions, 14 deletions

diff --git a/sysutils/checkpassword/Makefile b/sysutils/checkpassword/Makefile
index 49c95051fb8..062e9a4b55a 100644
--- a/sysutils/checkpassword/Makefile
+++ b/sysutils/checkpassword/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2020/01/26 17:32:08 rillig Exp $
+# $NetBSD: Makefile,v 1.22 2020/06/25 05:42:40 schmonz Exp $
 #
 
 DISTNAME=		checkpassword-0.90
@@ -13,6 +13,8 @@ LICENSE=		public-domain
 
 DJB_RESTRICTED=		no
 
+SUBST_CLASSES+=		djberrno
+
 CHECKPASSWORD_BIN=	bin/checkpassword
 
 INSTALLATION_DIRS=	bin
diff --git a/sysutils/daemontools-encore/Makefile b/sysutils/daemontools-encore/Makefile
index 0919d8d81f1..b772ee4dfea 100644
--- a/sysutils/daemontools-encore/Makefile
+++ b/sysutils/daemontools-encore/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2020/04/28 04:22:44 rillig Exp $
+# $NetBSD: Makefile,v 1.5 2020/06/25 05:42:40 schmonz Exp $
 
 DISTNAME=		daemontools-encore-1.11
 PKGREVISION=		2
@@ -13,7 +13,6 @@ LICENSE=		mit
 CONFLICTS+=		daemontools-[0-9]*
 
 DJB_RESTRICTED=		no
-DJB_ERRNO_HACK=		no
 
 MAKE_ENV+=		PKGSRC_SHELL=${TOOLS_PLATFORM.sh}
 INSTALL_TARGET=		install
diff --git a/sysutils/daemontools/Makefile b/sysutils/daemontools/Makefile
index df90aafe5b0..aea1450ab6b 100644
--- a/sysutils/daemontools/Makefile
+++ b/sysutils/daemontools/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.43 2020/05/23 21:32:15 schmonz Exp $
+# $NetBSD: Makefile,v 1.44 2020/06/25 05:42:39 schmonz Exp $
 
 DISTNAME=		daemontools-0.76
 PKGREVISION=		3
@@ -17,7 +17,6 @@ SITES.${MANPAGES}=	http://smarden.org/pape/djb/manpages/
 CONFLICTS+=		daemontools-encore-[0-9]*
 
 DJB_RESTRICTED=		no
-DJB_ERRNO_HACK=		no
 
 WRKSRC=			${WRKDIR}/admin/${PKGNAME_NOREV}
 DJB_SLASHPACKAGE=	YES
@@ -28,7 +27,8 @@ USE_TOOLS+=		file
 
 INSTALLATION_DIRS=	bin man ${PKGMANDIR}/man8
 
-SUBST_FILES.djbware+=	src/error.h
+SUBST_CLASSES+=		djberrno
+SUBST_FILES.djberrno+=	src/error.h
 
 SUBST_CLASSES+=		paths
 SUBST_STAGE.paths=	do-configure
diff --git a/sysutils/fdtools/Makefile b/sysutils/fdtools/Makefile
index c8cbd801732..6b5f1e5668f 100644
--- a/sysutils/fdtools/Makefile
+++ b/sysutils/fdtools/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2020/05/01 20:44:52 rillig Exp $
+# $NetBSD: Makefile,v 1.6 2020/06/25 05:42:40 schmonz Exp $
 
 DISTNAME=		fdtools-2015.03.28
 PKGREVISION=		2
@@ -12,7 +12,6 @@ COMMENT=		Manipulate file descriptor properties from shell scripts
 LICENSE=		gnu-gpl-v2
 
 DJB_RESTRICTED=		no
-DJB_ERRNO_HACK=		no
 
 WRKSRC=			${WRKDIR}/misc/${PKGNAME_NOREV}
 DJB_SLASHPACKAGE=	YES
diff --git a/sysutils/memtester/Makefile b/sysutils/memtester/Makefile
index 3caf5c573e3..243eeb1aab7 100644
--- a/sysutils/memtester/Makefile
+++ b/sysutils/memtester/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2020/04/27 04:11:26 rillig Exp $
+# $NetBSD: Makefile,v 1.26 2020/06/25 05:42:40 schmonz Exp $
 #
 
 DISTNAME=		memtester-4.3.0
@@ -14,7 +14,6 @@ NOT_FOR_PLATFORM=	Interix-*-* # no m[un]lock(2), so not useful anyway
 
 DJB_RESTRICTED=		NO
 DJB_MAKE_TARGETS=	NO
-DJB_ERRNO_HACK=		NO
 
 INSTALLATION_DIRS=	bin ${PKGMANDIR}/man8 share/doc/memtester
 
diff --git a/sysutils/qlogtools/Makefile b/sysutils/qlogtools/Makefile
index 83a4412055b..18fb2553c7f 100644
--- a/sysutils/qlogtools/Makefile
+++ b/sysutils/qlogtools/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2020/05/02 11:49:40 rillig Exp $
+# $NetBSD: Makefile,v 1.13 2020/06/25 05:42:40 schmonz Exp $
 #
 
 DISTNAME=		qlogtools-3.1
@@ -11,7 +11,9 @@ COMMENT=		Tools useful in analyzing logs from qmail and other pkgs
 
 DJB_RESTRICTED=		NO
 DJB_MAKE_TARGETS=	NO
-DJB_ERRNO_HACK_FILES=	qfilelog.c
+
+SUBST_CLASSES+=		djberrno
+SUBST_FILES.djberrno=	qfilelog.c
 
 INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
 
diff --git a/sysutils/qpasswd/Makefile b/sysutils/qpasswd/Makefile
index 92493dc57c6..627288a654d 100644
--- a/sysutils/qpasswd/Makefile
+++ b/sysutils/qpasswd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2018/12/15 16:51:36 schmonz Exp $
+# $NetBSD: Makefile,v 1.3 2020/06/25 05:42:40 schmonz Exp $
 
 DISTNAME=		qpasswd-0.5
 CATEGORIES=		sysutils
@@ -10,6 +10,8 @@ HOMEPAGE=		https://mcmilk.de/projects/qpasswd/
 COMMENT=		Password-checking tools for many authentication schemes
 #LICENSE=		# TODO: (see mk/license.mk)
 
+SUBST_CLASSES+=		djberrno
+
 SUBST_CLASSES+=		paths
 SUBST_STAGE.paths=	pre-build
 SUBST_FILES.paths=	man/checkqpasswd.8 man/qpasswd.5
diff --git a/sysutils/service-config/Makefile b/sysutils/service-config/Makefile
index 6f7921a0582..fa1b5fd98ef 100644
--- a/sysutils/service-config/Makefile
+++ b/sysutils/service-config/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2017/09/04 18:01:01 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2020/06/25 05:42:39 schmonz Exp $
 #
 
 DISTNAME=		service-config-0.51
@@ -14,6 +14,8 @@ DEPENDS+=		daemontools-[0-9]*:../../sysutils/daemontools
 # Possibly inherited DJB-style distribution terms
 DJB_RESTRICTED=		YES
 
+SUBST_CLASSES+=		djberrno
+
 INSTALLATION_DIRS=	bin
 
 do-install: