diff options
| author | schmonz <schmonz@pkgsrc.org> | 2006-01-11 17:20:32 +0000 |
|---|---|---|
| committer | schmonz <schmonz@pkgsrc.org> | 2006-01-11 17:20:32 +0000 |
| commit | 784c1168183353ca00998a2799e5e5f5ab0c07f5 (patch) | |
| tree | ed1e5016d3b7c326a4c5c37c15dd755e0a184eee | |
| parent | 779abf9ccb4721996af2a488e14efbe6f274ce18 (diff) | |
| download | pkgsrc-784c1168183353ca00998a2799e5e5f5ab0c07f5.tar.gz | |
Fix ${MACHINE_ARCH} conditional (it's "x86_64, not "amd64"). Since
Bernhard Roth's tinydns-data patch for 64-bit systems is no longer
available on the net, store it directly in pkgsrc.
| -rw-r--r-- | net/djbdns/files/patch-tinydns64 | 55 | ||||
| -rw-r--r-- | net/djbdns/options.mk | 9 |
2 files changed, 59 insertions, 5 deletions
diff --git a/net/djbdns/files/patch-tinydns64 b/net/djbdns/files/patch-tinydns64 new file mode 100644 index 00000000000..652b3b114c8 --- /dev/null +++ b/net/djbdns/files/patch-tinydns64 @@ -0,0 +1,55 @@ +--- tinydns-data.c.orig 2001-02-11 16:11:45.000000000 -0500 ++++ tinydns-data.c 2005-03-30 04:14:07.000000000 -0500 +@@ -196,6 +196,7 @@ + char type[2]; + char soa[20]; + char buf[4]; ++ uint32 hack64bit; + + umask(022); + +@@ -251,19 +252,39 @@ + 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(); diff --git a/net/djbdns/options.mk b/net/djbdns/options.mk index a9dbdad0ea7..da7ef99880a 100644 --- a/net/djbdns/options.mk +++ b/net/djbdns/options.mk @@ -1,11 +1,11 @@ -# $NetBSD: options.mk,v 1.8 2005/10/05 05:46:54 schmonz Exp $ +# $NetBSD: options.mk,v 1.9 2006/01/11 17:20:32 schmonz Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.djbdns PKG_SUPPORTED_OPTIONS+= inet6 djbdns-ignoreip2 djbdns-tinydns64 .if ${MACHINE_ARCH} == "sparc64" || \ ${MACHINE_ARCH} == "alpha" || \ - ${MACHINE_ARCH} == "amd64" + ${MACHINE_ARCH} == "x86_64" PKG_SUGGESTED_OPTIONS+= djbdns-tinydns64 .endif @@ -26,7 +26,6 @@ SITES_${IGNOREIP2_PATCH}= http://www.tinydns.org/ .endif .if !empty(PKG_OPTIONS:Mdjbdns-tinydns64) -TINYDNS64_PATCH= tinydns64.diff -PATCHFILES+= ${TINYDNS64_PATCH} -SITES_${TINYDNS64_PATCH}= http://www.pwrlock.de/br/ +post-patch: + @cd ${WRKSRC} && ${PATCH} ${PATCH_ARGS} < ${FILESDIR}/patch-tinydns64 .endif |