3 files changed, 21 insertions, 61 deletions
diff --git a/net/djbdns/distinfo b/net/djbdns/distinfo
index 89c621d58f2..676a15fdc31 100644
--- a/net/djbdns/distinfo
+++ b/net/djbdns/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.13 2005/03/21 04:03:35 schmonz Exp $
+$NetBSD: distinfo,v 1.14 2005/03/30 10:00:36 schmonz Exp $
 
 SHA1 (djbdns-1.05.tar.gz) = 2efdb3a039d0c548f40936aa9cb30829e0ce8c3d
 RMD160 (djbdns-1.05.tar.gz) = a832cbfd93e4ccec6a565492a4ee0b3c1b4b68ed
@@ -11,6 +11,8 @@ RMD160 (djbdns-1.05-ipv6.diff.bz2) = 9c6e0087d4b99620775224d66b06f148fc016e53
 Size (djbdns-1.05-ipv6.diff.bz2) = 7306 bytes
 SHA1 (djbdns-1.05-ignoreip2.patch) = ec4281a6864bd044a84fbfcaaf42baa6b003976d
 Size (djbdns-1.05-ignoreip2.patch) = 3890 bytes
+SHA1 (tinydns64.diff) = 5a06ba9968ddd905ef69ce036bdc9d18bb738982
+RMD160 (tinydns64.diff) = 7eb8ea387731385576fb1c933c18e0957477c3e0
+Size (tinydns64.diff) = 1537 bytes
 SHA1 (patch-aa) = 8953486b88d57d003956c6fe2addea9bcd16e5aa
 SHA1 (patch-ab) = e14b7cba40d1dc7279c3ab04ede597277e2576d1
-SHA1 (patch-ac) = 338c8dbda014f35a7dccae780126fd8a7a3b33c6
diff --git a/net/djbdns/options.mk b/net/djbdns/options.mk
index daf29e7955b..343c1175d09 100644
--- a/net/djbdns/options.mk
+++ b/net/djbdns/options.mk
@@ -1,7 +1,13 @@
-# $NetBSD: options.mk,v 1.2 2004/11/17 19:56:49 xtraeme Exp $
+# $NetBSD: options.mk,v 1.3 2005/03/30 10:00:36 schmonz Exp $
+
+.if ${MACHINE_ARCH} == "sparc64" || \
+	${MACHINE_ARCH} == "alpha" || \
+	${MACHINE_ARCH} == "amd64"
+PKG_DEFAULT_OPTIONS+=   tinydns64
+.endif
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.djbdns
-PKG_SUPPORTED_OPTIONS=	inet6 ignoreip2
+PKG_SUPPORTED_OPTIONS=	inet6 ignoreip2 tinydns64
 .include "../../mk/bsd.options.mk"
 
 ###
@@ -23,3 +29,12 @@ IGNOREIP2_PATCH=		djbdns-1.05-ignoreip2.patch
 PATCHFILES+=			${IGNOREIP2_PATCH}
 SITES_${IGNOREIP2_PATCH}=	http://www.tinydns.org/
 .endif
+
+###
+### Bernhard Roth's patch to fix tinydns-data on 64-bit platforms
+###
+.if !empty(PKG_OPTIONS:Mtinydns64)
+TINYDNS64_PATCH=		tinydns64.diff
+PATCHFILES+=			${TINYDNS64_PATCH}
+SITES_${TINYDNS64_PATCH}=	http://www.pwrlock.de/br/
+.endif
diff --git a/net/djbdns/patches/patch-ac b/net/djbdns/patches/patch-ac
deleted file mode 100644
index e16b78ac262..00000000000
--- a/net/djbdns/patches/patch-ac
+++ /dev/null
@@ -1,57 +0,0 @@
-$NetBSD: patch-ac,v 1.3 2005/03/21 04:03:35 schmonz Exp $
-
---- tinydns-data.c.orig	2001-02-11 16:11:45.000000000 -0500
-+++ tinydns-data.c
-@@ -196,6 +196,7 @@ int main()
-   char type[2];
-   char soa[20];
-   char buf[4];
-+  uint32 hack64bit;
- 
-   umask(022);
- 
-@@ -251,19 +252,39 @@ int main()
- 	if (!dns_domain_fromdot(&d1,f[0].s,f[0].len)) nomem();
- 
- 	if (!stralloc_0(&f[3])) nomem();
--	if (!scan_ulong(f[3].s,&u)) uint32_unpack_big(defaultsoa,&u);
-+	if (!scan_ulong(f[3].s,&u))
-+	{
-+	  uint32_unpack_big(defaultsoa,&hack64bit);
-+	  u = hack64bit;
-+	}
- 	uint32_pack_big(soa,u);
- 	if (!stralloc_0(&f[4])) nomem();
--	if (!scan_ulong(f[4].s,&u)) uint32_unpack_big(defaultsoa + 4,&u);
-+	if (!scan_ulong(f[4].s,&u))
-+	{
-+	  uint32_unpack_big(defaultsoa + 4,&hack64bit);
-+	  u = hack64bit;
-+	}
- 	uint32_pack_big(soa + 4,u);
- 	if (!stralloc_0(&f[5])) nomem();
--	if (!scan_ulong(f[5].s,&u)) uint32_unpack_big(defaultsoa + 8,&u);
-+	if (!scan_ulong(f[5].s,&u))
-+	{
-+	  uint32_unpack_big(defaultsoa + 8,&hack64bit);
-+	  u = hack64bit;
-+	}
- 	uint32_pack_big(soa + 8,u);
- 	if (!stralloc_0(&f[6])) nomem();
--	if (!scan_ulong(f[6].s,&u)) uint32_unpack_big(defaultsoa + 12,&u);
-+	if (!scan_ulong(f[6].s,&u))
-+	{
-+	  uint32_unpack_big(defaultsoa + 12,&hack64bit);
-+	  u = hack64bit;
-+	}
- 	uint32_pack_big(soa + 12,u);
- 	if (!stralloc_0(&f[7])) nomem();
--	if (!scan_ulong(f[7].s,&u)) uint32_unpack_big(defaultsoa + 16,&u);
-+	if (!scan_ulong(f[7].s,&u))
-+	{
-+	  uint32_unpack_big(defaultsoa + 16,&hack64bit);
-+	  u = hack64bit;
-+	}
- 	uint32_pack_big(soa + 16,u);
- 
- 	if (!stralloc_0(&f[8])) nomem();