Thu Jun 2 22:47:10 UTC 2011

14 files changed, 136 insertions, 100 deletions

diff --git a/extra/bind/PKGBUILD b/extra/bind/PKGBUILD
index 5af689c41..8df2eb03d 100644
--- a/extra/bind/PKGBUILD
+++ b/extra/bind/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 124551 2011-05-22 22:52:52Z bisson $
+# $Id: PKGBUILD 125623 2011-05-27 08:34:32Z bisson $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: judd <jvinet@zeroflux.org>
 # Contributor: Mario Vazquez <mario_vazq@hotmail.com>
@@ -6,9 +6,9 @@
 pkgname=bind
 
 # Use a period and not a hyphen before the patch level for proper versioning.
-pkgver=9.8.0.P1
-_pkgver=9.8.0-P1
-pkgrel=3
+pkgver=9.8.0.P2
+_pkgver=9.8.0-P2
+pkgrel=1
 
 pkgdesc='Berkeley Internet Name Daemon (BIND) is the reference implementation of the Domain Name System (DNS) protocols'
 arch=('i686' 'x86_64')
@@ -30,10 +30,10 @@ source=("http://ftp.isc.org/isc/bind9/${_pkgver}/${pkgname}-${_pkgver}.tar.gz"
         'named.logrotate'
         'localhost.zone'
         '127.0.0.zone')
