Update to 1.9.7, now with theme support, keyboard support, and some

other changes.

5 files changed, 51 insertions, 77 deletions

diff --git a/games/icebreaker/Makefile b/games/icebreaker/Makefile
index 0b85531af8a..0dc816276bf 100644
--- a/games/icebreaker/Makefile
+++ b/games/icebreaker/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2002/08/27 18:49:10 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2002/08/30 22:55:59 wiz Exp $
 #
 
-DISTNAME=	icebreaker-1.2.1
+DISTNAME=	icebreaker-1.9.7
 CATEGORIES=	games
-MASTER_SITES=	http://www.mattdm.org/icebreaker/1.2.x/
+MASTER_SITES=	http://www.mattdm.org/icebreaker/1.9.x/
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	wiz@netbsd.org
@@ -12,9 +12,16 @@ COMMENT=	penguin capturing simulation
 
 USE_BUILDLINK2=	yes
 USE_GMAKE=	yes
+MAKE_ENV+=	mandir="${PREFIX}/man" highscoredir="/var/games"
+MAKE_ENV+=	prefix="${PREFIX}"
 
-post-install:
+do-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/icebreaker
+	${INSTALL_DATA_DIR} ${PREFIX}/share/icebreaker
+	cd ${WRKSRC} && ${INSTALL_DATA} *.ibt *.wav *.bmp \
+		${PREFIX}/share/icebreaker
+	${INSTALL_PROGRAM} -g games -m 2755 ${WRKSRC}/icebreaker ${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/icebreaker.6 ${PREFIX}/man/man6
 	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/icebreaker
 
 .include "../../audio/SDL-mixer/buildlink2.mk"
diff --git a/games/icebreaker/PLIST b/games/icebreaker/PLIST
index 5ea0349c334..e4a1c3a680f 100644
--- a/games/icebreaker/PLIST
+++ b/games/icebreaker/PLIST
@@ -1,11 +1,42 @@
-@comment $NetBSD: PLIST,v 1.2 2002/03/13 23:25:46 wiz Exp $
+@comment $NetBSD: PLIST,v 1.3 2002/08/30 22:56:00 wiz Exp $
 bin/icebreaker
 man/man6/icebreaker.6
 share/doc/icebreaker/README
+share/icebreaker/atom.bmp
+share/icebreaker/bgeveryone.wav
+share/icebreaker/bgvvint.wav
+share/icebreaker/billg.bmp
+share/icebreaker/billg.ibt
+share/icebreaker/blocks.ibt
+share/icebreaker/bwop.wav
+share/icebreaker/cheese.ibt
+share/icebreaker/cow.bmp
+share/icebreaker/cows.ibt
 share/icebreaker/crash.wav
+share/icebreaker/drum.wav
+share/icebreaker/ewww.wav
 share/icebreaker/icebreaker_48.bmp
+share/icebreaker/jz-like.ibt
+share/icebreaker/kitty.bmp
+share/icebreaker/kitty.ibt
+share/icebreaker/linux.ibt
+share/icebreaker/moo.wav
+share/icebreaker/mouse-r.bmp
+share/icebreaker/mouse.bmp
+share/icebreaker/nbwoanp.wav
 share/icebreaker/ouch.wav
 share/icebreaker/penguin.bmp
 share/icebreaker/penguinicon_32.bmp
+share/icebreaker/phase.wav
+share/icebreaker/pop.wav
+share/icebreaker/scrunch.wav
+share/icebreaker/splat.wav
+share/icebreaker/squeak.wav
+share/icebreaker/star.bmp
+share/icebreaker/stars.ibt
+share/icebreaker/tap.wav
+share/icebreaker/turtle.bmp
+share/icebreaker/turtles.ibt
+share/icebreaker/woodblock.bmp
 @dirrm share/icebreaker
 @dirrm share/doc/icebreaker
diff --git a/games/icebreaker/distinfo b/games/icebreaker/distinfo
index d2fac4a7cbf..c50d78314f6 100644
--- a/games/icebreaker/distinfo
+++ b/games/icebreaker/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.2 2002/03/13 23:25:46 wiz Exp $
+$NetBSD: distinfo,v 1.3 2002/08/30 22:56:00 wiz Exp $
 
-SHA1 (icebreaker-1.2.1.tgz) = 7b7c1e655f2a979cd1f05aa6ff0cddc5d2430efb
-Size (icebreaker-1.2.1.tgz) = 56622 bytes
-SHA1 (patch-aa) = 7bb29e67eb6e76349fa802d5aa0a02f68498b213
-SHA1 (patch-ab) = 1850a318cae8205ac250f1e3faf2416e121dec16
+SHA1 (icebreaker-1.9.7.tgz) = 856ed5e3c8498660b97558acdd10abb6b9472bfa
+Size (icebreaker-1.9.7.tgz) = 189167 bytes
+SHA1 (patch-aa) = 97accbbf40dec7b3212fcf32efd4b4fce265bb1b
diff --git a/games/icebreaker/patches/patch-aa b/games/icebreaker/patches/patch-aa
index e8f3c49c7c0..feaf47265fa 100644
--- a/games/icebreaker/patches/patch-aa
+++ b/games/icebreaker/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.2 2002/03/13 23:25:47 wiz Exp $
+$NetBSD: patch-aa,v 1.3 2002/08/30 22:56:00 wiz Exp $
 
---- Makefile.orig	Mon Jul 30 03:32:36 2001
+--- Makefile.orig	Fri Jun  7 05:39:18 2002
 +++ Makefile
-@@ -1,9 +1,9 @@
+@@ -1,6 +1,6 @@
 -CC=gcc
 +CC?=gcc
  
@@ -10,54 +10,4 @@ $NetBSD: patch-aa,v 1.2 2002/03/13 23:25:47 wiz Exp $
 +SDLCONFIG?=sdl-config
  
  ifndef prefix
--  prefix=/usr/local
-+  prefix=${PREFIX}
-   #prefix=/usr
- endif
- 
-@@ -12,11 +12,11 @@
- endif
- 
- ifndef mandir
--  mandir=$(prefix)/share/man
-+  mandir=$(prefix)/man
- endif
- 
- ifndef highscoredir
--  highscoredir=/var/local/lib/games
-+  highscoredir=/var/games
-   #highscoredir=/var/lib/games
- endif
- 
-@@ -30,7 +30,7 @@
-     level.c intro.c text.c status.c transition.c hiscore.c dialog.c \
-     options.c fullscreen.c
- 
--SDL_MIXER=-lSDL_mixer
-+SDL_MIXER=-lSDL_mixer -lsmpeg
- SDL_LIB=$(SDL_LDFLAGS) $(SDL_MIXER) 
- SDL_CFLAGS := $(shell $(SDLCONFIG) --cflags)
- SDL_LDFLAGS := $(shell $(SDLCONFIG) --libs)
-@@ -103,14 +103,14 @@
- 	   sed 's/\$$VERDATE/$(VERDATE)/' > $@
- 
- install: all
--	mkdir -p $(prefix)/bin
--	mkdir -p $(prefix)/share/icebreaker
--	mkdir -p $(highscoredir)
--	mkdir -p $(mandir)/man6
--
--	install -m 644 *.wav *.bmp $(prefix)/share/icebreaker
--	install -g games -s -m 2755 icebreaker $(prefix)/bin
--	install -m 644 icebreaker.6 $(mandir)/man6
-+	${BSD_INSTALL_DATA_DIR} $(prefix)/bin
-+	${BSD_INSTALL_DATA_DIR} $(prefix)/share/icebreaker
-+	${BSD_INSTALL_DATA_DIR} $(highscoredir)
-+	${BSD_INSTALL_DATA_DIR} $(mandir)/man6
-+
-+	${BSD_INSTALL_DATA} -m 644 *.wav *.bmp $(prefix)/share/icebreaker
-+	${BSD_INSTALL_DATA} -g games -s -m 2755 icebreaker $(prefix)/bin
-+	${BSD_INSTALL_MAN} -m 644 icebreaker.6 $(mandir)/man6
- 	touch $(highscoredir)/icebreaker.scores
- 	chown games:games $(highscoredir)/icebreaker.scores
- 	chmod 664 $(highscoredir)/icebreaker.scores
+   prefix=/usr/local
diff --git a/games/icebreaker/patches/patch-ab b/games/icebreaker/patches/patch-ab
deleted file mode 100644
index 824f9c9e536..00000000000
--- a/games/icebreaker/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2002/03/08 19:19:15 wiz Exp $
-
---- sound.c.orig	Fri Jul 27 02:47:59 2001
-+++ sound.c
-@@ -38,7 +38,7 @@
- 		soundsystemworks=false;
- 		fprintf(stderr, "Can't start sound subsystem: %s\nContinuing without it.\n", SDL_GetError());
- 	}	
--	else if  (Mix_OpenAudio(11025, (Uint16)AUDIO_U8, 2, 256))
-+	else if  (Mix_OpenAudio(44100, (Uint16)AUDIO_U8, 2, 256))
- 	{
- 		soundsystemworks=false;
- 		fprintf(stderr, "Can't open audio: %s\nContinuing without it.\n", SDL_GetError());