From 10e8f840f1a22daa55f6f761a67eedbff8f1d7d1 Mon Sep 17 00:00:00 2001
From: obache <obache>
Date: Sun, 1 Oct 2006 07:48:38 +0000
Subject: Update qdbm and sub packages to 1.8.71.

Changes:
2006-08-24  Mikio Hirabayashi

	- Makefile was modified to assure portability.
	- Silent flag was added to the C++ API, the Java API, and the Ruby API.
	- Release: 1.8.71
---
 databases/qdbm/Makefile.common  |  4 ++--
 databases/qdbm/distinfo         | 22 +++++++++++-----------
 databases/qdbm/patches/patch-aa | 14 ++++++++------
 databases/qdbm/patches/patch-ab | 18 +++++++++++++++---
 databases/qdbm/patches/patch-ac | 19 ++++++++++---------
 databases/qdbm/patches/patch-ad | 23 +++++++++++++----------
 databases/qdbm/patches/patch-ae | 28 +++++++++++++++++-----------
 databases/qdbm/patches/patch-af |  6 +++---
 databases/qdbm/patches/patch-ag | 15 +++++++--------
 9 files changed, 86 insertions(+), 63 deletions(-)

(limited to 'databases/qdbm')

diff --git a/databases/qdbm/Makefile.common b/databases/qdbm/Makefile.common
index 9e3933c3578..927022f58b9 100644
--- a/databases/qdbm/Makefile.common
+++ b/databases/qdbm/Makefile.common
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile.common,v 1.10 2006/09/03 02:56:00 obache Exp $
+# $NetBSD: Makefile.common,v 1.11 2006/10/01 07:48:38 obache Exp $
 #
 
 DISTNAME=	qdbm-${QDBM_VERSION}
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=qdbm/}
-QDBM_VERSION=	1.8.70
+QDBM_VERSION=	1.8.71
 
 MAINTAINER=	obata@lins.jp
 HOMEPAGE=	http://qdbm.sourceforge.net/
diff --git a/databases/qdbm/distinfo b/databases/qdbm/distinfo
index 6a4866facd4..fd2bc064931 100644
--- a/databases/qdbm/distinfo
+++ b/databases/qdbm/distinfo
@@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.12 2006/09/03 02:56:00 obache Exp $
+$NetBSD: distinfo,v 1.13 2006/10/01 07:48:38 obache Exp $
 
-SHA1 (qdbm-1.8.70.tar.gz) = e647bc15b950dd0cb2443a66726576815078890b
-RMD160 (qdbm-1.8.70.tar.gz) = 350ed9b831f8ed63486bcc4742d06595b5345927
-Size (qdbm-1.8.70.tar.gz) = 914959 bytes
-SHA1 (patch-aa) = 85c331f066c2887a657ee03148ba7cd39f620814
-SHA1 (patch-ab) = cfd59f30dc058766357461ca3265748c52665fd6
-SHA1 (patch-ac) = 31164f476b2e092b2a2664e2599a87e340550f6d
-SHA1 (patch-ad) = 0ec2622a8d2a201051a3d7c835e12804041c70ed
-SHA1 (patch-ae) = 06543315d0c9350b024a10cd4747107626de3526
-SHA1 (patch-af) = f73702a19230eca143945703b2bdd35b3282d636
-SHA1 (patch-ag) = fda1f598bf163e8ee2bdf001edb75da3045578f8
+SHA1 (qdbm-1.8.71.tar.gz) = f915aed8b0babd878ac745f8adc9fa236f3b5bb4
+RMD160 (qdbm-1.8.71.tar.gz) = 0d3f48471bf1857fe6a9d2b94f4552a40195f933
+Size (qdbm-1.8.71.tar.gz) = 921838 bytes
+SHA1 (patch-aa) = 61b1e6439f4a9b3154f02a632d53d08be938d0f8
+SHA1 (patch-ab) = 7084668dfe5f6e835047d96ef7d5c861603aec7a
+SHA1 (patch-ac) = 1047525166dfbc61633bafe234620459839b2def
+SHA1 (patch-ad) = 0b9d39da15c0c1b8ac888956a31144b1029a50c6
+SHA1 (patch-ae) = 31cad5699a893adfefbb665e0a56207171d9f7a3
+SHA1 (patch-af) = db3cfc3b08a16f82b925fb4fe961eef4c936fd86
+SHA1 (patch-ag) = 45deb8adfa3fc4d687b154b5307f32e171e97463
diff --git a/databases/qdbm/patches/patch-aa b/databases/qdbm/patches/patch-aa
index d54490dc22d..054c212f56a 100644
--- a/databases/qdbm/patches/patch-aa
+++ b/databases/qdbm/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.4 2006/09/03 02:56:00 obache Exp $
+$NetBSD: patch-aa,v 1.5 2006/10/01 07:48:38 obache Exp $
 