-sha1sums=('aa8f308f218e437ac4bad616e0ae83a9b9c40c29'
+sha1sums=('b3492ad11cfbf2939d9b0fb62c52c204de58679b'
           'ee52947062c1582858187716b776afa3613608fb'
-          '2f737f4e81186447ac2ef370fa8dcea0b3abec31'
-          '5277cf4d6fbc5728c55b51c77c9347d28393fb7c'
+          'b433ba99f23e3db305f8ce293fe4ce6d1b8d4cfb'
+          '17444f9d759a4bde7688bdaa304dac57a138e4c1'
           '46232e9db243c6c05e170a1781d7a7f413be5d03'
           '5ca7a5f2a132548a090a045a2df3acea6b35d9eb'
           '7848edbfb9a848843f57c11c02b0289eefd42d00'
@@ -46,8 +46,8 @@ install=install
 build() {
 	cd "${srcdir}/${pkgname}-${_pkgver}"
 
-	patch -p1 -i "${srcdir}"/so_bsdcompat.patch
-	patch -p1 -i "${srcdir}"/notools.patch
+	patch -p1 -i ../so_bsdcompat.patch
+	patch -p1 -i ../notools.patch
 
 	./configure \
 		--prefix=/usr \
diff --git a/extra/bind/notools.patch b/extra/bind/notools.patch
index 2d16fdcd5..0ad083a01 100644
--- a/extra/bind/notools.patch
+++ b/extra/bind/notools.patch
@@ -1,5 +1,6 @@
---- bind-9.7.0/bin/Makefile.in.orig	2010-03-14 21:19:23.000000000 -0400
-+++ bind-9.7.0/bin/Makefile.in	2010-03-14 21:19:37.000000000 -0400
+diff -aur old/bin/Makefile.in new/bin/Makefile.in
+--- old/bin/Makefile.in	2011-05-27 10:12:59.392416094 +0200
++++ new/bin/Makefile.in	2011-05-27 10:13:12.372521984 +0200
 @@ -19,7 +19,7 @@
  VPATH =		@srcdir@
  top_srcdir =	@top_srcdir@
diff --git a/extra/bind/so_bsdcompat.patch b/extra/bind/so_bsdcompat.patch
index cae2b835c..4d7031fcc 100644
--- a/extra/bind/so_bsdcompat.patch
+++ b/extra/bind/so_bsdcompat.patch
@@ -1,13 +1,12 @@
 diff -aur old/lib/isc/unix/socket.c new/lib/isc/unix/socket.c
---- old/lib/isc/unix/socket.c	2010-03-12 04:25:20.000000000 +0100
-+++ new/lib/isc/unix/socket.c	2011-01-22 21:07:52.410000038 +0100
-@@ -681,6 +681,8 @@
- 	isc_sockstatscounter_fdwatchrecvfail
- };
+--- old/lib/isc/unix/socket.c	2011-02-18 05:01:16.000000000 +0100
++++ new/lib/isc/unix/socket.c	2011-05-27 10:12:01.685269374 +0200
+@@ -712,6 +712,8 @@
+ }
+ #endif
  
 +#undef SO_BSDCOMPAT
 +
  static void
- manager_log(isc__socketmgr_t *sockmgr,
- 	    isc_logcategory_t *category, isc_logmodule_t *module, int level,
-Only in new/lib/isc/unix: socket.c.orig
+ socket_log(isc__socket_t *sock, isc_sockaddr_t *address,
+ 	   isc_logcategory_t *category, isc_logmodule_t *module, int level,
diff --git a/extra/enblend-enfuse/PKGBUILD b/extra/enblend-enfuse/PKGBUILD
index 76fc7290d..219240f8c 100644
--- a/extra/enblend-enfuse/PKGBUILD
+++ b/extra/enblend-enfuse/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 64417 2010-01-20 07:24:28Z eric $
+# $Id: PKGBUILD 126103 2011-06-01 14:26:46Z stephane $
 # Maintainer: tobias <tobias@archlinux.org>
 # Contributor: Dominik Ryba <domryba@post.pl>
 
 pkgname=enblend-enfuse
 pkgver=4.0
-pkgrel=1
+pkgrel=2
 pkgdesc="intelligent blend tool for overlapping picture"
 arch=("i686" "x86_64")
 license=('GPL')
@@ -21,10 +21,14 @@ sha1sums=('34c3a5ce11c6ef0ef520d8a15a3cb6a94a567033' 'eae6cf48ea082865130302d0b4
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}-753b534c819d"
-  patch -p1 < ../libpng-1.4.patch || return 1
-  ./configure --prefix=/usr || return 1
-  make || return 1
-  make DESTDIR="${pkgdir}" install || return 1
-  install -D -m644 doc/enblend.info "${pkgdir}/usr/share/info/enblend.info" || return 1
-  install -D -m644 doc/enfuse.info "${pkgdir}/usr/share/info/enfuse.info" || return 1
+  patch -Np1 -i ../libpng-1.4.patch
+  ./configure --prefix=/usr
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}-753b534c819d"
+  make DESTDIR="${pkgdir}" install
+  install -D -m644 doc/enblend.info "${pkgdir}/usr/share/info/enblend.info"
+  install -D -m644 doc/enfuse.info "${pkgdir}/usr/share/info/enfuse.info"
 }
diff --git a/extra/glew/PKGBUILD b/extra/glew/PKGBUILD
index baee8c467..6270e8c8f 100644
--- a/extra/glew/PKGBUILD
+++ b/extra/glew/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 108690 2011-02-02 16:13:23Z stephane $
+# $Id: PKGBUILD 125318 2011-05-25 20:28:27Z stephane $
 # Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
 # Contributor: SleepyDog
 
 pkgname=glew
-pkgver=1.5.8
+pkgver=1.6.0
 pkgrel=1
 pkgdesc="The OpenGL Extension Wrangler Library"
 arch=('i686' 'x86_64')
@@ -11,7 +11,7 @@ url="http://glew.sourceforge.net"
 license=('BSD' 'MIT' 'GPL')
 depends=('libxmu' 'libxi' 'mesa')
 source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tgz)
-sha1sums=('450946935faa20ac4950cb42ff025be2c1f7c22e')
+sha1sums=('ed555d15d0f01239b262c4cf803e97d60d8a18b6')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
@@ -21,7 +21,9 @@ build() {
 
 package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  make GLEW_DEST="${pkgdir}/usr" install
+  make GLEW_DEST="${pkgdir}/usr" install.all
   install -D -m644 LICENSE.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-  chmod 0755 "${pkgdir}/usr/lib/libGLEW.so.${pkgver}"
+
+  rm "${pkgdir}"/usr/lib/{libGLEW,libGLEWmx}.a
+  chmod 0755 "${pkgdir}"/usr/lib/libGLEW*.so.${pkgver}
 }
