From 9038d7156c7f1a6032657746ac837357c58b6082 Mon Sep 17 00:00:00 2001
From: schmonz <schmonz@pkgsrc.org>
Date: Mon, 2 Jan 2006 21:13:43 +0000
Subject: This already had a hack to fix building on OS X with BIND9 system
 resolver. Convert it to the less hacky one used elsewhere, mainly so that I
 won't miss it when implementing a more general solution to this common
 problem.

---
 mail/qmail/hacks.mk   | 9 +++++++++
 mail/qmail/options.mk | 8 +-------
 2 files changed, 10 insertions(+), 7 deletions(-)
 create mode 100644 mail/qmail/hacks.mk

(limited to 'mail/qmail')

diff --git a/mail/qmail/hacks.mk b/mail/qmail/hacks.mk
new file mode 100644
index 00000000000..9d429571815
--- /dev/null
+++ b/mail/qmail/hacks.mk
@@ -0,0 +1,9 @@
+# $NetBSD: hacks.mk,v 1.1 2006/01/02 21:13:43 schmonz Exp $
+
+.include "../../mk/bsd.prefs.mk"
+
+# Fix build on OS X with BIND9 system resolver
+.if ${OPSYS} == "Darwin"
+PKG_HACKS+=		macosx-bind9-bind8compat
+CFLAGS+=		-DBIND_8_COMPAT=1
+.endif
diff --git a/mail/qmail/options.mk b/mail/qmail/options.mk
index 9257a42f979..d1d2aab0d19 100644
--- a/mail/qmail/options.mk
+++ b/mail/qmail/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.18 2005/12/05 20:50:35 rillig Exp $
+# $NetBSD: options.mk,v 1.19 2006/01/02 21:13:43 schmonz Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.qmail
 PKG_SUPPORTED_OPTIONS+=	darwin sasl syncdir tls qmail-badrcptto qmail-bigdns
@@ -30,12 +30,6 @@ DARWIN_PATCH=		panther.patch
 PATCHFILES+=		${DARWIN_PATCH}
 SITES_${DARWIN_PATCH}=	http://http.netdevice.com:9080/qmail/patch/
 PATCH_DIST_STRIP.${DARWIN_PATCH}=	-p1
-post-wrapper:
-	${_PKG_SILENT}${_PKG_DEBUG}					\
-	nameser8_compat_h="include/nameser8_compat.h";			\
-	if [ ! -e /usr/$${nameser8_compat_h} ]; then			\
-		${TOUCH} ${BUILDLINK_DIR}/$${nameser8_compat_h};	\
-	fi
 DARWINSUFX=		.doc
 .else
 DARWINSUFX=		# empty
-- 
cgit v1.2.3