From 1043434e2a25c72630e277d032dd5e658cf97f49 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Thu, 24 May 2012 21:57:18 +0200 Subject: [PATCH] sqlite: update to 3.7.12.1. --- srcpkgs/sqlite/sqlite-devel.template | 13 +++++-------- srcpkgs/sqlite/sqlite-tcl.template | 9 +++------ srcpkgs/sqlite/template | 11 +++++------ 3 files changed, 13 insertions(+), 20 deletions(-) diff --git a/srcpkgs/sqlite/sqlite-devel.template b/srcpkgs/sqlite/sqlite-devel.template index 3b3059816f8..f06e1bbeb43 100644 --- a/srcpkgs/sqlite/sqlite-devel.template +++ b/srcpkgs/sqlite/sqlite-devel.template @@ -1,16 +1,13 @@ # Template file for 'sqlite-devel'. # -depends="tcl-devel readline-devel glibc-devel sqlite" +depends="tcl-devel readline-devel sqlite>=${version}" short_desc="${sourcepkg} (development files)" long_desc="${long_desc} This package contains files for development, headers, static libs, etc." - -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 +do_install() { + vmove usr/include usr + vmove "usr/lib/*.a" usr/lib + vmove usr/lib/pkgconfig usr/lib } diff --git a/srcpkgs/sqlite/sqlite-tcl.template b/srcpkgs/sqlite/sqlite-tcl.template index b8f3c9f1b6b..64b39f51376 100644 --- a/srcpkgs/sqlite/sqlite-tcl.template +++ b/srcpkgs/sqlite/sqlite-tcl.template @@ -1,14 +1,11 @@ # Template file for 'sqlite-tcl'. # -depends="sqlite tcl" +depends="sqlite>=$version tcl" short_desc="${sourcepkg} TCL bindings" long_desc="${long_desc} This package contains TCL bindings for sqlite." - -do_install() -{ - mkdir -p ${DESTDIR}/usr/lib - mv ${SRCPKGDESTDIR}/usr/lib/sqlite* ${DESTDIR}/usr/lib +do_install() { + vmove "usr/lib/sqlite*" usr/lib } diff --git a/srcpkgs/sqlite/template b/srcpkgs/sqlite/template index 631c7ce6ce8..0edc690dc6e 100644 --- a/srcpkgs/sqlite/template +++ b/srcpkgs/sqlite/template @@ -1,16 +1,17 @@ # Template build file for 'sqlite'. pkgname=sqlite -version=3.7.11 -_amalgamationver=3071100 +version=3.7.12.1 wrksrc=sqlite create_wrksrc=yes -distfiles="http://www.sqlite.org/sqlite-autoconf-${_amalgamationver}.tar.gz" +subpackages="$pkgname-devel $pkgname-tcl" makedepends="readline-devel tcl-devel" short_desc="SQL Database Engine in a C Library" maintainer="Juan RP " homepage="http://www.sqlite.org" license="Public Domain" -checksum=2badc75dc536249bcd68c44d2a655724285d054303251eaff9d355194cb3476b +_amalgamationver=3071201 +distfiles="http://www.sqlite.org/sqlite-autoconf-${_amalgamationver}.tar.gz" +checksum=b4ce93881cb88e7d1d0f2ad50a206b600163b40fea6df9d0749ad152aaebf845 long_desc=" SQLite is a C library that implements an SQL database engine. Programs that link with the SQLite library can have SQL database access without @@ -23,8 +24,6 @@ long_desc=" SQLite is the server. The SQLite library reads and writes directly to and from the database files on disk." -subpackages="$pkgname-devel $pkgname-tcl" - do_configure() { export CFLAGS="$XBPS_CFLAGS -DSQLITE_ENABLE_FTS3=1 \ -DSQLITE_ENABLE_COLUMN_METADATA=1 \