diff --git a/extra/hugin/PKGBUILD b/extra/hugin/PKGBUILD
index 736aeb71b..d09e302dd 100644
--- a/extra/hugin/PKGBUILD
+++ b/extra/hugin/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 124912 2011-05-25 06:37:46Z eric $
+# $Id: PKGBUILD 125347 2011-05-26 02:15:23Z eric $
 # Maintainer: Tobias Kieslich <tobias@archlinux.org>
 # Contributor: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Dominik Ryba <domryba@post.pl>
 
 pkgname=hugin
 pkgver=2010.4.0
-pkgrel=3
+pkgrel=4
 pkgdesc="A frontend to the panorama-tools"
 arch=('i686' 'x86_64')
 url="http://hugin.sourceforge.net/"
diff --git a/extra/koffice/PKGBUILD b/extra/koffice/PKGBUILD
index 66e08bc5c..1884dd92c 100644
--- a/extra/koffice/PKGBUILD
+++ b/extra/koffice/PKGBUILD
@@ -1,5 +1,6 @@
-# $Id: PKGBUILD 115172 2011-03-17 10:46:47Z andrea $
+# $Id: PKGBUILD 125678 2011-05-28 00:58:39Z andrea $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
+# Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: BlackEagle < ike DOT devolder AT gmail DOT com >
 
 pkgbase=koffice
@@ -36,23 +37,25 @@ pkgname=(
 #	'koffice-kdgantt' # still an empty package
 )
 pkgver=2.3.3
-pkgrel=3
+pkgrel=4
 arch=('i686' 'x86_64')
 url='http://koffice.kde.org'
 license=('GPL' 'LGPL' 'FDL')
-makedepends=('pkg-config' 'cmake' 'automoc4' 'boost' 'eigen' \
-  'kdelibs' 'gsl' 'qca' 'lcms' 'glew' 'qimageblitz' \
-  'kdepimlibs' 'pstoedit' 'poppler-qt' 'libwpd' 'libwpg' 'openexr' 'opengtl' 'kdegraphics-libs' 'sqlite3' 'docbook-xml' 'docbook-xsl')
+makedepends=('pkg-config' 'cmake' 'automoc4' 'boost' 'eigen' 'gsl' 'lcms'
+             'glew' 'qimageblitz' 'kdepimlibs' 'pstoedit' 'poppler-qt' 'libwpd'
+             'libwpg' 'opengtl' 'kdegraphics-libs')
 groups=('koffice')
