[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  e...@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  e...@archlinux.org
-
-   * glhack 1.2-3
-   * Moved binaries to /usr/bin (close FS#15303)
-   * Moved saved games to /var
-   * Added ChangeLog

Modified: PKGBUILD
===
--- PKGBUILD2011-09-12 03:56:43 UTC (rev 137856)
+++ PKGBUILD2011-09-12 05:03:50 UTC (rev 137857)
@@ -1,15 +1,15 @@
 # $Id$
-# Maintainer: Eric Belanger e...@archlinux.org
-# Contributor : Markus Meissner mar...@meissna.de
+# Maintainer: Eric Bélanger e...@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

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

[Eric Bélanger]

Date: Monday, January 18, 2010 @ 20:01:11
  Author: eric
Revision: 63897

upgpkg: glhack 1.2-4
Rebuilt against libpng 1.4/libjpeg 8, Fixed man page conflict with nethack 
(close FS#17226)

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

---+
 ChangeLog |6 ++
 PKGBUILD  |   10 +-
 2 files changed, 15 insertions(+), 1 deletion(-)

Modified: ChangeLog
===
--- ChangeLog   2010-01-19 00:59:51 UTC (rev 63896)
+++ ChangeLog   2010-01-19 01:01:11 UTC (rev 63897)
@@ -1,3 +1,9 @@
+2010-01-18  Eric Belanger  e...@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  e...@archlinux.org
 
* glhack 1.2-3

Modified: PKGBUILD
===
--- PKGBUILD2010-01-19 00:59:51 UTC (rev 63896)
+++ PKGBUILD2010-01-19 01:01:11 UTC (rev 63897)
@@ -4,7 +4,7 @@
 
 pkgname=glhack
 pkgver=1.2
-pkgrel=3
+pkgrel=4
 pkgdesc=A port of Nethack, a single player dungeon exploration game in 2D
 arch=('i686' 'x86_64')
 url=http://glhack.sourceforge.net/;
@@ -14,6 +14,7 @@
 install=glhack.install
 
source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz)
 md5sums=('b4c68e3ab689610ca638b7660c1b05bd')
+sha1sums=('7dc46e6bd4a3c2ec10ab4d314acfbb30cefc6eae')
 
 build(){
   cd ${srcdir}/${pkgname}-${pkgver}
@@ -30,6 +31,13 @@
   make DESTDIR=$pkgdir install || return 1
   install -D -m644 dat/license 
${pkgdir}/usr/share/licenses/${pkgname}/license
 
+# Renaming man pages which conflicts with nethack
+  cd ${pkgdir}/usr/share/man/man6
+  for manpage in dgn_comp dlb lev_comp nethack recover; do
+mv $manpage.6 $manpage-glhack.6
+  done
+  cd ${srcdir}/${pkgname}-${pkgver}
+
   mv ${pkgdir}/usr/share/glhack/glhack ${pkgdir}/usr/bin/glhack
   mv ${pkgdir}/usr/share/glhack/recover_glhack 
${pkgdir}/usr/bin/recover_glhack