[arch-commits] Commit in mysql-clients/repos (testing-i686 testing-i686/PKGBUILD)

[Douglas Soares de Andrade]

    Date: Tuesday, March 24, 2009 @ 03:32:40
  Author: douglas
Revision: 31058

Merged revisions 23691,27669,31057 via svnmerge from 
svn+ssh://archlinux.org/srv/svn-packages/mysql-clients/trunk

........
  r23691 | douglas | 2009-01-11 14:08:05 -0200 (Dom, 11 Jan 2009) | 1 line
  
  upgpkg: mysql-clients 5.0.75-2
........
  r27669 | douglas | 2009-02-24 14:38:14 -0300 (Ter, 24 Fev 2009) | 1 line
  
  upgpkg: mysql-clients 5.0.77-1
........
  r31057 | douglas | 2009-03-24 04:31:53 -0300 (Ter, 24 Mar 2009) | 1 line
  
  upgpkg: mysql-clients 5.1.32-1
........

Modified:
  mysql-clients/repos/testing-i686/	(properties)
  mysql-clients/repos/testing-i686/PKGBUILD

----------+
 PKGBUILD |   46 ++++++++++++++++++++++++++++++++--------------
 1 file changed, 32 insertions(+), 14 deletions(-)


Property changes on: mysql-clients/repos/testing-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /mysql-clients/trunk:1-23605
   + /mysql-clients/trunk:1-31057

Modified: testing-i686/PKGBUILD
===================================================================
--- testing-i686/PKGBUILD	2009-03-24 07:31:53 UTC (rev 31057)
+++ testing-i686/PKGBUILD	2009-03-24 07:32:40 UTC (rev 31058)
@@ -2,37 +2,55 @@
 # Maintainer: judd <jvinet at zeroflux.org>
 
 pkgname=mysql-clients
-pkgver=5.1.30
+pkgver=5.1.32
 pkgrel=1
 pkgdesc="MySQL client tools"
 arch=(i686 x86_64)
-depends=("libmysqlclient>=${pkgver}" 'gcc-libs' 'readline')
-makedepends=('tcp_wrappers' 'libtool' 'gcc')
+depends=("libmysqlclient>=${pkgver}")
+makedepends=('tcp_wrappers' 'libtool' 'gcc' 'readline')
 url=('http://www.mysql.com/')
 options=('!libtool')
 license=('GPL')
-source=(http://mysql.cce.usp.br/Downloads/MySQL-5.1/mysql-$pkgver.tar.gz)
+source=(ftp://ftp.pucpr.br/mysql/Downloads/MySQL-5.1/mysql-$pkgver.tar.gz)
 
 build() {
   cd $startdir/src/mysql-${pkgver}
+  
   ./configure --prefix=/usr --libexecdir=/usr/sbin \
-    --localstatedir=/var --sysconfdir=/etc \
-    --without-debug --without-docs --without-readline \
-    --enable-local-infile --with-ssl \
-    --with-charset=latin1 --with-collation=latin1_general_ci \
-    --with-extra-charsets=complex --enable-thread-safe-client \
-    --with-libwrap 
-
-  for dir in include strings regex mysys dbug extra libmysql libmysql_r; do
+  --localstatedir=/var --sysconfdir=/etc \
+  --without-debug --without-docs --without-readline \
+  --enable-local-infile --with-ssl \
+  --with-charset=latin1 --with-collation=latin1_general_ci \
+  --with-extra-charsets=complex --enable-thread-safe-client \
+  --with-libwrap
+  
+  pushd include || return
+    make || return 1
+  popd
+ 
+  for dir in libmysql libmysql_r; do
     pushd ${dir} || return 1
+    make link_sources
     make || return 1
+    make DESTDIR=${startdir}/pkg install
     popd
   done
+  
+  for dir in strings regex mysys dbug extra; do
+    pushd ${dir} || return 1
+    make || return 1
+    popd
+  done
+
   cd client
+
   sed -i -e 's|\$(top_builddir)/libmysql/libmysqlclient.la|/usr/lib/mysql/libmysqlclient.so|g' Makefile
   make link_sources
   make || return 1
   make DESTDIR=${startdir}/pkg install
+
+  # Removing libmysql stuff
+  rm -rf $pkgdir/usr/lib/
+
 }
-
-md5sums=('b658e58887a74dce65224ae0fc8ee06a')
+md5sums=('f2d14b5e3b9d50b809c9b9985e4513b7')