-source=("ftp://ftp.kde.org/pub/kde/stable/${pkgbase}-${pkgver}/${pkgbase}-${pkgver}.tar.bz2"
-	"kde4-koffice-libwpg02.patch")
+source=("http://download.kde.org/stable/${pkgbase}-${pkgver}/${pkgbase}-${pkgver}.tar.bz2"
+        'kde4-koffice-libwpg02.patch' 'gcc46.patch')
 sha256sums=('31ba0d98c0d29c7b8ab97efdeb6c618b82177b2b0ec85da088178254da43c099'
-            '69106deb4081d71b5bd8f2e4f5af67ca689e4ce9f2bb49c11dbce5fb3409d612')
+            '69106deb4081d71b5bd8f2e4f5af67ca689e4ce9f2bb49c11dbce5fb3409d612'
+            'e095c0b2bbedf41da6535a68b2275464dafd3f194566028d0135322f596e4739')
 
 build() {
 	cd "${srcdir}/${pkgbase}-${pkgver}"
 
-	patch -Np1 -i "${srcdir}/kde4-koffice-libwpg02.patch"
+	patch -p1 -i "${srcdir}/kde4-koffice-libwpg02.patch"
+    patch -p1 -i "${srcdir}"/gcc46.patch
 
 	cd "${srcdir}"
 	mkdir build
diff --git a/extra/koffice/gcc46.patch b/extra/koffice/gcc46.patch
new file mode 100644
index 000000000..dcf8a4f85
--- /dev/null
+++ b/extra/koffice/gcc46.patch
@@ -0,0 +1,23 @@
+diff -up koffice-2.3.2/krita/plugins/formats/exr/exr_converter.cc.gcc46 koffice-2.3.2/krita/plugins/formats/exr/exr_converter.cc
+--- koffice-2.3.2/krita/plugins/formats/exr/exr_converter.cc.gcc46	2011-02-17 06:13:40.000000000 -0600
++++ koffice-2.3.2/krita/plugins/formats/exr/exr_converter.cc	2011-02-19 21:15:56.597142885 -0600
+@@ -80,6 +80,9 @@ ImageType imfTypeToKisType(Imf::PixelTyp
+         return IT_FLOAT16;
+     case Imf::FLOAT:
+         return IT_FLOAT32;
++    default:
++    // shouldn't reach here
++        return IT_UNSUPPORTED;
+     }
+ }
+ 
+@@ -93,6 +96,9 @@ const KoColorSpace* kisTypeToColorSpace(
+     case IT_UNKNOWN:
+     case IT_UNSUPPORTED:
+         return 0;
++    default:
++    // shouldn't reach here
++        return 0;
+     }
+ }
+ 
diff --git a/extra/libass/PKGBUILD b/extra/libass/PKGBUILD
index 7de827fb1..44277f446 100644
--- a/extra/libass/PKGBUILD
+++ b/extra/libass/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 87470 2010-08-13 22:22:30Z giovanni $
+# $Id: PKGBUILD 126098 2011-06-01 12:39:10Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: G_Syme <demichan(at)mail(dot)upb(dot)de>
 
 pkgname=libass
-pkgver=0.9.11
+pkgver=0.9.12
 pkgrel=1
 pkgdesc="A portable library for SSA/ASS subtitles rendering"
 arch=('i686' 'x86_64')
@@ -12,13 +12,18 @@ license=('GPL')
 depends=('enca' 'fontconfig' 'libpng')
 makedepends=('pkgconfig')
 options=(!libtool)
