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@.

41 files changed, 103 insertions, 97 deletions

diff --git a/databases/cdb/Makefile b/databases/cdb/Makefile
index 0e07c636640..a4eae3de3da 100644
--- a/databases/cdb/Makefile
+++ b/databases/cdb/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2020/01/26 17:30:52 rillig Exp $
+# $NetBSD: Makefile,v 1.26 2020/06/25 05:42:36 schmonz Exp $
 
 DISTNAME=		cdb-0.75
 CATEGORIES=		databases
@@ -13,6 +13,8 @@ CONFLICTS+=		tinycdb-[0-9]*
 
 DJB_RESTRICTED=		no
 
+SUBST_CLASSES+=		djberrno
+
 INSTALLATION_DIRS=	bin include lib
 
 do-install:
diff --git a/devel/bglibs/Makefile b/devel/bglibs/Makefile
index e65fbd164ba..57d8d1741e3 100644
--- a/devel/bglibs/Makefile
+++ b/devel/bglibs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2020/03/22 11:29:46 rillig Exp $
+# $NetBSD: Makefile,v 1.38 2020/06/25 05:42:36 schmonz Exp $
 #
 
 DISTNAME=		bglibs-2.04
@@ -18,7 +18,6 @@ USE_LIBTOOL=		yes
 
 DJB_RESTRICTED=		NO
 DJB_MAKE_TARGETS=	NO
-DJB_ERRNO_HACK=		NO
 TEST_TARGET=		selftests
 
 DJB_CONFIG_CMDS= \
diff --git a/devel/libtai/Makefile b/devel/libtai/Makefile
index 78aad307b40..00de48b7491 100644
--- a/devel/libtai/Makefile
+++ b/devel/libtai/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2020/05/23 21:32:14 schmonz Exp $
+# $NetBSD: Makefile,v 1.21 2020/06/25 05:42:36 schmonz Exp $
 #
 
 DISTNAME=		libtai-0.60
@@ -14,11 +14,11 @@ LICENSE=		public-domain
 CONFLICTS=		libowfat<0.32nb1
 
 DJB_RESTRICTED=		NO
-DJB_ERRNO_HACK=		no
 
 EGDIR=			share/examples/${PKGBASE}
 
-SUBST_FILES.djbware+=	leapsecs_read.c
+SUBST_CLASSES+=		djberrno
+SUBST_FILES.djberrno+=	leapsecs_read.c
 
 SUBST_CLASSES+=		paths
 SUBST_STAGE.paths=	do-configure
diff --git a/mail/dot-forward/Makefile b/mail/dot-forward/Makefile
index d2c823e5950..224ac5c3c03 100644
--- a/mail/dot-forward/Makefile
+++ b/mail/dot-forward/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2020/01/26 17:31:33 rillig Exp $
+# $NetBSD: Makefile,v 1.29 2020/06/25 05:42:38 schmonz Exp $
 #
 
 DISTNAME=		dot-forward-0.71
@@ -19,6 +19,8 @@ DJB_RESTRICTED=		no
 
 INSTALLATION_DIRS=	${PKGMANDIR}
 
+SUBST_CLASSES+=		djberrno
+
 SUBST_CLASSES+=		paths
 SUBST_STAGE.paths=	do-configure
 SUBST_FILES.paths=	hier.c
diff --git a/mail/ezmlm-idx/Makefile b/mail/ezmlm-idx/Makefile
index 9e760dce473..3eaf2255cb2 100644
--- a/mail/ezmlm-idx/Makefile
+++ b/mail/ezmlm-idx/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.55 2020/06/02 08:24:14 adam Exp $
+# $NetBSD: Makefile,v 1.56 2020/06/25 05:42:38 schmonz Exp $
 #
 
 DISTNAME=		ezmlm-idx-${IDXVERSION}
@@ -25,7 +25,6 @@ DJB_CONFIG_CMDS+=	${ECHO} ${DESTDIR:Q} > conf-destdir;		\
 			${ECHO} ${EGDIR:Q} > conf-egdir;		\
 			${ECHO} ${PKG_SYSCONFDIR:Q} > conf-etc;		\
 			${ECHO} ${PREFIX:Q}/lib/ezmlm > conf-lib;
