Merge in numerous local fixes:

- when outputing character to the screen check that we actually have a
  character for the charcode supplied. This fixes potential segfault
  when user types in some character that isn't in the table;
- don't hog all CPU time when playing level completion sound. This also
  makes level completion sound much more less jerky;
- by default use sdl12 library instead of sdl10, because sdl10 is at the
  end of its lifecycle and would be retired RSN.

Bump PPORTREVISION to indicate that major changes were made.

7 files changed, 104 insertions, 16 deletions

diff --git a/games/digger-vgl/Makefile b/games/digger-vgl/Makefile
index dff4b6155791..9a7128bfe3b4 100644
--- a/games/digger-vgl/Makefile
+++ b/games/digger-vgl/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	digger
 PORTVERSION=	1.0
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	http://www.digger.org/
 DISTNAME=	${PORTNAME}-${DIGREL}
@@ -14,8 +15,10 @@ DISTNAME=	${PORTNAME}-${DIGREL}
 MAINTAINER=	sobomax@FreeBSD.org
 
 .if defined(WITH_SOUND)
-LIB_DEPENDS=	SDL-1.0.2:${PORTSDIR}/devel/sdl10
-MAKE_ENV=	SOUND=yes
+SDL_CONFIG?=	${LOCALBASE}/bin/sdl11-config
+LIB_DEPENDS=	SDL-1.1.3:${PORTSDIR}/devel/sdl12
+MAKE_ENV=	SOUND=yes \
+		SDL_CONFIG=${SDL_CONFIG}
 .endif
 
 ONLY_FOR_ARCHS=	i386	# Alphas don't have libvgl yet...
diff --git a/games/digger-vgl/files/patch-aa b/games/digger-vgl/files/patch-aa
index 0d829ea48f01..1b34a4543ed1 100644
--- a/games/digger-vgl/files/patch-aa
+++ b/games/digger-vgl/files/patch-aa
@@ -1,6 +1,9 @@
---- Makefile.fbsd.orig	Fri Apr 14 10:29:24 2000
-+++ Makefile.fbsd	Fri Apr 14 10:29:57 2000
-@@ -4,7 +4,7 @@
+
+$FreeBSD$
+
+--- Makefile.fbsd.orig	Mon Apr  3 23:42:48 2000
++++ Makefile.fbsd	Sat Sep 22 23:07:01 2001
+@@ -4,24 +4,28 @@
  		newsnd.c ini.c input.c monster.c bags.c alpha.c vgagrafx.c \
  		title_gz.c
  
@@ -9,3 +12,28 @@
  
  LDADD+=		-lz
  
++SDL_CONFIG?=	sdl-config
++
+ .if !defined(SDL)
+ CFLAGS+=	-D_VGL
+ LDADD+=		-lvgl 
+ SRCS+=		fbsd_sup.c fbsd_vid.c fbsd_kbd.c fbsd_timer.c
+ .if defined(SOUND)
+ SRCS+=		sdl_snd.c
+-CFLAGS+=	-D_SDL_SOUND `sdl-config --cflags`
+-LDADD+=		`sdl-config --libs`
++SDL_CFLAGS!=	${SDL_CONFIG} --cflags
++SDL_LDFLAGS!=	${SDL_CONFIG} --libs
++CFLAGS+=	-D_SDL_SOUND ${SDL_CFLAGS}
++LDADD+=		${SDL_LDFLAGS}
+ .else	# NO SOUND
+ SRCS+=		fbsd_snd.c
+ .endif	# SOUND
+ .else	# SDL
+-CFLAGS+=	-D_SDL `sdl-config --cflags`
+-LDADD+=		`sdl-config --libs`
++CFLAGS+=	-D_SDL `${SDL_CONFIG} --cflags`
++LDADD+=		`${SDL_CONFIG} --libs`
+ SRCS+=		fbsd_sup.c sdl_vid.c sdl_timer.c sdl_kbd.c sdl_snd.c icon.c
+ .endif
+ 
diff --git a/games/digger-vgl/files/patch-ab b/games/digger-vgl/files/patch-ab
index 854722ac1f13..3ad9055a5eda 100644
--- a/games/digger-vgl/files/patch-ab
+++ b/games/digger-vgl/files/patch-ab
@@ -1,10 +1,34 @@
---- fbsd_vid.c	2000/11/28 13:05:23	1.1
-+++ fbsd_vid.c	2000/11/28 13:05:27
-@@ -1,4 +1,6 @@
+
+$FreeBSD$
+
+--- fbsd_vid.c.orig	Mon Apr  3 23:42:44 2000
++++ fbsd_vid.c	Sat Sep 22 22:18:25 2001
+@@ -1,4 +1,18 @@
 -#include <machine/console.h>