---- Makefile.in.orig	2006-08-21 00:17:27.000000000 +0900
+--- Makefile.in.orig	2006-08-24 11:56:03.000000000 +0900
 +++ Makefile.in
 @@ -45,7 +45,7 @@ MYLIBDIR = @libdir@
  MYBINDIR = @bindir@
@@ -11,14 +11,16 @@ $NetBSD: patch-aa,v 1.4 2006/09/03 02:56:00 obache Exp $
  MYPCDIR = @libdir@/pkgconfig
  DESTDIR =
  
-@@ -58,8 +58,8 @@ CPPFLAGS = -I$(srcdir) -I$(HOME)/include
+@@ -58,9 +58,9 @@ CPPFLAGS = -I$(srcdir) -I$(HOME)/include
  CFLAGS = -Wall -pedantic -fPIC -fsigned-char -O3 -fomit-frame-pointer -fforce-addr @MYOPTS@
  LD = @LD@
  LIBS = -lqdbm @LIBS@
 -LIBLDFLAGS = -L. -L$(HOME)/lib -L/usr/local/lib @LIBS@
 -LDFLAGS = -L. -L$(HOME)/lib -L/usr/local/lib $(LIBS)
-+LIBLDFLAGS = @LDFLAGS@ -L. -L$(HOME)/lib -L/usr/local/lib @LIBS@
-+LDFLAGS = @LDFLAGS@ -L. -L$(HOME)/lib -L/usr/local/lib $(LIBS)
- LDENV = LD_RUN_PATH=/lib:/usr/lib:$(HOME)/lib:/usr/local/lib:$(MYLIBDIR)
+-LDENV = LD_RUN_PATH=/lib:/usr/lib:$(HOME)/lib:/usr/local/lib:$(MYLIBDIR)
++LIBLDFLAGS = @LDFLAGS@ -L. @LIBS@
++LDFLAGS = @LDFLAGS@ -L. $(LIBS)
++LDENV = LD_RUN_PATH=/lib:/usr/lib:$(MYLIBDIR)
  AR = @AR@
  ARFLAGS = rcsv
+ RUNENV = LD_LIBRARY_PATH=.:/lib:/usr/lib:$(HOME)/lib:/usr/local/lib
diff --git a/databases/qdbm/patches/patch-ab b/databases/qdbm/patches/patch-ab
index e2e327470dc..a7c72f17cf6 100644
--- a/databases/qdbm/patches/patch-ab
+++ b/databases/qdbm/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.1 2005/11/23 06:20:36 minskim Exp $
+$NetBSD: patch-ab,v 1.2 2006/10/01 07:48:38 obache Exp $
 
---- perl/Makefile.in.orig	2005-06-19 08:12:23.000000000 +0900
+--- perl/Makefile.in.orig	2006-09-06 12:37:15.000000000 +0900
 +++ perl/Makefile.in
-@@ -21,7 +21,7 @@ MYDOCS = plspex.html plspex-ja.html plap
+@@ -21,16 +21,16 @@ MYDOCS = plspex.html plspex-ja.html plap
  prefix = @prefix@
  exec_prefix = @exec_prefix@
  MYBINDIR = @bindir@
@@ -11,6 +11,18 @@ $NetBSD: patch-ab,v 1.1 2005/11/23 06:20:36 minskim Exp $
  DESTDIR =
  
  # Building binaries
