8 files changed, 15 insertions, 73 deletions
diff --git a/community/ffmpeg-compat/PKGBUILD b/community/ffmpeg-compat/PKGBUILD
index f7baae1c0..7963a16ff 100644
--- a/community/ffmpeg-compat/PKGBUILD
+++ b/community/ffmpeg-compat/PKGBUILD
@@ -7,7 +7,7 @@
 
 pkgname=ffmpeg-compat
 pkgver=0.10.8
-pkgrel=3
+pkgrel=4
 epoch=1
 pkgdesc='Complete and free Internet live audio and video broadcasting solution for Linux/Unix'
 arch=('i686' 'x86_64')
@@ -20,7 +20,6 @@ depends=(
       'v4l-utils' 'x264' 'xvidcore' 'zlib'
       )
 makedepends=('libvdpau' 'yasm')
-install=$pkgname.install
 source=(http://ffmpeg.org/releases/ffmpeg-$pkgver.tar.bz2)
 sha256sums=('2e371088a71656be41b4ff70ae7e80a1d88c5149d6209013c9cce4b84278cbc8')
 
@@ -71,7 +70,7 @@ package() {
   rm -rf "$pkgdir"/usr/{bin,share}
 
   install -dm755 "$pkgdir"/etc/ld.so.conf.d/
-  echo '/usr/lib/\n/usr/lib/ffmpeg-compat/' > "$pkgdir"/etc/ld.so.conf.d/$pkgname.conf
+  echo -e '/usr/lib/\n/usr/lib/ffmpeg-compat/' > "$pkgdir"/etc/ld.so.conf.d/$pkgname.conf
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/community/ffmpeg-compat/ffmpeg-compat.install b/community/ffmpeg-compat/ffmpeg-compat.install
deleted file mode 100644
index 91de66756..000000000
--- a/community/ffmpeg-compat/ffmpeg-compat.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-  usr/bin/ldconfig -r .
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/community/midori-gtk3/PKGBUILD b/community/midori-gtk3/PKGBUILD
index 38ee8efcc..8f2deb460 100644
--- a/community/midori-gtk3/PKGBUILD
+++ b/community/midori-gtk3/PKGBUILD
@@ -1,28 +1,20 @@
-# $Id: PKGBUILD 94966 2013-08-01 20:26:43Z arodseth $
+# $Id: PKGBUILD 94988 2013-08-02 13:05:49Z arodseth $
 # Maintainer:  Alexander Rødseth <rodseth@gmail.com>
-# Maintainer:  Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
+# Contributor:  Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
 # Contributor: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: rabyte <rabyte.at.gmail.dot.com>
 # Contributor: Johannes Krampf <wuischke.at.amule.dot.org>
 # Contributor: Bartłomiej Piotrowski <barthalion@gmail.com>
 
-#
-# Note:
-#
-# * Depending on and compiling with 'granite' didn't work last time I tried.
-# * If steadyflow is moved to [community] or [extra], it can be added as an optdepends.
-#
-
 pkgname=midori-gtk3
 pkgver=0.5.4
-pkgrel=1
+pkgrel=2
 pkgdesc='Lightweight web browser (GTK3)'
 arch=('x86_64' 'i686')
 url='http://www.midori-browser.org/'
 license=('LGPL2.1')
 install='midori.install'
 conflicts=('midori')
-replaces=('midori')
 provides=('midori')
 depends=('libzeitgeist' 'webkitgtk' 'libnotify' 'libxss' 'hicolor-icon-theme' 'desktop-file-utils' 'libunique3' 'gcr')
 makedepends=('pkg-config' 'bzr' 'python2' 'libxml2' 'gtk3' 'intltool' 'python2-docutils' 'libsoup' 'vala' 'librsvg')
@@ -35,6 +27,7 @@ sha256sums=('d4ee77f3dd9bf2c07cea7674d533e77960e9346bd8b5482582ccb3cdaf182022')
 build() {
   cd "$srcdir/midori_${pkgver}_all_"
 
+  # if granite is present, the build fails (last time I tried)
   python2 ./waf configure \
     --prefix=/usr \
     --enable-gtk3 \
diff --git a/community/midori/PKGBUILD b/community/midori/PKGBUILD
index e0cbe2f8a..f29243781 100644
--- a/community/midori/PKGBUILD
+++ b/community/midori/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 94963 2013-08-01 19:50:34Z arodseth $
+# $Id: PKGBUILD 94981 2013-08-02 10:17:44Z arodseth $
 # Maintainer:  Alexander Rødseth <rodseth@gmail.com>
 # Maintainer:  Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
 # Contributor: Andreas Radke <andyrtr@archlinux.org>
@@ -6,23 +6,15 @@
 # Contributor: Johannes Krampf <wuischke.at.amule.dot.org>
 # Contributor: Bartłomiej Piotrowski <barthalion@gmail.com>
 
-#
-# Note:
-#
-# * Depending on and compiling with 'granite' didn't work last time I tried.
-# * To compile with gtk3 instead of gtk2, depend on 'webkitgtk' and 'gtk3' then --enable-gtk3.
-# * If steadyflow is moved to [community] or [extra], it can be added as an optdepends.
-#
-
 pkgname=midori
 pkgver=0.5.4
-pkgrel=3
+pkgrel=4
 pkgdesc='Lightweight web browser (GTK2)'
 arch=('x86_64' 'i686')
 url='http://www.midori-browser.org/'
 license=('LGPL2.1')
 install='midori.install'
-depends=('libzeitgeist' 'webkitgtk2' 'libnotify' 'libxss' 'hicolor-icon-theme' 'desktop-file-utils' 'libunique3' 'gcr')
+depends=('libzeitgeist' 'webkitgtk2' 'libnotify' 'libxss' 'hicolor-icon-theme' 'desktop-file-utils' 'libunique' 'gcr')
 makedepends=('pkg-config' 'bzr' 'python2' 'libxml2' 'gtk2' 'intltool' 'python2-docutils' 'libsoup' 'vala' 'librsvg')
 optdepends=('gstreamer0.10-ugly-plugins: HTML5 videos support'
             'aria2: download utility')
diff --git a/community/xdebug/PKGBUILD b/community/xdebug/PKGBUILD
index b6b2cc3e9..34050cc83 100644
--- a/community/xdebug/PKGBUILD
+++ b/community/xdebug/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 92281 2013-06-03 13:37:54Z spupykin $
+# $Id: PKGBUILD 94986 2013-08-02 13:00:08Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Jonathan Wiersma <arch aur at jonw dot org>
 # Contributor: Jonathan Wiersma <arch aur at jonw dot org>
@@ -6,20 +6,17 @@
 
 pkgname=xdebug
 pkgver=2.2.3
-pkgrel=1
+pkgrel=2
 pkgdesc="PHP debugging extension"
 arch=('i686' 'x86_64')
 url="http://www.xdebug.org"
 license=('GPL')
 depends=('php')
-install="${pkgname}.install"
 backup=('etc/php/conf.d/xdebug.ini')
 source=(http://www.xdebug.org/files/$pkgname-$pkgver.tgz
-	xdebug-5.2.ini
 	xdebug.ini)
 md5sums=('e49cec9861b45dc0b36eae33bf8a14fa'
-         '6b7fdbbe0bf381bda40e77e29981f439'
-         '68de800943369d4c76bdf7eb35c8463b')
+         '6a1f2ef91c632d4c9b7b218cd2e278ef')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
@@ -39,11 +36,6 @@ package() {
   make DESTDIR=$pkgdir install
 
   cd $srcdir/$pkgname-$pkgver
-  if [ "$PHPVER" \< "5.3.0" ] ; then
-    install -D -m 744 modules/xdebug.so $pkgdir/usr/lib/php/modules/xdebug.so
-    install -D -m 644 $srcdir/xdebug-5.2.ini $pkgdir/etc/php/conf.d/xdebug.ini
-  else
-    install -D -m 744 modules/xdebug.so $pkgdir/usr/lib/php/modules/xdebug.so
-    install -D -m 644 $srcdir/xdebug.ini $pkgdir/etc/php/conf.d/xdebug.ini
-  fi
+  make INSTALL_ROOT=$pkgdir install
+  install -D -m 644 $srcdir/xdebug.ini $pkgdir/etc/php/conf.d/xdebug.ini
 }
diff --git a/community/xdebug/xdebug-5.2.ini b/community/xdebug/xdebug-5.2.ini
deleted file mode 100644
index 9beb7fc30..000000000
--- a/community/xdebug/xdebug-5.2.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-zend_extension=/usr/lib/php/xdebug.so
-;xdebug.remote_enable=on
-;xdebug.remote_host=127.0.0.1
-;xdebug.remote_port=9000
-;xdebug.remote_handler=dbgp
diff --git a/community/xdebug/xdebug.ini b/community/xdebug/xdebug.ini
index c6c9222ea..9062dfc8b 100644
--- a/community/xdebug/xdebug.ini
+++ b/community/xdebug/xdebug.ini
@@ -1,4 +1,4 @@
-zend_extension=/usr/lib/php/modules/xdebug.so
+;zend_extension=/usr/lib/php/modules/xdebug.so
 ;xdebug.remote_enable=on
 ;xdebug.remote_host=127.0.0.1
 ;xdebug.remote_port=9000
diff --git a/community/xdebug/xdebug.install b/community/xdebug/xdebug.install
deleted file mode 100644
index a7ec0b9cc..000000000
--- a/community/xdebug/xdebug.install
+++ /dev/null
@@ -1,18 +0,0 @@
-post_install() {
-  local _configfile=/etc/php/conf.d/xdebug.ini
-  echo " ==> You may wish to uncomment/change the settings found in "
-  echo "     $_configfile"
-  echo ""
-}
-
-post_upgrade() {
-  local _configfile=/etc/php/conf.d/xdebug.ini
-  local PHPVER=$(php -r 'echo phpversion();')
-  post_install $1
-
-  if [ "$PHPVER" \< "5.3" ] ; then
-    echo " ==> You are currenty running a version of php < 5.3."
-    echo "     When/if you upgrade php to a version >= 5.3, you will need to reinstall $pkgname."
-    echo ""
-  fi
-}