Sun Jul 17 23:11:47 UTC 2011

6 files changed, 33 insertions, 40 deletions

diff --git a/extra/bzr/PKGBUILD b/extra/bzr/PKGBUILD
index 7ae96eb77..942251939 100644
--- a/extra/bzr/PKGBUILD
+++ b/extra/bzr/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 124960 2011-05-25 12:48:29Z andrea $
+# $Id: PKGBUILD 131892 2011-07-16 22:47:18Z eric $
 # Maintainer :
 # Contributor: Hugo Doria <hugo@archlinux.org>
 
 pkgname=bzr
-pkgver=2.3.3
+pkgver=2.3.4
 pkgrel=1
 pkgdesc="A decentralized revision control system (bazaar)"
 arch=('i686' 'x86_64')
@@ -12,11 +12,13 @@ license=('GPL')
 depends=('python2')
 optdepends=('python-paramiko: for sftp support')
 source=("http://launchpad.net/${pkgname}/${pkgver%.*}/${pkgver}/+download/${pkgname}-${pkgver}.tar.gz")
-md5sums=('a8ca30af0431c691ce7e71a74497e31d')
+md5sums=('2efb1350c69abd4d5bf7437f06f1fdb9')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   sed -i 's|man/man1|share/man/man1|' setup.py
+  sed -i 's|/usr/bin/env python|/usr/bin/env python2|' \
+    bzrlib/{plugins/bash_completion/bashcomp.py,tests/ssl_certs/create_ssls.py,patiencediff.py,_patiencediff_py.py}
   python2 setup.py build
 }
 
diff --git a/extra/libmp3splt/PKGBUILD b/extra/libmp3splt/PKGBUILD
index fefb3827c..f374e413d 100644
--- a/extra/libmp3splt/PKGBUILD
+++ b/extra/libmp3splt/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 117351 2011-03-31 07:10:06Z tpowa $
+# $Id: PKGBUILD 131866 2011-07-16 10:20:18Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 
 pkgname=libmp3splt
-pkgver=0.6.1a
+pkgver=0.7
 pkgrel=1
 arch=('i686' 'x86_64')
 pkgdesc="Library for splitting mp3 and ogg files without decoding"
@@ -24,4 +24,4 @@ package() {
   cd $srcdir/$pkgname-$pkgver
   make DESTDIR=$pkgdir/ install
 }
-md5sums=('a6a00d83e49adf27abb7a0cb0ea384a4')
+md5sums=('dadb166361e2a28955032a1b9f10ed38')
diff --git a/extra/libproxy/PKGBUILD b/extra/libproxy/PKGBUILD
index 7fde7ae6d..5b1367bd5 100644
--- a/extra/libproxy/PKGBUILD
+++ b/extra/libproxy/PKGBUILD
@@ -2,40 +2,39 @@
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=libproxy
-pkgver=0.4.6
-pkgrel=7
+pkgver=0.4.7
+pkgrel=1
 pkgdesc="A library that provides automatic proxy configuration management"
 arch=(i686 x86_64)
 license=('LGPL')
 depends=('gcc-libs')