+ CC = gcc
+-INC = -I. -I../.. -I$(HOME)/include -I/usr/local/include
++INC = -I. -I../..
+ OPTIMIZE = -O2
+ LD = ld
+-LIBS = -L../.. -I$(HOME)/lib -L/usr/local/lib -lqdbm @LIBS@
+-RUNENV = LD_LIBRARY_PATH=.:..:../..:/usr/local/lib:$(HOME)/lib
++LIBS = -L../.. -lqdbm @LIBS@
++RUNENV = LD_LIBRARY_PATH=.:..:../..
+ 
+ 
+ 
 @@ -42,15 +42,15 @@ RUNENV = LD_LIBRARY_PATH=.:..:../..:/usr
  all :
  	cd depot && [ -f Makefile ] || \
diff --git a/databases/qdbm/patches/patch-ac b/databases/qdbm/patches/patch-ac
index 7560f04dbfc..7859360bfe8 100644
--- a/databases/qdbm/patches/patch-ac
+++ b/databases/qdbm/patches/patch-ac
@@ -1,21 +1,22 @@
-$NetBSD: patch-ac,v 1.1 2005/11/23 06:20:36 minskim Exp $
+$NetBSD: patch-ac,v 1.2 2006/10/01 07:48:38 obache Exp $
 
---- cgi/Makefile.in.orig	2004-08-18 20:17:02.000000000 +0900
+--- cgi/Makefile.in.orig	2006-08-24 11:55:35.000000000 +0900
 +++ cgi/Makefile.in
-@@ -22,20 +22,20 @@ MYDOCS = cgispex.html cgispex-ja.html
+@@ -22,19 +22,19 @@ MYDOCS = cgispex.html cgispex-ja.html
  
  # Building binaries
  CC = gcc
--RELCFLAGS = -O2 -DNDEBUG
-+RELCFLAGS = ${PTHREAD_CFLAGS} -O2 -DNDEBUG
- CPPFLAGS = -I$(srcdir) -I$(srcdir)/.. -I$(HOME)/include -I/usr/local/include \
+-CPPFLAGS = -I$(srcdir) -I$(srcdir)/.. -I$(HOME)/include -I/usr/local/include \
++CPPFLAGS = -I$(srcdir) -I$(srcdir)/.. \
    -D_XOPEN_SOURCE_EXTENDED=1 -D_GNU_SOURCE=1 -D__EXTENSIONS__=1 -D_HPUX_SOURCE=1 \
-   -D_POSIX_MAPPED_FILES=1 -D_POSIX_SYNCHRONIZED_IO=1
- CFLAGS = -Wall -ansi -pedantic -fsigned-char $(RELCFLAGS)
+   -D_POSIX_MAPPED_FILES=1 -D_POSIX_SYNCHRONIZED_IO=1 -DNDEBUG
+-CFLAGS = -Wall -ansi -pedantic -fsigned-char -O2
++CFLAGS = ${PTHREAD_CFLAGS} -Wall -ansi -pedantic -fsigned-char -O2
  LIBS = -lqdbm @LIBS@
 -LDFLAGS = -L$(srcdir)/.. -L$(HOME)/lib -L/usr/local/lib $(LIBS)
+-LDENV = LD_RUN_PATH=/lib:/usr/lib:$(HOME)/lib:/usr/local/lib:$(prefix)/lib
 +LDFLAGS = @LDFLAGS@ -L$(srcdir)/.. -L$(HOME)/lib -L/usr/local/lib $(LIBS)
- LDENV = LD_RUN_PATH=/lib:/usr/lib:$(HOME)/lib:/usr/local/lib:$(prefix)/lib
++LDENV = LD_RUN_PATH=/lib:/usr/lib:$(prefix)/lib
  
  # Install destinations
  prefix = @prefix@
