diff options
author | obache <obache@pkgsrc.org> | 2010-09-11 08:26:04 +0000 |
---|---|---|
committer | obache <obache@pkgsrc.org> | 2010-09-11 08:26:04 +0000 |
commit | f97204915c6fb5b2dc18b7bf55af1930ba3376a7 (patch) | |
tree | ce2b3a014aa8b71287afebd3e4cab187f8d85486 /databases/tinycdb | |
parent | 1c57778248ebfccb85352bada1022bc4bbb18dec (diff) | |
download | pkgsrc-f97204915c6fb5b2dc18b7bf55af1930ba3376a7.tar.gz |
Update tinycdb to 0.77.
pkgsrc changes:
* simplify subst with SUBST_VARS.
* build and install shared library.
* install pkgconfig file.
package changes:
tinycdb-0.77
- bugfix release: manpage typos, portability fixes and the like
- bugfix: improper logic in EINTR handling in _cdb_make_full_write
routine which may lead to corruped .cdb file.
Diffstat (limited to 'databases/tinycdb')
-rw-r--r-- | databases/tinycdb/Makefile | 21 | ||||
-rw-r--r-- | databases/tinycdb/PLIST | 5 | ||||
-rw-r--r-- | databases/tinycdb/buildlink3.mk | 5 | ||||
-rw-r--r-- | databases/tinycdb/distinfo | 11 | ||||
-rw-r--r-- | databases/tinycdb/patches/patch-aa | 6 | ||||
-rw-r--r-- | databases/tinycdb/patches/patch-ab | 12 |
6 files changed, 42 insertions, 18 deletions
diff --git a/databases/tinycdb/Makefile b/databases/tinycdb/Makefile index 8c607a098b7..60f4eda34ef 100644 --- a/databases/tinycdb/Makefile +++ b/databases/tinycdb/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.4 2008/06/20 01:09:11 joerg Exp $ +# $NetBSD: Makefile,v 1.5 2010/09/11 08:26:04 obache Exp $ # -DISTNAME= tinycdb_0.76 +DISTNAME= tinycdb_0.77 PKGNAME= ${DISTNAME:S/_/-/} CATEGORIES= databases MASTER_SITES= http://www.corpit.ru/mjt/tinycdb/ @@ -16,12 +16,21 @@ CONFLICTS+= cdb-[0-9]* WRKSRC= ${WRKDIR}/${PKGNAME_NOREV} +BUILD_TARGET= all sharedlib +INSTALL_TARGET= install install-sharedlib + SUBST_CLASSES+= paths SUBST_STAGE.paths= do-configure -SUBST_FILES.paths= Makefile -SUBST_SED.paths= -e 's|@PREFIX@|${PREFIX}|g' -SUBST_SED.paths+= -e 's|@PKG_SYSCONFDIR@|${PKG_SYSCONFDIR}|g' -SUBST_SED.paths+= -e 's|@PKGMANDIR@|${PKGMANDIR}|g' +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 + +INSTALLATION_DIRS+= lib/pkgconfig + +post-install: + ${INSTALL_DATA} ${WRKSRC}/debian/libcdb.pc \ + ${DESTDIR}${PREFIX}/lib/pkgconfig + .include "../../mk/bsd.pkg.mk" diff --git a/databases/tinycdb/PLIST b/databases/tinycdb/PLIST index 69922d90c3e..8f107e83846 100644 --- a/databases/tinycdb/PLIST +++ b/databases/tinycdb/PLIST @@ -1,7 +1,10 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2006/01/07 06:47:10 schmonz Exp $ +@comment $NetBSD: PLIST,v 1.2 2010/09/11 08:26:04 obache Exp $ bin/cdb include/cdb.h lib/libcdb.a +lib/libcdb.so +lib/libcdb.so.1 +lib/pkgconfig/libcdb.pc man/man1/cdb.1 man/man3/cdb.3 man/man5/cdb.5 diff --git a/databases/tinycdb/buildlink3.mk b/databases/tinycdb/buildlink3.mk index 8467198912b..bc72a3bb236 100644 --- a/databases/tinycdb/buildlink3.mk +++ b/databases/tinycdb/buildlink3.mk @@ -1,12 +1,11 @@ -# $NetBSD: buildlink3.mk,v 1.6 2009/03/20 19:24:08 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.7 2010/09/11 08:26:04 obache Exp $ BUILDLINK_TREE+= tinycdb .if !defined(TINYCDB_BUILDLINK3_MK) TINYCDB_BUILDLINK3_MK:= -BUILDLINK_API_DEPENDS.tinycdb+= tinycdb>=0.75 -BUILDLINK_DEPMETHOD.tinycdb?= build +BUILDLINK_API_DEPENDS.tinycdb+= tinycdb>=0.77 BUILDLINK_PKGSRCDIR.tinycdb?= ../../databases/tinycdb .endif # TINYCDB_BUILDLINK3_MK diff --git a/databases/tinycdb/distinfo b/databases/tinycdb/distinfo index 45750059538..3691ae4525b 100644 --- a/databases/tinycdb/distinfo +++ b/databases/tinycdb/distinfo @@ -1,6 +1,7 @@ -$NetBSD: distinfo,v 1.3 2007/01/18 22:46:12 schmonz Exp $ +$NetBSD: distinfo,v 1.4 2010/09/11 08:26:04 obache Exp $ -SHA1 (tinycdb_0.76.tar.gz) = a048055a997c247c0ab88262b2cee5aa1e711920 -RMD160 (tinycdb_0.76.tar.gz) = f95919d9f92a525fdc9d74ceee58ac8f5504237d -Size (tinycdb_0.76.tar.gz) = 35777 bytes -SHA1 (patch-aa) = 2ffeb0d814cbef82a619292c2586bddbfcd30836 +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 diff --git a/databases/tinycdb/patches/patch-aa b/databases/tinycdb/patches/patch-aa index 396b52c950c..82107f5de3a 100644 --- a/databases/tinycdb/patches/patch-aa +++ b/databases/tinycdb/patches/patch-aa @@ -1,10 +1,10 @@ -$NetBSD: patch-aa,v 1.3 2007/01/18 22:46:12 schmonz Exp $ +$NetBSD: patch-aa,v 1.4 2010/09/11 08:26:04 obache Exp $ ---- Makefile.orig 2006-06-28 11:17:37.000000000 -0400 +--- Makefile.orig 2009-01-31 17:12:21.000000000 +0000 +++ Makefile @@ -7,23 +7,23 @@ - VERSION = 0.76 + VERSION = 0.77 -prefix=/usr/local +prefix=@PREFIX@ diff --git a/databases/tinycdb/patches/patch-ab b/databases/tinycdb/patches/patch-ab new file mode 100644 index 00000000000..1e9d9115689 --- /dev/null +++ b/databases/tinycdb/patches/patch-ab @@ -0,0 +1,12 @@ +$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 |