Date: Wednesday, May 30, 2018 @ 18:29:37 Author: jelle Revision: 325155
archrelease: copy trunk to extra-x86_64 Added: glhack/repos/extra-x86_64/PKGBUILD (from rev 325154, glhack/trunk/PKGBUILD) glhack/repos/extra-x86_64/glhack-libpng15.patch (from rev 325154, glhack/trunk/glhack-libpng15.patch) glhack/repos/extra-x86_64/glhack.install (from rev 325154, glhack/trunk/glhack.install) Deleted: glhack/repos/extra-x86_64/PKGBUILD glhack/repos/extra-x86_64/glhack-libpng15.patch glhack/repos/extra-x86_64/glhack.install -----------------------+ PKGBUILD | 114 ++++++++++++++++++++++++------------------------ glhack-libpng15.patch | 22 ++++----- glhack.install | 48 ++++++++++---------- 3 files changed, 92 insertions(+), 92 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2018-05-30 18:29:02 UTC (rev 325154) +++ PKGBUILD 2018-05-30 18:29:37 UTC (rev 325155) @@ -1,57 +0,0 @@ -# $Id$ -# Maintainer: Eric Bélanger <e...@archlinux.org> - -pkgname=glhack -pkgver=1.2 -pkgrel=7 -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') - -prepare() { - cd ${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 -} - -build(){ - cd ${pkgname}-${pkgver} - make -} - -package() { - cd ${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 - pushd "${pkgdir}/usr/share/man/man6" - for manpage in dgn_comp dlb lev_comp nethack recover; do - mv $manpage.6 $manpage-glhack.6 - done - popd - - 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-x86_64/PKGBUILD (from rev 325154, glhack/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2018-05-30 18:29:37 UTC (rev 325155) @@ -0,0 +1,57 @@ +# $Id$ +# Maintainer: Eric Bélanger <e...@archlinux.org> + +pkgname=glhack +pkgver=1.2 +pkgrel=8 +pkgdesc="A port of Nethack, a single player dungeon exploration game in 2D" +arch=('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') + +prepare() { + cd ${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 +} + +build(){ + cd ${pkgname}-${pkgver} + make +} + +package() { + cd ${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 + pushd "${pkgdir}/usr/share/man/man6" + for manpage in dgn_comp dlb lev_comp nethack recover; do + mv $manpage.6 $manpage-glhack.6 + done + popd + + 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" +} Deleted: glhack-libpng15.patch =================================================================== --- glhack-libpng15.patch 2018-05-30 18:29:02 UTC (rev 325154) +++ glhack-libpng15.patch 2018-05-30 18:29:37 UTC (rev 325155) @@ -1,11 +0,0 @@ ---- 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; Copied: glhack/repos/extra-x86_64/glhack-libpng15.patch (from rev 325154, glhack/trunk/glhack-libpng15.patch) =================================================================== --- glhack-libpng15.patch (rev 0) +++ glhack-libpng15.patch 2018-05-30 18:29:37 UTC (rev 325155) @@ -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: glhack.install =================================================================== --- glhack.install 2018-05-30 18:29:02 UTC (rev 325154) +++ glhack.install 2018-05-30 18:29:37 UTC (rev 325155) @@ -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-x86_64/glhack.install (from rev 325154, glhack/trunk/glhack.install) =================================================================== --- glhack.install (rev 0) +++ glhack.install 2018-05-30 18:29:37 UTC (rev 325155) @@ -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 +}