Update to 0.78

* Take MAINTAINERship, ok by schmonz@.
* Libtoolized.
* Fix typo in variable name.
* Set LICENSE as public-domain.

Changelog:
tinycdb-0.78 2012-05-11

 - bugfix release:
  o fixed >2Gb file size prob on 32bit platform
  o fixed handling of files >=4Gb
  o fixed a few compiler warnings

 - introduce $(LD) and $(LDFLAGS), and also $(CDEFS) in Makefile

7 files changed, 103 insertions, 75 deletions

diff --git a/databases/tinycdb/Makefile b/databases/tinycdb/Makefile
index a1aa7150801..ef8e9b21797 100644
--- a/databases/tinycdb/Makefile
+++ b/databases/tinycdb/Makefile
@@ -1,35 +1,34 @@
-# $NetBSD: Makefile,v 1.7 2012/10/02 21:25:54 asau Exp $
+# $NetBSD: Makefile,v 1.8 2013/02/27 12:38:12 ryoon Exp $
 #
 
-DISTNAME=		tinycdb_0.77
-PKGNAME=		${DISTNAME:S/_/-/}
-PKGREVISION=		1
+DISTNAME=		tinycdb-0.78
 CATEGORIES=		databases
 MASTER_SITES=		http://www.corpit.ru/mjt/tinycdb/
 
-MAINTAINER=		schmonz@NetBSD.org
+MAINTAINER=		ryoon@NetBSD.org
 HOMEPAGE=		http://www.corpit.ru/mjt/tinycdb.html
 COMMENT=		Create and read constant databases
+LICENSE=		public-domain
 
 CONFLICTS+=		cdb-[0-9]*
 
-WRKSRC=			${WRKDIR}/${PKGNAME_NOREV}
+USE_LIBTOOL=		yes
+USE_LANGUAGES=		c
 
-BUILD_TARGET=		all sharedlib piclib
-INSTALL_TARGET=		install install-piclib install-sharedlib
+MAKE_FILE=		BSDmakefile
 
-SUBST_CLASSES+=		paths
-SUBST_STAGE.paths=	do-configure
-SUBST_FILES.paths=	Makefile debian/libcdb.pc
-SUBST_VARS.paths=	PREFIX PKG_SYSCONFDIR PKGMANDIR
-SUBST_MESSAGE.paths=	Configuring pkgsrc paths.
-
-PKGCONFIG_OVERRIDE+=	debian/libcdb.pc
+PKGCONFIG_OVERRIDE+=	libcdb.pc
 
 INSTALLATION_DIRS+=	lib/pkgconfig
 
+SUBST_CLASSES+=		paths
+SUBST_STAGE.paths=	pre-configure
+SUBST_FILES.paths=	libcdb.pc
+SUBST_VARS.paths=	PREFIX
+SUBST_MESSAGE.paths=	Configuring pkgsrc paths.
+
 post-install:
-	${INSTALL_DATA} ${WRKSRC}/debian/libcdb.pc \
+	${INSTALL_DATA} ${WRKSRC}/libcdb.pc \
 			${DESTDIR}${PREFIX}/lib/pkgconfig
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/databases/tinycdb/PLIST b/databases/tinycdb/PLIST
index 01ea33b942c..338203dd3c4 100644
--- a/databases/tinycdb/PLIST
+++ b/databases/tinycdb/PLIST
@@ -1,10 +1,8 @@
-@comment $NetBSD: PLIST,v 1.3 2012/02/27 17:14:46 elric Exp $
+@comment $NetBSD: PLIST,v 1.4 2013/02/27 12:38:12 ryoon Exp $
 bin/cdb
 include/cdb.h
-lib/libcdb.a
-lib/libcdb.so
-lib/libcdb.so.1
-lib/libcdb_pic.a
+lib/libcdb.la
+lib/libcdb_pic.la
 lib/pkgconfig/libcdb.pc
 man/man1/cdb.1
 man/man3/cdb.3
