Convert DJB_ERRNO_HACK to a "djbware-errno-hack" option available

in all packages using djbware.mk. For now, keep the same default,
avoiding PKGREVISION bumps.

5 files changed, 7 insertions, 16 deletions

diff --git a/mail/ezmlm-idx/Makefile b/mail/ezmlm-idx/Makefile
index ad3466363f5..45bdac90084 100644
--- a/mail/ezmlm-idx/Makefile
+++ b/mail/ezmlm-idx/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2005/07/12 10:58:09 schmonz Exp $
+# $NetBSD: Makefile,v 1.23 2005/08/19 04:44:09 schmonz Exp $
 #
 
 .include "../../mail/ezmlm/Makefile.common"
@@ -32,10 +32,6 @@ CONF_FILES+=		${EGDIR}/ezmlmrc ${PKG_SYSCONFDIR}/ezmlmrc
 INSTALLATION_DIRS=	bin man man/man1 man/man5 man/cat1 man/cat5
 INSTALLATION_DIRS+=	share/examples/ezmlm-idx
 
-.include "../../mk/bsd.prefs.mk"
-
-.include "options.mk"
-
 post-extract:
 	@${MV} ${WRKSRC}/* ${WRKDIR}/${EZMLM_VERS}
 	@${RMDIR} ${WRKSRC}
diff --git a/mail/ezmlm/Makefile b/mail/ezmlm/Makefile
index af610520c62..69df421e9b1 100644
--- a/mail/ezmlm/Makefile
+++ b/mail/ezmlm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2005/08/19 03:55:00 schmonz Exp $
+# $NetBSD: Makefile,v 1.18 2005/08/19 04:44:09 schmonz Exp $
 #
 
 .include "../../mail/ezmlm/Makefile.common"
@@ -20,8 +20,5 @@ DJB_RESTRICTED=		YES
 
 INSTALLATION_DIRS=	bin man man/man1 man/man5 man/cat1 man/cat5
 
-.include "../../mk/bsd.prefs.mk"
-.include "options.mk"
-
 .include "../../mk/djbware.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/ezmlm/options.mk b/mail/ezmlm/options.mk
index a4f952fd026..bbc392c4a83 100644
--- a/mail/ezmlm/options.mk
+++ b/mail/ezmlm/options.mk
@@ -1,7 +1,7 @@
-# $NetBSD: options.mk,v 1.3 2005/07/19 19:41:19 schmonz Exp $
+# $NetBSD: options.mk,v 1.4 2005/08/19 04:44:09 schmonz Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.ezmlm
-PKG_SUPPORTED_OPTIONS=	ezmlm-althash
+PKG_SUPPORTED_OPTIONS+=	ezmlm-althash
 PKG_OPTIONS_LEGACY_OPTS+=	althash:ezmlm-althash
 
 .if ${OPSYS} == "Darwin"
diff --git a/mail/qmail/Makefile b/mail/qmail/Makefile
index dff346929b0..7f29cbfbedc 100644
--- a/mail/qmail/Makefile
+++ b/mail/qmail/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2005/07/15 18:27:51 jlam Exp $
+# $NetBSD: Makefile,v 1.38 2005/08/19 04:44:09 schmonz Exp $
 #
 
 DISTNAME=		netqmail-1.05
@@ -71,8 +71,6 @@ INSTALLATION_DIRS+=	share/doc/qmail share/examples/qmail/boot share/qmail
 
 .include "../../mk/bsd.prefs.mk"
 
-.include "options.mk"
-
 BUILD_DEFS+=		QMAILDIR QMAIL_QUEUE_DIR QMAIL_QUEUE_EXTRA
 
 .if !empty(QMAIL_QUEUE_DIR:M${QMAILDIR}/*)
diff --git a/mail/qmail/options.mk b/mail/qmail/options.mk
index 9ac7ffae0af..f50d5e719ed 100644
--- a/mail/qmail/options.mk
+++ b/mail/qmail/options.mk
@@ -1,7 +1,7 @@
-# $NetBSD: options.mk,v 1.14 2005/07/19 19:41:19 schmonz Exp $
+# $NetBSD: options.mk,v 1.15 2005/08/19 04:44:10 schmonz Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.qmail
-PKG_SUPPORTED_OPTIONS=	darwin sasl syncdir tls qmail-badrcptto qmail-bigdns
+PKG_SUPPORTED_OPTIONS+=	darwin sasl syncdir tls qmail-badrcptto qmail-bigdns
 PKG_SUPPORTED_OPTIONS+=	qmail-netqmail qmail-outgoingip qmail-qregex
 PKG_SUPPORTED_OPTIONS+=	qmail-realrcptto qmail-viruscan
 PKG_OPTIONS_LEGACY_OPTS+=	badrcptto:qmail-badrcptto