[arch-commits] Commit in neverball/repos (9 files)

Wed Feb 4 03:24:31 UTC 2009

Date: Tuesday, February 3, 2009 @ 22:24:31
  Author: eric
Revision: 26237

Merged revisions 356,26236 via svnmerge from 
svn+ssh://svn.archlinux.org/srv/svn-packages/neverball/trunk

........
  r356 | aaron | 2008-04-18 18:56:27 -0400 (Fri, 18 Apr 2008) | 1 line
  
  Added svn:keywords to all PKGBUILDs
........
  r26236 | eric | 2009-02-03 22:24:02 -0500 (Tue, 03 Feb 2009) | 2 lines
  
  upgpkg: 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
........

Added:
  neverball/repos/extra-x86_64/ChangeLog
    (from rev 26236, neverball/trunk/ChangeLog)
Modified:
  neverball/repos/extra-x86_64/	(properties)
  neverball/repos/extra-x86_64/PKGBUILD
Deleted:
  neverball/repos/extra-x86_64/neverball
  neverball/repos/extra-x86_64/neverball.desktop
  neverball/repos/extra-x86_64/neverball.png
  neverball/repos/extra-x86_64/neverputt
  neverball/repos/extra-x86_64/neverputt.desktop
  neverball/repos/extra-x86_64/neverputt.png

-------------------+
 ChangeLog         |   11 ++++++++
 PKGBUILD          |   66 ++++++++++++++++++++++++++++------------------------
 neverball         |    2 -
 neverball.desktop |   11 --------
 neverputt         |    2 -
 neverputt.desktop |   11 --------
 6 files changed, 47 insertions(+), 56 deletions(-)


Property changes on: neverball/repos/extra-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /neverball/trunk:1
   + /neverball/trunk:1-26236

Copied: neverball/repos/extra-x86_64/ChangeLog (from rev 26236, neverball/trunk/ChangeLog)
===================================================================

--- extra-x86_64/ChangeLog	                        (rev 0)
+++ extra-x86_64/ChangeLog	2009-02-04 03:24:31 UTC (rev 26237)
@@ -0,0 +1,11 @@
+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: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2009-02-04 03:24:02 UTC (rev 26236)
+++ extra-x86_64/PKGBUILD	2009-02-04 03:24:31 UTC (rev 26237)
@@ -3,40 +3,46 @@
 # Contributor: Ben <contrasutra at myrealbox.com>
 
 pkgname=neverball
-pkgver=1.4.0
-pkgrel=4
+pkgver=1.5.0
+pkgrel=1
 pkgdesc="3D game similar to Super Monkey Ball or Marble Madness"
 arch=('i686' 'x86_64')
-url="http://icculus.org/neverball/"
+url="http://neverball.org/"
 license=('GPL')
 depends=('sdl_image' 'sdl_ttf' 'sdl_mixer' 'libgl')
