Provide a stringise function for 64bit integers, so that xapian will

build on systems with 64bit time_t's.

3 files changed, 47 insertions, 1 deletions

diff --git a/textproc/xapian/distinfo b/textproc/xapian/distinfo
index 40ece8063d7..28617b0a432 100644
--- a/textproc/xapian/distinfo
+++ b/textproc/xapian/distinfo
@@ -1,5 +1,7 @@
-$NetBSD: distinfo,v 1.7 2009/09/10 18:53:47 schmonz Exp $
+$NetBSD: distinfo,v 1.8 2009/11/24 21:57:53 agc Exp $
 
 SHA1 (xapian-core-1.0.16.tar.gz) = a3b40bdcff2dfa3256c4e0e90a66ce039ab8023f
 RMD160 (xapian-core-1.0.16.tar.gz) = ec6990e15e7612a71f45ec478121f1581490f36c
 Size (xapian-core-1.0.16.tar.gz) = 2976409 bytes
+SHA1 (patch-aa) = 13ed32d321966aed09b25ea5fb66cf8ae4e59181
+SHA1 (patch-ab) = da0ddb6ee3cef1b463afdd92f889e27eae5f3075
diff --git a/textproc/xapian/patches/patch-aa b/textproc/xapian/patches/patch-aa
new file mode 100644
index 00000000000..9ae7f18ae06
--- /dev/null
+++ b/textproc/xapian/patches/patch-aa
@@ -0,0 +1,19 @@
+$NetBSD: patch-aa,v 1.1 2009/11/24 21:57:53 agc Exp $
+
+provide a stringise function for systems with 64-bit time_t's.
+
+--- common/utils.h	2009/11/24 21:19:07	1.1
++++ common/utils.h	2009/11/24 21:19:49
+@@ -52,10 +52,9 @@
+ XAPIAN_VISIBILITY_DEFAULT
+ string om_tostring(unsigned long int a);
+ 
+-#ifdef __WIN32__
+ /// Convert a 64 bit integer to a string
+-string om_tostring(__int64 a);
+-#endif
++XAPIAN_VISIBILITY_DEFAULT
++string om_tostring(long long a);
+ 
+ /// Convert a double to a string
+ XAPIAN_VISIBILITY_DEFAULT
diff --git a/textproc/xapian/patches/patch-ab b/textproc/xapian/patches/patch-ab
new file mode 100644
index 00000000000..ba91c397f64
--- /dev/null
+++ b/textproc/xapian/patches/patch-ab
@@ -0,0 +1,25 @@
+$NetBSD: patch-ab,v 1.1 2009/11/24 21:57:53 agc Exp $
+
+provide a stringise function for systems with 64-bit time_t's.
+
+--- common/utils.cc	2009/11/24 21:19:54	1.1
++++ common/utils.cc	2009/11/24 21:20:41
+@@ -73,16 +73,11 @@
+     CONVERT_TO_STRING("%lu")
+ }
+ 
+-#ifdef __WIN32__
+ string
+-om_tostring(__int64 val)
++om_tostring(long long val)
+ {
+-    // Avoid a format string warning from GCC - mingw uses the MS C runtime DLL
+-    // which does understand "%I64d", but GCC doesn't know that.
+-    static const char fmt[] = { '%', 'I', '6', '4', 'd', 0 };
+-    CONVERT_TO_STRING(fmt)
++    CONVERT_TO_STRING("%lld")
+ }
+-#endif
+ 
+ string
+ om_tostring(double val)