-optdepends=('gconf: GNOME configuration module'
-            'kdelibs: KDE configuration module'
+optdepends=('kdelibs: KDE configuration module'
             'networkmanager: NetworkManager configuration module'
             'perl: Perl bindings'
             'python2: Python bindings')
-makedepends=('gconf' 'cmake' 'networkmanager' 'automoc4' 'python2' 'kdelibs' 'perl')
+makedepends=('cmake' 'networkmanager' 'automoc4' 'python2' 'kdelibs' 'perl')
 url="http://libproxy.googlecode.com"
 source=(http://libproxy.googlecode.com/files/${pkgname}-${pkgver}.tar.gz)
 options=('!libtool')
-md5sums=('199c6b120baf1f7258a55f38d5ec74f5')
+md5sums=('509e03a488a61cd62bfbaf3ab6a2a7a5')
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd "${srcdir}"
   mkdir build
   cd build
-  cmake -DCMAKE_INSTALL_PREFIX=/usr \
+  cmake ../${pkgname}-${pkgver} \
+    -DCMAKE_INSTALL_PREFIX=/usr \
     -DLIBEXEC_INSTALL_DIR=/usr/lib/libproxy \
     -DCMAKE_SKIP_RPATH=ON \
     -DPERL_VENDORINSTALL=yes \
-    -DCMAKE_BUILD_TYPE=None \
+    -DCMAKE_BUILD_TYPE=Release \
     -DWITH_WEBKIT=OFF \
     -DCMAKE_CXX_FLAGS="${CXXFLAGS}" \
-    -DCMAKE_C_FLAGS="${CFLAGS}" \
-    ..
+    -DCMAKE_C_FLAGS="${CFLAGS}"
   make
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}/build"
+  cd "${srcdir}/build"
   make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/mp3splt/PKGBUILD b/extra/mp3splt/PKGBUILD
index 9e1769c6f..3d03d5b62 100644
--- a/extra/mp3splt/PKGBUILD
+++ b/extra/mp3splt/PKGBUILD
@@ -1,14 +1,14 @@
-# $Id: PKGBUILD 116963 2011-03-26 16:55:54Z tpowa $
+# $Id: PKGBUILD 131861 2011-07-16 10:18:13Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 
 pkgname=mp3splt
-pkgver=2.3a
+pkgver=2.4
 pkgrel=1
 arch=('i686' 'x86_64')
 pkgdesc="Comandline tool for splitting mp3 and ogg files without decoding"
 license=('GPL')
 url="http://mp3splt.sourceforge.net"
-depends=('libmp3splt>=0.6.1a')
+depends=('libmp3splt')
 source=(http://downloads.sourceforge.net/sourceforge/mp3splt/$pkgname-$pkgver.tar.gz)
 options=(!libtool)
 
@@ -22,4 +22,4 @@ package() {
   cd $srcdir/$pkgname-$pkgver
   make DESTDIR=$pkgdir/ install
 }
-md5sums=('1fe663f7de5a6949bbe5b6aa78fea79f')
+md5sums=('aa4dc3de6e789961c71d8b3daaac0623')
diff --git a/extra/ocaml/PKGBUILD b/extra/ocaml/PKGBUILD
index f460befbc..5f0a24b79 100644
--- a/extra/ocaml/PKGBUILD
+++ b/extra/ocaml/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 123206 2011-05-09 09:44:39Z jgc $
+# $Id: PKGBUILD 131871 2011-07-16 10:36:29Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 
 pkgname=ocaml	
-pkgver=3.12.0
-pkgrel=2
+pkgver=3.12.1
+pkgrel=1
 pkgdesc="A functional language with OO extensions"
 arch=('i686' 'x86_64')
 license=('LGPL2' 'custom: QPL-1.0')
@@ -11,15 +11,11 @@ url="http://caml.inria.fr/"
 depends=('gdbm')
 makedepends=('tk' 'ncurses>=5.6-7' 'libx11')
 optdepends=('ncurses: advanced ncurses features' 'tk: advanced tk features')
-source=(http://caml.inria.fr/distrib/ocaml-3.12/${pkgname}-${pkgver}.tar.gz
-        fix-ocaml-binutils-2.21.patch)
+source=(http://caml.inria.fr/distrib/ocaml-3.12/${pkgname}-${pkgver}.tar.gz)
 options=('!makeflags' '!emptydirs')
-md5sums=('3ba7cc65123c3579f14e7c726d3ee782'
-         '8c664a0a346424ea2ec6fc6f713170c6')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -Np1 -i "${srcdir}/fix-ocaml-binutils-2.21.patch"
   ./configure -prefix /usr 
   make world.opt
   make PREFIX="${pkgdir}/usr" MANDIR="${pkgdir}/usr/share/man" install
@@ -31,3 +27,4 @@ build() {
   install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
   install -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/"
 }
+md5sums=('814a047085f0f901ab7d8e3a4b7a9e65')
diff --git a/extra/vlc/PKGBUILD b/extra/vlc/PKGBUILD
index 43d28f429..654c7d390 100644
--- a/extra/vlc/PKGBUILD
+++ b/extra/vlc/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 129958 2011-06-30 16:26:39Z giovanni $
+# $Id: PKGBUILD 131876 2011-07-16 10:50:22Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Sarah Hay <sarahhay@mb.sympatico.ca>
 # Contributor: Martin Sandsmark <martin.sandsmark@kde.org>
 
 pkgname=vlc
-pkgver=1.1.10
-pkgrel=6
+pkgver=1.1.11
+pkgrel=1
 pkgdesc="A multi-platform MPEG, VCD/DVD, and DivX player"
 arch=('i686' 'x86_64')
 url="http://www.videolan.org/vlc/"
@@ -34,19 +34,14 @@ conflicts=('vlc-plugin')
 replaces=('vlc-plugin')
 options=('!libtool')
 install=vlc.install
-source=("http://download.videolan.org/pub/videolan/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.bz2"
-        vlc-1.1.10-libavformat.patch)
-md5sums=('066cb94b1e3aa848d828121354d6be4d'
-         '9b82571a594e08e67fbae9c96c3f3ed7')
+source=("http://download.videolan.org/pub/videolan/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.bz2")
+md5sums=('a64846d6f21ea179ae8e8bfb6f9447fe')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
   sed -i -e 's:truetype/freefont:TTF:g' modules/misc/freetype.c
 
-  # FS#24872
-  patch -Np1 -i ${srcdir}/vlc-1.1.10-libavformat.patch
-
   ./configure --prefix=/usr \
               --disable-rpath \
               --enable-faad \