Sat Jul 31 21:09:14 2010 UTC ()
#undef u_int64_t before including db.h, as on platforms where u_int64_t
is missing, this package's configure script defines it on the command
line and db4 also provides it as a typedef in db.h, and the two don't
mix. This is a hack, but it should fix PR 42805.
(dholland)
diff -r1.14 -r1.15 pkgsrc/www/webalizer/distinfo
diff -r0 -r1.1 pkgsrc/www/webalizer/patches/patch-ba
diff -r0 -r1.1 pkgsrc/www/webalizer/patches/patch-bb
diff -r0 -r1.1 pkgsrc/www/webalizer/patches/patch-bc
diff -r0 -r1.1 pkgsrc/www/webalizer/patches/patch-bd
--- pkgsrc/www/webalizer/distinfo 2010/06/02 13:13:14 1.14
+++ pkgsrc/www/webalizer/distinfo 2010/07/31 21:09:14 1.15
| @@ -1,8 +1,12 @@ | | | @@ -1,8 +1,12 @@ |
1 | $NetBSD: distinfo,v 1.14 2010/06/02 13:13:14 adam Exp $ | | 1 | $NetBSD: distinfo,v 1.15 2010/07/31 21:09:14 dholland Exp $ |
2 | | | 2 | |
3 | SHA1 (webalizer-2.21-02-src.tar.bz2) = b637ebf1eb459e03c052c24d7da3e5f0794e2230 | | 3 | SHA1 (webalizer-2.21-02-src.tar.bz2) = b637ebf1eb459e03c052c24d7da3e5f0794e2230 |
4 | RMD160 (webalizer-2.21-02-src.tar.bz2) = c7d48acf6e2c1fedfd04eac30214a76db7c84aee | | 4 | RMD160 (webalizer-2.21-02-src.tar.bz2) = c7d48acf6e2c1fedfd04eac30214a76db7c84aee |
5 | Size (webalizer-2.21-02-src.tar.bz2) = 304926 bytes | | 5 | Size (webalizer-2.21-02-src.tar.bz2) = 304926 bytes |
6 | SHA1 (patch-ac) = f4885b334b3adb3f8523f959a89e6fe5f7f3b52f | | 6 | SHA1 (patch-ac) = f4885b334b3adb3f8523f959a89e6fe5f7f3b52f |
7 | SHA1 (patch-ad) = 09e9ca7fd61b0ad13306e98a644f362a932fcf3b | | 7 | SHA1 (patch-ad) = 09e9ca7fd61b0ad13306e98a644f362a932fcf3b |
8 | SHA1 (patch-ae) = ea0c444408cef1be4e69b837170bbbe9a7a5150e | | 8 | SHA1 (patch-ae) = ea0c444408cef1be4e69b837170bbbe9a7a5150e |
| | | 9 | SHA1 (patch-ba) = eadf9f9d22c89d441debd90b993846529fc872fd |
| | | 10 | SHA1 (patch-bb) = d8a5f6f60f53d6de8fc24d3b1844a052be0ad69a |
| | | 11 | SHA1 (patch-bc) = 98d263cfb585477798f620a6f3690680ce2759b6 |
| | | 12 | SHA1 (patch-bd) = 21f074725a85de5d9d865b84cc88dc04919226d4 |
$NetBSD: patch-ba,v 1.1 2010/07/31 21:09:14 dholland Exp $
Avoid conflict between configure script, which #defines u_int64_t on
the command line, and db.h, which provides it on platforms where it's
missing. PR 42805.
(Upstream ought to switch to using uint64_t and stdint.h.)
--- dns_resolv.c.orig 2009-01-13 04:42:46.000000000 +0000
+++ dns_resolv.c
@@ -61,6 +61,7 @@
#include <sys/stat.h>
#include <sys/time.h>
#include <sys/wait.h>
+#undef u_int64_t
#include <db.h> /* DB header ****************/
#include "webalizer.h" /* main header */
#include "lang.h" /* language declares */
$NetBSD: patch-bb,v 1.1 2010/07/31 21:09:14 dholland Exp $
Avoid conflict between configure script, which #defines u_int64_t on
the command line, and db.h, which provides it on platforms where it's
missing. PR 42805.
(Upstream ought to switch to using uint64_t and stdint.h.)
--- output.c.orig 2009-01-13 05:34:04.000000000 +0000
+++ output.c
@@ -35,6 +35,7 @@
#include <sys/stat.h>
#include <sys/utsname.h>
#ifdef USE_DNS
+#undef u_int64_t
#include <db.h>
#endif
$NetBSD: patch-bc,v 1.1 2010/07/31 21:09:14 dholland Exp $
Avoid conflict between configure script, which #defines u_int64_t on
the command line, and db.h, which provides it on platforms where it's
missing. PR 42805.
(Upstream ought to switch to using uint64_t and stdint.h.)
--- wcmgr.c.orig 2009-01-13 04:45:49.000000000 +0000
+++ wcmgr.c
@@ -70,6 +70,7 @@ int main()
#include <sys/types.h>
#endif
+#undef u_int64_t
#include <db.h>
#include "webalizer.h"
$NetBSD: patch-bd,v 1.1 2010/07/31 21:09:14 dholland Exp $
Avoid conflict between configure script, which #defines u_int64_t on
the command line, and db.h, which provides it on platforms where it's
missing. PR 42805.
(Upstream ought to switch to using uint64_t and stdint.h.)
--- webalizer.c.orig 2009-01-13 05:35:54.000000000 +0000
+++ webalizer.c
@@ -68,6 +68,7 @@
#include <netdb.h>
#include <netinet/in.h>
#include <arpa/inet.h>
+#undef u_int64_t
#include <db.h>
#endif /* USE_DNS */