Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el

Conflicts:
	community/abe/PKGBUILD
	community/account-plugins/PKGBUILD
	community/adesklets/PKGBUILD
	community/aircrack-ng/PKGBUILD
	community/audit/PKGBUILD
	community/bchunk/PKGBUILD
	community/bibutils/PKGBUILD
	community/cantata/PKGBUILD
	community/cdck/PKGBUILD
	community/cinnamon-control-center/PKGBUILD
	community/clusterssh/PKGBUILD
	community/consonance/PKGBUILD
	community/credentials-preferences/PKGBUILD
	community/dee/PKGBUILD
	community/dosbox/PKGBUILD
	community/drbd/PKGBUILD
	community/dvdisaster/PKGBUILD
	community/ekg/PKGBUILD
	community/ekg2/PKGBUILD
	community/emelfm2/PKGBUILD
	community/erlang/PKGBUILD
	community/ettercap/PKGBUILD
	community/evilwm/PKGBUILD
	community/fatrat/PKGBUILD
	community/fcitx-mozc/PKGBUILD
	community/fcrackzip/PKGBUILD
	community/ffmpegsource/PKGBUILD
	community/fssos-nsvs/PKGBUILD
	community/geda-gaf/PKGBUILD
	community/gnome-applets/PKGBUILD
	community/gnome-panel/PKGBUILD
	community/gnustep-make/PKGBUILD
	community/gwibber/PKGBUILD
	community/html2text/PKGBUILD
	community/intellij-idea-libs/PKGBUILD
	community/libcgns2/PKGBUILD
	community/libmatio/PKGBUILD
	community/librcc/PKGBUILD
	community/libsignon-glib/PKGBUILD
	community/linux-tools/PKGBUILD
	community/minitube/PKGBUILD
	community/mpdscribble/PKGBUILD
	community/mplayer2/PKGBUILD
	community/musepack-tools/PKGBUILD
	community/nginx/PKGBUILD
	community/pam_pwcheck/PKGBUILD
	community/portaudio/PKGBUILD
	community/portaudio_cpp/PKGBUILD
	community/prelink/PKGBUILD
	community/projectm/PKGBUILD
	community/prosody/PKGBUILD
	community/python-basemap/PKGBUILD
	community/qgit/PKGBUILD
	community/raptor1/PKGBUILD
	community/sensors-applet/PKGBUILD
	community/signon-keyring-extension/PKGBUILD
	community/signon-plugin-oauth2/PKGBUILD
	community/signon-ui/PKGBUILD
	community/sshguard/PKGBUILD
	community/tea/PKGBUILD
	community/tint2/PKGBUILD
	community/tremulous/PKGBUILD
	community/vobcopy/PKGBUILD
	community/windowlab/PKGBUILD
	community/xdelta/PKGBUILD
	community/xmms2/PKGBUILD
	community/xosd/PKGBUILD
	core/gdbm/PKGBUILD
	core/heirloom-mailx/PKGBUILD
	core/libffi/PKGBUILD
	core/procps-ng/PKGBUILD
	core/systemd/PKGBUILD
	core/tar/PKGBUILD
	cross/mips64el-unknown-linux-gnu-linux-libre-api-headers/PKGBUILD
	extra/arj/PKGBUILD
	extra/audacity/PKGBUILD
	extra/cdparanoia/PKGBUILD
	extra/elfutils/PKGBUILD
	extra/fltk/PKGBUILD
	extra/gnome-python-desktop/PKGBUILD
	extra/gstreamer/PKGBUILD
	extra/gtk2/PKGBUILD
	extra/gvfs/PKGBUILD
	extra/imagemagick/PKGBUILD
	extra/indent/PKGBUILD
	extra/kdepim/PKGBUILD
	extra/lcms/PKGBUILD
	extra/lesstif/PKGBUILD
	extra/libchewing/PKGBUILD
	extra/libdrm/PKGBUILD
	extra/libmodplug/PKGBUILD
	extra/libnotify/PKGBUILD
	extra/libsm/PKGBUILD
	extra/libxmu/PKGBUILD
	extra/libxpm/PKGBUILD
	extra/mariadb/PKGBUILD
	extra/mesa/PKGBUILD
	extra/mkvtoolnix/PKGBUILD
	extra/neon/PKGBUILD
	extra/ocaml/PKGBUILD
	extra/phonon-vlc/PKGBUILD
	extra/php-xcache/PKGBUILD
	extra/polkit/PKGBUILD
	extra/pycups/PKGBUILD
	extra/python-cairo/PKGBUILD
	extra/python/PKGBUILD
	extra/ruby/PKGBUILD
	extra/sqlite/PKGBUILD
	extra/talloc/PKGBUILD
	extra/thunar-archive-plugin/PKGBUILD
	extra/totem-plparser/PKGBUILD
	extra/totem/PKGBUILD
	extra/vinagre/PKGBUILD
	extra/vino/PKGBUILD
	extra/vlc/PKGBUILD
	extra/wget/PKGBUILD
	extra/xine-lib/PKGBUILD
	extra/xorg-server/PKGBUILD
	extra/xorg-twm/PKGBUILD
	extra/xorg-xclipboard/PKGBUILD
	extra/xorg-xclock/PKGBUILD
	extra/xorg-xkill/PKGBUILD
	extra/xorg-xlsclients/PKGBUILD
	extra/xorg-xman/PKGBUILD
	extra/xorg-xrdb/PKGBUILD
	extra/xpdf/PKGBUILD
	extra/xvidcore/PKGBUILD
	extra/yelp/PKGBUILD
	libre/audacious-plugins-libre/PKGBUILD
	libre/mc-libre/PKGBUILD
	libre/python2-reportlab-libre/PKGBUILD

