Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el

Conflicts:
	community/apcupsd/PKGBUILD
	community/bmp-musepack/PKGBUILD
	community/bmp-wma/PKGBUILD
	community/bonnie++/PKGBUILD
	community/cantata/PKGBUILD
	community/checkinstall/PKGBUILD
	community/chrootuid/PKGBUILD
	community/compiz-bcop/PKGBUILD
	community/compiz-fusion-plugins-extra/PKGBUILD
	community/compiz-fusion-plugins-main/PKGBUILD
	community/compiz/PKGBUILD
	community/compizconfig-backend-gconf/PKGBUILD
	community/compizconfig-python/PKGBUILD
	community/ekg2/PKGBUILD
	community/emerald/PKGBUILD
	community/fbgetty/PKGBUILD
	community/flumotion/PKGBUILD
	community/leafnode/PKGBUILD
	community/libcompizconfig/PKGBUILD
	community/libdnet/PKGBUILD
	community/libee/PKGBUILD
	community/libtxc_dxtn/PKGBUILD
	community/linux-tools/PKGBUILD
	community/openntpd/PKGBUILD
	community/osiris/PKGBUILD
	community/perl-package-stash-xs/PKGBUILD
	community/perl-params-util/PKGBUILD
	community/procstatd/PKGBUILD
	community/scponly/PKGBUILD
	community/sniffit/PKGBUILD
	community/synergy/PKGBUILD
	community/turbojpeg/PKGBUILD
	community/unbound/PKGBUILD
	community/uucp/PKGBUILD
	core/gawk/PKGBUILD
	core/ifenslave/PKGBUILD
	core/jfsutils/PKGBUILD
	core/openldap/PKGBUILD
	core/rfkill/PKGBUILD
	core/systemd/PKGBUILD
	core/wireless_tools/PKGBUILD
	core/xinetd/PKGBUILD
	extra/avahi/PKGBUILD
	extra/calligra/PKGBUILD
	extra/clutter-gst/PKGBUILD
	extra/flac/PKGBUILD
	extra/hddtemp/PKGBUILD
	extra/libbluray/PKGBUILD
	extra/libdmx/PKGBUILD
	extra/libfs/PKGBUILD
	extra/libjpeg-turbo/PKGBUILD
	extra/libtiff/PKGBUILD
	extra/libxau/PKGBUILD
	extra/libxfixes/PKGBUILD
	extra/licq/PKGBUILD
	extra/mariadb/PKGBUILD
	extra/mesa/PKGBUILD
	extra/perl-guard/PKGBUILD
	extra/perl-template-toolkit/PKGBUILD
	extra/pidgin/PKGBUILD
	extra/pigeonhole/PKGBUILD
	extra/poppler/PKGBUILD
	extra/postgresql/PKGBUILD
	extra/python-geoip/PKGBUILD
	extra/python/PKGBUILD
	extra/samba/PKGBUILD
	extra/sqlite/PKGBUILD
	extra/vde2/PKGBUILD
	extra/vim/PKGBUILD
	extra/vlc/PKGBUILD
	extra/wireshark/PKGBUILD
	extra/xfce4-dict/PKGBUILD
	libre/libquicktime-libre/PKGBUILD
	libre/xscreensaver-libre/PKGBUILD

1 files changed, 11 insertions, 7 deletions

diff --git a/community/dsniff/PKGBUILD b/community/dsniff/PKGBUILD
index d7bcb0f4a..e0a357243 100644
--- a/community/dsniff/PKGBUILD
+++ b/community/dsniff/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 61947 2012-01-11 15:21:36Z stephane $
+# $Id: PKGBUILD 91568 2013-05-24 09:42:47Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: ViNS <gladiator@fastwebnet.it>
 
 pkgname=dsniff
 pkgver=2.4b1
-pkgrel=21
+pkgrel=22
 pkgdesc="Collection of tools for network auditing and penetration testing"
 url="http://www.monkey.org/~dugsong/dsniff/"
 arch=('i686' 'x86_64' 'mips64el')
@@ -15,22 +15,26 @@ source=("http://www.monkey.org/~dugsong/${pkgname}/beta/$pkgname-$pkgver.tar.gz"
 md5sums=('2f761fa3475682a7512b0b43568ee7d6'
          'fbc9f62f9ab2f98f24f53ad497c1ce5d')
 
-build() {
+prepare() {
   cd $srcdir/$pkgname-2.4
   patch -N < "${srcdir}"/dsniff_2.4b1+debian-18.diff
   for i in *.dpatch; do
     patch -N < "$i"
   done
+  sed -i 's|${CC-cc} -E|${CC-cc} -O2 -E|g' configure
+}
 
-  LDFLAGS="-lresolv -lglib-2.0 -lgthread-2.0 $LDFLAGS" ./configure --prefix=/usr
-  make
+build() {
+  cd $srcdir/$pkgname-2.4
+  LDFLAGS="-lresolv -lglib-2.0 -lgthread-2.0 $LDFLAGS" ./configure \
+    --prefix=/usr --sbindir=/usr/bin
+  make -j1
 }
 
 package() {
   cd "$srcdir"/$pkgname-2.4
-  make prefix="$pkgdir"/usr install
+  make install_prefix="$pkgdir" install
   install -D -m0644 LICENSE "$pkgdir"/usr/share/licenses/${pkgname}/LICENSE
-
   install -d "$pkgdir"/usr/share
   mv "$pkgdir"/usr/man "$pkgdir"/usr/share/
 }