From 450fdf2d7519f8a66280bc417286c861b2f93d2e Mon Sep 17 00:00:00 2001
From: obache <obache>
Date: Sat, 31 May 2014 07:28:57 +0000
Subject: Update qdbm to 1.8.78.

2007-12-22  Mikio Hirabayashi  <mikio@fallabs.com>

	- Converters from Depot/Curia/Villa to TCHDB/TCBDB were added.

	- Release: 1.8.78
---
 databases/qdbm/Makefile         |  6 +++++-
 databases/qdbm/Makefile.common  | 14 ++++++++++----
 databases/qdbm/PLIST            |  6 +++++-
 databases/qdbm/distinfo         | 24 ++++++++++++------------
 databases/qdbm/patches/patch-aa |  4 +++-
 databases/qdbm/patches/patch-ab | 19 +++++++++++++------
 databases/qdbm/patches/patch-ac | 17 +++++++++++------
 databases/qdbm/patches/patch-ad |  5 ++++-
 databases/qdbm/patches/patch-ae | 26 ++++++++++++++++++++++----
 databases/qdbm/patches/patch-af | 13 +++++++++++--
 databases/qdbm/patches/patch-ag | 30 ++++++++++++++++++++++++------
 databases/qdbm/patches/patch-ak |  6 +++---
 12 files changed, 123 insertions(+), 47 deletions(-)

(limited to 'databases/qdbm')

diff --git a/databases/qdbm/Makefile b/databases/qdbm/Makefile
index 6e3f7ae676d..f2a8647cc24 100644
--- a/databases/qdbm/Makefile
+++ b/databases/qdbm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2012/10/02 21:25:50 asau Exp $
+# $NetBSD: Makefile,v 1.11 2014/05/31 07:28:57 obache Exp $
 #
 
 .include "Makefile.common"
@@ -11,6 +11,7 @@ LICENSE=	gnu-lgpl-v2.1
 USE_LIBTOOL=	yes
 MAKE_FILE=	LTmakefile
 GNU_CONFIGURE=	yes
+USE_TOOLS+=	pax
 
 CONFIGURE_ARGS+=	--enable-zlib
 CONFIGURE_ARGS+=	--enable-iconv
@@ -21,6 +22,9 @@ TEST_TARGET=		check
 
 INSTALLATION_DIRS+=	bin include lib
 
+post-install:
+	cd ${WRKSRC}/doc;${PAX} -rwpp . -s /.*~$$//g ${DESTDIR}${PREFIX}/share/doc/qdbm
+
 .include "../../archivers/bzip2/buildlink3.mk"
 .include "../../archivers/lzo/buildlink3.mk"
 .include "../../converters/libiconv/buildlink3.mk"
diff --git a/databases/qdbm/Makefile.common b/databases/qdbm/Makefile.common
index 38968fc00d3..5a2c9d3843b 100644
--- a/databases/qdbm/Makefile.common
+++ b/databases/qdbm/Makefile.common
@@ -1,13 +1,19 @@
-# $NetBSD: Makefile.common,v 1.18 2007/11/16 11:50:45 obache Exp $
+# $NetBSD: Makefile.common,v 1.19 2014/05/31 07:28:57 obache Exp $
 #
+# used by databases/java-qdbm/Makefile
+# used by databases/p5-qdbm/Makefile
+# used by databases/qdbm/Makefile
+# used by databases/qdbm-cgi/Makefile
+# used by databases/qdbm-plus/Makefile
+# used by databases/ruby-qdbm/Makefile
 
 DISTNAME=	qdbm-${QDBM_VERSION}
 CATEGORIES=	databases
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=qdbm/}
-QDBM_VERSION=	1.8.77
+MASTER_SITES=	http://fallabs.com/qdbm/
+QDBM_VERSION=	1.8.78
 
 MAINTAINER=	obache@NetBSD.org
-HOMEPAGE=	http://qdbm.sourceforge.net/
+HOMEPAGE=	http://fallabs.com/qdbm/
 
 DISTINFO_FILE=	${.CURDIR}/../../databases/qdbm/distinfo
 PATCHDIR=	${.CURDIR}/../../databases/qdbm/patches
diff --git a/databases/qdbm/PLIST b/databases/qdbm/PLIST
index e935a62e519..c02589144d4 100644
--- a/databases/qdbm/PLIST
+++ b/databases/qdbm/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2009/06/14 17:43:23 joerg Exp $
+@comment $NetBSD: PLIST,v 1.9 2014/05/31 07:28:57 obache Exp $
 bin/cbcodec
 bin/cbtest
 bin/crmgr
