[arch-commits] Commit in neverball/trunk (ChangeLog PKGBUILD)

[Eric Bélanger]

    Date: Monday, May 23, 2011 @ 04:40:29
  Author: eric
Revision: 124594

upgpkg: neverball 1.5.4-3
Rebuilt with latest gcc, Cleaned up PKGBUILD, Removed ChangeLog

Modified:
  neverball/trunk/PKGBUILD
Deleted:
  neverball/trunk/ChangeLog

-----------+
 ChangeLog |   50 --------------------------------------------------
 PKGBUILD  |   52 +++++++++++++++++++++++-----------------------------
 2 files changed, 23 insertions(+), 79 deletions(-)

Deleted: ChangeLog
===================================================================
--- ChangeLog	2011-05-23 06:05:50 UTC (rev 124593)
+++ ChangeLog	2011-05-23 08:40:29 UTC (rev 124594)
@@ -1,50 +0,0 @@
-2010-01-18  Eric Belanger  <eric at archlinux.org>
-
-	* neverball 1.5.4-2
-	* Rebuilt for libpng 1.4 and libjpeg 8
-
-2009-09-20  Eric Belanger  <eric at archlinux.org>
-
-	* neverball 1.5.4-1
-	* Upstream update
-
-2009-09-08  Eric Belanger  <eric at archlinux.org>
-
-	* neverball 1.5.3-1
-	* Upstream update
-
-2009-08-16  Eric Belanger  <eric at archlinux.org>
-
-	* neverball 1.5.2-1
-	* Upstream update
-	* Added physfs depends
-	* Fixed file permissions
-
-2009-08-08  Eric Belanger  <eric at archlinux.org>
-
-	* neverball 1.5.1-2.1
-	* Built i686 package without sse (close FS#15849)
-
-2009-07-01  Eric Belanger  <eric at archlinux.org>
-
-	* neverball 1.5.1-2
-	* Rebuilt against libjpeg 7
-
-2009-04-08  Eric Belanger  <eric at archlinux.org>
-
-	* neverball 1.5.1-1
-	* Upstream update
-	* Removed sdl_image and sdl_mixer depends: not needed anymore
-	* Added libpng, libjpeg and libvorbis depends
-
-2009-02-03  Eric Belanger  <eric at archlinux.org>
-
-	* neverball 1.5.0-1
-	* Upstream update
-	* Updated url
-	* Added mesa makedepends
-	* Switched to upstream desktop file and icons
-	* Removed wrapper scripts
-	* Added mapc binary
-	* Added locales, man pages and docs
-	* Added ChangeLog

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-05-23 06:05:50 UTC (rev 124593)
+++ PKGBUILD	2011-05-23 08:40:29 UTC (rev 124594)
@@ -1,15 +1,14 @@
 # $Id$
-# Maintainer: Eric Belanger <eric at archlinux.org>
-# Contributor: Ben <contrasutra at myrealbox.com>
+# Maintainer: Eric Bélanger <eric at 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')
 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 @@
 
 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
+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 -d "${pkgdir}/usr/share/neverball"
-  cp -r data/* "${pkgdir}/usr/share/neverball/" || return 1
-  find "${pkgdir}/usr/share/neverball" -type f -exec chmod 0644 {} \;
+  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"
 
-  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
+  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 {} \;
 }