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

[Eric Bélanger]

    Date: Monday, September 12, 2011 @ 01:03:50
  Author: eric
Revision: 137857

upgpkg: glhack 1.2-5

Rebuild against latest toolchain, Clean up PKGBUILD, Change mesa depends to libgl, Remove ChangeLog

Modified:
  glhack/trunk/PKGBUILD
Deleted:
  glhack/trunk/ChangeLog

-----------+
 ChangeLog |   12 ------------
 PKGBUILD  |   28 ++++++++++++++++------------
 2 files changed, 16 insertions(+), 24 deletions(-)

Deleted: ChangeLog
===================================================================
--- ChangeLog	2011-09-12 03:56:43 UTC (rev 137856)
+++ ChangeLog	2011-09-12 05:03:50 UTC (rev 137857)
@@ -1,12 +0,0 @@
-2010-01-18  Eric Belanger  <eric at archlinux.org>
-
-	* glhack 1.2-4
-	* Rebuilt for libpng 1.4 and libjpeg 8
-	* Fixed man page conflict with nethack (close FS#17226)
-
-2009-06-29  Eric Belanger  <eric at archlinux.org>
-
-	* glhack 1.2-3
-	* Moved binaries to /usr/bin (close FS#15303)
-	* Moved saved games to /var
-	* Added ChangeLog

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-09-12 03:56:43 UTC (rev 137856)
+++ PKGBUILD	2011-09-12 05:03:50 UTC (rev 137857)
@@ -1,15 +1,15 @@
 # $Id$
-# Maintainer: Eric Belanger <eric at archlinux.org>
-# Contributor : Markus Meissner <markus at meissna.de>
+# Maintainer: Eric Bélanger <eric at archlinux.org>
 
 pkgname=glhack
 pkgver=1.2
-pkgrel=4
+pkgrel=5
 pkgdesc="A port of Nethack, a single player dungeon exploration game in 2D"
 arch=('i686' 'x86_64')
 url="http://glhack.sourceforge.net/"
 license=('custom')
-depends=('sdl' 'libpng' 'mesa')
+depends=('sdl' 'libpng' 'libgl')
+makedepends=('mesa')
 options=('!makeflags')
 install=glhack.install
 source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz)
@@ -19,16 +19,20 @@
 build(){
   cd "${srcdir}/${pkgname}-${pkgver}"
 
-  sed -i 's|/usr/lib/games|/usr/share|' include/config.h || return 1
-  sed -i 's|/var/lib/games/glhack|/var/games/glhack|' include/unixconf.h || return 1
-  sed -i -e 's|PREFIX	 = /usr|PREFIX	 = $(DESTDIR)/usr|' Makefile || return 1
-  sed -i -e 's|VARDIR   = /var/lib/games/glhack|VARDIR   = $(DESTDIR)/var/games/glhack|' Makefile || return 1
-  sed -i -e 's|/usr/man/man6|$(DESTDIR)/usr/share/man/man6|' doc/Makefile || return 1
-  sed -i -e 's|GAMEDIR  = $(PREFIX)/lib/games/$(GAME)|GAMEDIR  = $(PREFIX)/share/$(GAME)|' Makefile || return 1
+  sed -i 's|/usr/lib/games|/usr/share|' include/config.h
+  sed -i 's|/var/lib/games/glhack|/var/games/glhack|' include/unixconf.h
+  sed -i -e 's|PREFIX	 = /usr|PREFIX	 = $(DESTDIR)/usr|' Makefile
+  sed -i -e 's|VARDIR   = /var/lib/games/glhack|VARDIR   = $(DESTDIR)/var/games/glhack|' Makefile
+  sed -i -e 's|/usr/man/man6|$(DESTDIR)/usr/share/man/man6|' doc/Makefile
+  sed -i -e 's|GAMEDIR  = $(PREFIX)/lib/games/$(GAME)|GAMEDIR  = $(PREFIX)/share/$(GAME)|' Makefile
 
-  make   || return 1
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
   install -d "${pkgdir}"/usr/share/man/man{5,6}
-  make DESTDIR="$pkgdir" install || return 1
+  make DESTDIR="$pkgdir" install
   install -D -m644 dat/license "${pkgdir}/usr/share/licenses/${pkgname}/license"
 
 # Renaming man pages which conflicts with nethack