1 files changed, 52 insertions, 39 deletions

diff --git a/community/prosody/PKGBUILD b/community/prosody/PKGBUILD
index 78a7aae01..2ab0743cc 100644
--- a/community/prosody/PKGBUILD
+++ b/community/prosody/PKGBUILD
@@ -1,59 +1,72 @@
-# $Id: PKGBUILD 96186 2013-08-21 12:28:21Z spupykin $
+# $Id: PKGBUILD 97026 2013-09-10 15:54:28Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Maintainer: Dwayne Bent <dbb.0@liqd.org>
+# Maintainer: Dwayne Bent <dbb@dbb.io>
 # Contributor: Paul-Sebastian Manole <brokenthorn@gmail.com>
+# Contributor: Timothée Ravier <tim@siosm.fr>
 
 pkgname=prosody
-pkgver=0.9.0
+pkgver=0.9.1
 pkgrel=1
-pkgdesc="Lightweight and extensible Jabber/XMPP server written in Lua."
+pkgdesc="Lightweight and extensible Jabber/XMPP server written in Lua"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://prosody.im/"
 license=('MIT')
-depends=('lua51' 'lua51-socket' 'lua51-expat' 'lua51-filesystem' 'libidn' 'openssl')
+depends=('lua51' 'lua51-socket' 'lua51-expat' 'lua51-filesystem' 'libidn'
+         'openssl')
 optdepends=('lua51-sec: TLS encryption support')
 install=prosody.install
 backup=('etc/logrotate.d/prosody'
-	'etc/prosody/prosody.cfg.lua')
-source=("http://prosody.im/depot/${pkgver}/prosody-${pkgver}.tar.gz"
-	'prosody.logrotated'
-	'fix-config.patch'
-	'prosody.tmpfile.d'
-	'prosody.service')
-md5sums=('cf0dd4f3389ab666d2d2b3a43464afc4'
-         '5b44aee99f1fa9e7f055e067688cafbd'
-         'a21d6a6efef8a08ae21109c2aa9c2fc7'
-         'e2f5a1df410b05696a30dcb058841084'
-         'e74045f27cb60908d535969906781f75')
+        'etc/prosody/prosody.cfg.lua')
+source=("http://prosody.im/downloads/source/${pkgname}-${pkgver}.tar.gz"{,.asc}
+        'prosody.logrotated'
+        'fix-config.patch'
+        'prosody.tmpfile.d'
+        'prosody.service')
+sha256sums=('f0e5e5fa27aa3ffec326b6c212adf2d86fb438133739d45e1232082ff0fbe06f'
+            'SKIP'
+            '5a2466b73bd069fb73be97a4e23b24e4c8dd1adb7db871cb8f5ab4094c1f967f'
+            '1b461d860b584c09ba4c16300a245f2580f1d0b74d774ae7567b7aac0f249587'
+            '3f5cc5db2cfe74c4edf91f60e692e04c3504025e893d0880114d52728a2c4bc4'
+            '16fbfb54bf21bb73ce9d9acacb60d47f237c35e842c5a00f1153f72f0d2f7f6b')
+sha256sums=('6cdea6fd6027bec621f7995709ca825a29aa5e066b321bfbb7785925c9f32cd5'
+            'SKIP'
+            '5a2466b73bd069fb73be97a4e23b24e4c8dd1adb7db871cb8f5ab4094c1f967f'
+            'db37b1b6bcd648f264164c5db5e754fc077671c74df6079c101384e146f4d6da'
+            '3f5cc5db2cfe74c4edf91f60e692e04c3504025e893d0880114d52728a2c4bc4'
+            '16fbfb54bf21bb73ce9d9acacb60d47f237c35e842c5a00f1153f72f0d2f7f6b')
+
+prepare() {
+  cd ${pkgname}-${pkgver}
+  patch -p1 < ../fix-config.patch
+  find . -type f -exec \
+    sed -i '1s,^#! \?/usr/bin/\(env \|\)lua$,#!/usr/bin/lua5.1,' {} \;
+}
 
 build() {
-    cd "$srcdir/prosody-$pkgver"
-    patch -p1 <$srcdir/fix-config.patch
-    find . -type f -exec \
-      sed -i '1s,^#! \?/usr/bin/\(env \|\)lua$,#!/usr/bin/lua5.1,' {} \;
-    ./configure --prefix=/usr --sysconfdir=/etc/prosody \
-        --datadir=/var/lib/prosody --with-lua-include=/usr/include/lua5.1
-    make
+  cd ${pkgname}-${pkgver}
+  ./configure --ostype=linux --prefix=/usr --sysconfdir=/etc/prosody \
+    --datadir=/var/lib/prosody --with-lua-include=/usr/include/lua5.1 \
+    --cflags="${CFLAGS} -fPIC -Wall -Wextra -D_GNU_SOURCE" \
+    --ldflags="${LDFLAGS} -shared"
+  make
 }
 
 package() {
-    cd "$srcdir/prosody-$pkgver"
-
-    make DESTDIR="$pkgdir" install
-    make DESTDIR="$pkgdir" install -C tools/migration
+  cd ${pkgname}-${pkgver}
+  make DESTDIR="${pkgdir}" install
+  make DESTDIR="${pkgdir}" install -C tools/migration
 
-    rm $pkgdir/etc/prosody/certs/*
+  install -Dm 0644 $srcdir/prosody.logrotated "${pkgdir}"/etc/logrotate.d/prosody
+  install -Dm 0644 $srcdir/prosody.tmpfile.d "${pkgdir}"/usr/lib/tmpfiles.d/prosody.conf
+  install -Dm 0644 $srcdir/prosody.service "${pkgdir}"/usr/lib/systemd/system/prosody.service
 
-    install -d "$pkgdir/etc/logrotate.d"
-    install -d "$pkgdir/var/log/prosody"
-    for i in tools/*.lua; do
-      install -Dm0644 $i $pkgdir/usr/share/prosody/$i
-    done
+  for i in tools/*.lua; do
+    install -Dm 0644 ${i} "${pkgdir}"/usr/share/prosody/${i}
+  done
 
-    install -o root -g root -m 644 "$srcdir/prosody.logrotated" \
-        "$pkgdir/etc/logrotate.d/prosody"
-
-    install -Dm0644 COPYING $pkgdir/usr/share/licenses/$pkgname/COPYING
-    install -Dm0644 $srcdir/prosody.tmpfile.d $pkgdir/usr/lib/tmpfiles.d/prosody.conf
-    install -Dm0644 $srcdir/prosody.service $pkgdir/usr/lib/systemd/system/prosody.service
+  install -Dm 0644 COPYING "${pkgdir}"/usr/share/licenses/${pkgname}/COPYING
+  install -dm 755 "${pkgdir}"/var/log/prosody
+  rm "${pkgdir}"/etc/prosody/certs/*
 }
+
+# vim: ft=sh syn=sh ts=2 sw=2