++/*
++ * ---------------------------------------------------------------------------
++ * "THE BEER-WARE LICENSE" (Revision 42, (c) Poul-Henning Kamp): Maxim
++ * Sobolev <sobomax@altavista.net> wrote this file. As long as you retain
++ * this  notice you can  do whatever you  want with this stuff. If we meet
++ * some day, and you think this stuff is worth it, you can buy me a beer in
++ * return.
++ *
++ * Maxim Sobolev
++ * ---------------------------------------------------------------------------
++ */
++
 +#include <sys/fbio.h>
-+#include <sys/consio.h>
 +#include <sys/kbio.h>
++#include <sys/consio.h>
  #include <vgl.h>
  #include <signal.h>
  #include <osreldate.h>
+@@ -272,6 +286,8 @@
+     Sint4           w = 3, h = 12, size;
+     Sint4           i;
+ 
++    if(((ch - 32) >= 0x5f) || (ch < 32))
++	return;
+     tmp = ch2bmap(alphas[ch - 32], w, h);
+     size = tmp->Xsize * tmp->Ysize;
+     copy = malloc(size);
diff --git a/games/digger-vgl/files/patch-ac b/games/digger-vgl/files/patch-ac
index 643c184d7a92..1c539cf4d90f 100644
--- a/games/digger-vgl/files/patch-ac
+++ b/games/digger-vgl/files/patch-ac
@@ -1,10 +1,13 @@
---- fbsd_kbd.c	2000/11/28 13:07:51	1.1
-+++ fbsd_kbd.c	2000/11/28 13:08:03
+
+$FreeBSD$
+
+--- fbsd_kbd.c.orig	Mon Apr  3 23:42:46 2000
++++ fbsd_kbd.c	Sat Sep 22 22:19:37 2001
 @@ -1,4 +1,6 @@
 -#include <machine/console.h>
 +#include <sys/fbio.h>
-+#include <sys/consio.h>
 +#include <sys/kbio.h>
++#include <sys/consio.h>
  #include <vgl.h>
  
  #include "def.h"
diff --git a/games/digger-vgl/files/patch-ad b/games/digger-vgl/files/patch-ad
index 7be9a3e84dde..2aa7e4e905cb 100644
--- a/games/digger-vgl/files/patch-ad
+++ b/games/digger-vgl/files/patch-ad
@@ -1,13 +1,15 @@
---- fbsd_timer.c	2000/11/28 13:09:59	1.1
-+++ fbsd_timer.c	2000/11/28 13:10:48
-@@ -2,7 +2,9 @@
+
+$FreeBSD$
+
+--- fbsd_timer.c.orig	Mon Apr  3 23:42:44 2000
++++ fbsd_timer.c	Sat Sep 22 22:20:03 2001
+@@ -2,7 +2,8 @@
  #include <stdlib.h>
  #include <time.h>
  #include <sys/time.h>
 -#include <machine/console.h>
 +#include <sys/fbio.h>
 +#include <sys/consio.h>
-+#include <sys/kbio.h>
  #include <vgl.h>
  
  #include "def.h"
diff --git a/games/digger-vgl/files/patch-sdl_snd.c b/games/digger-vgl/files/patch-sdl_snd.c
new file mode 100644
index 000000000000..c1e7a1527d18
--- /dev/null
+++ b/games/digger-vgl/files/patch-sdl_snd.c
@@ -0,0 +1,13 @@
+
+$FreeBSD$
+
+--- sdl_snd.c	2001/09/22 19:20:28	1.1
++++ sdl_snd.c	2001/09/22 19:20:38
+@@ -15,7 +15,6 @@
+ 
+ bool initsounddevice(void)
+ {
+-//	SDL_PauseAudio(0);
+ 	return(TRUE);
+ }
+ 
diff --git a/games/digger-vgl/files/patch-sound.c b/games/digger-vgl/files/patch-sound.c
new file mode 100644
index 000000000000..c19804552fc2
--- /dev/null
+++ b/games/digger-vgl/files/patch-sound.c
@@ -0,0 +1,15 @@
+
+$FreeBSD$
+
+--- sound.c.orig	Mon Apr  3 23:42:42 2000
++++ sound.c	Sat Sep 22 22:18:55 2001
+@@ -172,6 +172,9 @@
+ 	if (!wave_device_available)
+ 		soundlevdoneflag=FALSE;
+ #endif
++#if defined _SDL || defined _SDL_SOUND
++    SDL_Delay(10);	/* Let some CPU time go away */
++#endif
+ #ifdef ARM
+     gretrace();
+     soundint();