-make this build with newer g++ (add a forward decl; for older compilers

 a "friend" decl seems to imply this)
-put hiscore files to a sane location
-update to 0.4pre10 - this is called "Debian/PPC fix" in the changelog,
 but there is obviously more cleanup and fixes

5 files changed, 41 insertions, 73 deletions

diff --git a/games/KoboDeluxe/Makefile b/games/KoboDeluxe/Makefile
index 060d9708555..25674a9036f 100644
--- a/games/KoboDeluxe/Makefile
+++ b/games/KoboDeluxe/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.17 2006/06/12 16:28:07 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2007/02/08 18:16:09 drochner Exp $
 
-DISTNAME=	KoboDeluxe-0.4pre8
+DISTNAME=	KoboDeluxe-0.4pre10
 PKGNAME=	${DISTNAME:S/pre/rc/}
-PKGREVISION=	8
 CATEGORIES=	games
 MASTER_SITES=	http://olofson.net/kobodl/download/
 
@@ -13,6 +12,7 @@ COMMENT=	Multi-way scrolling shoot 'em up game for X
 GNU_CONFIGURE=	YES
 USE_LANGUAGES=	c c++
 USE_TOOLS+=	gmake
+CONFIGURE_ENV+=	VARBASE=${VARBASE}
 
 .include "../../devel/SDL/buildlink3.mk"
 .include "../../graphics/SDL_image/buildlink3.mk"
diff --git a/games/KoboDeluxe/PLIST b/games/KoboDeluxe/PLIST
index fb88a4aabc6..6ea5724c824 100644
--- a/games/KoboDeluxe/PLIST
+++ b/games/KoboDeluxe/PLIST
@@ -1,5 +1,6 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2003/07/12 09:30:41 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2007/02/08 18:16:09 drochner Exp $
 bin/kobodl
+man/man6/kobodl.6
 share/games/kobo-deluxe/gfx/bigship.pcx
 share/games/kobo-deluxe/gfx/brushes.png
 share/games/kobo-deluxe/gfx/bullets.pcx
@@ -9,117 +10,56 @@ share/games/kobo-deluxe/gfx/font3b.png
 share/games/kobo-deluxe/gfx/font4b.png
 share/games/kobo-deluxe/gfx/loading.png
 share/games/kobo-deluxe/gfx/logo3.png
+share/games/kobo-deluxe/gfx/noise.pcx
 share/games/kobo-deluxe/gfx/screen.png
 share/games/kobo-deluxe/gfx/sprites.pcx
 share/games/kobo-deluxe/gfx/tiles.pcx
 share/games/kobo-deluxe/gfx/tube1.png
 share/games/kobo-deluxe/gfx/tube2.png
 share/games/kobo-deluxe/sfx/aguitar1.agw
-share/games/kobo-deluxe/sfx/aguitar2.agw
 share/games/kobo-deluxe/sfx/ballad1.agw
 share/games/kobo-deluxe/sfx/ballad1.mid
-share/games/kobo-deluxe/sfx/banjo1.agw
-share/games/kobo-deluxe/sfx/bassdrum1.agw
-share/games/kobo-deluxe/sfx/bassdrum10.agw
-share/games/kobo-deluxe/sfx/bassdrum2.agw
 share/games/kobo-deluxe/sfx/bassdrum3.agw
-share/games/kobo-deluxe/sfx/bassdrum4.agw
 share/games/kobo-deluxe/sfx/bassdrum5.agw
-share/games/kobo-deluxe/sfx/bassdrum6.agw
-share/games/kobo-deluxe/sfx/bassdrum7.agw
-share/games/kobo-deluxe/sfx/bassdrum8.agw
-share/games/kobo-deluxe/sfx/bassdrum9.agw
 share/games/kobo-deluxe/sfx/beam.raw
 share/games/kobo-deluxe/sfx/bomb.raw
 share/games/kobo-deluxe/sfx/bongo1.agw
-share/games/kobo-deluxe/sfx/brass1.agw
 share/games/kobo-deluxe/sfx/brass2.agw
 share/games/kobo-deluxe/sfx/bubble.raw
+share/games/kobo-deluxe/sfx/bzzzt1.agw
 share/games/kobo-deluxe/sfx/claps1.agw
