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, 25 insertions, 31 deletions

diff --git a/extra/neverball/PKGBUILD b/extra/neverball/PKGBUILD
index 90812bd04..839a9a9d1 100644
--- a/extra/neverball/PKGBUILD
+++ b/extra/neverball/PKGBUILD
@@ -1,15 +1,14 @@
-# $Id: PKGBUILD 63937 2010-01-19 04:44:36Z eric $
-# Maintainer: Eric Belanger <eric@archlinux.org>
-# Contributor: Ben <contrasutra@myrealbox.com>
+# $Id: PKGBUILD 124594 2011-05-23 08:40:29Z eric $
+# Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=neverball
 pkgver=1.5.4
-pkgrel=2
+pkgrel=3
 pkgdesc="3D game similar to Super Monkey Ball or Marble Madness"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://neverball.org/"
 license=('GPL')
-depends=('sdl_ttf' 'libgl' 'libpng' 'libjpeg>=7' 'libvorbis' 'physfs')
+depends=('sdl_ttf' 'libgl' 'libpng' 'libjpeg' 'libvorbis' 'physfs')
 makedepends=('mesa')
 source=(http://neverball.org/${pkgname}-${pkgver}.tar.gz)
 md5sums=('c523b0f72c2035831310e821162f7bd7')
@@ -17,36 +16,31 @@ sha1sums=('619c227e1958bd60738f12dbbde9b30c91dd79a7')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  sed -i 's|#define CONFIG_LOCALE "./locale"|#define CONFIG_LOCALE "/usr/share/locale"|' share/base_config.h || return 1
+  sed -i 's|#define CONFIG_LOCALE "./locale"|#define CONFIG_LOCALE "/usr/share/locale"|' share/base_config.h
 
   if [ "${CARCH}" = "i686" ] ;then
-    make ENABLE_NLS=1 DATADIR=/usr/share/neverball SSE_CFLAGS="" || return 1
+    make ENABLE_NLS=1 DATADIR=/usr/share/neverball SSE_CFLAGS=""
   else
-    make ENABLE_NLS=1 DATADIR=/usr/share/neverball || return 1
+    make ENABLE_NLS=1 DATADIR=/usr/share/neverball
   fi
+}
 
-  install -D -m755 neverball "${pkgdir}/usr/bin/neverball" || return 1
-  install -D -m755 neverputt "${pkgdir}/usr/bin/neverputt" || return 1
-  install -D -m755 mapc "${pkgdir}/usr/bin/mapc" || return 1
-
-  install -d "${pkgdir}/usr/share/neverball"
-  cp -r data/* "${pkgdir}/usr/share/neverball/" || return 1
+package(){
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  install -d "${pkgdir}/usr/bin"
+  install -d "${pkgdir}"/usr/share/{neverball,locale,applications,pixmaps,doc/neverball}
+  install -d "${pkgdir}"/usr/share/man/man{1,6}
+
+  install -m755 neverball neverputt mapc "${pkgdir}/usr/bin"
+  cp -r locale/* "${pkgdir}/usr/share/locale/"
+  cp -r data/* "${pkgdir}/usr/share/neverball/"
+  install -m644 doc/* "${pkgdir}/usr/share/doc/neverball/"
+  install -m644 dist/*.desktop "${pkgdir}/usr/share/applications/"
+  install -m644 dist/*.png "${pkgdir}/usr/share/pixmaps/"
+  install -m644 dist/mapc.1 "${pkgdir}/usr/share/man/man1"
+  install -m644 dist/{neverball.6,neverputt.6} "${pkgdir}/usr/share/man/man6"
+
+  ln -s neverball_48.png "${pkgdir}/usr/share/pixmaps/neverball.png"
+  ln -s neverputt_48.png "${pkgdir}/usr/share/pixmaps/neverputt.png"
   find "${pkgdir}/usr/share/neverball" -type f -exec chmod 0644 {} \;
-
-  install -d "${pkgdir}/usr/share/locale"
-  cp -r locale/* "${pkgdir}/usr/share/locale/" || return 1
-
-  install -d "${pkgdir}/usr/share/applications"
-  install -d "${pkgdir}/usr/share/pixmaps"
-  install -m644 dist/*.desktop "${pkgdir}/usr/share/applications/" || return 1
-  install -m644 dist/*.png "${pkgdir}/usr/share/pixmaps/" || return 1
-  ln -s neverball_48.png "${pkgdir}/usr/share/pixmaps/neverball.png" || return 1
-  ln -s neverputt_48.png "${pkgdir}/usr/share/pixmaps/neverputt.png" || return 1
-
-  install -d "${pkgdir}/usr/share/doc/neverball"
-  install -m644 doc/* "${pkgdir}/usr/share/doc/neverball/" || return 1
-
-  install -D -m644 dist/mapc.1 "${pkgdir}/usr/share/man/man1/mapc.1" || return 1
-  install -D -m644 dist/neverball.6 "${pkgdir}/usr/share/man/man6/neverball.6" || return 1
-  install -D -m644 dist/neverputt.6 "${pkgdir}/usr/share/man/man6/neverputt.6" || return 1
 }