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

Conflicts:
	community/chmsee/PKGBUILD
	community/flumotion/PKGBUILD
	community/gnash/PKGBUILD
	community/kadu/PKGBUILD
	community/mythplugins/PKGBUILD
	community/performous/PKGBUILD
	community/sleuthkit/PKGBUILD
	community/virtualbox/PKGBUILD
	community/wbar/PKGBUILD
	core/attr/PKGBUILD
	core/binutils/PKGBUILD
	core/heimdal/PKGBUILD
	core/sqlite3/PKGBUILD
	extra/acpid/PKGBUILD
	extra/apache-ant/PKGBUILD
	extra/aria2/PKGBUILD
	extra/boost/PKGBUILD
	extra/bs/PKGBUILD
	extra/bzr/PKGBUILD
	extra/cvsps/PKGBUILD
	extra/dosbox/PKGBUILD
	extra/ettercap-gtk/PKGBUILD
	extra/fetchmail/PKGBUILD
	extra/gnome-desktop-sharp/PKGBUILD
	extra/gnome-panel/PKGBUILD
	extra/gptfdisk/PKGBUILD
	extra/gqmpeg/PKGBUILD
	extra/gstreamer0.10-base/PKGBUILD
	extra/gstreamer0.10-ugly/PKGBUILD
	extra/gtk-theme-switch2/PKGBUILD
	extra/icecast/PKGBUILD
	extra/kdeedu/PKGBUILD
	extra/kmldonkey/PKGBUILD
	extra/kmplayer/PKGBUILD
	extra/libbtctl/PKGBUILD
	extra/libftdi/PKGBUILD
	extra/liborigin2/PKGBUILD
	extra/libpst/PKGBUILD
	extra/libx86/PKGBUILD
	extra/lsdvd/PKGBUILD
	extra/mc/PKGBUILD
	extra/monotone/PKGBUILD
	extra/multitail/PKGBUILD
	extra/nbsmtp/PKGBUILD
	extra/nickle/PKGBUILD
	extra/nppangband/PKGBUILD
	extra/numlockx/PKGBUILD
	extra/pidgin/PKGBUILD
	extra/poppler/PKGBUILD
	extra/python-gtkglext/PKGBUILD
	extra/scim/PKGBUILD
	extra/socat/PKGBUILD
	extra/speedcrunch/PKGBUILD
	extra/transmission/PKGBUILD
	extra/vbetool/PKGBUILD
	extra/vlc/PKGBUILD
	extra/xchat-gnome/xchat-gnome.install
	libre/kernel26-libre/PKGBUILD
	libre/pacman/PKGBUILD
	libre/xchat-gnome-libre/PKGBUILD
	libre/xchat-gnome-libre/gtk2-2.20.patch
	libre/xchat-gnome-libre/xchat-gnome-0.26.1-deprecated-symbol.patch
	libre/xchat-gnome-libre/xchat-gnome.install
	multilib/nspluginwrapper/PKGBUILD
	testing/libgweather/libgweather.install
	testing/mesa/PKGBUILD

1 files changed, 17 insertions, 17 deletions

diff --git a/extra/glsof/PKGBUILD b/extra/glsof/PKGBUILD
index cc82175f7..f1845aafe 100644
--- a/extra/glsof/PKGBUILD
+++ b/extra/glsof/PKGBUILD
@@ -1,38 +1,38 @@
-# $Id: PKGBUILD 123056 2011-05-07 20:58:12Z eric $
+# $Id: PKGBUILD 124019 2011-05-16 00:31:31Z eric $
 #  Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=glsof
-pkgver=1.0.0
+pkgver=1.5
+_fmver=1.5
+_qver=1.0.0
 pkgrel=1
 pkgdesc="Two separate GUI utilities (Queries and Filemonitor) to the lsof command line utility"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://glsof.sourceforge.net/"
 license=('GPL3')
-depends=('java-runtime' 'lsof')
+depends=('sh' 'java-runtime' 'lsof')
+source=(http://downloads.sourceforge.net/sourceforge/glsof/filemonitor-${_fmver}.tar.gz)
 if [ "$CARCH" = "i686" ]; then
-  source=(http://downloads.sourceforge.net/sourceforge/glsof/filemonitor-${pkgver}/filemonitor_linux32.tar.gz \
-          http://downloads.sourceforge.net/sourceforge/glsof/queries-${pkgver}/queries_linux32.tar.gz \
+  source=(${source[@]} http://downloads.sourceforge.net/sourceforge/glsof/queries-${_qver}/queries_linux32.tar.gz \
           glsof-filemonitor glsof-queries)
-  md5sums=('7a541ee8c432b78f9bfd36dd1707fb8d'
-         '895bcec79edea97ebde36d7f5eaa3ee9'
-         '7e43c1120e15e65bd1a12d6f188be4a0'
-         '980da4b39e1e3f4fbed08018dfd3be7b')
+  md5sums=('6ca86f9f356e9cba02e4f0861eb1c464'
+           '895bcec79edea97ebde36d7f5eaa3ee9'
+           '7e43c1120e15e65bd1a12d6f188be4a0'
+           '980da4b39e1e3f4fbed08018dfd3be7b')
 elif [ "$CARCH" = "x86_64" ]; then
-  source=(http://downloads.sourceforge.net/sourceforge/glsof/filemonitor-${pkgver}/filemonitor_linux64.tar.gz \
-          http://downloads.sourceforge.net/sourceforge/glsof/queries-${pkgver}/queries_linux64.tar.gz \
+  source=(${source[@]} http://downloads.sourceforge.net/sourceforge/glsof/queries-${_qver}/queries_linux64.tar.gz \
           glsof-filemonitor glsof-queries)
-  md5sums=('9a6043b0b90fbc6de4db36967647dab0'
-         'ed96ee2105428aa8b038f5fe13b8cd1d'
-         '7e43c1120e15e65bd1a12d6f188be4a0'
-         '980da4b39e1e3f4fbed08018dfd3be7b')
+  md5sums=('6ca86f9f356e9cba02e4f0861eb1c464'
+           'ed96ee2105428aa8b038f5fe13b8cd1d'
+           '7e43c1120e15e65bd1a12d6f188be4a0'
+           '980da4b39e1e3f4fbed08018dfd3be7b')
 fi
 
 package() {
  cd "${srcdir}"
  install -D -m755 glsof-filemonitor "${pkgdir}/usr/bin/glsof-filemonitor"
  install -D -m755 glsof-queries "${pkgdir}/usr/bin/glsof-queries"
- install -D -m644 filemonitor_linux??/filemonitor.jar "${pkgdir}/usr/share/java/glsof/filemonitor.jar"
- install -D -m644 filemonitor_linux??/filemonitor.pdf "${pkgdir}/usr/share/doc/glsof/filemonitor.pdf"
+ install -D -m644 filemonitor/filemonitor.jar "${pkgdir}/usr/share/java/glsof/filemonitor.jar"
  install -D -m644 queries_linux??/queries.jar "${pkgdir}/usr/share/java/glsof/queries.jar"
  install -D -m644 queries_linux??/queries.pdf "${pkgdir}/usr/share/doc/glsof/queries.pdf"
 }