From 78b1676ce6afe36c7ffab4540ff6eacba4eea264 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Mon, 16 Jan 2012 07:44:38 +0100 Subject: [PATCH] tdb: update to 1.2.9. --- srcpkgs/tdb/libtdb.template | 8 ++--- .../tdb/patches/tdb-utils-linking-order.patch | 33 ------------------- srcpkgs/tdb/tdb-devel.template | 8 ++--- srcpkgs/tdb/tdb-python.rshlibs | 4 --- srcpkgs/tdb/tdb-python.template | 7 ++-- srcpkgs/tdb/template | 18 +++------- 6 files changed, 10 insertions(+), 68 deletions(-) delete mode 100644 srcpkgs/tdb/patches/tdb-utils-linking-order.patch diff --git a/srcpkgs/tdb/libtdb.template b/srcpkgs/tdb/libtdb.template index 330b22be1f3..1ae30810f46 100644 --- a/srcpkgs/tdb/libtdb.template +++ b/srcpkgs/tdb/libtdb.template @@ -1,14 +1,10 @@ # Template file for 'libtdb'. # -revision=1 short_desc="Trivial Database - shared library" long_desc="${long_desc} This package contains the shared library file." - -do_install() -{ - mkdir -p ${DESTDIR}/usr/lib - mv ${SRCPKGDESTDIR}/usr/lib/*.so* ${DESTDIR}/usr/lib +do_install() { + vmove "usr/lib/*.so*" usr/lib } diff --git a/srcpkgs/tdb/patches/tdb-utils-linking-order.patch b/srcpkgs/tdb/patches/tdb-utils-linking-order.patch deleted file mode 100644 index 6fe87d44cca..00000000000 --- a/srcpkgs/tdb/patches/tdb-utils-linking-order.patch +++ /dev/null @@ -1,33 +0,0 @@ ---- tdb.mk.orig 2011-11-16 14:59:11.561978836 +0100 -+++ tdb.mk 2011-11-16 15:01:20.037847681 +0100 -@@ -15,16 +15,16 @@ bin/tdbtest$(EXEEXT): tools/tdbtest.o $( - $(CC) $(CFLAGS) $(LDFLAGS) -o bin/tdbtest tools/tdbtest.o -L. -ltdb -lgdbm $(TDB_DEPS) - - bin/tdbtool$(EXEEXT): tools/tdbtool.o $(TDB_LIB) -- $(CC) $(CFLAGS) $(LDFLAGS) -o bin/tdbtool tools/tdbtool.o -L. -ltdb $(TDB_DEPS) -+ $(CC) $(CFLAGS) $(LDFLAGS) tools/tdbtool.o $(TDB_DEPS) $(srcdir)/$(TDB_SOLIB) -o bin/tdbtool - - bin/tdbtorture$(EXEEXT): tools/tdbtorture.o $(TDB_LIB) - $(CC) $(CFLAGS) $(LDFLAGS) -o bin/tdbtorture tools/tdbtorture.o -L. -ltdb $(TDB_DEPS) - - bin/tdbdump$(EXEEXT): tools/tdbdump.o $(TDB_LIB) -- $(CC) $(CFLAGS) $(LDFLAGS) -o bin/tdbdump tools/tdbdump.o -L. -ltdb $(TDB_DEPS) -+ $(CC) $(CFLAGS) $(LDFLAGS) tools/tdbdump.o $(TDB_DEPS) $(srcdir)/$(TDB_SOLIB) -o bin/tdbdump - - bin/tdbbackup$(EXEEXT): tools/tdbbackup.o $(TDB_LIB) -- $(CC) $(CFLAGS) $(LDFLAGS) -o bin/tdbbackup tools/tdbbackup.o -L. -ltdb $(TDB_DEPS) -+ $(CC) $(CFLAGS) $(LDFLAGS) tools/tdbbackup.o $(TDB_DEPS) $(srcdir)/$(TDB_SOLIB) -o bin/tdbbackup - - test:: abi_checks - ---- Makefile.in.orig 2011-11-18 09:26:39.467966708 +0100 -+++ Makefile.in 2011-11-18 09:27:01.555448949 +0100 -@@ -48,7 +48,7 @@ default: all - include $(tdbdir)/tdb.mk - include $(tdbdir)/rules.mk - --all:: showflags dirs $(PROGS) $(TDB_SOLIB) libtdb.a $(PYTHON_BUILD_TARGET) $(EXTRA_TARGETS) -+all:: showflags dirs $(TDB_SOLIB) libtdb.a $(PROGS) $(PYTHON_BUILD_TARGET) $(EXTRA_TARGETS) - - install:: all - $(TDB_SOLIB): $(TDB_OBJ) diff --git a/srcpkgs/tdb/tdb-devel.template b/srcpkgs/tdb/tdb-devel.template index 7227cb19c49..bfb701df6f5 100644 --- a/srcpkgs/tdb/tdb-devel.template +++ b/srcpkgs/tdb/tdb-devel.template @@ -5,14 +5,10 @@ long_desc="${long_desc} This package contains files for development, headers, static libs, etc." -Add_dependency run pkg-config -Add_dependency run python Add_dependency run libtdb do_install() { - mkdir -p ${DESTDIR}/usr/lib - mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr - mv ${SRCPKGDESTDIR}/usr/lib/lib*.*a ${DESTDIR}/usr/lib - mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib + vmove usr/include usr + vmove usr/lib/pkgconfig usr/lib } diff --git a/srcpkgs/tdb/tdb-python.rshlibs b/srcpkgs/tdb/tdb-python.rshlibs index ddcbdb44f4f..a5579dba761 100644 --- a/srcpkgs/tdb/tdb-python.rshlibs +++ b/srcpkgs/tdb/tdb-python.rshlibs @@ -1,7 +1,3 @@ libtdb.so.1 -libpthread.so.0 -libdl.so.2 -libutil.so.1 -libm.so.6 libpython2.7.so.1.0 libc.so.6 diff --git a/srcpkgs/tdb/tdb-python.template b/srcpkgs/tdb/tdb-python.template index 01bc32df467..3645366ed1a 100644 --- a/srcpkgs/tdb/tdb-python.template +++ b/srcpkgs/tdb/tdb-python.template @@ -6,9 +6,6 @@ long_desc="${long_desc} This package contains the Python bindings to the libtdb." - -do_install() -{ - mkdir -p ${DESTDIR}/usr/lib - mv ${SRCPKGDESTDIR}/usr/lib/python* ${DESTDIR}/usr/lib +do_install() { + vmove "usr/lib/python*" usr/lib } diff --git a/srcpkgs/tdb/template b/srcpkgs/tdb/template index 981980f2915..3092e2cf30a 100644 --- a/srcpkgs/tdb/template +++ b/srcpkgs/tdb/template @@ -1,31 +1,21 @@ # Template build file for 'tdb'. pkgname=tdb -version=1.2.2 +version=1.2.9 +homepage="http://tdb.samba.org/" distfiles="http://samba.org/ftp/tdb/tdb-$version.tar.gz" build_style=gnu-configure -revision=2 short_desc="Hierarchical pool based memory allocator with destructors" maintainer="Juan RP " -checksum=faee3dbb5c0af896c98f5edf3ab68b2ed9bc4992376666f2cd502873a1b2f892 +license="GPL-3" +checksum=886fbca71710b9fcf168ffcae47f05a6c3ff3392cf951f4cb1f949851c04f9ed long_desc=" This is a simple database API. It is modelled after the structure of GDBM. TDB features, unlike GDBM, multiple writers support with appropriate locking and transactions." -disable_parallel_build=yes subpackages="libtdb tdb-devel tdb-python" Add_dependency build pkg-config -Add_dependency build automake Add_dependency build python-devel Add_dependency build libxslt Add_dependency build docbook-xsl - -pre_configure() { - ./autogen.sh -} - -post_install() { - # _PUBLIC_ is only defined internally! - sed -i -e "s|_PUBLIC_ ||g" ${DESTDIR}/usr/include/tdb.h -}