-source=(http://libass.googlecode.com/files/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('f9042884397002ba40aa89dc7d34f59f')
+source=("http://libass.googlecode.com/files/${pkgname}-${pkgver}.tar.xz")
+md5sums=('fcef4b048ca2655a14073d692551cd1f')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
   ./configure --prefix=/usr
-  make || return 1
-  make DESTDIR="${pkgdir}" install || return 1
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/libssh/PKGBUILD b/extra/libssh/PKGBUILD
index e6acc5d23..34d929086 100644
--- a/extra/libssh/PKGBUILD
+++ b/extra/libssh/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 107427 2011-01-24 20:24:15Z andrea $
+# $Id: PKGBUILD 126134 2011-06-01 18:06:44Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: ice-man <icemanf@gmail.com>
 # Contributor: sergeantspoon <sergeantspoon@archlinux.us>
 
 pkgname=libssh
-pkgver=0.4.8
+pkgver=0.5.0
 pkgrel=1
 pkgdesc="Library for accessing ssh client services through C libraries"
 url="http://www.libssh.org/"
@@ -12,11 +12,11 @@ license=('LGPL')
 arch=('i686' 'x86_64')
 depends=('openssl')
 makedepends=('cmake' 'doxygen')
-source=("http://www.libssh.org/files/0.4/${pkgname}-${pkgver}.tar.gz")
-md5sums=('d97b3feea1abe047ca8cf86d06e4b789')
+source=("http://www.libssh.org/files/0.5/${pkgname}-${pkgver}.tar.gz")
+md5sums=('9b37f45751c0ae7ba66099c1fb136946')
 
 build() {
-  cd ${srcdir}
+  cd "${srcdir}"
   mkdir build
   cd build
   cmake ../${pkgname}-${pkgver} \
@@ -26,6 +26,6 @@ build() {
 }
 
 package(){
-  cd ${srcdir}/build
-  make DESTDIR=${pkgdir} install
+  cd "${srcdir}"/build
+  make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/mysql/PKGBUILD b/extra/mysql/PKGBUILD
index 269829024..639fd702c 100644
--- a/extra/mysql/PKGBUILD
+++ b/extra/mysql/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 122912 2011-05-07 10:07:11Z andrea $
+# $Id: PKGBUILD 126056 2011-06-01 08:38:57Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
 # Contributor: judd <jvinet@zeroflux.org>
 
 pkgbase=mysql
 pkgname=('libmysqlclient' 'mysql-clients' 'mysql')
-pkgver=5.5.12
+pkgver=5.5.13
 pkgrel=1
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -15,7 +15,7 @@ options=('!libtool')
 source=("http://ftp.gwdg.de/pub/misc/mysql/Downloads/MySQL-5.5/${pkgbase}-${pkgver}.tar.gz"
         'mysqld'
         'my.cnf')
-md5sums=('53d31a0b24f3eb3176185090eff129b9'
+md5sums=('f0e519e90ee7c00fceb0730edf859d7b'
          '2234207625baa29b2ff7d7b4f088abce'
          '1c949c0dbea5206af0db14942d9927b6')
 
@@ -31,8 +31,13 @@ build() {
   cmake ../${pkgbase}-${pkgver} \
     -DCMAKE_BUILD_TYPE=Release \
     -DCMAKE_INSTALL_PREFIX=/usr \
-    -DMYSQL_DATADIR=/var/lib/mysql \
+    -DMANUFACTURER="Arch Linux" \
     -DSYSCONFDIR=/etc/mysql \
+    -DMYSQL_DATADIR=/var/lib/mysql \
+    -DMYSQL_UNIX_ADDR=/var/run/mysqld/mysqld.sock \
+    -DDEFAULT_CHARSET=utf8 \
+    -DDEFAULT_COLLATION=utf8_general_ci \
+    -DENABLED_LOCAL_INFILE=ON \
     -DINSTALL_INFODIR=share/mysql/docs \
     -DINSTALL_MANDIR=share/man \
     -DINSTALL_PLUGINDIR=/usr/lib/mysql/plugin \
@@ -41,23 +46,21 @@ build() {
     -DINSTALL_DOCREADMEDIR=share/mysql \
     -DINSTALL_SUPPORTFILESDIR=share/mysql \
     -DINSTALL_MYSQLSHAREDIR=share/mysql \
+    -DINSTALL_DOCDIR=share/mysql/docs \
     -DINSTALL_SHAREDIR=share/mysql \
     -DWITH_READLINE=ON \
     -DWITH_ZLIB=system \
     -DWITH_SSL=system \
     -DWITH_LIBWRAP=ON \
-    -DDEFAULT_CHARSET=utf8 \
-    -DDEFAULT_COLLATION=utf8_general_ci \
+    -DWITH_MYSQLD_LDFLAGS="${LDFLAGS}" \
     -DWITH_EXTRA_CHARSETS=complex \
     -DWITH_EMBEDDED_SERVER=ON \
-    -DMYSQL_UNIX_ADDR=/var/run/mysqld/mysqld.sock \
-    -DENABLED_LOCAL_INFILE=ON \
+    -DWITH_INNOBASE_STORAGE_ENGINE=1 \
     -DWITH_PARTITION_STORAGE_ENGINE=1 \
     -DWITHOUT_EXAMPLE_STORAGE_ENGINE=1 \
     -DWITHOUT_ARCHIVE_STORAGE_ENGINE=1 \
     -DWITHOUT_BLACKHOLE_STORAGE_ENGINE=1 \
-    -DWITHOUT_FEDERATED_STORAGE_ENGINE=1 \
-    -DWITH_INNOBASE_STORAGE_ENGINE=1
+    -DWITHOUT_FEDERATED_STORAGE_ENGINE=1
 
   make
 }
@@ -71,11 +74,11 @@ package_libmysqlclient(){
     make -C ${dir} DESTDIR="${pkgdir}" install
   done
 
-  install -d "${pkgdir}/usr/bin"
-  install -m755 scripts/mysql_config "${pkgdir}/usr/bin/"
-  install -d "${pkgdir}/usr/share/man/man1"
+  install -d "${pkgdir}"/usr/bin
+  install -m755 scripts/mysql_config "${pkgdir}"/usr/bin/
+  install -d "${pkgdir}"/usr/share/man/man1
   for man in mysql_config mysql_client_test_embedded mysqltest_embedded; do
-    install -m644 "${srcdir}/${pkgbase}-${pkgver}/man/$man.1" "${pkgdir}/usr/share/man/man1/$man.1"
+    install -m644 "${srcdir}"/${pkgbase}-${pkgver}/man/$man.1 "${pkgdir}"/usr/share/man/man1/$man.1
   done
 }
 
@@ -87,9 +90,9 @@ package_mysql-clients(){
   make -C client DESTDIR="${pkgdir}" install
 
   # install man pages
-  install -d "${pkgdir}/usr/share/man/man1"
+  install -d "${pkgdir}"/usr/share/man/man1
   for man in mysql mysqladmin mysqlcheck mysqldump mysqlimport mysqlshow mysqlslap; do
-    install -m644 "${srcdir}/${pkgbase}-${pkgver}/man/$man.1" "${pkgdir}/usr/share/man/man1/$man.1"
+    install -m644 "${srcdir}"/${pkgbase}-${pkgver}/man/$man.1 "${pkgdir}"/usr/share/man/man1/$man.1
   done
 
   # provided by mysql
@@ -104,28 +107,24 @@ package_mysql(){
   optdepends=('perl-dbi' 'perl-dbd-mysql')
 
   cd "${srcdir}"/build
-  make DESTDIR=${pkgdir} install
+  make DESTDIR="${pkgdir}" install
 
-  install -Dm644 ${srcdir}/my.cnf ${pkgdir}/etc/mysql/my.cnf
-  install -Dm755 ${srcdir}/mysqld ${pkgdir}/etc/rc.d/mysqld
+  install -Dm644 "${srcdir}"/my.cnf "${pkgdir}"/etc/mysql/my.cnf
+  install -Dm755 "${srcdir}"/mysqld "${pkgdir}"/etc/rc.d/mysqld
 
   # provided by libmysqlclient
-  rm ${pkgdir}/usr/bin/{mysql_config,mysql_client_test_embedded,mysqltest_embedded}
-  rm ${pkgdir}/usr/lib/libmysql*
-  rm -r ${pkgdir}/usr/include/
-  rm ${pkgdir}/usr/share/man/man1/{mysql_config,mysql_client_test_embedded,mysqltest_embedded}.1
+  rm "${pkgdir}"/usr/bin/{mysql_config,mysql_client_test_embedded,mysqltest_embedded}
+  rm "${pkgdir}"/usr/lib/libmysql*
+  rm -r "${pkgdir}"/usr/include/
+  rm "${pkgdir}"/usr/share/man/man1/{mysql_config,mysql_client_test_embedded,mysqltest_embedded}.1
   
   # provided by mysql-clients
-  rm ${pkgdir}/usr/bin/{mysql,mysqladmin,mysqlcheck,mysqldump,mysqlimport,mysqlshow,mysqlslap}
-  rm ${pkgdir}/usr/share/man/man1/{mysql,mysqladmin,mysqlcheck,mysqldump,mysqlimport,mysqlshow,mysqlslap}.1
+  rm "${pkgdir}"/usr/bin/{mysql,mysqladmin,mysqlcheck,mysqldump,mysqlimport,mysqlshow,mysqlslap}
+  rm "${pkgdir}"/usr/share/man/man1/{mysql,mysqladmin,mysqlcheck,mysqldump,mysqlimport,mysqlshow,mysqlslap}.1
 
   # not needed
-  rm -r ${pkgdir}/usr/{mysql-test,sql-bench}
-
-  # These shouldn't be here
-  rm -r ${pkgdir}/usr/docs
-  install -d ${pkgdir}/var/lib/mysql
-  cp -r ${pkgdir}/usr/data/* ${pkgdir}/var/lib/mysql/
-  chmod -R 700 ${pkgdir}/var/lib/mysql
-  rm -r ${pkgdir}/usr/data
+  rm -r "${pkgdir}"/usr/{data,mysql-test,sql-bench}
+  rm "${pkgdir}"/usr/share/man/man1/mysql-test-run.pl.1
+
+  install -dm700 "${pkgdir}"/var/lib/mysql
 }
diff --git a/extra/telepathy-glib/PKGBUILD b/extra/telepathy-glib/PKGBUILD
index 2feeea9b5..7f7261081 100644
--- a/extra/telepathy-glib/PKGBUILD
+++ b/extra/telepathy-glib/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 124130 2011-05-16 17:05:51Z ibiru $
+# $Id: PKGBUILD 126144 2011-06-01 19:05:33Z ibiru $
 # Maintainer:  Ionut Biru <ibiru@archlinux.org>
 # Contributor: Kessia 'even' Pinheiro <kessiapinheiro at gmail.com
 # Contributor: Bjorn Lindeijer <bjorn lindeijer nl>
 pkgname=telepathy-glib
-pkgver=0.14.6
+pkgver=0.14.7
 pkgrel=1
 pkgdesc="GLib bindings for the Telepathy D-Bus protocol"
 arch=('i686' 'x86_64')
@@ -14,7 +14,7 @@ options=('!libtool' '!emptydirs')
 depends=('dbus-glib')
 makedepends=('libxslt' 'vala' 'gobject-introspection')
 source=("http://telepathy.freedesktop.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz")
-md5sums=('ab8cf90283ef3382de1d20d87c9d970a')
+md5sums=('3230f7389cd3a0ebe4436eb1f7e40c18')
 
 build() {
     cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/vala/PKGBUILD b/extra/vala/PKGBUILD
index 8772c333f..339e2f86d 100644
--- a/extra/vala/PKGBUILD
+++ b/extra/vala/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 117513 2011-04-04 09:41:11Z ibiru $
+# $Id: PKGBUILD 126139 2011-06-01 18:48:36Z ibiru $
 # Maintainer : Ionut Biru <ibiru@archlinux.org>
 # Contributor: Timm Preetz <timm@preetz.us>
 
 pkgname=vala
-pkgver=0.12.0
+pkgver=0.12.1
 pkgrel=1
 pkgdesc="Compiler for the GObject type system"
 arch=('i686' 'x86_64')
@@ -12,8 +12,8 @@ license=('LGPL')
 depends=('glib2')
 makedepends=('libxslt')
 options=('!libtool')
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/0.12/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('9a398e16fba2c78c9bcadb05e489c9bc318e34901d43451ac5d2ce4bc46b1225')
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/0.12/${pkgname}-${pkgver}.tar.xz)
+sha256sums=('f102bb64549ebe88955bb9fa0f502d974413aec71fec88e3544c65adfeb0afb4')
 
 build() {
     cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/wireshark/PKGBUILD b/extra/wireshark/PKGBUILD
index a83355164..5181428a6 100644
--- a/extra/wireshark/PKGBUILD
+++ b/extra/wireshark/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 121168 2011-04-29 06:39:53Z stephane $
+# $Id: PKGBUILD 126090 2011-06-01 11:36:55Z guillaume $
 # Maintainer: Guillaume ALAUX <guillaume at alaux dot net>
 # Contributor: Florian Pritz <bluewind at jabber dot ccc dot de>
 pkgname=(wireshark-cli wireshark-gtk)
 pkgbase=wireshark
-pkgver=1.4.6
-pkgrel=2
+pkgver=1.4.7
+pkgrel=1
 arch=('i686' 'x86_64')
 license=('GPL2')
 makedepends=('bison' 'flex' 'gtk2' 'krb5' 'libpcap' 'bash' 'gnutls' 'libcap')
 url="http://www.wireshark.org/"
 options=(!libtool)
 source=(http://www.wireshark.org/download/src/${pkgbase}-${pkgver}.tar.bz2)
-md5sums=('fd301004ebc5fac8e56c2f0d4ef6173f')
+md5sums=('b5065426d5524ddc1667314f8256c2b1')
 
 build() {
   cd "${srcdir}/${pkgbase}-${pkgver}"