-share/games/kobo-deluxe/sfx/claps2.agw
-share/games/kobo-deluxe/sfx/crash1.agw
-share/games/kobo-deluxe/sfx/cymbal1.agw
-share/games/kobo-deluxe/sfx/cymbal2.agw
-share/games/kobo-deluxe/sfx/cymbal3.agw
-share/games/kobo-deluxe/sfx/cymbal4.agw
-share/games/kobo-deluxe/sfx/edge1.agw
 share/games/kobo-deluxe/sfx/edge2.agw
-share/games/kobo-deluxe/sfx/edit.agw
-share/games/kobo-deluxe/sfx/elecbass1.agw
 share/games/kobo-deluxe/sfx/elecbass2.agw
-share/games/kobo-deluxe/sfx/elecbass3.agw
-share/games/kobo-deluxe/sfx/elecbass4.agw
-share/games/kobo-deluxe/sfx/elecbass5.agw
 share/games/kobo-deluxe/sfx/enemym.raw
 share/games/kobo-deluxe/sfx/expl.raw
 share/games/kobo-deluxe/sfx/expl2.raw
 share/games/kobo-deluxe/sfx/expl3.raw
 share/games/kobo-deluxe/sfx/fine.raw
-share/games/kobo-deluxe/sfx/fmbass1.agw
-share/games/kobo-deluxe/sfx/fmbass2.agw
-share/games/kobo-deluxe/sfx/fmknock1.agw
-share/games/kobo-deluxe/sfx/fmkoto1.agw
-share/games/kobo-deluxe/sfx/gmsclock.agw
+share/games/kobo-deluxe/sfx/gameover1.agw
 share/games/kobo-deluxe/sfx/hardsync1.agw
-share/games/kobo-deluxe/sfx/hihat1c.agw
-share/games/kobo-deluxe/sfx/hihat1o.agw
-share/games/kobo-deluxe/sfx/hihat1p.agw
-share/games/kobo-deluxe/sfx/hihat2.agw
-share/games/kobo-deluxe/sfx/kettle1.agw
 share/games/kobo-deluxe/sfx/kobosfx.h
 share/games/kobo-deluxe/sfx/launch.agw
 share/games/kobo-deluxe/sfx/launch2.agw
-share/games/kobo-deluxe/sfx/marimba1.agw
 share/games/kobo-deluxe/sfx/marimba2.agw
 share/games/kobo-deluxe/sfx/metallic.raw
 share/games/kobo-deluxe/sfx/music.agw
 share/games/kobo-deluxe/sfx/noiseburst1.agw
 share/games/kobo-deluxe/sfx/noiseburst2.agw
-share/games/kobo-deluxe/sfx/noiseburst3.agw
-share/games/kobo-deluxe/sfx/noiseflute1.agw
 share/games/kobo-deluxe/sfx/oneup.raw
 share/games/kobo-deluxe/sfx/phattpad1.agw
 share/games/kobo-deluxe/sfx/phattpad2.agw
-share/games/kobo-deluxe/sfx/phattpad3.agw
-share/games/kobo-deluxe/sfx/ride1.agw
-share/games/kobo-deluxe/sfx/ride2.agw
-share/games/kobo-deluxe/sfx/ride3.agw
-share/games/kobo-deluxe/sfx/ride4.agw
-share/games/kobo-deluxe/sfx/rideping1.agw
-share/games/kobo-deluxe/sfx/rideping2.agw
+share/games/kobo-deluxe/sfx/ready1.agw
 share/games/kobo-deluxe/sfx/ring.raw
-share/games/kobo-deluxe/sfx/sawsynth1.agw
-share/games/kobo-deluxe/sfx/sawsynth2.agw
 share/games/kobo-deluxe/sfx/sfx.agw
 share/games/kobo-deluxe/sfx/shot.raw
 share/games/kobo-deluxe/sfx/sine.agw
-share/games/kobo-deluxe/sfx/sineknock1.agw
-share/games/kobo-deluxe/sfx/sineknock2.agw
 share/games/kobo-deluxe/sfx/snare1.agw
