Update qdbm to 1.8.34. Patches from OBATA Akio (maintainer).

Change:
- A bug of i-node duplication on MinGW was fixed.

pkgsrc Change:
- Split Makefile to provide bindings for other languages in separate
packages.

12 files changed, 249 insertions, 51 deletions

diff --git a/databases/qdbm/DESCR b/databases/qdbm/DESCR
index 1747dd6b036..0738307f9f2 100644
--- a/databases/qdbm/DESCR
+++ b/databases/qdbm/DESCR
@@ -2,6 +2,7 @@ QDBM is an embeded database library compatible with GDBM and NDBM.  It
 features hash database and B+ tree database and is developed referring
 to GDBM for the purpose of the following three points: higher
 processing speed, smaller size of a database file, and simpler API.
-This package includes APIs for C, C++, and Java.  CGI scripts are also
-contained.  APIs for Perl and Ruby should be installed with a source
+
+This package includes APIs for C.
+APIs for C++, Java, Perl, Ruby and  CGI scripts are provided as separate
 package.
diff --git a/databases/qdbm/Makefile b/databases/qdbm/Makefile
index e315474208a..5c7c853997a 100644
--- a/databases/qdbm/Makefile
+++ b/databases/qdbm/Makefile
@@ -1,12 +1,10 @@
-# $NetBSD: Makefile,v 1.2 2005/10/29 15:33:35 minskim Exp $
+# $NetBSD: Makefile,v 1.3 2005/11/23 06:20:36 minskim Exp $
 #
 
-DISTNAME=	qdbm-1.8.33
+.include "Makefile.common"
+
 CATEGORIES=	databases
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=qdbm/}
 
-MAINTAINER=	obata@lins.jp
-HOMEPAGE=	http://qdbm.sourceforge.net/
 COMMENT=	Quick Database Manager - library of routines for managing a db
 
 GNU_CONFIGURE=	yes
diff --git a/databases/qdbm/Makefile.common b/databases/qdbm/Makefile.common
new file mode 100644
index 00000000000..8230d516e95
--- /dev/null
+++ b/databases/qdbm/Makefile.common
@@ -0,0 +1,13 @@
+# $NetBSD: Makefile.common,v 1.1 2005/11/23 06:20:36 minskim Exp $
+#
+
+DISTNAME=	qdbm-${QDBM_VERSION}
+CATEGORIES=	databases
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=qdbm/}
+QDBM_VERSION=	1.8.34
+
+MAINTAINER=	obata@lins.jp
+HOMEPAGE=	http://qdbm.sourceforge.net/
+
+DISTINFO_FILE=	${.CURDIR}/../../databases/qdbm/distinfo
+PATCHDIR=	${.CURDIR}/../../databases/qdbm/patches
diff --git a/databases/qdbm/PLIST b/databases/qdbm/PLIST
index dcd17d998a0..7b8815baa01 100644
--- a/databases/qdbm/PLIST
+++ b/databases/qdbm/PLIST
@@ -1,70 +1,70 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2005/10/23 19:01:56 minskim Exp $
-bin/dpmgr
-bin/dptest
-bin/dptsv
+@comment $NetBSD: PLIST,v 1.2 2005/11/23 06:20:36 minskim Exp $
+bin/cbcodec
+bin/cbtest
 bin/crmgr
 bin/crtest
 bin/crtsv
-bin/rlmgr
-bin/rltest
+bin/dpmgr
+bin/dptest
+bin/dptsv
 bin/hvmgr
 bin/hvtest
-bin/cbtest
-bin/cbcodec
+bin/odidx
+bin/odmgr
+bin/odtest
+bin/rlmgr
+bin/rltest
 bin/vlmgr
 bin/vltest
 bin/vltsv
-bin/odmgr
-bin/odtest
-bin/odidx
-include/depot.h
+include/cabin.h
 include/curia.h
-include/relic.h
+include/depot.h
 include/hovel.h
-include/cabin.h
+include/odeum.h
+include/relic.h
 include/villa.h
 include/vista.h
