No idea what __os_clock is, but replace it with portable gettimeofday

usage. Add DESTDIR support. Bump revision.

4 files changed, 67 insertions, 7 deletions

diff --git a/databases/bdb-xml/Makefile b/databases/bdb-xml/Makefile
index 159a8c6aacc..c8b678c3d80 100644
--- a/databases/bdb-xml/Makefile
+++ b/databases/bdb-xml/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.12 2008/01/12 11:36:28 adam Exp $
+# $NetBSD: Makefile,v 1.13 2008/04/03 11:18:23 joerg Exp $
 
 DISTNAME=	dbxml-1.2.1
 PKGNAME=	${DISTNAME:S/db/bdb-/}
-PKGREVISION=	6
+PKGREVISION=	7
 CATEGORIES=	databases
 MASTER_SITES=	http://www.sleepycat.com/update/snapshot/
 
@@ -10,6 +10,8 @@ MAINTAINER=	minskim@NetBSD.org
 HOMEPAGE=	http://www.sleepycat.com/products/xml.shtml
 COMMENT=	Native XML data manager built on Berkeley DB
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 CONFLICTS=	dbxml<=1.2.1
 
 WRKSRC=			${WRKDIR}/${DISTNAME}/build_unix
diff --git a/databases/bdb-xml/distinfo b/databases/bdb-xml/distinfo
index 88cd208746f..c3f79d3fd41 100644
--- a/databases/bdb-xml/distinfo
+++ b/databases/bdb-xml/distinfo
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.4 2006/01/02 17:32:13 joerg Exp $
+$NetBSD: distinfo,v 1.5 2008/04/03 11:18:23 joerg Exp $
 
 SHA1 (dbxml-1.2.1.tar.gz) = cc6ce354b3fb2e00d5b424c0b15ecee4ec340842
 RMD160 (dbxml-1.2.1.tar.gz) = 162f3e14e509aefd764bb97af80d5bbf06151df7
 Size (dbxml-1.2.1.tar.gz) = 3151529 bytes
 SHA1 (patch-aa) = 8bf913113e7fe700adb94463b5f69e99b3c20063
-SHA1 (patch-ab) = 39612561440760dc353ba471808065b5d48ab51e
+SHA1 (patch-ab) = 4e124704238d4d3c6fc753d28ce3cb0bd5e3731f
 SHA1 (patch-ac) = b19ca080112614634660a8d77303bbdc0a4b7adc
+SHA1 (patch-ad) = dfbfa3fe27f8da99b35964223a754f8223a5b7e9
diff --git a/databases/bdb-xml/patches/patch-ab b/databases/bdb-xml/patches/patch-ab
index fd73b9d1e53..464d3424f50 100644
--- a/databases/bdb-xml/patches/patch-ab
+++ b/databases/bdb-xml/patches/patch-ab
@@ -1,8 +1,14 @@
-$NetBSD: patch-ab,v 1.1.1.1 2004/03/31 17:15:58 minskim Exp $
+$NetBSD: patch-ab,v 1.2 2008/04/03 11:18:23 joerg Exp $
 
---- ../dist/Makefile.in.orig	2003-12-16 20:38:24.000000000 -0600
+--- ../dist/Makefile.in.orig	2003-12-17 00:23:30.000000000 +0100
 +++ ../dist/Makefile.in
-@@ -11,7 +11,7 @@ exec_prefix=@exec_prefix@
+@@ -6,12 +6,12 @@ builddir=.
+ ##################################################
+ # Installation directories and permissions.
+ ##################################################
+-prefix=	@prefix@
++prefix=	${DESTDIR}@prefix@
+ exec_prefix=@exec_prefix@
  bindir=	@bindir@
  includedir=@includedir@/dbxml
  libdir=	@libdir@
diff --git a/databases/bdb-xml/patches/patch-ad b/databases/bdb-xml/patches/patch-ad
new file mode 100644
index 00000000000..46dca8339a2
--- /dev/null
+++ b/databases/bdb-xml/patches/patch-ad
@@ -0,0 +1,51 @@
+$NetBSD: patch-ad,v 1.1 2008/04/03 11:18:23 joerg Exp $
+
+Replace non-portable function with gettimeofday.
+
+--- ../src/dbxml/HighResTimer.cpp.orig	2003-05-09 02:01:45.000000000 +0200
++++ ../src/dbxml/HighResTimer.cpp
+@@ -17,8 +17,6 @@ static const char revid[] = "$Id: HighRe
+ #include <iostream>
+ #include <sstream>
+ 
+-extern "C" int __os_clock(DB_ENV *, u_int32_t *, u_int32_t *);
+-
+ using namespace DbXml;
+ 
+ #ifdef _MSC_VER
+@@ -96,6 +94,10 @@ void HighResTimer::reset()
+ 
+ #else /* !_MSC_VER */
+ 
++extern "C" {
++#include <sys/time.h>
++}
++
+ HighResTimer::HighResTimer(const char *name, const char *what, const char *whats)
+ 	: name_(name),
+ 	what_(what),
+@@ -110,14 +112,22 @@ HighResTimer::~HighResTimer()
+ 
+ void HighResTimer::start()
+ {
+-	(void)__os_clock(NULL, &start_secs, &start_usecs);
++	struct timeval tv;
++
++	gettimeofday(&tv, NULL);
++	start_secs = tv.tv_sec;
++	start_usecs = tv.tv_usec;
+ }
+ 
+ void HighResTimer::stop()
+ {
+ #define	USECS_PER_SEC 1000000
++	struct timeval tv;
+ 	u_int32_t stop_secs, stop_usecs;
+-	(void)__os_clock(NULL, &stop_secs, &stop_usecs);
++
++	gettimeofday(&tv, NULL);
++	stop_secs = tv.tv_sec;
++	stop_usecs = tv.tv_usec;
+ 	duration_secs += (stop_secs - start_secs);
+ 	duration_usecs += (stop_usecs - start_usecs);
+ 	// fixup for usec under/overflow