-share/games/kobo-deluxe/sfx/snare2.agw
-share/games/kobo-deluxe/sfx/snare3.agw
-share/games/kobo-deluxe/sfx/snare4.agw
-share/games/kobo-deluxe/sfx/snare5.agw
-share/games/kobo-deluxe/sfx/speed.agw
-share/games/kobo-deluxe/sfx/speed1.agw
-share/games/kobo-deluxe/sfx/speed2.agw
-share/games/kobo-deluxe/sfx/steelguit1.agw
 share/games/kobo-deluxe/sfx/synbass1.agw
 share/games/kobo-deluxe/sfx/test2.agw
 share/games/kobo-deluxe/sfx/test2.mid
 share/games/kobo-deluxe/sfx/thunder1.agw
 share/games/kobo-deluxe/sfx/trance1.agw
 share/games/kobo-deluxe/sfx/trance1.mid
-share/games/kobo-deluxe/sfx/truefm1.agw
-share/games/kobo-deluxe/sfx/tububells1.agw
-share/games/kobo-deluxe/sfx/tububells2.agw
-share/games/kobo-deluxe/sfx/warmpad1.agw
-share/games/kobo-deluxe/sfx/xylophone1.agw
-share/games/kobo-deluxe/sfx/xylophone2.agw
 @dirrm share/games/kobo-deluxe/sfx
 @dirrm share/games/kobo-deluxe/gfx
 @dirrm share/games/kobo-deluxe
-@exec ${MKDIR} %D/games/kobo-deluxe/scores
-@dirrm games/kobo-deluxe/scores
-@dirrm games/kobo-deluxe
-@dirrm games
diff --git a/games/KoboDeluxe/distinfo b/games/KoboDeluxe/distinfo
index bec09b15a4e..bffda5587a6 100644
--- a/games/KoboDeluxe/distinfo
+++ b/games/KoboDeluxe/distinfo
@@ -1,5 +1,7 @@
-$NetBSD: distinfo,v 1.2 2005/02/23 23:11:54 agc Exp $
+$NetBSD: distinfo,v 1.3 2007/02/08 18:16:09 drochner Exp $
 
-SHA1 (KoboDeluxe-0.4pre8.tar.gz) = 4f32cb42de0e1229fd74aeaa7956dcb23d0000ab
-RMD160 (KoboDeluxe-0.4pre8.tar.gz) = b163210e2eb2e5af4a965a76b46e402ea968f002
-Size (KoboDeluxe-0.4pre8.tar.gz) = 676204 bytes
+SHA1 (KoboDeluxe-0.4pre10.tar.gz) = 7b1f37482d40e9f68291527d8b1b9dd7d88dd25c
+RMD160 (KoboDeluxe-0.4pre10.tar.gz) = 0b5cc8062bbde8697eadce6f5cf95e61485f21bc
+Size (KoboDeluxe-0.4pre10.tar.gz) = 800650 bytes
+SHA1 (patch-aa) = f6aed754db79fb584ef7274f9fadfe79e0918cc9
+SHA1 (patch-ab) = 40a7d8b47055c9a1b8afb5c9dbaaa0a2cbbbe822
diff --git a/games/KoboDeluxe/patches/patch-aa b/games/KoboDeluxe/patches/patch-aa
new file mode 100644
index 00000000000..838d6aaa06d
--- /dev/null
+++ b/games/KoboDeluxe/patches/patch-aa
@@ -0,0 +1,13 @@
+$NetBSD: patch-aa,v 1.1 2007/02/08 18:16:09 drochner Exp $
+
+--- gamestate.h.orig	2007-02-08 15:19:12.000000000 +0100
++++ gamestate.h
+@@ -24,6 +24,8 @@
+ 
+ #include "window.h"
+ 
++class gamestatemanager_t;
++
+ class gamestate_t
+ {
+ 	friend class gamestatemanager_t;
diff --git a/games/KoboDeluxe/patches/patch-ab b/games/KoboDeluxe/patches/patch-ab
new file mode 100644
index 00000000000..67fdb0decbd
--- /dev/null
+++ b/games/KoboDeluxe/patches/patch-ab
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.1 2007/02/08 18:16:09 drochner Exp $
+
+--- configure.orig	2007-02-08 17:04:52.000000000 +0100
++++ configure
+@@ -4200,7 +4200,7 @@ build_macosx_bundle=no
+ build_simple_bundle=no
+ unix_scoredir=yes
+ DATADIR='$(datadir)/games/kobo-deluxe'
+-SCOREDIR='$(prefix)/games/kobo-deluxe/scores'
++SCOREDIR=${VARBASE}/games/kobo-deluxe/scores
+ CONFIGDIR='HOME>>'
+ CONFIGFILE='.kobodlrc'
+ EXEFILE=kobodl