-DJB_ERRNO_HACK=		no
 
 LDFLAGS.Darwin+=	-Wl,-U,_FATAL -Wl,-U,_USAGE
 LDFLAGS.Linux+=		-Wl,--export-dynamic
@@ -53,6 +52,8 @@ SPECIAL_PERMS+=		${PREFIX}/libexec/cgi-bin/ezmlm-cgi ${REAL_ROOT_USER} ${REAL_RO
 INSTALLATION_DIRS=	bin lib libexec/cgi-bin ${PKGMANDIR} ${PKGMANDIR}/man1 ${PKGMANDIR}/man5
 INSTALLATION_DIRS+=	share/doc/${PKGBASE} share/examples/${PKGBASE}
 
+.include "options.mk"
+
 post-extract:
 	${GREP} -v '^#' < cf-files.mk | ${CUT} -f2 | ${SED} -e 's|^|share/examples/ezmlm-idx/|g' > ${WRKDIR}/PLIST.idxcf
 
diff --git a/mail/ezmlm/Makefile b/mail/ezmlm/Makefile
index 921ac58e87c..cbc0ce122e2 100644
--- a/mail/ezmlm/Makefile
+++ b/mail/ezmlm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2020/01/26 17:31:34 rillig Exp $
+# $NetBSD: Makefile,v 1.28 2020/06/25 05:42:38 schmonz Exp $
 #
 
 DISTNAME=		ezmlm-0.53
@@ -20,7 +20,11 @@ DJB_CONFIG_CMDS=	${ECHO} ${DESTDIR:Q} > conf-destdir
 DJB_BUILD_TARGETS=	install
 INSTALL_TARGET=		setup
 
+SUBST_CLASSES+=		djberrno
+
 INSTALLATION_DIRS=	bin man ${PKGMANDIR}/man1 ${PKGMANDIR}/man5 ${PKGMANDIR}/cat1 ${PKGMANDIR}/cat5
 
+.include "options.mk"
+
 .include "../../mk/djbware.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/fastforward/Makefile b/mail/fastforward/Makefile
index 247b0a70d16..f3590bba5bd 100644
--- a/mail/fastforward/Makefile
+++ b/mail/fastforward/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2020/01/26 17:31:34 rillig Exp $
+# $NetBSD: Makefile,v 1.28 2020/06/25 05:42:39 schmonz Exp $
 #
 
 DISTNAME=		fastforward-0.51
@@ -19,7 +19,8 @@ DJB_BUILD_TARGETS=	install instcheck
 
 DJB_RESTRICTED=		no
 
-SUBST_FILES.djbware+=	cdb_seek.c
+SUBST_CLASSES+=		djberrno
+SUBST_FILES.djberrno+=	cdb_seek.c
 
 SUBST_CLASSES+=		paths
 SUBST_STAGE.paths=	do-configure
diff --git a/mail/mailfront/Makefile b/mail/mailfront/Makefile
index 156fadaa84f..2ebc7bb46c0 100644
--- a/mail/mailfront/Makefile
+++ b/mail/mailfront/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2020/05/23 21:32:15 schmonz Exp $
+# $NetBSD: Makefile,v 1.30 2020/06/25 05:42:38 schmonz Exp $
 #
 
 DISTNAME=		mailfront-2.22
@@ -15,7 +15,6 @@ DEPENDS+=		daemontools-[0-9]*:../../sysutils/daemontools
 DEPENDS+=		qmail>=1.03nb8:../../mail/qmail
 
 DJB_RESTRICTED=		NO
-DJB_ERRNO_HACK=		no
 DJB_MAKE_TARGETS=	NO
 BUILD_TARGET=		all
 DJB_CONFIG_CMDS+=	${ECHO} ${PREFIX}/include > conf-include;	\
diff --git a/mail/mess822/Makefile b/mail/mess822/Makefile
index f56783a3d8a..bde7da827fa 100644
--- a/mail/mess822/Makefile
+++ b/mail/mess822/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2020/01/26 17:31:35 rillig Exp $
+# $NetBSD: Makefile,v 1.35 2020/06/25 05:42:38 schmonz Exp $
 #
 
 DISTNAME=		mess822-0.58
@@ -20,7 +20,8 @@ DJB_BUILD_TARGETS=	install instcheck
 
 AUTO_MKDIRS=		yes
 
-SUBST_FILES.djbware+=	cdb_seek.c
+SUBST_CLASSES+=		djberrno
+SUBST_FILES.djberrno+=	cdb_seek.c
 
 SUBST_CLASSES+=		paths
 SUBST_STAGE.paths=	do-configure
diff --git a/mail/qconfirm/Makefile b/mail/qconfirm/Makefile
index 7214e35c320..24047e481db 100644
--- a/mail/qconfirm/Makefile
+++ b/mail/qconfirm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2020/05/16 15:21:29 rillig Exp $
+# $NetBSD: Makefile,v 1.3 2020/06/25 05:42:39 schmonz Exp $
 
 DISTNAME=		qconfirm-0.14.3
 CATEGORIES=		mail
@@ -14,7 +14,6 @@ DEPENDS+=		qmail-[0-9]*:../../mail/qmail
 
 DJB_SLASHPACKAGE=	yes
 DJB_RESTRICTED=		no
-DJB_ERRNO_HACK=		no
 
 WRKSRC=			${WRKDIR}/mail/${DISTNAME}
 
diff --git a/mail/qmail-acceptutils/Makefile b/mail/qmail-acceptutils/Makefile
index f031795c11a..18eb06b01a7 100644
--- a/mail/qmail-acceptutils/Makefile
+++ b/mail/qmail-acceptutils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2020/05/16 15:22:20 rillig Exp $
+# $NetBSD: Makefile,v 1.13 2020/06/25 05:42:39 schmonz Exp $
 
 DISTNAME=		netqmail-1.06
 PKGNAME=		qmail-acceptutils-${ACPATCHVERSION}
@@ -21,7 +21,6 @@ DEPENDS+=		ucspi-ssl-[0-9]*:../../net/ucspi-ssl
 CONFLICTS+=		qmail<=1.03nb32
 
 DJB_RESTRICTED=		no
-DJB_ERRNO_HACK=		no
 BUILD_TARGET=		acceptutils
 
 USE_LANGUAGES=		c c99
diff --git a/mail/qmail-autoresponder/Makefile b/mail/qmail-autoresponder/Makefile
index 6ec08a6113c..88445c32fe9 100644
--- a/mail/qmail-autoresponder/Makefile
+++ b/mail/qmail-autoresponder/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2020/05/23 21:32:15 schmonz Exp $
+# $NetBSD: Makefile,v 1.7 2020/06/25 05:42:37 schmonz Exp $
 
 DISTNAME=		qmail-autoresponder-2.0
 CATEGORIES=		mail
@@ -15,7 +15,6 @@ INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
 INSTALL_ENV+=		install_prefix=${DESTDIR:Q}
 
 DJB_RESTRICTED=		no
-DJB_ERRNO_HACK=		no
 DJB_MAKE_TARGETS=	no
 BUILD_TARGET=		all
 
diff --git a/mail/qmail-conf/Makefile b/mail/qmail-conf/Makefile
index b3e21b98242..d9424f0def1 100644
--- a/mail/qmail-conf/Makefile
+++ b/mail/qmail-conf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2020/05/23 21:32:15 schmonz Exp $
+# $NetBSD: Makefile,v 1.36 2020/06/25 05:42:38 schmonz Exp $
 #
 
 DISTNAME=		qmail-conf-0.60
@@ -16,10 +16,10 @@ DEPENDS+=		daemontools>=0.70:../../sysutils/daemontools
 DEPENDS+=		qmail>=1.03nb7:../../mail/qmail
 
 DJB_RESTRICTED=		NO
-DJB_ERRNO_HACK=		no
 DJB_CONFIG_CMDS=	${ECHO} ${PREFIX:Q} > ${WRKSRC}/conf-ucspi-tcp;
 
-SUBST_FILES.djbware+=	../djbdns-1.05/error.h
+SUBST_CLASSES+=		djberrno
+SUBST_FILES.djberrno+=	../djbdns-1.05/error.h
 
 .include "options.mk"
 
diff --git a/mail/qmail-qfilter/Makefile b/mail/qmail-qfilter/Makefile
index 988ac765ae7..6fc8e4835a2 100644
--- a/mail/qmail-qfilter/Makefile
+++ b/mail/qmail-qfilter/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2020/05/16 15:25:11 rillig Exp $
+# $NetBSD: Makefile,v 1.29 2020/06/25 05:42:37 schmonz Exp $
 #
 
 DISTNAME=		qmail-qfilter-2.1
@@ -28,7 +28,6 @@ INSTALL_ENV+=		install_prefix=${DESTDIR:Q}
 BUILD_DEFS+=		QMAILDIR
 
 DJB_RESTRICTED=		NO
-DJB_ERRNO_HACK=		no
 DJB_MAKE_TARGETS=	NO
 
 .include "../../mk/bsd.prefs.mk"
diff --git a/mail/qmail-rejectutils/Makefile b/mail/qmail-rejectutils/Makefile
index 6a9996ec4c5..37bd790b08a 100644
--- a/mail/qmail-rejectutils/Makefile
+++ b/mail/qmail-rejectutils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2020/05/16 15:25:49 rillig Exp $
+# $NetBSD: Makefile,v 1.8 2020/06/25 05:42:38 schmonz Exp $
 
 DISTNAME=		netqmail-1.06
 PKGNAME=		qmail-rejectutils-${RJPATCHVERSION}
@@ -19,7 +19,6 @@ SITES.${RJPATCH}=	${HOMEPAGE}
 CONFLICTS+=		qmail<=1.03nb32
 
 DJB_RESTRICTED=		no
-DJB_ERRNO_HACK=		no
 BUILD_TARGET=		rejectutils
 
 REJECTUTILS=		qmail-qfilter-queue		\
diff --git a/mail/qmail/Makefile b/mail/qmail/Makefile
index e4aae737367..7e61d6641b4 100644
--- a/mail/qmail/Makefile
+++ b/mail/qmail/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.120 2020/05/23 20:50:02 schmonz Exp $
+# $NetBSD: Makefile,v 1.121 2020/06/25 05:42:39 schmonz Exp $
 #
 
 DISTNAME=		notqmail-1.08
@@ -36,7 +36,6 @@ DJB_CONFIG_CMDS+=	${ECHO} ${QMAIL_QMAIL_GROUP:Q}    > conf-groups;
 DJB_CONFIG_CMDS+=	${ECHO} ${QMAIL_NOFILES_GROUP:Q} >> conf-groups;
 DJB_BUILD_TARGETS=	man
 DJB_RESTRICTED=		no
-DJB_ERRNO_HACK=		no
 
 TEST_TARGET=		test
 #.include "../../devel/check/buildlink3.mk"
@@ -114,8 +113,6 @@ SUBST_STAGE.config=	do-configure
 SUBST_FILES.config=	config-fast-pkgsrc-defaults.sh
 SUBST_VARS.config=	SORT MV CP PKG_SYSCONFDIR QMAIL_QUEUE_EXTRA
 
-SUBST_FILES.djbware+=	cdb_seek.c dns.c
-
 PKG_USERS_VARS+=		QMAIL_ALIAS_USER QMAIL_DAEMON_USER QMAIL_LOG_USER
 PKG_USERS_VARS+=		QMAIL_ROOT_USER QMAIL_PASSWD_USER QMAIL_QUEUE_USER
 PKG_USERS_VARS+=		QMAIL_REMOTE_USER QMAIL_SEND_USER
@@ -181,6 +178,8 @@ PATCH_DIST_CAT.${SPP_PATCH}=	${TAR} -C ${WRKDIR} -zxf ${SPP_PATCH} ${SPP_PATCHFI
 PATCH_DIST_STRIP.${SPP_PATCH}=	-p1
 LICENSE+=			AND gnu-gpl-v2
 
+.include "options.mk"
+
 post-extract:
 	for i in ${READMES}; do						\
 		${CP} ${FILESDIR}/$$i ${WRKSRC} || ${TRUE};		\
diff --git a/mail/qmailanalog/Makefile b/mail/qmailanalog/Makefile
index a9136eb3c61..e05553e2bc5 100644
--- a/mail/qmailanalog/Makefile
+++ b/mail/qmailanalog/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2020/01/26 17:31:36 rillig Exp $
+# $NetBSD: Makefile,v 1.18 2020/06/25 05:42:38 schmonz Exp $
 #
 
 DISTNAME=		qmailanalog-0.70
@@ -13,5 +13,7 @@ COMMENT=		Collection of tools to help analyze qmail's activity
 DJB_RESTRICTED=		YES
 DJB_CONFIG_PREFIX=	${PREFIX}/qmailanalog
 
+SUBST_CLASSES+=		djberrno
+
 .include "../../mk/djbware.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/qtools/Makefile b/mail/qtools/Makefile
index f8e0d2dc42f..0cb0f9e19ae 100644
--- a/mail/qtools/Makefile
+++ b/mail/qtools/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2012/10/08 12:19:29 asau Exp $
+# $NetBSD: Makefile,v 1.18 2020/06/25 05:42:37 schmonz Exp $
 #
 
 DISTNAME=		qtools-0.56
@@ -15,5 +15,7 @@ DEPENDS+=		qmail>=1.03:../../mail/qmail
 DJB_RESTRICTED=		NO
 DJB_CONFIG_CMDS=	${ECHO} ${LOCALBASE:Q} > ${WRKSRC}/conf-ezmlm
 
+SUBST_CLASSES+=		djberrno
+
 .include "../../mk/djbware.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/queue-fix/Makefile b/mail/queue-fix/Makefile
index 606b8b3295c..1f65109e109 100644
--- a/mail/queue-fix/Makefile
+++ b/mail/queue-fix/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2019/05/23 19:23:07 rillig Exp $
+# $NetBSD: Makefile,v 1.12 2020/06/25 05:42:37 schmonz Exp $
 #
 
 DISTNAME=		queue-fix-1.4
@@ -14,6 +14,8 @@ INSTALLATION_DIRS=	bin
 
 DJB_RESTRICTED=		NO
 
+SUBST_CLASSES+=		djberrno
+
 SUBST_CLASSES+=		groups
 SUBST_STAGE.groups=	do-configure
 SUBST_FILES.groups=	queue-fix.c
diff --git a/mail/relay-ctrl/Makefile b/mail/relay-ctrl/Makefile
index b8e5fa2badf..aca25f1fbc0 100644
--- a/mail/relay-ctrl/Makefile
+++ b/mail/relay-ctrl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2020/04/27 17:31:07 rillig Exp $
+# $NetBSD: Makefile,v 1.10 2020/06/25 05:42:39 schmonz Exp $
 #
 
 DISTNAME=		relay-ctrl-3.2
@@ -11,7 +11,6 @@ COMMENT=		Allows relaying via POP/IMAP-before-SMTP
 
 DJB_RESTRICTED=		NO
 DJB_MAKE_TARGETS=	NO
-DJB_ERRNO_HACK=		NO
 
 DOCDIR=			share/doc/${PKGBASE}
 INSTALLATION_DIRS=	bin ${PKGMANDIR}/man8 ${DOCDIR}
diff --git a/mail/safecat/Makefile b/mail/safecat/Makefile
index 6f4f6f05e5c..9c1b213e812 100644
--- a/mail/safecat/Makefile
+++ b/mail/safecat/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2020/04/27 17:37:37 rillig Exp $
+# $NetBSD: Makefile,v 1.23 2020/06/25 05:42:37 schmonz Exp $
 #
 
 DISTNAME=		safecat-1.13
@@ -15,7 +15,6 @@ MAKE_JOBS_SAFE=		no
 DJB_RESTRICTED=		NO
 DJB_BUILD_TARGETS+=	install instcheck
 DJB_CONFIG_HOME=	conf-root
-DJB_ERRNO_HACK=		no
 
 SUBST_CLASSES+=		pkgmandir
 SUBST_STAGE.pkgmandir=	pre-configure
diff --git a/mail/serialmail/Makefile b/mail/serialmail/Makefile
index 9c2ae9c2208..83dc2020a19 100644
--- a/mail/serialmail/Makefile
+++ b/mail/serialmail/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2020/01/26 17:31:36 rillig Exp $
+# $NetBSD: Makefile,v 1.13 2020/06/25 05:42:38 schmonz Exp $
 #
 
 DISTNAME=		serialmail-0.75
@@ -18,7 +18,7 @@ INSTALLATION_DIRS=	share/doc/${PKGBASE}
 # provide compatibility symlinks. We also apply patches.
 DJB_RESTRICTED=		YES
 
-SUBST_FILES.djbware+=	leapsecs_read.c
+SUBST_CLASSES+=		djberrno
 
 SUBST_CLASSES+=		paths
 SUBST_STAGE.paths=	do-configure
diff --git a/math/djbfft/Makefile b/math/djbfft/Makefile
index 9081e779bf1..6bcebf7276e 100644
--- a/math/djbfft/Makefile
+++ b/math/djbfft/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2020/01/26 17:31:38 rillig Exp $
+# $NetBSD: Makefile,v 1.21 2020/06/25 05:42:39 schmonz Exp $
 
 DISTNAME=	djbfft-0.76
 CATEGORIES=	math
@@ -12,7 +12,11 @@ LICENSE=	public-domain
 DJB_RESTRICTED=		no
 NOT_FOR_PLATFORM=	IRIX-*-*
 
+SUBST_CLASSES+=		djberrno
+
 INSTALLATION_DIRS=	include/djbfft lib
 
+.include "options.mk"
+
 .include "../../mk/djbware.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mk/defaults/options.description b/mk/defaults/options.description
index b6499ba3101..8b20153d3c6 100644
--- a/mk/defaults/options.description
+++ b/mk/defaults/options.description
@@ -140,7 +140,6 @@ djbdns-tinydns64	Patch to fix tinydns-data on 64-bit platforms.
 djbfft-pentium		Optimize for Pentium{,MMX} processors.
 djbfft-ppro		Optimize for Pentium{Pro,II,III} processors.
 djbfft-sparc		Optimize for UltraSPARC-{I,II} processors.
-djbware-errno-hack	Patch to #include <errno.h> for correctness.
 djvu			Enable DjVuLibRe support.
 dkim-milter-arlib	ar(3) support for dkim-milter.
 dkim-stats		dkim-stats(8) support for dkim-milter.
diff --git a/mk/djbware.mk b/mk/djbware.mk
index 4138a6eff08..6b82eefb44c 100644
--- a/mk/djbware.mk
+++ b/mk/djbware.mk
@@ -1,4 +1,4 @@
-# $NetBSD: djbware.mk,v 1.29 2020/05/02 11:49:40 rillig Exp $
+# $NetBSD: djbware.mk,v 1.30 2020/06/25 05:42:36 schmonz Exp $
 #
 # Makefile fragment for packages with djb-style build machinery
 #
@@ -29,7 +29,6 @@ DJB_RESTRICTED?=	YES
 DJB_MAKE_TARGETS?=	YES
 DJB_BUILD_TARGETS?=	# empty
 DJB_INSTALL_TARGETS?=	# empty
-DJB_ERRNO_HACK?=	YES
 DJB_SLASHPACKAGE?=	NO
 .if !empty(DJB_SLASHPACKAGE:M[yY][eE][sS])
 DJB_CONFIG_DIR?=	${WRKSRC}/src
@@ -83,30 +82,10 @@ do-build:
 	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} package/compile ${DJB_BUILD_ARGS}
 .endif
 
-.if !empty(DJB_ERRNO_HACK:M[yY][eE][sS]) || !empty(DJB_ERRNO_HACK_FILES)
-PKG_SUPPORTED_OPTIONS+=	djbware-errno-hack
-PKG_SUGGESTED_OPTIONS+=	djbware-errno-hack
-
-.  include "bsd.fast.prefs.mk"
-
-.  if exists(${PKGDIR}/options.mk)
-.    include "${PKGDIR}/options.mk"
-.  else
-# Note: This expression is the same as ${PKGBASE}, but the latter is
-# not defined yet, so we cannot use it here.
-PKG_OPTIONS_VAR=	PKG_OPTIONS.${PKGNAME:C/-[0-9].*//}
-.    include "bsd.options.mk"
-.  endif
-
-.  if !empty(PKG_OPTIONS:Mdjbware-errno-hack) || !empty(DJB_ERRNO_HACK_FILES)
-SUBST_CLASSES+=		djbware
-SUBST_STAGE.djbware=	do-configure
-SUBST_FILES.djbware+=	${DJB_ERRNO_HACK_FILES:Uerror.h}
-SUBST_SED.djbware=	-e 's|^extern\ int\ errno\;|\#include \<errno.h\>|'
-SUBST_MESSAGE.djbware=	Correcting definition of errno.
-.  endif
-.else
-.  sinclude "${PKGDIR}/options.mk"
-.endif
+# Set SUBST_CLASSES+=djberrno for packages that need this fix
+SUBST_STAGE.djberrno=	do-configure
+SUBST_FILES.djberrno?=	error.h
+SUBST_SED.djberrno=	-e 's|^extern\ int\ errno\;|\#include \<errno.h\>|'
+SUBST_MESSAGE.djberrno=	Correcting definition of errno.
 
 .endif	# DJBWARE_MK
diff --git a/net/djbdns/Makefile b/net/djbdns/Makefile
index da81b786607..6d6ceeff9c5 100644
--- a/net/djbdns/Makefile
+++ b/net/djbdns/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.70 2020/01/26 17:31:49 rillig Exp $
+# $NetBSD: Makefile,v 1.71 2020/06/25 05:42:36 schmonz Exp $
 
 DISTNAME=		djbdns-1.05
 PKGREVISION=		14
@@ -18,6 +18,8 @@ CONFLICTS+=		djbdnscurve6-[0-9]*
 
 DJB_RESTRICTED=		no
 
+SUBST_CLASSES+=		djberrno
+
 SUBST_CLASSES+=		etc
 SUBST_STAGE.etc=	do-configure
 SUBST_FILES.etc=	dns_rcrw.c
@@ -32,6 +34,8 @@ BUILD_DEFS+=		PKG_SYSCONFBASE
 
 INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1 ${PKGMANDIR}/man5 ${PKGMANDIR}/man8 share/examples/${PKGBASE}
 
+.include "options.mk"
+
 post-install:
 	cd ${WRKDIR}/${PKGBASE}-man; for i in 1 5 8; do		 	\
 		for j in *.$$i; do ${INSTALL_MAN} $$j			\
diff --git a/net/djbdnscurve6/Makefile b/net/djbdnscurve6/Makefile
index 57f716367a0..7f168f8ab0f 100644
--- a/net/djbdnscurve6/Makefile
+++ b/net/djbdnscurve6/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2020/04/27 05:36:56 rillig Exp $
+# $NetBSD: Makefile,v 1.14 2020/06/25 05:42:36 schmonz Exp $
 
 DISTNAME=		djbdnscurve6-36b
 CATEGORIES=		net
@@ -15,7 +15,6 @@ CONFLICTS+=		djbdns-[0-9]*
 WRKSRC=			${WRKDIR}/net/${PKGBASE}/${DISTNAME}
 DJB_SLASHPACKAGE=	yes
 DJB_RESTRICTED=		no
-DJB_ERRNO_HACK=		no
 
 DJB_CONFIG_DIR=		${WRKSRC}
 
diff --git a/net/publicfile/Makefile b/net/publicfile/Makefile
index 95fdac818af..241c88b03cb 100644
--- a/net/publicfile/Makefile
+++ b/net/publicfile/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2020/05/02 13:44:55 rillig Exp $
+# $NetBSD: Makefile,v 1.18 2020/06/25 05:42:36 schmonz Exp $
 #
 
 DISTNAME=		publicfile-0.52
@@ -15,5 +15,9 @@ DEPENDS+=		daemontools-[0-9]*:../../sysutils/daemontools
 DJB_RESTRICTED=		YES
 DJB_CONFIG_PREFIX=	${PREFIX}/publicfile
 
+SUBST_CLASSES+=		djberrno
+
+.include "options.mk"
+
 .include "../../mk/djbware.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/ucspi-ssl/Makefile b/net/ucspi-ssl/Makefile
index e02b167b1f7..7d24d10a954 100644
--- a/net/ucspi-ssl/Makefile
+++ b/net/ucspi-ssl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.45 2020/03/30 08:04:18 schmonz Exp $
+# $NetBSD: Makefile,v 1.46 2020/06/25 05:42:37 schmonz Exp $
 #
 
 DISTNAME=		ucspi-ssl-0.11.4
@@ -14,7 +14,6 @@ COMMENT=		Command-line tools for SSL client-server applications
 WRKSRC=			${WRKDIR}/host/superscript.com/net/${DISTNAME}
 DJB_SLASHPACKAGE=	YES
 DJB_RESTRICTED=		no
-DJB_ERRNO_HACK=		no
 
 SSL_SCRIPTS=		https@ sslcat sslconnect
 SSL_PROGRAMS=		sslclient sslserver
@@ -46,6 +45,8 @@ DEFAULT_MEDIUM_CIPHERS=	aNULL:-aNULL:ALL:!EXPORT:!LOW:+RC4:@STRENGTH
 
 INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1 ${PKGMANDIR}/man2 share/doc/${PKGBASE} ${EGDIR}
 
+.include "options.mk"
+
 do-test:
 	cd ${WRKSRC}; \
 		./package/rts
diff --git a/net/ucspi-tcp/Makefile b/net/ucspi-tcp/Makefile
index b397523aea7..9f0bc2c1450 100644
--- a/net/ucspi-tcp/Makefile
+++ b/net/ucspi-tcp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.45 2020/01/26 17:31:57 rillig Exp $
+# $NetBSD: Makefile,v 1.46 2020/06/25 05:42:37 schmonz Exp $
 
 DISTNAME=		ucspi-tcp-0.88
 PKGREVISION=		6
@@ -22,6 +22,8 @@ CONFLICTS+=		ucspi-tcp6-[0-9]*
 
 DJB_RESTRICTED=		no
 
+SUBST_CLASSES+=		djberrno
+
 SUBST_CLASSES+=		etc
 SUBST_STAGE.etc=	do-configure
 SUBST_FILES.etc=	dns_rcrw.c
@@ -32,6 +34,8 @@ BUILD_DEFS+=		PKG_SYSCONFBASE
 
 INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
 
+.include "options.mk"
+
 post-install:
 	cd ${WRKDIR}/${PKGNAME_NOREV}-man; for i in 1; do	 	\
 		for j in *.$$i; do ${INSTALL_MAN} $$j			\
diff --git a/net/ucspi-tcp6/Makefile b/net/ucspi-tcp6/Makefile
index fe9be696a71..0f4ee791de5 100644
--- a/net/ucspi-tcp6/Makefile
+++ b/net/ucspi-tcp6/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2020/04/25 20:25:32 rillig Exp $
+# $NetBSD: Makefile,v 1.24 2020/06/25 05:42:36 schmonz Exp $
 
 DISTNAME=		ucspi-tcp6-1.11.4
 CATEGORIES=		net
@@ -16,7 +16,6 @@ WRKSRC=			${WRKDIR}/net/${PKGBASE}/${DISTNAME}
 DJB_SLASHPACKAGE=	yes
 DJB_RESTRICTED=		no
 DJB_CONFIG_DIR=		${WRKSRC}
-DJB_ERRNO_HACK=		no
 
 INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1 ${PKGMANDIR}/man5
 
diff --git a/security/cvm/Makefile b/security/cvm/Makefile
index 4e03ec96ee6..26e73c1fe37 100644
--- a/security/cvm/Makefile
+++ b/security/cvm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2020/03/28 19:43:31 rillig Exp $
+# $NetBSD: Makefile,v 1.27 2020/06/25 05:42:37 schmonz Exp $
 #
 
 DISTNAME=		cvm-0.97
@@ -16,7 +16,6 @@ MAKE_JOBS_SAFE=		no
 DEPENDS+=		daemontools-[0-9]*:../../sysutils/daemontools
 
 DJB_RESTRICTED=		NO
-DJB_ERRNO_HACK=		NO
 DJB_MAKE_TARGETS=	NO
 INSTALL_ENV+=		install_prefix=${DESTDIR:Q}
 
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:
diff --git a/time/leapsunpack/Makefile b/time/leapsunpack/Makefile
index a1e4f262e72..dbd0ca587dc 100644
--- a/time/leapsunpack/Makefile
+++ b/time/leapsunpack/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2019/05/23 19:23:18 rillig Exp $
+# $NetBSD: Makefile,v 1.8 2020/06/25 05:42:39 schmonz Exp $
 #
 
 DISTNAME=		leapsunpack-0.05
@@ -15,6 +15,8 @@ DJB_RESTRICTED=		no
 
 LDFLAGS.SunOS+=		-lsocket -lnsl
 
+SUBST_CLASSES+=		djberrno
+
 SUBST_CLASSES+=		files
 SUBST_STAGE.files=	do-configure
 SUBST_FILES.files=	leapsinstall.sh