@@ -64,5 +64,9 @@ share/doc/qdbm/COPYING
 share/doc/qdbm/ChangeLog
 share/doc/qdbm/NEWS
 share/doc/qdbm/THANKS
+share/doc/qdbm/icon16.png
+share/doc/qdbm/index.html
+share/doc/qdbm/index.ja.html
+share/doc/qdbm/logo.png
 share/doc/qdbm/spex-ja.html
 share/doc/qdbm/spex.html
diff --git a/databases/qdbm/distinfo b/databases/qdbm/distinfo
index ac2eabaabbe..4d388e40a68 100644
--- a/databases/qdbm/distinfo
+++ b/databases/qdbm/distinfo
@@ -1,17 +1,17 @@
-$NetBSD: distinfo,v 1.27 2013/12/28 08:52:17 obache Exp $
+$NetBSD: distinfo,v 1.28 2014/05/31 07:28:57 obache Exp $
 
-SHA1 (qdbm-1.8.77.tar.gz) = e277e77bc0209cc4c8eb205a9082ef880048445c
-RMD160 (qdbm-1.8.77.tar.gz) = 3c684a4127204faf32472d29d7fd64a07e394332
-Size (qdbm-1.8.77.tar.gz) = 948271 bytes
-SHA1 (patch-aa) = 8299b37a6bbd7c711df033f51ee0d828492d40ee
-SHA1 (patch-ab) = 973e4e2e4e88f6a999456347380aedc19b3f0425
-SHA1 (patch-ac) = 7986596c900d20d2b26a8906eca1d925060bec91
-SHA1 (patch-ad) = 38b1852cabca8c064bd2a6a4639368e812869448
-SHA1 (patch-ae) = aa90ad3e228f765b0ac0a8a6744f7af0f4cf9a7f
-SHA1 (patch-af) = 3aae0b089f9ace97f48ee5070123350f80643f83
-SHA1 (patch-ag) = 6a8df8c41db5d804b39572af0e9d1f201fc1a058
+SHA1 (qdbm-1.8.78.tar.gz) = 8c2ab938c2dad8067c29b0aa93efc6389f0e7076
+RMD160 (qdbm-1.8.78.tar.gz) = 84c812eaa0ddde822dd37515de67287098bd3a4b
+Size (qdbm-1.8.78.tar.gz) = 1015429 bytes
+SHA1 (patch-aa) = aa83e9ce9ebd7aba7c579a641c8d79905b6ee388
+SHA1 (patch-ab) = f8f73b014bd560af11cf97043f429434d689bc3f
+SHA1 (patch-ac) = f6d5d4617815829421e4c7d04d404052f9bf795c
+SHA1 (patch-ad) = f201cc735301c6db632b6526d0c82167a731c7e6
+SHA1 (patch-ae) = 703663e50be542b4496a2d10d1aad63233ec5ceb
+SHA1 (patch-af) = 3595dd43196b0934a7cf3c1b9d14345c5f6328ef
+SHA1 (patch-ag) = 2055b75bda7793cd3f7bfdbebc8761527d50e219
 SHA1 (patch-ah) = e857d2bd82ace8396316c70fe2e35c450477616f
 SHA1 (patch-ai) = 68f87529b45a1f4b87cdb598ef0cb4eb13bef035
 SHA1 (patch-aj) = e1e6d3b73f8abbf2329b12d5b3ff3aa82f6421b3
-SHA1 (patch-ak) = 897e5dffb46be5740552484236e9b6217eae7f21
+SHA1 (patch-ak) = 20d8b98702b4606d35b7207718d2e2758244aecb
 SHA1 (patch-java_configure) = c3c7c28bfccb9b9bfce47cd87f90ba6a808e893d
diff --git a/databases/qdbm/patches/patch-aa b/databases/qdbm/patches/patch-aa
index 21628895a99..cd08714c4c4 100644
--- a/databases/qdbm/patches/patch-aa
+++ b/databases/qdbm/patches/patch-aa
@@ -1,4 +1,6 @@
-$NetBSD: patch-aa,v 1.7 2007/10/16 14:06:35 obache Exp $
+$NetBSD: patch-aa,v 1.8 2014/05/31 07:28:57 obache Exp $
+
+* Change documantation path
 
 --- Makefile.in.orig	2007-03-07 02:41:10.000000000 +0000
 +++ Makefile.in
