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

Conflicts:
	community/cmus/PKGBUILD
	community/ettercap/PKGBUILD
	community/gnunet/PKGBUILD
	extra/fltk/PKGBUILD
	extra/libcanberra/PKGBUILD

2 files changed, 19 insertions, 38 deletions

diff --git a/community/ettercap/PKGBUILD b/community/ettercap/PKGBUILD
index d23dd0e97..79fa70f9d 100644
--- a/community/ettercap/PKGBUILD
+++ b/community/ettercap/PKGBUILD
@@ -1,44 +1,35 @@
-# $Id: PKGBUILD 68331 2012-03-21 20:33:50Z andrea $
+# $Id: PKGBUILD 79575 2012-11-07 21:26:51Z jelle $
 # Maintainer:
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgbase=ettercap
 pkgname=('ettercap' 'ettercap-gtk')
-pkgver=NG_0.7.4.2
-_origver=${pkgver/_/-}
-pkgrel=2
+pkgver=0.7.5
+pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 url="http://ettercap.sourceforge.net/"
 license=('GPL')
-makedepends=('libpcap' 'libltdl' 'libnet' 'gtk2' 'hicolor-icon-theme')
+makedepends=('ghostscript' 'cmake' 'libpcap' 'libltdl' 'libnet' 'gtk2')
 options=('!libtool' '!makeflags' '!emptydirs')
-source=("http://drizztbsd.github.com/${pkgbase}/dist/${pkgbase}-${_origver}.tar.gz")
+source=("http://sourceforge.net/projects/ettercap/files/$pkgbase/$pkgver-Assimilation/$pkgbase-$pkgver.tar.gz")
 md5sums=('ab2354bf9c91195f06ad0b5d058565a4')
 
 build() {
   cd "${srcdir}"
-  sed -i 's/su-to-root -c/gksu/' ${pkgbase}-${_origver}/desktop/ettercap.desktop
+#sed -i 's/su-to-root -c/gksu/' ${pkgbase}-${pkgver}/desktop/ettercap.desktop
 
-  cp -r ${pkgbase}-${_origver} ${pkgbase}-${_origver}-gtk
+  cp -r ${pkgbase}-${pkgver} ${pkgbase}-${pkgver}-gtk
 
-  cd ${pkgbase}-${_origver}
-  ./configure --prefix=/usr \
-              --sysconfdir=/etc \
-              --mandir=/usr/share/man \
-              --datarootdir=/usr/share \
-              --enable-plugins \
-              --enable-https \
-              --disable-gtk
+  cd ${pkgbase}-${pkgver}
+  mkdir build
+  cd build
+  cmake -D ENABLE_GTK=OFF -D CMAKE_INSTALL_PREFIX=/usr -D INSTALL_PREFX=/usr -D CMAKE_BUILD_TYPE=RELEASE ../
   make
 
-  cd ../${pkgbase}-${_origver}-gtk
-  ./configure --prefix=/usr \
-              --sysconfdir=/etc \
-              --mandir=/usr/share/man \
-              --datarootdir=/usr/share \
-              --enable-plugins \
-              --enable-https \
-              --enable-gtk
+  cd "$srcdir"/${pkgbase}-${pkgver}-gtk
+  mkdir build
+  cd build
+  cmake  -D INSTALL_PREFX=/usr -D CMAKE_BUILD_TYPE=RELEASE ../
   make
 }
 
@@ -47,24 +38,15 @@ package_ettercap() {
   depends=('openssl' 'libpcap' 'pcre' 'libltdl' 'libnet')
   backup=('etc/etter.conf')
 
-  cd "${srcdir}"/${pkgbase}-${_origver}
+  cd "${srcdir}"/${pkgbase}-${pkgver}/build
   make DESTDIR="${pkgdir}" install
 }
 
 package_ettercap-gtk() {
   pkgdesc="A network sniffer/interceptor/logger for ethernet LANs - GTK"
-  depends=('ettercap' 'gtk2' 'hicolor-icon-theme')
-  optdepends=('gksu: to run ettercap from the menu')
-  install=ettercap-gtk.install
+  depends=('ettercap' 'gtk2')
 
-  cd "${srcdir}"/${pkgbase}-${_origver}-gtk
+  cd "${srcdir}"/${pkgbase}-${pkgver}-gtk/build
   install -Dm755 src/ettercap "${pkgdir}"/usr/bin/ettercap-gtk
-  install -Dm644 desktop/ettercap.desktop \
-    "${pkgdir}"/usr/share/applications/ettercap.desktop
-  install -Dm644 share/ettercap.png \
-    "${pkgdir}"/usr/share/ettercap/ettercap.png
-  install -Dm644 desktop/ettercap.xpm \
-    "${pkgdir}"/usr/share/icons/hicolor/32x32/apps/ettercap.xpm
-  install -Dm644 desktop/ettercap.svg \
-    "${pkgdir}"/usr/share/icons/hicolor/scalable/apps/ettercap.svg
 }
+md5sums=('037b28cd94efa086a795060fc0f76080')
diff --git a/community/ettercap/ettercap-gtk.install b/community/ettercap/ettercap-gtk.install
index 1a05f573e..0b09f5904 100644
--- a/community/ettercap/ettercap-gtk.install
+++ b/community/ettercap/ettercap-gtk.install
@@ -1,5 +1,4 @@
 post_install() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
 }
 
 post_upgrade() {