-include/odeum.h
 lib/libqdbm.a
 lib/libqdbm.so
 lib/libqdbm.so.11
-lib/libqdbm.so.11.5.0
+lib/libqdbm.so.11.6.0
 lib/pkgconfig/qdbm.pc
-man/man1/dpmgr.1
-man/man1/dptest.1
-man/man1/dptsv.1
+man/man1/cbcodec.1
+man/man1/cbtest.1
 man/man1/crmgr.1
 man/man1/crtest.1
 man/man1/crtsv.1
-man/man1/rlmgr.1
-man/man1/rltest.1
+man/man1/dpmgr.1
+man/man1/dptest.1
+man/man1/dptsv.1
 man/man1/hvmgr.1
 man/man1/hvtest.1
-man/man1/cbtest.1
-man/man1/cbcodec.1
+man/man1/odidx.1
+man/man1/odmgr.1
+man/man1/odtest.1
+man/man1/rlmgr.1
+man/man1/rltest.1
 man/man1/vlmgr.1
 man/man1/vltest.1
 man/man1/vltsv.1
-man/man1/odmgr.1
-man/man1/odtest.1
-man/man1/odidx.1
-man/man3/qdbm.3
+man/man3/cabin.3
+man/man3/cropen.3
+man/man3/curia.3
 man/man3/depot.3
 man/man3/dpopen.3
-man/man3/curia.3
-man/man3/cropen.3
-man/man3/relic.3
 man/man3/hovel.3
-man/man3/cabin.3
-man/man3/villa.3
-man/man3/vlopen.3
-man/man3/vista.3
 man/man3/odeum.3
 man/man3/odopen.3
-share/doc/qdbm/spex.html
-share/doc/qdbm/spex-ja.html
+man/man3/qdbm.3
+man/man3/relic.3
+man/man3/villa.3
+man/man3/vista.3
+man/man3/vlopen.3
 share/doc/qdbm/COPYING
 share/doc/qdbm/ChangeLog
 share/doc/qdbm/NEWS
 share/doc/qdbm/THANKS
+share/doc/qdbm/spex-ja.html
+share/doc/qdbm/spex.html
 @dirrm share/doc/qdbm
diff --git a/databases/qdbm/buildlink3.mk b/databases/qdbm/buildlink3.mk
index 1221d1f5cf4..3d5707edd2d 100644
--- a/databases/qdbm/buildlink3.mk
+++ b/databases/qdbm/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2005/10/23 19:01:56 minskim Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2005/11/23 06:20:36 minskim Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 QDBM_BUILDLINK3_MK:=	${QDBM_BUILDLINK3_MK}+
@@ -18,5 +18,10 @@ BUILDLINK_PKGSRCDIR.qdbm?=	../../databases/qdbm
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
+.if defined(PTHREAD_TYPE) && ${PTHREAD_TYPE} != "none"
+CONFIGURE_ARGS+=	--enable-pthread
+BUILDLINK_CFLAGS.qdbm+=	${PTHREAD_CFLAGS}
+BUILDLINK_LDFLAGS.qdbm+=${PTHREAD_LDFLAGS}
+.endif
 
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/databases/qdbm/distinfo b/databases/qdbm/distinfo
index 8c57d7efc74..f1af21fdaa5 100644
--- a/databases/qdbm/distinfo
+++ b/databases/qdbm/distinfo
@@ -1,6 +1,11 @@
-$NetBSD: distinfo,v 1.2 2005/10/29 15:33:35 minskim Exp $
+$NetBSD: distinfo,v 1.3 2005/11/23 06:20:36 minskim Exp $
 