diff --git a/databases/qdbm/patches/patch-ab b/databases/qdbm/patches/patch-ab
index 79e46871467..0613aa82be2 100644
--- a/databases/qdbm/patches/patch-ab
+++ b/databases/qdbm/patches/patch-ab
@@ -1,6 +1,10 @@
-$NetBSD: patch-ab,v 1.3 2007/03/05 15:56:27 obache Exp $
+$NetBSD: patch-ab,v 1.4 2014/05/31 07:28:57 obache Exp $
 
---- perl/Makefile.in.orig	2006-11-12 21:18:12.000000000 +0900
+* Change documentation path
+* Prevent to hard code, honor user settings.
+* install perl modules as vendor
+
+--- perl/Makefile.in.orig	2006-11-12 12:18:12.000000000 +0000
 +++ perl/Makefile.in
 @@ -21,16 +21,16 @@ MYDOCS = plspex.html plspex-ja.html plap
  prefix = @prefix@
@@ -11,13 +15,16 @@ $NetBSD: patch-ab,v 1.3 2007/03/05 15:56:27 obache Exp $
  DESTDIR =
  
  # Building binaries
- CC = gcc
+-CC = gcc
 -INC = -I. -I../.. -I$(HOME)/include -I/usr/local/include
-+INC = -I. -I../..
- OPTIMIZE = -O2
- LD = gcc
+-OPTIMIZE = -O2
+-LD = gcc
 -LIBS = -L../.. -I$(HOME)/lib -L/usr/local/lib -lqdbm @LIBS@
 -RUNENV = LD_LIBRARY_PATH=.:..:../..:/usr/local/lib:$(HOME)/lib
++CC = @CC@
++INC = -I. -I../..
++OPTIMIZE = @CFLAGS@
++LD = @CC@
 +LIBS = -L../.. -lqdbm @LIBS@
 +RUNENV = LD_LIBRARY_PATH=.:..:../..
  
diff --git a/databases/qdbm/patches/patch-ac b/databases/qdbm/patches/patch-ac
index fdbe9ce030a..463e5a4eb49 100644
--- a/databases/qdbm/patches/patch-ac
+++ b/databases/qdbm/patches/patch-ac
@@ -1,22 +1,27 @@
-$NetBSD: patch-ac,v 1.3 2007/03/05 15:56:27 obache Exp $
+$NetBSD: patch-ac,v 1.4 2014/05/31 07:28:57 obache Exp $
 
---- cgi/Makefile.in.orig	2006-08-24 11:55:35.000000000 +0900
+* prevent to overwrite settings with unwanted variables
+* adapt to pkgsrc layout
+
+--- cgi/Makefile.in.orig	2006-08-24 02:55:35.000000000 +0000
 +++ cgi/Makefile.in
-@@ -22,19 +22,19 @@ MYDOCS = cgispex.html cgispex-ja.html
+@@ -21,20 +21,20 @@ MYCONFS = qadm.conf qupl.conf qfts.conf
+ MYDOCS = cgispex.html cgispex-ja.html
  
  # Building binaries
- CC = gcc
+-CC = gcc
 -CPPFLAGS = -I$(srcdir) -I$(srcdir)/.. -I$(HOME)/include -I/usr/local/include \
++CC = @CC@
 +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 -DNDEBUG
 -CFLAGS = -Wall -ansi -pedantic -fsigned-char -O2
-+CFLAGS = ${PTHREAD_CFLAGS} -Wall -ansi -pedantic -fsigned-char -O2
++CFLAGS += ${PTHREAD_CFLAGS} -Wall -ansi -pedantic -fsigned-char
  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)/.. $(LIBS)
-+LDENV = LD_RUN_PATH=/lib:/usr/lib:$(prefix)/lib
++LDENV = 
  
  # Install destinations
  prefix = @prefix@
diff --git a/databases/qdbm/patches/patch-ad b/databases/qdbm/patches/patch-ad
index b54d997f6ea..13bf71f2a57 100644
--- a/databases/qdbm/patches/patch-ad
+++ b/databases/qdbm/patches/patch-ad
@@ -1,4 +1,7 @@
-$NetBSD: patch-ad,v 1.5 2007/10/16 14:06:35 obache Exp $
+$NetBSD: patch-ad,v 1.6 2014/05/31 07:28:57 obache Exp $
+
+* match to pkgsrc layout style
+* prevent to overwrite with unwanted variables
 
 --- java/Makefile.in.orig	2007-03-07 02:47:59.000000000 +0000
 +++ java/Makefile.in