diff --git a/databases/qdbm/patches/patch-ad b/databases/qdbm/patches/patch-ad
index cc320142677..673a7b488bd 100644
--- a/databases/qdbm/patches/patch-ad
+++ b/databases/qdbm/patches/patch-ad
@@ -1,6 +1,6 @@
-$NetBSD: patch-ad,v 1.2 2006/01/11 18:23:02 wiz Exp $
+$NetBSD: patch-ad,v 1.3 2006/10/01 07:48:38 obache Exp $
 
---- java/Makefile.in.orig	2005-08-18 05:18:37.000000000 +0900
+--- java/Makefile.in.orig	2006-08-24 15:44:22.000000000 +0900
 +++ java/Makefile.in
 @@ -37,7 +37,7 @@ prefix = @prefix@
  exec_prefix = @exec_prefix@
@@ -11,21 +11,24 @@ $NetBSD: patch-ad,v 1.2 2006/01/11 18:23:02 wiz Exp $
  DESTDIR =
  
  # Building binaries
-@@ -50,7 +50,7 @@ JAVAH = @JAVAH@
+@@ -50,16 +50,16 @@ JAVAH = @JAVAH@
  JAVADOC = @JAVADOC@
  JAVARUN = @JAVARUN@
  CC = @CC@
--RELCFLAGS = -O2 -DNDEBUG
-+RELCFLAGS = -O2 -DNDEBUG ${PTHREAD_CFLAGS}
- CPPFLAGS = -I$(srcdir) -I$(srcdir)/.. -I$(HOME)/include -I/usr/local/include \
+-CPPFLAGS = -I$(srcdir) -I$(srcdir)/.. -I$(HOME)/include -I/usr/local/include \
++CPPFLAGS = -I$(srcdir) -I$(srcdir)/.. \
    -I$(MYJAVAHOME)/include -I$(MYJAVAHOME)/include/$(JVMPLATFORM) -I$(MYJAVAHOME)/Headers \
    @MYDEFS@ -D_XOPEN_SOURCE_EXTENDED=1 -D_GNU_SOURCE=1 -D__EXTENSIONS__=1 -D_HPUX_SOURCE=1 \
-@@ -59,7 +59,7 @@ CPPFLAGS = -I$(srcdir) -I$(srcdir)/.. -I
- CFLAGS = -Wall -fPIC -fsigned-char $(RELCFLAGS)
+   -D_POSIX_MAPPED_FILES=1 -D_POSIX_SYNCHRONIZED_IO=1 \
+   -DPIC=1 -D_THREAD_SAFE=1 -D_REENTRANT=1 -DNDEBUG
+-CFLAGS = -Wall -fPIC -fsigned-char -O2 @MYOPTS@
++CFLAGS = ${PTHREAD_CFLAGS} -Wall -fPIC -fsigned-char -O2 @MYOPTS@
  LD = @LD@
  LIBS = -lqdbm @LIBS@
 -LIBLDFLAGS = -L. -L$(srcdir)/.. -L$(HOME)/lib -L/usr/local/lib $(LIBS)
-+LIBLDFLAGS = @LDFLAGS@ -L. -L$(srcdir)/.. -L$(HOME)/lib -L/usr/local/lib $(LIBS)
- RUNENV = LD_LIBRARY_PATH=.:..:/lib:/usr/lib:$(HOME)/lib:/usr/local/lib
+-RUNENV = LD_LIBRARY_PATH=.:..:/lib:/usr/lib:$(HOME)/lib:/usr/local/lib
++LIBLDFLAGS = @LDFLAGS@ -L. -L$(srcdir)/.. $(LIBS)
++RUNENV = LD_LIBRARY_PATH=.:..:/lib:/usr/lib
+ 
  
  
diff --git a/databases/qdbm/patches/patch-ae b/databases/qdbm/patches/patch-ae
index 2c6464b4886..97f7564311a 100644
--- a/databases/qdbm/patches/patch-ae
+++ b/databases/qdbm/patches/patch-ae
@@ -1,8 +1,8 @@
-$NetBSD: patch-ae,v 1.1 2005/11/23 06:20:36 minskim Exp $
+$NetBSD: patch-ae,v 1.2 2006/10/01 07:48:38 obache Exp $
 
