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

Conflicts:
	community/bitcoin/PKGBUILD
	community/ecryptfs-utils/PKGBUILD
	community/erlang/PKGBUILD
	community/esmtp/PKGBUILD
	community/gmic/PKGBUILD
	community/ibus-sunpinyin/PKGBUILD
	community/libev/PKGBUILD
	community/libmirage/PKGBUILD
	community/libraw/PKGBUILD
	community/lilypond/PKGBUILD
	community/luajit/PKGBUILD
	community/matchbox-window-manager/PKGBUILD
	community/miniupnpc/PKGBUILD
	community/mplayer2/PKGBUILD
	community/mumble/PKGBUILD
	community/oss/PKGBUILD
	community/pidgin-lwqq/PKGBUILD
	community/postgis/PKGBUILD
	community/python2-pytables/PKGBUILD
	community/qmc2/PKGBUILD
	community/qtfm/PKGBUILD
	community/ruby-gtk3/PKGBUILD
	community/tea/PKGBUILD
	community/yacpi/PKGBUILD
	core/bridge-utils/PKGBUILD
	core/gcc/PKGBUILD
	core/libsasl/PKGBUILD
	core/lvm2/PKGBUILD
	core/net-tools/PKGBUILD
	core/ppp/PKGBUILD
	core/pptpclient/PKGBUILD
	core/sdparm/PKGBUILD
	core/systemd/PKGBUILD
	core/sysvinit-tools/PKGBUILD
	extra/aisleriot/PKGBUILD
	extra/arora/PKGBUILD
	extra/bluez-hcidump/PKGBUILD
	extra/bluez/PKGBUILD
	extra/cups/PKGBUILD
	extra/cyrus-sasl/PKGBUILD
	extra/dhcp/PKGBUILD
	extra/gnome-bluetooth/PKGBUILD
	extra/gnome-desktop/PKGBUILD
	extra/gnutls/PKGBUILD
	extra/gts/PKGBUILD
	extra/guile/PKGBUILD
	extra/harfbuzz/PKGBUILD
	extra/iptraf-ng/PKGBUILD
	extra/json-c/PKGBUILD
	extra/kdenetwork/PKGBUILD
	extra/kdepim/PKGBUILD
	extra/kdesdk-kate/PKGBUILD
	extra/libatasmart/PKGBUILD
	extra/libbsd/PKGBUILD
	extra/libdmtx/PKGBUILD
	extra/libhangul/PKGBUILD
	extra/libindi/PKGBUILD
	extra/libpeas/PKGBUILD
	extra/libsmbios/PKGBUILD
	extra/libspiro/PKGBUILD
	extra/libsrtp/PKGBUILD
	extra/libxml2/PKGBUILD
	extra/libxrender/PKGBUILD
	extra/libxvmc/PKGBUILD
	extra/llvm/PKGBUILD
	extra/maxima/PKGBUILD
	extra/msmtp/PKGBUILD
	extra/ortp/PKGBUILD
	extra/perl-dbd-sqlite/PKGBUILD
	extra/perl-yaml-syck/PKGBUILD
	extra/php/PKGBUILD
	extra/pm-utils/PKGBUILD
	extra/pulseaudio/PKGBUILD
	extra/pyqt4/PKGBUILD
	extra/scim-anthy/PKGBUILD
	extra/scim-chewing/PKGBUILD
	extra/scim-m17n/PKGBUILD
	extra/scim/PKGBUILD
	extra/ssmtp/PKGBUILD
	extra/texmacs/PKGBUILD
	extra/v86d/PKGBUILD
	extra/vlc/PKGBUILD
	extra/webkitgtk/PKGBUILD
	extra/webkitgtk2/PKGBUILD
	extra/wireshark/PKGBUILD
	extra/zsh/PKGBUILD
	libre/bogofilter-libre/PKGBUILD
	libre/ecasound-libre/PKGBUILD
	libre/libretools/libretools.install
	libre/mc-libre/PKGBUILD

1 files changed, 13 insertions, 8 deletions

diff --git a/community/wvstreams/PKGBUILD b/community/wvstreams/PKGBUILD
index 0f7797cd2..e81d55fad 100644
--- a/community/wvstreams/PKGBUILD
+++ b/community/wvstreams/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 75083 2012-08-13 16:55:40Z bluewind $
+# $Id: PKGBUILD 92257 2013-06-03 11:15:30Z allan $
 # Maintainer:
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: dorphell <dorphell@archlinux.org>
 
 pkgname=wvstreams
 pkgver=4.6.1
-pkgrel=5
+pkgrel=6
 pkgdesc="A network programming library written in C++"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://alumnit.ca/wiki/?page=WvStreams"
@@ -19,14 +19,19 @@ md5sums=('2760dac31a43d452a19a3147bfde571c'
          'df423c68134a09439b3961c34635e0b4')
 options=('!makeflags')
 
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
+prepare() {
+  cd ${pkgname}-${pkgver}
 
   patch -p0 -i "$srcdir/wvstreams-4.6.1-glibc212.patch"
   patch -p0 -i "$srcdir/wvstreams-4.6.1-gcc47.patch"
   patch -p1 -i "$srcdir/openssl-buildfix.patch"
+}
+
+build() {
+  cd ${pkgname}-${pkgver}
 
   ./configure --prefix=/usr \
+     --sbin=/usr/bin \
      --sysconfdir=/etc \
      --localstatedir=/var \
      --without-dbus \
@@ -38,12 +43,12 @@ build() {
 }
 
 package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install
+  cd ${pkgname}-${pkgver}
+  make DESTDIR="${pkgdir}" install
   
   # FS#15974
   # --without-dbus still installs the pkg-config file
-  rm ${pkgdir}/usr/lib/pkgconfig/libwvdbus.pc
+  rm "${pkgdir}/usr/lib/pkgconfig/libwvdbus.pc"
   # --without-qt still installs the pkg-config file
-  rm ${pkgdir}/usr/lib/pkgconfig/libwvqt.pc
+  rm "${pkgdir}/usr/lib/pkgconfig/libwvqt.pc"
 }