diff --git a/databases/qdbm/patches/patch-ae b/databases/qdbm/patches/patch-ae
index 7dce7714921..720fcb74026 100644
--- a/databases/qdbm/patches/patch-ae
+++ b/databases/qdbm/patches/patch-ae
@@ -1,8 +1,11 @@
-$NetBSD: patch-ae,v 1.5 2007/10/16 14:06:35 obache Exp $
+$NetBSD: patch-ae,v 1.6 2014/05/31 07:28:57 obache Exp $
+
+* pkgsrc layout style
+* prevent to overwrite with unwanted variables
 
 --- plus/Makefile.in.orig	2007-03-07 02:44:50.000000000 +0000
 +++ plus/Makefile.in
-@@ -34,7 +34,7 @@ exec_prefix = @exec_prefix@
+@@ -34,27 +34,27 @@ exec_prefix = @exec_prefix@
  MYHEADDIR = @includedir@
  MYLIBDIR = @libdir@
  MYBINDIR = @bindir@
@@ -11,12 +14,27 @@ $NetBSD: patch-ae,v 1.5 2007/10/16 14:06:35 obache Exp $
  DESTDIR =
  
  # Building binaries
-@@ -44,7 +44,7 @@ CPPFLAGS = @CPPFLAGS@ -I$(srcdir) -I$(sr
+ CXX = @CXX@
+ CPPFLAGS = @CPPFLAGS@ -I$(srcdir) -I$(srcdir)/.. -I$(MYHEADDIR) \
+-  -I$(HOME)/include -I/usr/local/include @MYDEFS@ \
++  @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_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@
++CXXFLAGS += ${PTHREAD_CFLAGS} -Wall -ansi -pedantic -fsigned-char -fPIC -fno-strict-aliasing @MYOPTS@
  LD = @LD@
  LIBS = -lqdbm @LIBS@
  LIBLDFLAGS = @LDFLAGS@ -L. -L$(srcdir)/.. -L$(MYLIBDIR) \
+   -L$(HOME)/lib -L/usr/local/lib $(LIBS)
+ LDFLAGS = @LDFLAGS@ -L. -L$(srcdir)/.. -L$(MYLIBDIR) \
+   -L$(HOME)/lib -L/usr/local/lib -lxqdbm $(LIBS)
+-LDENV = LD_RUN_PATH=/lib:/usr/lib:$(MYLIBDIR):$(HOME)/lib:/usr/local/lib
++LDENV = 
+ AR = @AR@
+ ARFLAGS = rcsv
+-RUNENV = LD_LIBRARY_PATH=.:..:/lib:/usr/lib:$(MYLIBDIR):$(HOME)/lib:/usr/local/lib
++RUNENV = LD_LIBRARY_PATH=.:..
+ 
+ 
+ 
diff --git a/databases/qdbm/patches/patch-af b/databases/qdbm/patches/patch-af
index 1c009920666..86ef28e65f3 100644
--- a/databases/qdbm/patches/patch-af
+++ b/databases/qdbm/patches/patch-af
@@ -1,8 +1,12 @@
-$NetBSD: patch-af,v 1.4 2008/06/19 14:45:38 taca Exp $
+$NetBSD: patch-af,v 1.5 2014/05/31 07:28:57 obache Exp $
+
+* pkgsrc layout style
+* prevent to overwrite with unwanted hard coded variables
+* install modules as vendor.
 
 --- ruby/Makefile.in.orig	2006-09-06 03:37:33.000000000 +0000
 +++ ruby/Makefile.in
-@@ -21,7 +21,7 @@ MYDOCS = rbspex.html rbspex-ja.html rbap
+@@ -21,11 +21,11 @@ MYDOCS = rbspex.html rbspex-ja.html rbap
  prefix = @prefix@
  exec_prefix = @exec_prefix@
  MYBINDIR = @bindir@
@@ -11,6 +15,11 @@ $NetBSD: patch-af,v 1.4 2008/06/19 14:45:38 taca Exp $
  DESTDIR =
  
  # Building binaries
+-RUNENV = LD_LIBRARY_PATH=.:..:../..:/usr/local/lib
++RUNENV = LD_LIBRARY_PATH=.:..:../..
+ 
+ 
+ 
 @@ -35,9 +35,9 @@ RUNENV = LD_LIBRARY_PATH=.:..:../..:/usr
  
  
diff --git a/databases/qdbm/patches/patch-ag b/databases/qdbm/patches/patch-ag
index e709ffa1e9e..8a3adb30ddd 100644
--- a/databases/qdbm/patches/patch-ag
+++ b/databases/qdbm/patches/patch-ag
@@ -1,8 +1,22 @@
-$NetBSD: patch-ag,v 1.5 2008/06/14 14:48:01 obache Exp $
+$NetBSD: patch-ag,v 1.6 2014/05/31 07:28:57 obache Exp $
+
+* fixes MYDOCS same as Makefile.in
+* pkgsrc layout style
+* prevent to overwrite with unwanted hard coded variables
+* install files with wanted permissions.
 
 --- LTmakefile.in.orig	2007-03-05 06:58:16.000000000 +0000
 +++ LTmakefile.in
-@@ -37,7 +37,7 @@ MYLIBDIR = @libdir@
+@@ -26,7 +26,7 @@ MYMAN1S = dpmgr.1 dptest.1 dptsv.1 crmgr
+   cbtest.1 cbcodec.1 vlmgr.1 vltest.1 vltsv.1 odmgr.1 odtest.1 odidx.1 qmttest.1
+ MYMAN3S = qdbm.3 depot.3 dpopen.3 curia.3 cropen.3 relic.3 hovel.3 \
+   cabin.3 villa.3 vlopen.3 vista.3 odeum.3 odopen.3
+-MYDOCS = spex.html spex-ja.html COPYING ChangeLog NEWS THANKS
++MYDOCS = COPYING ChangeLog NEWS THANKS
+ MYPCS = qdbm.pc
+ 
+ # Install destinations
+@@ -37,20 +37,20 @@ MYLIBDIR = @libdir@
  MYBINDIR = @bindir@
  MYMAN1DIR = @mandir@/man1
  MYMAN3DIR = @mandir@/man3
@@ -11,14 +25,18 @@ $NetBSD: patch-ag,v 1.5 2008/06/14 14:48:01 obache Exp $
  MYPCDIR = @libdir@/pkgconfig
  
  # Building binaries
-@@ -46,11 +46,11 @@ CC = gcc
- CFLAGS = -I. -I$(MYHEADDIR) -I$(HOME)/include -I/usr/local/include @MYDEFS@ \
+ LIBTOOL = libtool
+-CC = gcc
+-CFLAGS = -I. -I$(MYHEADDIR) -I$(HOME)/include -I/usr/local/include @MYDEFS@ \
++CC = @CC@
++CFLAGS = -I. -I$(MYHEADDIR) @CFLAGS@ @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_THREAD_SAFE=1 -D_REENTRANT=1 -DNDEBUG -O3
-+  -DPIC=1 -D_THREAD_SAFE=1 ${PTHREAD_CFLAGS} -DNDEBUG -O3
- LD = gcc
+-LD = gcc
 -LIBLDFLAGS = -rpath $(MYLIBDIR) -R $(MYLIBDIR) \
++  -DPIC=1 -D_THREAD_SAFE=1 ${PTHREAD_CFLAGS} -DNDEBUG
++LD = @CC@
 +LIBLDFLAGS = @LDFLAGS@ -rpath $(MYLIBDIR) -R $(MYLIBDIR) \
    -version-info $$(($(LIBVER)+$(LIBREV))):0:$(LIBREV) @LIBS@
 -LDFLAGS = -rpath $(MYLIBDIR) -R $(MYLIBDIR) -L. -lqdbm @LIBS@
diff --git a/databases/qdbm/patches/patch-ak b/databases/qdbm/patches/patch-ak
index bb2259ffa67..90d5ce4fb66 100644
--- a/databases/qdbm/patches/patch-ak
+++ b/databases/qdbm/patches/patch-ak
@@ -1,8 +1,8 @@
-$NetBSD: patch-ak,v 1.2 2011/07/31 23:45:22 dholland Exp $
+$NetBSD: patch-ak,v 1.3 2014/05/31 07:28:57 obache Exp $
 
-Out-of-class member declarations are invalid.
+* defined in xqdbm.h.
 
---- plus/xadbm.h.orig	2011-07-21 13:00:18.000000000 +0000
+--- plus/xadbm.h.orig	2006-01-01 05:23:58.000000000 +0000
 +++ plus/xadbm.h
 @@ -72,6 +72,7 @@ private:
   * @param latter the latter datum.
-- 
cgit v1.2.3