diff --git a/databases/tinycdb/distinfo b/databases/tinycdb/distinfo
index 3691ae4525b..09967d9bf77 100644
--- a/databases/tinycdb/distinfo
+++ b/databases/tinycdb/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.4 2010/09/11 08:26:04 obache Exp $
+$NetBSD: distinfo,v 1.5 2013/02/27 12:38:12 ryoon Exp $
 
-SHA1 (tinycdb_0.77.tar.gz) = 2873a5f614e925e284cd71a7216a0d10340aec9c
-RMD160 (tinycdb_0.77.tar.gz) = 803581ebb84cc4db7abe16b3fb5b978c05652553
-Size (tinycdb_0.77.tar.gz) = 37728 bytes
-SHA1 (patch-aa) = bef278a549d4dad63ed5968067fd1dde1f409f46
-SHA1 (patch-ab) = d4d0fa9fc253c7ea86287a66859fcba06b4ec485
+SHA1 (tinycdb-0.78.tar.gz) = ade42ee1e7c56f66a63cb933206c089b9983adba
+RMD160 (tinycdb-0.78.tar.gz) = d37c3d35f687574def9e5a161bcdd5ae9a7da4d0
+Size (tinycdb-0.78.tar.gz) = 36754 bytes
+SHA1 (patch-BSDmakefile) = ed40d49b094c56d9f2cea8688e6446035a866f01
+SHA1 (patch-libcdb.pc) = c4e027ab43ce21320c8c81c7a325108fa2aa4fb9
diff --git a/databases/tinycdb/patches/patch-BSDmakefile b/databases/tinycdb/patches/patch-BSDmakefile
new file mode 100644
index 00000000000..cbe1caf4c1f
--- /dev/null
+++ b/databases/tinycdb/patches/patch-BSDmakefile
@@ -0,0 +1,62 @@
+$NetBSD: patch-BSDmakefile,v 1.1 2013/02/27 12:38:12 ryoon Exp $
+
+--- BSDmakefile.orig	2012-12-19 17:49:56.000000000 +0000
++++ BSDmakefile
+@@ -0,0 +1,57 @@
++# Makefile for libtoolized tinycdb
++# based on tinycdb's Makefile
++
++VERSION=        0.78
++
++CFLAGS+=	-D_FILE_OFFSET_BITS=64
++
++
++OBJS=		cdb_init.o cdb_find.o cdb_findnext.o cdb_seq.o cdb_seek.o \
++		cdb_unpack.o \
++		cdb_make_add.o cdb_make_put.o cdb_make.o cdb_hash.o
++LOBJS=		${OBJS:R:S/$/.lo/g}
++
++
++all: libcdb.la libcdb_pic.la cdb
++install: install-man install-prog install-lib install-header
++
++.SUFFIXES: .c .lo
++
++.c.lo:
++	${LIBTOOL} --tag=CC --mode=compile ${CC} -c ${CFLAGS} -o ${.TARGET} ${.IMPSRC}
++
++libcdb.la: ${LOBJS}
++	${LIBTOOL} --tag=CC --mode=link ${CC} ${LDFLAGS} ${CFLAGS} -o ${.TARGET} \
++		${LOBJS} -version-info 1 -rpath ${PREFIX}/lib
++
++libcdb_pic.la: ${LOBJS}
++	${LIBTOOL} --tag=CC --mode=link ${CC} ${LDFLAGS} ${CFLAGS} -fPIC -o ${.TARGET} \
++		${LOBJS} -version-info 1 -rpath ${PREFIX}/lib
++
++cdb: cdb.lo libcdb.la
++	${LIBTOOL} --tag=CC --mode=link ${CC} ${LDFLAGS} ${CFLAGS} -o ${.TARGET} \
++		cdb.lo libcdb.la -rpath ${PREFIX}/lib
++
++install-man:
++	${BSD_INSTALL_MAN_DIR} ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
++	${BSD_INSTALL_MAN_DIR} ${DESTDIR}${PREFIX}/${PKGMANDIR}/man3
++	${BSD_INSTALL_MAN_DIR} ${DESTDIR}${PREFIX}/${PKGMANDIR}/man5
++	${BSD_INSTALL_MAN} cdb.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
++	${BSD_INSTALL_MAN} cdb.3 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man3
++	${BSD_INSTALL_MAN} cdb.5 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man5
++
++install-prog:
++	${BSD_INSTALL_PROGRAM_DIR} ${DESTDIR}${PREFIX}/bin
++	${LIBTOOL} --mode=install ${BSD_INSTALL_PROGRAM} cdb \
++		${DESTDIR}${PREFIX}/bin
++
++install-lib:
++	${BSD_INSTALL_LIB_DIR} ${DESTDIR}${PREFIX}/lib
++	${LIBTOOL} --mode=install ${BSD_INSTALL_LIB} libcdb.la \
++		${DESTDIR}${PREFIX}/lib
++	${LIBTOOL} --mode=install ${BSD_INSTALL_LIB} libcdb_pic.la \
++		${DESTDIR}${PREFIX}/lib
++
++install-header:
++	${BSD_INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/include
++	${BSD_INSTALL_DATA} cdb.h ${DESTDIR}${PREFIX}/include
diff --git a/databases/tinycdb/patches/patch-aa b/databases/tinycdb/patches/patch-aa
deleted file mode 100644
index 82107f5de3a..00000000000
--- a/databases/tinycdb/patches/patch-aa
+++ /dev/null
@@ -1,36 +0,0 @@
-$NetBSD: patch-aa,v 1.4 2010/09/11 08:26:04 obache Exp $
-
---- Makefile.orig	2009-01-31 17:12:21.000000000 +0000
-+++ Makefile
-@@ -7,23 +7,23 @@
- 
- VERSION = 0.77
- 
--prefix=/usr/local
-+prefix=@PREFIX@
- exec_prefix=$(prefix)
- bindir=$(exec_prefix)/bin
- libdir=$(exec_prefix)/lib
- syslibdir=$(libdir)
--sysconfdir=/etc
-+sysconfdir=@PKG_SYSCONFDIR@
- includedir=$(prefix)/include
--mandir=$(prefix)/man
-+mandir=$(prefix)/@PKGMANDIR@
- NSSCDB_DIR = $(sysconfdir)
- DESTDIR=
- 
--CC = cc
--CFLAGS = -O
-+CC ?= cc
-+CFLAGS ?= -O
- 
--AR = ar
--ARFLAGS = rv
--RANLIB = ranlib
-+AR ?= ar
-+ARFLAGS ?= rv
-+RANLIB ?= ranlib
- 
- NSS_CDB = libnss_cdb.so.2
- LIBBASE = libcdb
diff --git a/databases/tinycdb/patches/patch-ab b/databases/tinycdb/patches/patch-ab
deleted file mode 100644
index 1e9d9115689..00000000000
--- a/databases/tinycdb/patches/patch-ab
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2010/09/11 08:26:04 obache Exp $
-
---- debian/libcdb.pc.orig	2009-01-12 22:18:47.000000000 +0000
-+++ debian/libcdb.pc
-@@ -1,6 +1,6 @@
- # Package Information for pkg-config
- 
--prefix=/usr
-+prefix=@PREFIX@
- exec_prefix=${prefix}
- libdir=${exec_prefix}/lib
- includedir=${prefix}/include
diff --git a/databases/tinycdb/patches/patch-libcdb.pc b/databases/tinycdb/patches/patch-libcdb.pc
new file mode 100644
index 00000000000..d772a2b9e0f
--- /dev/null
+++ b/databases/tinycdb/patches/patch-libcdb.pc
@@ -0,0 +1,17 @@
+$NetBSD: patch-libcdb.pc,v 1.1 2013/02/27 12:38:12 ryoon Exp $
+
+--- libcdb.pc.orig	2012-12-19 17:50:14.000000000 +0000
++++ libcdb.pc
+@@ -0,0 +1,12 @@
++# Package Information for pkg-config
++
++prefix=@PREFIX@
++exec_prefix=${prefix}
++libdir=${exec_prefix}/lib
++includedir=${prefix}/include
++
++Name: libcdb
++Description: tinycdb - Constant Data Base library
++Version: 0.78
++Libs: -L${libdir} -lcdb
++Cflags: -I${includedir}