[arch-commits] Commit in glhack/repos (6 files)
Ionut Biru
ibiru at archlinux.org
Sun Feb 5 11:48:56 UTC 2012
Date: Sunday, February 5, 2012 @ 06:48:56
Author: ibiru
Revision: 148743
db-move: moved glhack from [testing] to [extra] (i686)
Added:
glhack/repos/extra-i686/PKGBUILD
(from rev 148654, glhack/repos/testing-i686/PKGBUILD)
glhack/repos/extra-i686/glhack-libpng15.patch
(from rev 148654, glhack/repos/testing-i686/glhack-libpng15.patch)
glhack/repos/extra-i686/glhack.install
(from rev 148654, glhack/repos/testing-i686/glhack.install)
Deleted:
glhack/repos/extra-i686/PKGBUILD
glhack/repos/extra-i686/glhack.install
glhack/repos/testing-i686/
-----------------------+
PKGBUILD | 108 ++++++++++++++++++++++++------------------------
glhack-libpng15.patch | 11 ++++
glhack.install | 48 ++++++++++-----------
3 files changed, 89 insertions(+), 78 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2012-02-05 11:48:53 UTC (rev 148742)
+++ extra-i686/PKGBUILD 2012-02-05 11:48:56 UTC (rev 148743)
@@ -1,54 +0,0 @@
-# $Id$
-# Maintainer: Eric Bélanger <eric at archlinux.org>
-
-pkgname=glhack
-pkgver=1.2
-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' 'libgl')
-makedepends=('mesa')
-options=('!makeflags')
-install=glhack.install
-source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz)
-md5sums=('b4c68e3ab689610ca638b7660c1b05bd')
-sha1sums=('7dc46e6bd4a3c2ec10ab4d314acfbb30cefc6eae')
-
-build(){
- cd "${srcdir}/${pkgname}-${pkgver}"
-
- 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
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- install -d "${pkgdir}"/usr/share/man/man{5,6}
- make DESTDIR="$pkgdir" install
- 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"
-
- chown -R root:root "${pkgdir}/usr/share/glhack"
-
- rm -r "${pkgdir}"/var/games/glhack
- install -d "${pkgdir}/var/games/glhack/save"
- chmod -R 775 "${pkgdir}/var/games"
- chown -R root:games "${pkgdir}/var/games"
-}
Copied: glhack/repos/extra-i686/PKGBUILD (from rev 148654, glhack/repos/testing-i686/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2012-02-05 11:48:56 UTC (rev 148743)
@@ -0,0 +1,54 @@
+# $Id$
+# Maintainer: Eric Bélanger <eric at archlinux.org>
+
+pkgname=glhack
+pkgver=1.2
+pkgrel=6
+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' 'libgl')
+makedepends=('mesa')
+options=('!makeflags')
+install=glhack.install
+source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz glhack-libpng15.patch)
+sha1sums=('7dc46e6bd4a3c2ec10ab4d314acfbb30cefc6eae'
+ '4cf1a13e76cc1f1eb3708d42c74b85b7f321092d')
+
+build(){
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ patch -p0 -i ../glhack-libpng15.patch
+ 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
+}
+
+package() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ install -d "${pkgdir}"/usr/share/man/man{5,6}
+ make DESTDIR="$pkgdir" install
+ 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"
+
+ chown -R root:root "${pkgdir}/usr/share/glhack"
+
+ rm -r "${pkgdir}"/var/games/glhack
+ install -d "${pkgdir}/var/games/glhack/save"
+ chmod -R 775 "${pkgdir}/var/games"
+ chown -R root:games "${pkgdir}/var/games"
+}
Copied: glhack/repos/extra-i686/glhack-libpng15.patch (from rev 148654, glhack/repos/testing-i686/glhack-libpng15.patch)
===================================================================
--- extra-i686/glhack-libpng15.patch (rev 0)
+++ extra-i686/glhack-libpng15.patch 2012-02-05 11:48:56 UTC (rev 148743)
@@ -0,0 +1,11 @@
+--- win/gl/gl_image.c.old 2012-01-19 04:01:26.000000000 -0500
++++ win/gl/gl_image.c 2012-01-19 04:03:04.000000000 -0500
+@@ -486,7 +486,7 @@
+ /* set error handling since we are using the setjmp/longjmp method
+ * (this is the normal method of doing things with libpng).
+ */
+- if (setjmp(png_ptr->jmpbuf))
++ if (setjmp(png_jmpbuf(png_ptr)))
+ {
+ sdlgl_warning("Problem within LibPNG (unknown)\n");
+ goto failed;
Deleted: extra-i686/glhack.install
===================================================================
--- extra-i686/glhack.install 2012-02-05 11:48:53 UTC (rev 148742)
+++ extra-i686/glhack.install 2012-02-05 11:48:56 UTC (rev 148743)
@@ -1,24 +0,0 @@
-post_install() {
- touch var/games/glhack/{record,perm,logfile}
- chown root:games var/games/glhack/{record,perm,logfile}
- chmod 664 var/games/glhack/{record,perm,logfile}
-}
-
-pre_upgrade() {
- install -d -m775 var/games/glhack
- chown root:games var/games/glhack
- [ -e usr/share/glhack/record ] && cp usr/share/glhack/record var/games/glhack
- [ -e usr/share/glhack/perm ] && cp usr/share/glhack/perm var/games/glhack
- [ -e usr/share/glhack/logfile ] && cp usr/share/glhack/logfile var/games/glhack
- if [ -d usr/share/glhack/save ]; then
- chmod g-s usr/share/glhack/save
- mv usr/share/glhack/save var/games/glhack
- else
- install -d -m775 var/games/glhack/save
- fi
- chown root:games var/games/glhack/save
-}
-
-post_upgrade() {
- post_install
-}
Copied: glhack/repos/extra-i686/glhack.install (from rev 148654, glhack/repos/testing-i686/glhack.install)
===================================================================
--- extra-i686/glhack.install (rev 0)
+++ extra-i686/glhack.install 2012-02-05 11:48:56 UTC (rev 148743)
@@ -0,0 +1,24 @@
+post_install() {
+ touch var/games/glhack/{record,perm,logfile}
+ chown root:games var/games/glhack/{record,perm,logfile}
+ chmod 664 var/games/glhack/{record,perm,logfile}
+}
+
+pre_upgrade() {
+ install -d -m775 var/games/glhack
+ chown root:games var/games/glhack
+ [ -e usr/share/glhack/record ] && cp usr/share/glhack/record var/games/glhack
+ [ -e usr/share/glhack/perm ] && cp usr/share/glhack/perm var/games/glhack
+ [ -e usr/share/glhack/logfile ] && cp usr/share/glhack/logfile var/games/glhack
+ if [ -d usr/share/glhack/save ]; then
+ chmod g-s usr/share/glhack/save
+ mv usr/share/glhack/save var/games/glhack
+ else
+ install -d -m775 var/games/glhack/save
+ fi
+ chown root:games var/games/glhack/save
+}
+
+post_upgrade() {
+ post_install
+}
More information about the arch-commits
mailing list