Update to 021212.

The data file needed for sound is installed into ${PREFIX}/share/xrick/data.zip.
Either copy it to your current dir, or start xrick with
	xrick -data ${PREFIX}/share/xrick/data.zip

Changes:
* Reworked the build system so xrick can easily be built on Unix boxes as
  well as on non-Unix boxes (do not rely on symbolic links, etc.).
* Use function keys instead of numeric keys for various game controls, as some
  non-US keyboard require that SHIFT is pressed for numbers (A. Majorel).
* Fixed a potential buffer overflow in command-line parameters handling
  (A. Majorel).
* Joystick is (hopefully) OK now (S. Chauveau).
* Implemented all sounds: music, effects, etc.
* The sound was horrible on Windows due to a poorly dimensionned sound
  buffer. Fixed.
* Re-ripped all sounds. This time I used STeem with debugger to save each
  sound as a WAV file, then Audacity to filter an annoying static noise
  produced by STeem, then SOX to re-sample.

4 files changed, 24 insertions, 51 deletions

diff --git a/games/xrick/Makefile b/games/xrick/Makefile
index 25041a21c05..19005c02841 100644
--- a/games/xrick/Makefile
+++ b/games/xrick/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2002/08/27 19:09:12 jlam Exp $
+# $NetBSD: Makefile,v 1.3 2003/01/06 19:48:08 wiz Exp $
 #
 
-DISTNAME=	xrick-010808
-WRKSRC=		${WRKDIR}/xrick
+DISTNAME=	xrick-021212
 CATEGORIES=	games
 MASTER_SITES=	http://www.bigorno.net/xrick/
 EXTRACT_SUFX=	.tgz
@@ -20,9 +19,6 @@ NO_SRC_ON_FTP=	    ${RESTRICTED}
 USE_GMAKE=		YES
 USE_BUILDLINK2=		YES
 USE_X11=		YES
-HAS_CONFIGURE=		YES
-
-CONFIGURE_SCRIPT=	./config
 
 post-extract:
 	cd ${WRKSRC} && ${GUNZIP_CMD} xrick.6.gz
@@ -30,6 +26,8 @@ post-extract:
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/xrick ${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/xrick.6 ${PREFIX}/man/man6
+	${INSTALL_DATA_DIR} ${PREFIX}/share/xrick
+	${INSTALL_DATA} ${WRKSRC}/data.zip ${PREFIX}/share/xrick
 
 .include "../../devel/SDL/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/xrick/PLIST b/games/xrick/PLIST
index 620925904d4..4e7c042aeef 100644
--- a/games/xrick/PLIST
+++ b/games/xrick/PLIST
@@ -1,3 +1,5 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/05/12 00:02:15 wiz Exp $
+@comment $NetBSD: PLIST,v 1.2 2003/01/06 19:48:08 wiz Exp $
 bin/xrick
 man/man6/xrick.6
+share/xrick/data.zip
+@dirrm share/xrick
diff --git a/games/xrick/distinfo b/games/xrick/distinfo
index 7c03c36ec48..33d532deeef 100644
--- a/games/xrick/distinfo
+++ b/games/xrick/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.2 2002/07/02 12:43:45 wiz Exp $
+$NetBSD: distinfo,v 1.3 2003/01/06 19:48:08 wiz Exp $
 
-SHA1 (xrick-010808.tgz) = f6b344433a11eb7ffb85412ffc66e79cc8b66e75
-Size (xrick-010808.tgz) = 244991 bytes
-SHA1 (patch-aa) = 99a518e9e190e581a9a445b11fc4e54d5ed9e26b
+SHA1 (xrick-021212.tgz) = 1a84eac20a22ab86d2013cc1c8ff7e0097b4466a
+Size (xrick-021212.tgz) = 1648538 bytes
+SHA1 (patch-aa) = 8909335f91b738948bb1aba2a82c44685d6d0efe
diff --git a/games/xrick/patches/patch-aa b/games/xrick/patches/patch-aa
index 3fe7d9bc225..6bb855df5b0 100644
--- a/games/xrick/patches/patch-aa
+++ b/games/xrick/patches/patch-aa
@@ -1,42 +1,15 @@
-$NetBSD: patch-aa,v 1.1.1.1 2002/05/12 00:02:16 wiz Exp $
+$NetBSD: patch-aa,v 1.2 2003/01/06 19:48:09 wiz Exp $
 
---- config.orig	Mon Aug  6 21:06:13 2001
-+++ config
-@@ -57,20 +57,23 @@
-   LDFLAGS="$LDFLAGS `sdl-config --libs`"
- fi
+--- include/unzip.h.orig	Tue Dec 24 14:32:56 2002
++++ include/unzip.h
+@@ -49,6 +49,10 @@ extern "C" {
+ #include "zlib.h"
+ #endif
  
--POSDOT=`expr index $SDLVER '.'`
--POSDOTp=`expr $POSDOT - 1`
--POSDOTn=`expr $POSDOT + 1`
--SDL_MAJ=`expr substr $SDLVER 1 $POSDOTp`
--LEN=`expr length $SDLVER`
--LEN=`expr $LEN - $POSDOT`
--SDLVER=`expr substr $SDLVER $POSDOTn $LEN`
--POSDOT=`expr index $SDLVER '.'`
--POSDOTp=`expr $POSDOT - 1`
--POSDOTn=`expr $POSDOT + 1`
--SDL_MIN=`expr substr $SDLVER 1 $POSDOTp`
--LEN=`expr length $SDLVER`
--LEN=`expr $LEN - $POSDOT`
--SDL_MIC=`expr substr $SDLVER $POSDOTn $LEN`
-+#POSDOT=`expr index $SDLVER '.'`
-+#POSDOTp=`expr $POSDOT - 1`
-+#POSDOTn=`expr $POSDOT + 1`
-+#SDL_MAJ=`expr substr $SDLVER 1 $POSDOTp`
-+SDL_MAJ=`echo $SDLVER |  sed -e 's/\([0-9]*\).*/\1/'`
-+#LEN=`expr length $SDLVER`
-+#LEN=`expr $LEN - $POSDOT`
-+#SDLVER=`expr substr $SDLVER $POSDOTn $LEN`
-+#POSDOT=`expr index $SDLVER '.'`
-+#POSDOTp=`expr $POSDOT - 1`
-+#POSDOTn=`expr $POSDOT + 1`
-+#SDL_MIN=`expr substr $SDLVER 1 $POSDOTp`
-+SDL_MIN=`echo $SDLVER |  sed -e 's/[0-9]\.\([0-9]*\).*/\1/'`
-+#LEN=`expr length $SDLVER`
-+#LEN=`expr $LEN - $POSDOT`
-+#SDL_MIC=`expr substr $SDLVER $POSDOTn $LEN`
-+SDL_MIC=`echo $SDLVER |  sed -e 's/[0-9]\.[0-9]\.\([0-9]*\).*/\1/'`
- 
- case "$TARGET" in
-   cygwin* | CYGWIN*)
++#ifndef OF
++#define OF(a)	a
++#endif
++
+ #if defined(STRICTUNZIP) || defined(STRICTZIPUNZIP)
+ /* like the STRICT of WIN32, we define a pointer that cannot be converted
+     from (void*) without cast */