-source=(http://icculus.org/$pkgname/$pkgname-$pkgver.tar.gz \
-        neverball neverball.desktop neverball.png neverputt neverputt.desktop neverputt.png)
-md5sums=('a6cd860f1c2b7d8cecbcfc05ff228ef0' '63631b77a11c38e1d16677fcff76d58f'\
-         'ecd21cf59609e9aa570f92bb514214c1' '641e993d13029b5abb8c4a1cd40750fa'\
-         '705fc97a4ef38965c22ab8c2a0e52f1f' '01c0219b7627b5880bf46a84f39255a4'\
-         'df67293e4e7318d11ea85450e00be35a')
-sha1sums=('630aab5b4149d6ffb781cc38c4ce26dd6b048b40'\
-          'f98c551178888aaeab9bb5bc947eaf81401ef8e5'\
-          '7b6630a114f3f351c1e9e0d6420508e0bc4cdae5'\
-          '148009f39e7a646f7db4c4bf8dd7b5bd3effa2bc'\
-          'cba82ce4eebc60eca334cc36e0111a23df788638'\
-          '1d00c887021306342363557fae8845becd83e0c7'\
-          '1270cfbd1e736927e8d438c75e35c52ce44ace36')
+makedepends=('mesa')
+source=(http://neverball.org/${pkgname}-${pkgver}.tar.gz)
+md5sums=('c170b502e2c5507846e946cdddd8a0ad')
+sha1sums=('35c5b9868836713205dd0428154f741f128e09d6')
     
 build() {
-  cd $startdir/src/$pkgname-$pkgver
-  [ "$CARCH" = "i686" ]   && sed -i 's/-O3/-O2 -march=i686   -mtune=generic -pipe/' Makefile
-  [ "$CARCH" = "x86_64" ] && sed -i 's/-O3/-O3 -march=x86-64 -mtune=generic -pipe/' Makefile
-  make || return 1
-  install -D -m755 neverball $startdir/pkg/usr/share/neverball/bin/neverball
-  install -D -m755 neverputt $startdir/pkg/usr/share/neverball/bin/neverputt
-  install -D -m755 ../neverball $startdir/pkg/usr/bin/neverball
-  install -D -m755 ../neverputt $startdir/pkg/usr/bin/neverputt
-  install -D -m644 ../neverball.desktop $startdir/pkg/usr/share/applications/neverball.desktop
-  install -D -m644 ../neverball.png $startdir/pkg/usr/share/pixmaps/neverball.png
-  install -D -m644 ../neverputt.desktop $startdir/pkg/usr/share/applications/neverputt.desktop
-  install -D -m644 ../neverputt.png $startdir/pkg/usr/share/pixmaps/neverputt.png
-  cp -r data/ $startdir/pkg/usr/share/neverball
-  find ${startdir}/pkg/usr/share/neverball/data -type f -exec chmod 644 {} \;
+  cd ${srcdir}/${pkgname}-${pkgver}
+  sed -i 's|#define CONFIG_DATA   "./data"|#define CONFIG_DATA   "/usr/share/neverball"|' share/base_config.h || return 1
+  sed -i 's|#define CONFIG_LOCALE "./locale"|#define CONFIG_LOCALE "/usr/share/locale"|' share/base_config.h || return 1
+
+  make ENABLE_NLS=1 || return 1
+
+  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
+
+  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
 }

Deleted: extra-x86_64/neverball
===================================================================
--- extra-x86_64/neverball	2009-02-04 03:24:02 UTC (rev 26236)
+++ extra-x86_64/neverball	2009-02-04 03:24:31 UTC (rev 26237)
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec /usr/share/neverball/bin/neverball /usr/share/neverball/data

Deleted: extra-x86_64/neverball.desktop
===================================================================
--- extra-x86_64/neverball.desktop	2009-02-04 03:24:02 UTC (rev 26236)
+++ extra-x86_64/neverball.desktop	2009-02-04 03:24:31 UTC (rev 26237)
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Type=Application
-Encoding=UTF-8
-Name=Neverball
-Comment=A 3D arcade game with a ball
-Comment[fr]=Un jeu d'arcade 3D avec une balle
-Icon=neverball.png
-Exec=neverball
-Terminal=false
-Categories=Application;Game;ArcadeGame;

Deleted: extra-x86_64/neverball.png
===================================================================
(Binary files differ)

Deleted: extra-x86_64/neverputt
===================================================================
--- extra-x86_64/neverputt	2009-02-04 03:24:02 UTC (rev 26236)
+++ extra-x86_64/neverputt	2009-02-04 03:24:31 UTC (rev 26237)
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec /usr/share/neverball/bin/neverputt /usr/share/neverball/data

Deleted: extra-x86_64/neverputt.desktop
===================================================================
--- extra-x86_64/neverputt.desktop	2009-02-04 03:24:02 UTC (rev 26236)
+++ extra-x86_64/neverputt.desktop	2009-02-04 03:24:31 UTC (rev 26237)
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Type=Application
-Encoding=UTF-8
-Name=Neverputt
-Comment=A 3D mini golf game
-Comment[fr]=Un jeu de minigolf en 3D
-Icon=neverputt.png
-Exec=neverputt
-Terminal=false
-Categories=Application;Game;ArcadeGame;

Deleted: extra-x86_64/neverputt.png
===================================================================
(Binary files differ)


