[arch-commits] Commit in glhack/repos (4 files)
Eric Bélanger
eric at archlinux.org
Sat Jul 11 00:36:21 UTC 2009
Date: Friday, July 10, 2009 @ 20:36:21
Author: eric
Revision: 45399
Merged revisions 34502,45398 via svnmerge from
svn+ssh://svn.archlinux.org/srv/svn-packages/glhack/trunk
........
r34502 | eric | 2009-04-09 16:35:30 -0400 (Thu, 09 Apr 2009) | 1 line
Improved description (close FS#14163), Updated Maintainer tag, Removed superfluous md5sums array
........
r45398 | eric | 2009-07-10 20:36:03 -0400 (Fri, 10 Jul 2009) | 2 lines
upgpkg: glhack 1.2-3
Moved binaries to /usr/bin (close FS#15303), Moved saved games to /var, Added ChangeLog
........
Added:
glhack/repos/extra-x86_64/ChangeLog
(from rev 45398, glhack/trunk/ChangeLog)
glhack/repos/extra-x86_64/glhack.install
(from rev 45398, glhack/trunk/glhack.install)
Modified:
glhack/repos/extra-x86_64/ (properties)
glhack/repos/extra-x86_64/PKGBUILD
----------------+
ChangeLog | 6 ++++++
PKGBUILD | 41 +++++++++++++++++++++++++++--------------
glhack.install | 24 ++++++++++++++++++++++++
3 files changed, 57 insertions(+), 14 deletions(-)
Property changes on: glhack/repos/extra-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
- /glhack/trunk:1-34210
+ /glhack/trunk:1-45398
Copied: glhack/repos/extra-x86_64/ChangeLog (from rev 45398, glhack/trunk/ChangeLog)
===================================================================
--- extra-x86_64/ChangeLog (rev 0)
+++ extra-x86_64/ChangeLog 2009-07-11 00:36:21 UTC (rev 45399)
@@ -0,0 +1,6 @@
+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: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2009-07-11 00:36:03 UTC (rev 45398)
+++ extra-x86_64/PKGBUILD 2009-07-11 00:36:21 UTC (rev 45399)
@@ -1,29 +1,42 @@
# $Id$
-# Maintainer: arjan <arjan at archlinux.org>
+# Maintainer: Eric Belanger <eric at archlinux.org>
# Contributor : Markus Meissner <markus at meissna.de>
pkgname=glhack
pkgver=1.2
-pkgrel=2
-pkgdesc="A 3D port of Nethack for use with OpenGL"
+pkgrel=3
+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')
options=('!makeflags')
-source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz)
+install=glhack.install
+source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz)
md5sums=('b4c68e3ab689610ca638b7660c1b05bd')
build(){
- cd $srcdir/$pkgname-$pkgver
- sed -i -e 's|GAMEDIR = $(PREFIX)/lib/games/$(GAME)|GAMEDIR = $(PREFIX)/share/$(GAME)|g' Makefile || return 1
- sed -i -e 's|SHELLDIR = $(PREFIX)/games|SHELLDIR = $(PREFIX)/bin|g' Makefile || return 1
- sed -i -e 's|VARDIR = /var/lib/games/glhack|VARDIR = $(PREFIX)/share/$(GAME)|g' Makefile || return 1
+ 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
+
make || return 1
- install -d $pkgdir/usr/share/man/man{5,6}
- sed -i "s|/usr/man/man6|$pkgdir/usr/share/man/man6|" doc/Makefile || return 1
- sed -i -e "s|PREFIX[\t]* = /usr|PREFIX = $pkgdir/usr|g" Makefile || return 1
- sed -i -e 's|s;/usr/games/lib/nethackdir;$(GAMEDIR);|s;/usr/games/lib/nethackdir;/usr/share/$(GAME);|g' Makefile || return 1
- make install || return 1
- install -D -m644 dat/license $pkgdir/usr/share/licenses/$pkgname/license
+ install -d "${pkgdir}"/usr/share/man/man{5,6}
+ make DESTDIR="$pkgdir" install || return 1
+ install -D -m644 dat/license "${pkgdir}/usr/share/licenses/${pkgname}/license"
+
+ 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/glhack.install (from rev 45398, glhack/trunk/glhack.install)
===================================================================
--- extra-x86_64/glhack.install (rev 0)
+++ extra-x86_64/glhack.install 2009-07-11 00:36:21 UTC (rev 45399)
@@ -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