Sat Aug 6 23:14:27 UTC 2011

6 files changed, 59 insertions, 49 deletions

diff --git a/extra/cups/PKGBUILD b/extra/cups/PKGBUILD
index 43d36c2a6..1d3b15889 100644
--- a/extra/cups/PKGBUILD
+++ b/extra/cups/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 134142 2011-08-02 09:11:04Z jgc $
+# $Id: PKGBUILD 134554 2011-08-05 18:35:01Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 
 pkgbase="cups"
 pkgname=('libcups' 'cups')
-pkgver=1.4.7
-pkgrel=4
+pkgver=1.4.8
+pkgrel=1
 arch=('i686' 'x86_64')
 license=('GPL')
 url="http://www.cups.org/"
@@ -16,7 +16,7 @@ source=(ftp://ftp.easysw.com/pub/cups/${pkgver}/cups-${pkgver}-source.tar.bz2
         cups-no-gcrypt.patch
         cups cups.logrotate cups.pam)
 #options=('!emptydirs')
-md5sums=('1590033ab4c739b859aeb672fe849089'
+md5sums=('0ec52d3f3c69bc2ab5ed70c594edbce6'
          '8ebd390197501ffd709f0ee546937fd5'
          '9b8467a1e51d360096b70e2c3c081e6c'
          'c9ede95cfc8e76571bd8156f0a573e3b'
diff --git a/extra/dbus/PKGBUILD b/extra/dbus/PKGBUILD
index bcac66a7a..6def02fe7 100644
--- a/extra/dbus/PKGBUILD
+++ b/extra/dbus/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 128609 2011-06-24 14:05:28Z ibiru $
+# $Id: PKGBUILD 134376 2011-08-03 11:19:50Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Link Dupont <link@subpop.net>
 #
 pkgname=dbus
-pkgver=1.4.12
+pkgver=1.4.14
 pkgrel=1
 pkgdesc="Freedesktop.org message bus system"
 url="http://www.freedesktop.org/Software/dbus"
@@ -12,7 +12,7 @@ license=('GPL' 'custom')
 depends=("dbus-core>=${pkgver}" 'libx11')
 source=(http://dbus.freedesktop.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz
         30-dbus)
-md5sums=('104f2ea94c10a896dfb1edecb5714cb1'
+md5sums=('ae6de2562a57516cfabaf56903375ba9'
          'd14e59575f04e55d21a04907b6fd9f3c')
 
 build() {
diff --git a/extra/emacs/PKGBUILD b/extra/emacs/PKGBUILD
index 88b2e2eb0..c411dd4fc 100644
--- a/extra/emacs/PKGBUILD
+++ b/extra/emacs/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 113641 2011-03-10 11:31:08Z juergen $
+# $Id: PKGBUILD 134523 2011-08-05 07:55:30Z juergen $
 # Maintainer: Juergen Hoetzel <juergen@archlinux.org>
 # Contributor: Renchi Raju <renchi@green.tam.uiuc.edu>
 pkgname=emacs
-pkgver=23.3
+pkgver=23.3a
 pkgrel=1
 pkgdesc="The Emacs Editor"
 arch=(i686 x86_64)
@@ -12,30 +12,30 @@ options=(docs)
 replaces=(cedet)
 depends=('dbus-core' 'librsvg' 'gpm'  'giflib' 'libtiff'  'libxpm' 'libjpeg' 'gtk2' 'texinfo' 'hicolor-icon-theme' 'gconf')
 source=(ftp://ftp.gnu.org/gnu/emacs/$pkgname-$pkgver.tar.gz emacs.desktop)
-md5sums=('bf07c01ef473d8540c9c39f94506b1e6'
+md5sums=('20aef9ea5b5bf8050d39f8b1e96a1c04'
          '8af038d2ba4561271e935bb444ceb4e3')
 install=emacs.install
 
 build() {
-  cd $startdir/src/$pkgname-$pkgver
+  cd $startdir/src/$pkgname-${pkgver%[a-z]}
   mandir=/usr/share/man
-  
+
   # gcc 4.5 Workaround: http://gcc.gnu.org/bugzilla/show_bug.cgi?id=43904
   CFLAGS="${CFLAGS} -fno-optimize-sibling-calls"\
     ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib \
     --localstatedir=/var --mandir=${mandir} --without-sound --with-x-toolkit=gtk
-  make 
-  make DESTDIR=$startdir/pkg install 
+  make
+  make DESTDIR=$startdir/pkg install
 
   # remove conflict with ctags package
-  mv $startdir/pkg/usr/bin/{ctags,ctags.emacs} 
-  mv $startdir/pkg/usr/bin/{etags,etags.emacs} 
-  mv $startdir/pkg${mandir}/man1/{etags.1,etags.emacs.1} 
-  mv $startdir/pkg${mandir}/man1/{ctags.1,ctags.emacs.1} 
+  mv $startdir/pkg/usr/bin/{ctags,ctags.emacs}
+  mv $startdir/pkg/usr/bin/{etags,etags.emacs}
+  mv $startdir/pkg${mandir}/man1/{etags.1,etags.emacs.1}
+  mv $startdir/pkg${mandir}/man1/{ctags.1,ctags.emacs.1}
   # fix all the 777 perms on directories
-  find $startdir/pkg/usr/share/emacs/$pkgver -type d -exec chmod 755 {} \;
+  find $startdir/pkg/usr/share/emacs/${pkgver%[a-z]} -type d -exec chmod 755 {} \;
   # fix user/root permissions on usr/share files
-  find $startdir/pkg/usr/share/emacs/$pkgver -exec chown root.root {} \;
+  find $startdir/pkg/usr/share/emacs/${pkgver%[a-z]} -exec chown root.root {} \;
   # fix perms on /var/games
   chmod 775 ${startdir}/pkg/var/games
   chmod 775 ${startdir}/pkg/var/games/emacs
@@ -43,8 +43,8 @@ build() {
   chown -R root:50 ${startdir}/pkg/var/games
 
 
-  # fix  FS#9253 
+  # fix  FS#9253
   mkdir -p $startdir/pkg/usr/share/pixmaps ${startdir}/pkg/usr/share/applications
   install -D -m644 ${startdir}/src/${pkgname}.desktop   ${startdir}/pkg/usr/share/applications
-  ln -s  ../emacs/${pkgver}/etc/images/icons/hicolor/48x48/apps/emacs.png $startdir/pkg/usr/share/pixmaps/emacs-icon.png  
+  ln -s  ../emacs/${pkgver%[a-z]}/etc/images/icons/hicolor/48x48/apps/emacs.png $startdir/pkg/usr/share/pixmaps/emacs-icon.png
 }
diff --git a/extra/ettercap/PKGBUILD b/extra/ettercap/PKGBUILD
index c247ae6a9..f24789350 100644
--- a/extra/ettercap/PKGBUILD
+++ b/extra/ettercap/PKGBUILD
@@ -1,36 +1,46 @@
-# $Id: PKGBUILD 75608 2010-04-01 23:02:08Z giovanni $
+# $Id: PKGBUILD 134559 2011-08-05 19:15:39Z giovanni $
+# Maintainer:
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
-# Maintainer: Kevin Piche <kevin@archlinux.org>
 
 pkgname=ettercap
 pkgver=NG_0.7.3
 _origver=NG-0.7.3
-pkgrel=15
+pkgrel=16
 pkgdesc="A network sniffer/interceptor/logger for ethernet LANs - console"
 arch=('i686' 'x86_64')
 url="http://ettercap.sourceforge.net/"
 license=('GPL')
-depends=('ncurses' 'openssl' 'libpcap>=1.0.0' 'zlib' 'pcre' 'libtool>=2.2.4' 'libnet')
-makedepends=('libnet')
+depends=('ncurses' 'openssl' 'libpcap' 'zlib' 'pcre' 'libtool' 'libnet')
+makedepends=('libnet' 'pkgconfig')
 options=(!libtool)
-source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$_origver.tar.gz
-	01_pointers_and_ints_dont_mix.diff)
+source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${_origver}.tar.gz"
+        01_pointers_and_ints_dont_mix.diff)
 md5sums=('28fb15cd024162c55249888fe1b97820'
          'ad235cd90aaa3e168575d06efac4d862')
 
 build() {
   cd ${srcdir}/${pkgname}-${_origver}
+  unset LDFLAGS
 
-  export LDFLAGS="${LDFLAGS//-Wl,--as-needed}"
-  patch -Np1 -i ${srcdir}/01_pointers_and_ints_dont_mix.diff || return 1
+  libtoolize --force --copy
+  aclocal
+  autoconf
 
-  ./configure --prefix=/usr --sysconfdir=/etc --mandir=/usr/share/man --enable-plugins \
-      --enable-https --disable-gtk
-  make || return 1
-  make DESTDIR=$pkgdir install || return 1
-  cd plug-ins
-  make || return 1
-  make DESTDIR=${pkgdir} install || return 1
-  chmod 755 ${pkgdir}/usr/lib/ettercap/*
-  chmod 755 ${pkgdir}/usr/bin/ettercap
+  patch -Np1 -i ${srcdir}/01_pointers_and_ints_dont_mix.diff
+
+  ./configure --prefix=/usr \
+              --sysconfdir=/etc \
+              --mandir=/usr/share/man \
+              --datarootdir=/usr/share \
+              --enable-plugins \
+              --enable-https \
+              --disable-gtk
+  sed -i 's/LTDL_SHLIB_EXT/\".so\"/' src/ec_plugins.c
+  make
+}
+
+package() {
+  cd ${srcdir}/${pkgname}-${_origver}
+
+  make DESTDIR=${pkgdir} install
 }
diff --git a/extra/krusader/PKGBUILD b/extra/krusader/PKGBUILD
index 413724c27..566054515 100644
--- a/extra/krusader/PKGBUILD
+++ b/extra/krusader/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 129545 2011-06-28 19:04:18Z andrea $
+# $Id: PKGBUILD 134530 2011-08-05 09:45:45Z andrea $
 # Maintainer:
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Alexander Baldeck <alexander@archlinux.org>
@@ -7,7 +7,7 @@
 pkgname=krusader
 pkgver=2.4.0beta1
 _pkgver=2.4.0-beta1
-pkgrel=3
+pkgrel=4
 pkgdesc="An alternative file manager for KDE resembling Midnight Commander"
 arch=('i686' 'x86_64')
 url="http://krusader.sourceforge.net/"
@@ -15,8 +15,9 @@ license=('GPL')
 depends=('kdebase-runtime' 'kdebase-lib')
 makedepends=('cmake' 'automoc4' 'docbook-xsl' 'kdeutils-ark')
 optdepends=("kdebase-keditbookmarks: to edit bookmarks"
+            "kdebase-kwrite: to edit/view files"
             "kdeutils-ark: extract archive with right-click")
-install=krusader.install
+install=${pkgname}.install
 source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${_pkgver}.tar.bz2")
 md5sums=('d2340718d05d69e7f2a7f0846471ee12')
 
diff --git a/extra/libvpx/PKGBUILD b/extra/libvpx/PKGBUILD
index cbe82e07f..573747f4c 100644
--- a/extra/libvpx/PKGBUILD
+++ b/extra/libvpx/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 113551 2011-03-09 12:18:46Z ibiru $
+# $Id: PKGBUILD 134545 2011-08-05 13:19:02Z ibiru $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 pkgname=libvpx
-pkgver=0.9.6
-pkgrel=2
+pkgver=0.9.7
+pkgrel=1
 pkgdesc="The VP8 Codec SDK"
 arch=('i686' 'x86_64')
 url="http://www.webmproject.org/"
@@ -10,11 +10,11 @@ license=('BSD')
 depends=('glibc')
 makedepends=('yasm')
 source=(http://webm.googlecode.com/files/${pkgname}-v${pkgver}.tar.bz2)
-sha1sums=('a3522bd2b73d52381ba767ded1cbf4760e9cc6f8')
+sha1sums=('639596df7182a93db83f61af8f5bb5b6a13dcf63')
 
 build() {
     cd "${srcdir}/${pkgname}-v${pkgver}"
-    ./configure --enable-vp8 \
+    ./configure --prefix=/usr --enable-vp8 \
         --enable-runtime-cpu-detect \
         --enable-shared \
         --enable-postproc \
@@ -28,5 +28,4 @@ package() {
     cd "${srcdir}/${pkgname}-v${pkgver}"
     make DIST_DIR="$pkgdir/usr" install
     install -D -m 0644 LICENSE "$pkgdir/usr/share/licenses/${pkgname}/LICENSE"
-    chmod 644 "$pkgdir"/usr/include/vpx/*.h
 }