-SHA1 (qdbm-1.8.33.tar.gz) = cac04ceb3b10b024cd3d34af4984643247e54141
-RMD160 (qdbm-1.8.33.tar.gz) = 28f74519675ed711132e8d0556b0520c56abef4c
-Size (qdbm-1.8.33.tar.gz) = 863217 bytes
-SHA1 (patch-aa) = bc1a7c486e47c3137108fad4304c000d26a907f9
+SHA1 (qdbm-1.8.34.tar.gz) = 4a450c224d4eb7d51ba16dc51c1b294f2a3772e2
+RMD160 (qdbm-1.8.34.tar.gz) = e1c3d84cf7c00ada5aed1e5c09dbcd7ccb28a751
+Size (qdbm-1.8.34.tar.gz) = 863540 bytes
+SHA1 (patch-aa) = 4e9cc93351f577c33663065fcb8e8919bd1a873e
+SHA1 (patch-ab) = cfd59f30dc058766357461ca3265748c52665fd6
+SHA1 (patch-ac) = 31164f476b2e092b2a2664e2599a87e340550f6d
+SHA1 (patch-ad) = 1ee5fc49f49435c3df06b855d76c6cc1e4f89621
+SHA1 (patch-ae) = 06543315d0c9350b024a10cd4747107626de3526
+SHA1 (patch-af) = f73702a19230eca143945703b2bdd35b3282d636
diff --git a/databases/qdbm/patches/patch-aa b/databases/qdbm/patches/patch-aa
index 7b8861be771..c99b3c0753b 100644
--- a/databases/qdbm/patches/patch-aa
+++ b/databases/qdbm/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.2 2005/10/29 15:33:35 minskim Exp $
+$NetBSD: patch-aa,v 1.3 2005/11/23 06:20:36 minskim Exp $
 
---- Makefile.in.orig	2005-08-31 12:19:56.000000000 -0700
+--- Makefile.in.orig	2005-09-01 04:19:56.000000000 +0900
 +++ Makefile.in
 @@ -45,13 +45,13 @@ MYLIBDIR = @libdir@
  MYBINDIR = @bindir@