---- plus/Makefile.in.orig	2005-08-18 05:18:11.000000000 +0900
+--- plus/Makefile.in.orig	2006-08-24 15:23:13.000000000 +0900
 +++ plus/Makefile.in
-@@ -34,12 +34,12 @@ exec_prefix = @exec_prefix@
+@@ -34,24 +34,24 @@ exec_prefix = @exec_prefix@
  MYHEADDIR = @includedir@
  MYLIBDIR = @libdir@
  MYBINDIR = @bindir@
@@ -12,19 +12,25 @@ $NetBSD: patch-ae,v 1.1 2005/11/23 06:20:36 minskim Exp $
  
  # Building binaries
  CXX = @CXX@
--RELCXXFLAGS = -O1 -DNDEBUG
-+RELCXXFLAGS = -O1 -DNDEBUG ${PTHREAD_CFLAGS}
- CPPFLAGS = -I$(srcdir) -I$(srcdir)/.. -I$(HOME)/include -I/usr/local/include \
+-CPPFLAGS = -I$(srcdir) -I$(srcdir)/.. -I$(HOME)/include -I/usr/local/include @MYDEFS@ \
++CPPFLAGS = -I$(srcdir) -I$(srcdir)/.. @MYDEFS@ \
    -D_XOPEN_SOURCE_EXTENDED=1 -D_GNU_SOURCE=1 -D__EXTENSIONS__=1 -D_HPUX_SOURCE=1 \
    -D_POSIX_MAPPED_FILES=1 -D_POSIX_SYNCHRONIZED_IO=1 \
-@@ -47,8 +47,8 @@ CPPFLAGS = -I$(srcdir) -I$(srcdir)/.. -I
- CXXFLAGS = -Wall -ansi -pedantic -fsigned-char -fPIC $(RELCXXFLAGS)
+   -DPIC=1 -D_THREAD_SAFE=1 -D_REENTRANT=1 -DNDEBUG
+-CXXFLAGS = -Wall -ansi -pedantic -fsigned-char -fPIC -O2 -fno-strict-aliasing @MYOPTS@
++CXXFLAGS = ${PTHREAD_CFLAGS} -Wall -ansi -pedantic -fsigned-char -fPIC -O2 -fno-strict-aliasing @MYOPTS@
  LD = @LD@
  LIBS = -lqdbm @LIBS@
 -LIBLDFLAGS = -L. -L$(srcdir)/.. -L$(HOME)/lib -L/usr/local/lib $(LIBS)
 -LDFLAGS = -L. -L$(srcdir)/.. -L$(HOME)/lib -L/usr/local/lib -lxqdbm $(LIBS)
-+LIBLDFLAGS = @LDFLAGS@ -L. -L$(srcdir)/.. -L$(HOME)/lib -L/usr/local/lib $(LIBS)
-+LDFLAGS = @LDFLAGS@ -L. -L$(srcdir)/.. -L$(HOME)/lib -L/usr/local/lib -lxqdbm $(LIBS)
- LDENV = LD_RUN_PATH=/lib:/usr/lib:$(HOME)/lib:/usr/local/lib:$(MYLIBDIR)
+-LDENV = LD_RUN_PATH=/lib:/usr/lib:$(HOME)/lib:/usr/local/lib:$(MYLIBDIR)
++LIBLDFLAGS = @LDFLAGS@ -L. -L$(srcdir)/.. $(LIBS)
++LDFLAGS = @LDFLAGS@ -L. -L$(srcdir)/.. -lxqdbm $(LIBS)
++LDENV = LD_RUN_PATH=/lib:/usr/lib:$(MYLIBDIR)
  AR = @AR@
  ARFLAGS = rcsv
+-RUNENV = LD_LIBRARY_PATH=.:..:/lib:/usr/lib:$(HOME)/lib:/usr/local/lib
++RUNENV = LD_LIBRARY_PATH=.:..:/lib:/usr/lib
+ 
+ 
+ 
diff --git a/databases/qdbm/patches/patch-af b/databases/qdbm/patches/patch-af
index ce5917df4eb..b92a9b26175 100644
--- a/databases/qdbm/patches/patch-af
+++ b/databases/qdbm/patches/patch-af
@@ -1,6 +1,6 @@
-$NetBSD: patch-af,v 1.1 2005/11/23 06:20:36 minskim Exp $
+$NetBSD: patch-af,v 1.2 2006/10/01 07:48:38 obache Exp $
 
