Update readline and ass sqlite3-tcl

readline/PKGBUILD

@@ -1,52 +1,57 @@
-# $Id: PKGBUILD 71014 2010-03-03 03:03:42Z allan $
-# Maintainer: Andreas Radke <andyrtr@archlinux.org>
-# Contributor: judd <jvinet@zeroflux.org>
+#
+# Chakra Packages for Chakra, part of chakra-project.org
+#
+# maintainer (i686): Phil Miller <philm[at]chakra-project[dog]org>
+# maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
 
 pkgname=readline
-_patchlevel=002 #prepare for some patches
-pkgver=6.1.$_patchlevel
+_basever=6.2
+_patchlevel=001 #prepare for some patches
+pkgver=$_basever.$_patchlevel
 pkgrel=1
 pkgdesc="GNU readline library"
-arch=(i686 x86_64)
+arch=('i686' 'x86_64')
 url="http://tiswww.case.edu/php/chet/readline/rltop.html"
 license=('GPL')
 depends=('glibc' 'ncurses')
-backup=("etc/inputrc")
-source=(http://ftp.gnu.org/gnu/readline/readline-6.1.tar.gz
+backup=('etc/inputrc')
+source=(http://ftp.gnu.org/gnu/readline/readline-$_basever.tar.gz
         inputrc)
 if [ $_patchlevel -gt 00 ]; then
-    for p in $(seq -w 01 $_patchlevel); do
-        source=(${source[@]} http://ftp.gnu.org/gnu/readline/readline-6.1-patches/readline61-$p)
+    for (( p=1; p<=$((10#${_patchlevel})); p++ )); do
+        source=(${source[@]} http://ftp.gnu.org/gnu/readline/readline-$_basever-patches/readline${_basever//./}-$(printf "%03d" $p))
     done
 fi
-md5sums=('fc2f7e714fe792db1ce6ddc4c9fb4ef3'
-         'e5fc955f56d9fa5beb871f3279b8fa8b'
-         'c642f2e84d820884b0bf9fd176bc6c3f'
-         '1a76781a1ea734e831588285db7ec9b1')
+md5sums=('67948acb2ca081f23359d0256e9a271c'
+         '58d54966c1191db45973cb3191ac621a'
+         '83287d52a482f790dfb30ec0a8746669')
 
 build() {
-  cd ${srcdir}/${pkgname}-6.1
-  for p in ../readline61-*; do
+  cd ${srcdir}/${pkgname}-$_basever
+  for p in ../readline${_basever//./}-*; do
     [ -e "$p" ] || continue
     msg "applying patch ${p}"
-    patch -Np0 -i ${p} || return 1
+    patch -Np0 -i ${p}
   done
 
-  # Remove RPATH from shared objects (FS#14366)
+  # Remove RPATH from shared objects
   sed -i 's|-Wl,-rpath,$(libdir) ||g' support/shobj-conf
 
   # build with -fPIC for x86_64 (FS#15634)
   [ $CARCH == "x86_64" ] && CFLAGS="$CFLAGS -fPIC"
 
-  ./configure --prefix=/usr --libdir=/lib \
-        --mandir=/usr/share/man --infodir=/usr/share/info
-  make SHLIB_LIBS=-lncurses || return 1
-  make DESTDIR=${pkgdir} install || return 1
+  ./configure --prefix=/usr --libdir=/lib
+  make SHLIB_LIBS=-lncurses
+}
+
+package() {
+  cd ${srcdir}/${pkgname}-$_basever
+  make DESTDIR=${pkgdir} install
   
-  mkdir -p ${pkgdir}/etc
-  install -m644 ../inputrc ${pkgdir}/etc/inputrc || return 1
-  #FHS recommends only shared libs in /lib
-  mkdir -p $pkgdir/usr/lib
+  install -Dm644 ${srcdir}/inputrc ${pkgdir}/etc/inputrc
+
+  # FHS recommends only shared libs in /lib
+  install -dm755 $pkgdir/usr/lib
   mv $pkgdir/lib/*.a $pkgdir/usr/lib
 
   # to make the linker find the shared lib and fix compile issues
@@ -54,3 +59,4 @@ build() {
   ln -sv /lib/libreadline.so .
   ln -sv /lib/libhistory.so .
 }
+

readline/inputrc

@@ -34,7 +34,3 @@ $if mode=emacs
 "\e[H": beginning-of-line
 "\e[F": end-of-line
 $endif
-
-# Include user-specific configuration
-$include ~/.inputrc
-

sqlite3/PKGBUILD

@@ -4,15 +4,12 @@
 # maintainer (i686): Phil Miller <philm[at]chakra-project[dog]org>
 # maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
 
-# include global config
-source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
-
 pkgbase="sqlite3"
-pkgname=('sqlite3' 'sqlite3-doc') 
+pkgname=('sqlite3' 'sqlite3-tcl' 'sqlite3-doc') 
 _amalgamationver=3070500
 _amalgamationver2=${_amalgamationver/00/}
 pkgver=${_amalgamationver2//0/.}
-pkgrel=1
+pkgrel=2
 pkgdesc="A C library that implements an SQL database engine"
 arch=('i686' 'x86_64')
 license=('custom')
@@ -30,21 +27,7 @@ md5sums=('a9604a82613ade2e7f4c303f233e477f'
          'c1cdbc5544034d9012e421e75a5e4890')
 
 build() {
-#  cd ${srcdir}/sqlite-src-${_amalgamationver}
-#  export LTLINK_EXTRAS="-ldl"
-#  export CFLAGS="$CFLAGS -DSQLITE_ENABLE_FTS3=1 -DSQLITE_ENABLE_COLUMN_METADATA=1 -DSQLITE_ENABLE_UNLOCK_NOTIFY -DSQLITE_SECURE_DELETE"
-#  ./configure --prefix=/usr \
-#        --enable-threadsafe \
-#        --enable-threads-override-locks \
-#        --enable-cross-thread-connections \
-#        --disable-static \
-#        --enable-load-extension
 
-  # rpath removal
-#  sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
-#  sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
-
-#  make
   export CFLAGS="$CFLAGS -DSQLITE_ENABLE_FTS3=1 -DSQLITE_ENABLE_COLUMN_METADATA=1 -DSQLITE_ENABLE_UNLOCK_NOTIFY -DSQLITE_SECURE_DELETE"
 
   # build sqlite
@@ -52,12 +35,13 @@ build() {
   ./configure --prefix=/usr \
 	--disable-static
   make
-
-    # build the tcl extension    
+  
+  # build the tcl extension    
   cd "$srcdir"/sqlite-tea-$_amalgamationver
   ./configure --prefix=/usr \
 	--with-system-sqlite
   make
+
 }
 
 package_sqlite3() {
@@ -70,10 +54,10 @@ package_sqlite3() {
 #  cd ${srcdir}/sqlite-src-${_amalgamationver}
 #  make DESTDIR=${pkgdir} install
 #  install -Dm0644 sqlite3.1 ${pkgdir}/usr/share/man/man1/sqlite3.1
-  
+
   cd ${srcdir}/sqlite-autoconf-$_amalgamationver
   make DESTDIR=${pkgdir} install
-
+  
   # license
   install -D -m644 ${srcdir}/license.txt ${pkgdir}/usr/share/licenses/${pkgname}/license.txt
 }