Thu Apr 21 04:17:42 UTC 2011

10 files changed, 77 insertions, 82 deletions

diff --git a/extra/libplist/PKGBUILD b/extra/libplist/PKGBUILD
index 2a82efc5d..0121e951c 100644
--- a/extra/libplist/PKGBUILD
+++ b/extra/libplist/PKGBUILD
@@ -1,36 +1,30 @@
-# $Id: PKGBUILD 89629 2010-09-02 17:11:43Z remy $
+# $Id: PKGBUILD 120143 2011-04-20 11:59:42Z ibiru $
 # Maintainer : Ionut Biru <ibiru@archlinux.org>
 # Contributor: Gabriel Martinez < reitaka at gmail dot com >
 
 pkgname=libplist
-pkgver=1.3
-pkgrel=2
+pkgver=1.4
+pkgrel=1
 pkgdesc="A library to handle Apple Property List format whereas it's binary or XML"
 url="http://libimobiledevice.org/"
 arch=('i686' 'x86_64')
 license=('GPL2' 'LGPL2.1')
-depends=('glib2>=2.24.1' 'libxml2>=2.7.7')
-makedepends=('cmake' 'swig' 'python2')
-source=(http://cloud.github.com/downloads/JonathanBeck/${pkgname}/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('982c8aac59cdc3fafc925a407a29b6cf367c5ec9bad6ad509fe5ea25d3e5b6b0')
+depends=('glib2' 'libxml2' 'python2')
+makedepends=('cmake' 'swig')
+source=(http://www.libimobiledevice.org/downloads/${pkgname}-${pkgver}.tar.bz2)
+sha256sums=('2ad226abe1131a72e7ecbb2b921ad92f54b8e787c2281c89b00145b519479a71')
 
 build() {
-  # CMake is not patched yet
-  cd "${srcdir}/${pkgname}-${pkgver}/cmake/modules"
-  cp /usr/share/cmake-2.8/Modules/FindPython*.cmake .
-  sed -i -e 's#2.6#2.7 2.6#' FindPythonLibs.cmake
-  sed -i -e 's#python2.6#python2.7 python2.6#' FindPythonInterp.cmake
-
   cd "${srcdir}"
   mkdir build
   cd build
   cmake ../"${pkgname}-${pkgver}" \
       -DCMAKE_SKIP_RPATH=ON \
       -DCMAKE_INSTALL_PREFIX:PATH=/usr
-  make || return 1
+  make
 }
 
 package() {
   cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install || return 1
+  make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/libtorrent-rasterbar/PKGBUILD b/extra/libtorrent-rasterbar/PKGBUILD
index 2918856be..44968f451 100644
--- a/extra/libtorrent-rasterbar/PKGBUILD
+++ b/extra/libtorrent-rasterbar/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 111968 2011-03-02 18:24:01Z ibiru $
+# $Id: PKGBUILD 120130 2011-04-20 11:35:26Z ibiru $
 # Maintainer : Ionut Biru <ibiru@archlinux.org>
 # Contributor: Hugo Doria <hugo@archlinux.org>
 
 pkgname=libtorrent-rasterbar
-pkgver=0.15.5
-pkgrel=2
+pkgver=0.15.6
+pkgrel=1
 pkgdesc="A C++ library that aims to be a good alternative to all the other bittorrent implementations around"
 url="http://www.rasterbar.com/products/libtorrent/"
 arch=('i686' 'x86_64')
@@ -12,12 +12,10 @@ license=('custom')
 depends=('boost-libs' 'python2')
 makedepends=('boost')
 source=(http://libtorrent.googlecode.com/files/${pkgname}-${pkgver}.tar.gz)
-md5sums=('f1504a619e876c2731ee9a6b7d19cb1d')
+sha1sums=('e6f33b139933ec245e8850558efe52e88081fc6d')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  export CFLAGS="${CFLAGS} -DBOOST_FILESYSTEM_VERSION=2"
-  export CXXFLAGS="${CXXFLAGS} -DBOOST_FILESYSTEM_VERSION=2"
   ./configure --prefix=/usr --enable-python-binding
   make
 }
diff --git a/extra/mirage/PKGBUILD b/extra/mirage/PKGBUILD
index d13d8ddd5..c63d6eddc 100644
--- a/extra/mirage/PKGBUILD
+++ b/extra/mirage/PKGBUILD
@@ -1,20 +1,24 @@
-# $Id: PKGBUILD 89709 2010-09-03 11:45:48Z remy $
+# $Id: PKGBUILD 120115 2011-04-20 11:08:02Z ibiru $
 # Maintainer : Ionut Biru <ibiru@archlinux.org>
 # Contributor: James Rayner <james@archlinux.org>
 # Contributor: Scott Horowitz <stonecrest@gmail.com>
 pkgname=mirage
-pkgver=0.9.5.1
-pkgrel=2
+pkgver=0.9.5.2
+pkgrel=1
 pkgdesc="A simple GTK+ Image Viewer"
 url="http://mirageiv.berlios.de"
 license=("GPL")
-depends=('pygtk>=2.17.0' 'desktop-file-utils')
+depends=('pygtk' 'desktop-file-utils')
 arch=('i686' 'x86_64')
 source=(http://download.berlios.de/mirageiv/${pkgname}-${pkgver}.tar.gz)
 install=$pkgname.install
-md5sums=('8b74db43ca6c81e3326d70c81df4bc56')
+md5sums=('dace5cf01e5e53317ba8be0f8a74f4bf')
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  python2 setup.py install --root="${pkgdir}"
+    cd "${srcdir}/${pkgname}-${pkgver}"
+    python2 setup.py build
+}
+package() {
+    cd "${srcdir}/${pkgname}-${pkgver}"
+    python2 setup.py install --root="${pkgdir}"
 }
diff --git a/extra/nitrogen/PKGBUILD b/extra/nitrogen/PKGBUILD
index b9c902a12..3a3ddac95 100644
--- a/extra/nitrogen/PKGBUILD
+++ b/extra/nitrogen/PKGBUILD
@@ -1,24 +1,27 @@
-# $Id: PKGBUILD 67236 2010-02-05 22:06:57Z ibiru $
+# $Id: PKGBUILD 120125 2011-04-20 11:21:45Z ibiru $
 # Maintainer: James Rayner <james@archlinux.org>
 # Maintainer: Alexander Fehr <pizzapunk gmail com>
 # Contributor: Sebastian Sareyko <public@nooms.de>
 
 pkgname=nitrogen
-pkgver=1.5.1
+pkgver=1.5.2
 pkgrel=1
 pkgdesc="Background browser and setter for X windows"
 arch=('i686' 'x86_64')
 url="http://projects.l3ib.org/nitrogen/"
 license=('GPL')
-depends=('gtkmm' 'hicolor-icon-theme' 'librsvg>=2.26')
+depends=('gtkmm' 'hicolor-icon-theme' 'librsvg')
 install=nitrogen.install
-source=(http://projects.l3ib.org/nitrogen/files/nitrogen-$pkgver.tar.gz)
-md5sums=('e683d7c10c17bd18eb9fd78c87c4e08c')
+source=(http://projects.l3ib.org/nitrogen/files/${pkgname}-${pkgver}.tar.gz)
+md5sums=('dd779a252a222eb9d329d74b809cfe73')
 
 build() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  ./configure --prefix=/usr
+  make
+}
 
-  ./configure --prefix=/usr || return 1
-  make || return 1
-  make DESTDIR="$pkgdir" install || return 1
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/orc/PKGBUILD b/extra/orc/PKGBUILD
index 5e1fc92ce..3c0ad40d6 100644
--- a/extra/orc/PKGBUILD
+++ b/extra/orc/PKGBUILD
@@ -1,7 +1,7 @@
-# $Id: PKGBUILD 98440 2010-11-08 23:53:36Z ibiru $
+# $Id: PKGBUILD 120120 2011-04-20 11:12:16Z ibiru $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 pkgname=orc
-pkgver=0.4.11
+pkgver=0.4.13
 pkgrel=1
 pkgdesc="The Oild Runtime Compiler"
 arch=('i686' 'x86_64')
@@ -10,14 +10,15 @@ url="http://code.entropywave.com/projects/orc/"
 depends=('glibc')
 options=('!libtool')
 source=(http://code.entropywave.com/download/${pkgname}/${pkgname}-${pkgver}.tar.gz)
-md5sums=('b8b0b148d319422c3ad250c29483b3c4')
+md5sums=('f6d0aed003f67c91933c22d9e5f1696a')
 
 build () {
     cd "${srcdir}/${pkgname}-${pkgver}"
-
-    ./configure --prefix=/usr \
-        --disable-static
+    ./configure --prefix=/usr --disable-static
     make
+}
+package() {
+    cd "${srcdir}/${pkgname}-${pkgver}"
     make DESTDIR=${pkgdir} install
     install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING"
 }
diff --git a/extra/php/PKGBUILD b/extra/php/PKGBUILD
index ee8e0a17c..d8daf9053 100644
--- a/extra/php/PKGBUILD
+++ b/extra/php/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 118966 2011-04-09 20:51:34Z pierre $
+# $Id: PKGBUILD 120015 2011-04-18 10:42:15Z pierre $
 # Maintainer: Pierre Schmitz <pierre@archlinux.de>
 
 pkgbase=php
@@ -24,7 +24,7 @@ pkgname=('php'
          'php-tidy'
          'php-xsl')
 pkgver=5.3.6
-pkgrel=2
+pkgrel=3
 _suhosinver=${pkgver}-0.9.10
 arch=('i686' 'x86_64')
 license=('PHP')
@@ -40,7 +40,7 @@ source=("http://www.php.net/distributions/${pkgbase}-${pkgver}.tar.bz2"
 md5sums=('2286f5a82a6e8397955a0025c1c2ad98'
          'fff1a38877142f3ae6036dbe5a85d0a6'
          '39eaa70d276fc3d45d6bcf6cd5ae1106'
-         '96ca078be6729b665be8a865535a97bf'
+         'dec2cbaad64e3abf4f0ec70e1de4e8e9'
          'b01be5f816988fcee7e78225836e5e27'
          'd50ff349da08110a7cc8c691ce2d0423'
          '07c4e412909ac65a44ec90e7a2c4bade')
diff --git a/extra/php/apache.conf b/extra/php/apache.conf
index 86344c803..c3ca0aad5 100644
--- a/extra/php/apache.conf
+++ b/extra/php/apache.conf
@@ -3,7 +3,11 @@
 <IfModule dir_module>
 	<IfModule php5_module>
 		DirectoryIndex index.php index.html
-		AddHandler application/x-httpd-php .php
-		AddHandler application/x-httpd-php-source .phps
+		<FilesMatch "\.php$">
+			SetHandler application/x-httpd-php
+		</FilesMatch>
+		<FilesMatch "\.phps$">
+			SetHandler application/x-httpd-php-source
+		</FilesMatch>
 	</IfModule>
-</IfModule>
\ No newline at end of file
+</IfModule>
diff --git a/extra/sofia-sip/PKGBUILD b/extra/sofia-sip/PKGBUILD
index 244979be8..74e54b92a 100644
--- a/extra/sofia-sip/PKGBUILD
+++ b/extra/sofia-sip/PKGBUILD
@@ -1,21 +1,25 @@
-# $Id: PKGBUILD 75544 2010-04-01 19:17:05Z ibiru $
+# $Id: PKGBUILD 120138 2011-04-20 11:51:10Z ibiru $
 # Maintainer : Ionut Biru <ibiru@archlinux.org>
 # Contributor: Bjorn Lindeijer <bjorn lindeijer nl>
 pkgname=sofia-sip
-pkgver=1.12.10
-pkgrel=2
+pkgver=1.12.11
+pkgrel=1
 pkgdesc="An open-source SIP User-Agent library"
 arch=('i686' 'x86_64')
 url="http://sofia-sip.sourceforge.net"
 options=('!libtool' 'zipman')
 license=('LGPL')
 depends=('glib2' 'openssl')
-source=(http://downloads.sourceforge.net/sofia-sip/$pkgname-$pkgver.tar.gz)
-md5sums=('9e07fde3ad2009e44d1100ca3950d02b')
+source=(http://downloads.sourceforge.net/sofia-sip/${pkgname}-${pkgver}.tar.gz)
+md5sums=('f3582c62080eeecd3fa4cd5d4ccb4225')
 
 build() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd "${srcdir}/${pkgname}-${pkgver}"
   ./configure --prefix=/usr --with-openssl
-  make || return 1
-  make DESTDIR="$pkgdir" install
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/wxpython/PKGBUILD b/extra/wxpython/PKGBUILD
index be600b600..ccb46efba 100644
--- a/extra/wxpython/PKGBUILD
+++ b/extra/wxpython/PKGBUILD
@@ -1,25 +1,21 @@
-# $Id: PKGBUILD 119109 2011-04-10 23:04:52Z eric $
+# $Id: PKGBUILD 120105 2011-04-20 04:06:15Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
-# Contributor: Andrew Wright <andreww@photism.org>
 
 pkgname=wxpython
-pkgver=2.8.11.0
-pkgrel=3
+pkgver=2.8.12.0
+pkgrel=1
 pkgdesc="A wxWidgets GUI toolkit for Python"
 arch=('i686' 'x86_64')
 license=('custom:wxWindows')
 url="http://www.wxpython.org"
 depends=('wxgtk' 'python2')
 makedepends=('mesa')
-source=(http://downloads.sourceforge.net/wxpython/wxPython-src-${pkgver}.tar.bz2 editra-aui.diff)
-md5sums=('63f73aae49e530852db56a31b57529fa'
-         '06c637c34c1570d8c82b870ce19c0622')
-sha1sums=('18982edc236a1d87e4eef018928358c925aa5b17'
-          '077fe341bf8822647934d6b1ea82ce9b0adbf93a')
+source=(http://downloads.sourceforge.net/wxpython/wxPython-src-${pkgver}.tar.bz2)
+md5sums=('402e0b81e06f596d849e221a7a76acc6')
+sha1sums=('f9ce806dcb5517beb6e3d2ee0ecbf8e569b7f8e4')
 
 build() {
   cd "${srcdir}/wxPython-src-${pkgver}"
-  patch -p1 < ../editra-aui.diff
   ./configure --prefix=/usr --libdir=/usr/lib --with-gtk=2 --with-opengl --enable-unicode \
     --enable-graphics_ctx --with-gnomeprint --disable-optimize --enable-mediactrl \
     --with-libpng=sys --with-libxpm=sys --with-libjpeg=sys --with-libtiff=sys
diff --git a/extra/xfce4-xkb-plugin/PKGBUILD b/extra/xfce4-xkb-plugin/PKGBUILD
index 2cabd66df..98f79e4db 100644
--- a/extra/xfce4-xkb-plugin/PKGBUILD
+++ b/extra/xfce4-xkb-plugin/PKGBUILD
@@ -1,32 +1,23 @@
-# $Id: PKGBUILD 107269 2011-01-22 22:04:45Z andyrtr $
+# $Id: PKGBUILD 120152 2011-04-20 16:40:20Z andyrtr $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 # Contributor: Tobias Kieslich <tobias (at) archlinux.org>
 
 pkgname=xfce4-xkb-plugin
-pkgver=0.5.3.3
-pkgrel=4
+pkgver=0.5.4.0
+pkgrel=1
 pkgdesc="plugin to switch keyboard layouts for the Xfce4 panel"
 arch=(i686 x86_64)
 license=('custom')
 url="http://goodies.xfce.org/projects/panel-plugins/xfce4-xkb-plugin"
 groups=('xfce4-goodies')
-depends=('xfce4-panel' 'libxfcegui4' 'libxklavier>=5.0' 'librsvg')
+depends=('xfce4-panel' 'libxklavier>=5.0' 'librsvg')
 makedepends=('intltool')
 options=('!libtool')
-source=(http://archive.xfce.org/src/panel-plugins/${pkgname}/0.5/${pkgname}-${pkgver}.tar.gz
-        xfce4-xkb-plugin-0.5.3.3-libxklavier.patch
-	crashfix.diff)
-md5sums=('b233cc9de1cbace075eaf6e2c9a8e685'
-         '781165ce1bc08059ae8e846c45c0bab2'
-         '4faeaaea7d294cbad2972af964508086')
+source=(http://archive.xfce.org/src/panel-plugins/${pkgname}/0.5/${pkgname}-${pkgver}.tar.bz2)
+md5sums=('3ea1efe366367af660e6e1d24a240b5f')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
-  patch -Np1 -i "${srcdir}/xfce4-xkb-plugin-0.5.3.3-libxklavier.patch"
-
-  # https://bugs.archlinux.org/task/21067 - http://bugzilla.xfce.org/show_bug.cgi?id=6477
-  patch -Np1 -i ${srcdir}/crashfix.diff
-  
   ./configure --prefix=/usr \
 	--sysconfdir=/etc \
 	--libexecdir=/usr/lib \