diff --git a/databases/qdbm/patches/patch-ab b/databases/qdbm/patches/patch-ab
new file mode 100644
index 00000000000..e2e327470dc
--- /dev/null
+++ b/databases/qdbm/patches/patch-ab
@@ -0,0 +1,32 @@
+$NetBSD: patch-ab,v 1.1 2005/11/23 06:20:36 minskim Exp $
+
+--- perl/Makefile.in.orig	2005-06-19 08:12:23.000000000 +0900
++++ perl/Makefile.in
+@@ -21,7 +21,7 @@ MYDOCS = plspex.html plspex-ja.html plap
+ prefix = @prefix@
+ exec_prefix = @exec_prefix@
+ MYBINDIR = @bindir@
+-MYDATADIR = @datadir@/$(PACKAGE)/perl
++MYDATADIR = @datadir@/doc/$(PACKAGE)/perl
+ DESTDIR =
+ 
+ # Building binaries
+@@ -42,15 +42,15 @@ RUNENV = LD_LIBRARY_PATH=.:..:../..:/usr
+ all :
+ 	cd depot && [ -f Makefile ] || \
+ 	  $(RUNENV) perl Makefile.PL CC="$(CC)" INC="$(INC)" OPTIMIZE="$(OPTIMIZE)" \
+-	    LD="$(LD)" LIBS="$(LIBS)" PREFIX="$(prefix)" ; \
++	    LD="$(LD)" LIBS="$(LIBS)" PREFIX="$(prefix)" INSTALLDIRS=vendor ; \
+ 	  $(RUNENV) make
+ 	cd curia && [ -f Makefile ] || \
+ 	  $(RUNENV) perl Makefile.PL CC="$(CC)" INC="$(INC)" OPTIMIZE="$(OPTIMIZE)" \
+-	    LD="$(LD)" LIBS="$(LIBS)" PREFIX="$(prefix)" ; \
++	    LD="$(LD)" LIBS="$(LIBS)" PREFIX="$(prefix)" INSTALLDIRS=vendor ; \
+ 	  $(RUNENV) make
+ 	cd villa && [ -f Makefile ] || \
+ 	  $(RUNENV) perl Makefile.PL CC="$(CC)" INC="$(INC)" OPTIMIZE="$(OPTIMIZE)" \
+-	    LD="$(LD)" LIBS="$(LIBS)" PREFIX="$(prefix)" ; \
++	    LD="$(LD)" LIBS="$(LIBS)" PREFIX="$(prefix)" INSTALLDIRS=vendor ; \
+ 	  $(RUNENV) make
+ 	@printf '\n'
+ 	@printf '#================================================================\n'
diff --git a/databases/qdbm/patches/patch-ac b/databases/qdbm/patches/patch-ac
new file mode 100644
index 00000000000..7560f04dbfc
--- /dev/null
+++ b/databases/qdbm/patches/patch-ac
@@ -0,0 +1,29 @@
+$NetBSD: patch-ac,v 1.1 2005/11/23 06:20:36 minskim Exp $
+
+--- cgi/Makefile.in.orig	2004-08-18 20:17:02.000000000 +0900
++++ cgi/Makefile.in
+@@ -22,20 +22,20 @@ 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 \
+   -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)
+ LIBS = -lqdbm @LIBS@
+-LDFLAGS = -L$(srcdir)/.. -L$(HOME)/lib -L/usr/local/lib $(LIBS)
++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
+ 
+ # Install destinations
+ prefix = @prefix@
+ exec_prefix = @exec_prefix@
+-MYLIBEXECDIR = @libexecdir@
+-MYDATADIR = @datadir@/$(PACKAGE)/cgi
++MYLIBEXECDIR = @libexecdir@/cgi-bin
++MYDATADIR = @datadir@/doc/$(PACKAGE)/cgi
+ DESTDIR =
+ 
+ 
diff --git a/databases/qdbm/patches/patch-ad b/databases/qdbm/patches/patch-ad
new file mode 100644
index 00000000000..93e12002852
--- /dev/null
+++ b/databases/qdbm/patches/patch-ad
@@ -0,0 +1,13 @@
+$NetBSD: patch-ad,v 1.1 2005/11/23 06:20:36 minskim Exp $
+
+--- java/Makefile.in.orig	2005-08-18 05:18:37.000000000 +0900
++++ java/Makefile.in
+@@ -37,7 +37,7 @@ prefix = @prefix@
+ exec_prefix = @exec_prefix@
+ MYHEADDIR = @includedir@
+ MYLIBDIR = @libdir@
+-MYDATADIR = @datadir@/$(PACKAGE)/java
++MYDATADIR = @datadir@/doc/$(PACKAGE)/java
+ DESTDIR =
+ 
+ # Building binaries
diff --git a/databases/qdbm/patches/patch-ae b/databases/qdbm/patches/patch-ae
new file mode 100644
index 00000000000..2c6464b4886
--- /dev/null
+++ b/databases/qdbm/patches/patch-ae
@@ -0,0 +1,30 @@
+$NetBSD: patch-ae,v 1.1 2005/11/23 06:20:36 minskim Exp $
+
+--- plus/Makefile.in.orig	2005-08-18 05:18:11.000000000 +0900
++++ plus/Makefile.in
+@@ -34,12 +34,12 @@ exec_prefix = @exec_prefix@
+ MYHEADDIR = @includedir@
+ MYLIBDIR = @libdir@
+ MYBINDIR = @bindir@
+-MYDATADIR = @datadir@/$(PACKAGE)/plus
++MYDATADIR = @datadir@/doc/$(PACKAGE)/plus
+ DESTDIR =
+ 
+ # Building binaries
+ CXX = @CXX@
+-RELCXXFLAGS = -O1 -DNDEBUG
++RELCXXFLAGS = -O1 -DNDEBUG ${PTHREAD_CFLAGS}
+ CPPFLAGS = -I$(srcdir) -I$(srcdir)/.. -I$(HOME)/include -I/usr/local/include \
+   -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)
+ 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)
+ AR = @AR@
+ ARFLAGS = rcsv
diff --git a/databases/qdbm/patches/patch-af b/databases/qdbm/patches/patch-af
new file mode 100644
index 00000000000..ce5917df4eb
--- /dev/null
+++ b/databases/qdbm/patches/patch-af
@@ -0,0 +1,72 @@
+$NetBSD: patch-af,v 1.1 2005/11/23 06:20:36 minskim Exp $
+
+--- ruby/Makefile.in.orig	2004-05-12 20:36:57.000000000 +0900
++++ ruby/Makefile.in
+@@ -21,7 +21,7 @@ MYDOCS = rbspex.html rbspex-ja.html rbap
+ prefix = @prefix@
+ exec_prefix = @exec_prefix@
+ MYBINDIR = @bindir@
+-MYDATADIR = @datadir@/$(PACKAGE)/ruby
++MYDATADIR = @datadir@/doc/$(PACKAGE)/ruby
+ DESTDIR =
+ 
+ # Building binaries
+@@ -35,9 +35,9 @@ RUNENV = LD_LIBRARY_PATH=.:..:../..:/usr
+ 
+ 
+ all :
+-	cd depot && [ -f Makefile ] || $(RUNENV) ruby extconf.rb ; $(RUNENV) make
+-	cd curia && [ -f Makefile ] || $(RUNENV) ruby extconf.rb ; $(RUNENV) make
+-	cd villa && [ -f Makefile ] || $(RUNENV) ruby extconf.rb ; $(RUNENV) make
++	cd depot && [ -f Makefile ] || $(RUNENV) ${RUBY} extconf.rb ; $(RUNENV) make
++	cd curia && [ -f Makefile ] || $(RUNENV) ${RUBY} extconf.rb ; $(RUNENV) make
++	cd villa && [ -f Makefile ] || $(RUNENV) ${RUBY} extconf.rb ; $(RUNENV) make
+ 	@printf '\n'
+ 	@printf '#================================================================\n'
+ 	@printf '# Ready to install.\n'
+@@ -69,7 +69,7 @@ install :
+ 
+ 
+ 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 | \
+ 	  egrep '(mod_depot\.so|depot\.rb|mod_curia\.so|curia\.rb|mod_villa\.so|villa\.rb)' | \
+ 	  xargs rm -f
+@@ -85,27 +85,27 @@ check :
+ 	sync ; sync
+ 	cd depot && rm -rf casket
+ 	cd depot && \
+-	  $(RUNENV) ruby -w -Ilib rbdptest write casket 10000 1000
++	  $(RUNENV) ${RUBY} -w -Ilib rbdptest write casket 10000 1000
+ 	cd depot && \
+-	  $(RUNENV) ruby -w -Ilib rbdptest read casket
++	  $(RUNENV) ${RUBY} -w -Ilib rbdptest read casket
+ 	cd depot && \
+-	  $(RUNENV) ruby -w -Ilib rbdptest misc casket
++	  $(RUNENV) ${RUBY} -w -Ilib rbdptest misc casket
+ 	cd depot && rm -rf casket
+ 	cd curia && rm -rf casket
+ 	cd curia && \
+-	  $(RUNENV) ruby -w -Ilib rbcrtest write casket 10000 1000 10
++	  $(RUNENV) ${RUBY} -w -Ilib rbcrtest write casket 10000 1000 10
+ 	cd curia && \
+-	  $(RUNENV) ruby -w -Ilib rbcrtest read casket
++	  $(RUNENV) ${RUBY} -w -Ilib rbcrtest read casket
+ 	cd curia && \
+-	  $(RUNENV) ruby -w -Ilib rbcrtest misc casket
++	  $(RUNENV) ${RUBY} -w -Ilib rbcrtest misc casket
+ 	cd curia && rm -rf casket
+ 	cd villa && rm -rf casket
+ 	cd villa && \
+-	  $(RUNENV) ruby -w -Ilib rbvltest write casket 10000
++	  $(RUNENV) ${RUBY} -w -Ilib rbvltest write casket 10000
+ 	cd villa && \
+-	  $(RUNENV) ruby -w -Ilib rbvltest read casket
++	  $(RUNENV) ${RUBY} -w -Ilib rbvltest read casket
+ 	cd villa && \
+-	  $(RUNENV) ruby -w -Ilib rbvltest misc casket
++	  $(RUNENV) ${RUBY} -w -Ilib rbvltest misc casket
+ 	cd villa && rm -rf casket
+ 	@printf '\n'
+ 	@printf '#================================================================\n'