---- ruby/Makefile.in.orig	2004-05-12 20:36:57.000000000 +0900
+--- ruby/Makefile.in.orig	2006-09-06 12:37:33.000000000 +0900
 +++ ruby/Makefile.in
 @@ -21,7 +21,7 @@ MYDOCS = rbspex.html rbspex-ja.html rbap
  prefix = @prefix@
@@ -30,7 +30,7 @@ $NetBSD: patch-af,v 1.1 2005/11/23 06:20:36 minskim Exp $
  uninstall :
 -	pprefix=`ruby -e '$$:.each() do |path| ; printf("%s\n", path) ; end' | grep -v '^\.'` ; \
 +	pprefix=`${RUBY} -e '$$:.each() do |path| ; printf("%s\n", path) ; end' | grep -v '^\.'` ; \
- 	  find $$pprefix | sort | uniq | \
+ 	  find $$pprefix -print | sort | uniq | \
  	  egrep '(mod_depot\.so|depot\.rb|mod_curia\.so|curia\.rb|mod_villa\.so|villa\.rb)' | \
  	  xargs rm -f
 @@ -85,27 +85,27 @@ check :
diff --git a/databases/qdbm/patches/patch-ag b/databases/qdbm/patches/patch-ag
index 9cc09cd00dd..961f1c80f97 100644
--- a/databases/qdbm/patches/patch-ag
+++ b/databases/qdbm/patches/patch-ag
@@ -1,6 +1,6 @@
-$NetBSD: patch-ag,v 1.2 2006/09/03 02:56:00 obache Exp $
+$NetBSD: patch-ag,v 1.3 2006/10/01 07:48:38 obache Exp $
 
---- LTmakefile.in.orig	2006-08-21 00:18:21.000000000 +0900
+--- LTmakefile.in.orig	2006-08-24 11:57:27.000000000 +0900
 +++ LTmakefile.in
 @@ -37,7 +37,7 @@ MYLIBDIR = @libdir@
  MYBINDIR = @bindir@
@@ -11,13 +11,12 @@ $NetBSD: patch-ag,v 1.2 2006/09/03 02:56:00 obache Exp $
  MYPCDIR = @libdir@/pkgconfig
  
  # Building binaries
-@@ -46,11 +46,12 @@ CC = gcc
- CFLAGS = -I. @MYDEFS@ -D_XOPEN_SOURCE=1 -D_XOPEN_SOURCE_EXTENDED=1 \
-   -D_XOPEN_SOURCE_EXTENDED=1 -D_GNU_SOURCE=1 -D_HPUX_SOURCE=1 \
+@@ -46,11 +46,11 @@ CC = gcc
+ CFLAGS = -I. -I$(HOME)/include -I/usr/local/include @MYDEFS@ \
+   -D_XOPEN_SOURCE_EXTENDED=1 -D_GNU_SOURCE=1 -D__EXTENSIONS__=1 -D_HPUX_SOURCE=1 \
    -D_POSIX_MAPPED_FILES=1 -D_POSIX_SYNCHRONIZED_IO=1 \
--  -DPIC=1 -D_REENTRANT=1 -O3
-+  -D_NETBSD_SOURCE=1 \
-+  -DPIC=1 $(PTHREAD_CFLAGS) -O3
+-  -DPIC=1 -D_THREAD_SAFE=1 -D_REENTRANT=1 -DNDEBUG -O3
++  -DPIC=1 -D_THREAD_SAFE=1 ${PTHREAD_CFLAGS} -DNDEBUG -O3
  LD = gcc
 -LIBLDFLAGS = -rpath $(MYLIBDIR) -R $(MYLIBDIR) \
 +LIBLDFLAGS = @LDFLAGS@ -rpath $(MYLIBDIR) -R $(MYLIBDIR) \
-- 
cgit v1.2.3