[arch-commits] Commit in nethack/repos (extra-x86_64 extra-x86_64/PKGBUILD)

[Allan McRae]

    Date: Saturday, November 7, 2009 @ 07:46:53
  Author: allan
Revision: 58374

Merged revisions 58350,58373 via svnmerge from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/nethack/trunk

........
  r58350 | allan | 2009-11-07 16:23:00 +1000 (Sat, 07 Nov 2009) | 1 line
  
  make source url less ugly...
........
  r58373 | allan | 2009-11-07 22:45:44 +1000 (Sat, 07 Nov 2009) | 2 lines
  
  upgpkg: nethack 3.4.3-4
      move binary files out of /usr/share (FS#15304), add man pages and guidebook (FS#15692)
........

Modified:
  nethack/repos/extra-x86_64/	(properties)
  nethack/repos/extra-x86_64/PKGBUILD

----------+
 PKGBUILD |   38 ++++++++++++++++++++++++--------------
 1 file changed, 24 insertions(+), 14 deletions(-)


Property changes on: nethack/repos/extra-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /nethack/trunk:1-9607
   + /nethack/trunk:1-58373

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2009-11-07 12:45:44 UTC (rev 58373)
+++ extra-x86_64/PKGBUILD	2009-11-07 12:46:53 UTC (rev 58374)
@@ -5,38 +5,48 @@
 
 pkgname=nethack
 pkgver=3.4.3
-pkgrel=3
+pkgrel=4
 pkgdesc='A single player dungeon exploration game'
 arch=('i686' 'x86_64')
 url="http://www.nethack.org/index.html"
 license=('custom')
 depends=('ncurses' 'gzip')
-source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-`echo $pkgver | sed 's@\.@@g'`-src.tgz)
+source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-${pkgver//.}-src.tgz)
 md5sums=('21479c95990eefe7650df582426457f9')
 
 build(){
-  cd $startdir/src/$pkgname-$pkgver/sys/unix
-  sh setup.sh
+  cd $srcdir/$pkgname-$pkgver/
+  sh sys/unix/setup.sh
 
-  cd $startdir/src/$pkgname-$pkgver/include
   sed -e '/define HACKDIR/ s|/usr/games/lib/nethackdir|/usr/share/nethack/|' \
       -e '/^#define COMPRESS\s/ s|/usr/bin/compress|/bin/gzip|' \
       -e '/^#define COMPRESS_EXTENSION/ s|".Z"|".gz"|' \
-      -e 's|^/\* \(#define DLB\) \*/|\1|' -i config.h
+      -e 's|^/\* \(#define DLB\) \*/|\1|' -i include/config.h
+
   sed -e 's|^/\* \(#define LINUX\) \*/|\1|' \
-      -e 's|^/\* \(#define TIMED_DELAY\) \*/|\1|' -i unixconf.h
-  cd $startdir/src/$pkgname-$pkgver/src
+      -e 's|^/\* \(#define TIMED_DELAY\) \*/|\1|' -i include/unixconf.h
+
   sed -e 's|^# \(WINTTYLIB = -lncurses\)|\1|' \
-      -e 's|^WINTTYLIB = -ltermlib|#&|' -i Makefile
-  cd ..
+      -e 's|^WINTTYLIB = -ltermlib|#&|' -i src/Makefile
+
   sed -e '/^GAMEDIR\s*=/ s|/games/.*$|/share/$(GAME)|' \
       -e '/^GAMEUID\s*=/ s|games|root|' \
       -e '/^GAMEGRP\s*=/ s|bin|root|' \
       -e '/^SHELLDIR\s*=/ s|/games|/bin|' -i Makefile
+  sed -e "/^MANDIR\s*=/s|/usr/man/man6|$pkgdir/usr/share/man/man6|" -i doc/Makefile
 
   make || return 1
-  make PREFIX=$startdir/pkg/usr install
-  sed -e 's|HACKDIR=.*/pkg/usr/|HACKDIR=/usr/|' \
-      -i $startdir/pkg/usr/bin/nethack
-  install -Dm644 dat/license $startdir/pkg/usr/share/licenses/$pkgname/license
+  
+  install -dm755 $pkgdir/usr/share/{man/man6,doc/nethack}
+  make PREFIX=$pkgdir/usr install manpages
+  sed -e "s|HACKDIR=$pkgdir/usr/|HACKDIR=/usr/|" \
+      -e 's|HACK=$HACKDIR|HACK=/usr/lib/nethack|' \
+      -i $pkgdir/usr/bin/nethack
+
+  install -dm755 $pkgdir/usr/lib/nethack
+  mv $pkgdir/usr/share/nethack/{nethack,recover} $pkgdir/usr/lib/nethack/
+
+  install -Dm644 doc/Guidebook.txt $pkgdir/usr/share/doc/nethack/Guidebook.txt
+      
+  install -Dm644 dat/license $pkgdir/usr/share/licenses/$pkgname/license
 }