[pkgsrc/trunk]: pkgsrc/games/quake2forge Update to 0.3.

[xtraeme <xtraeme%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/0d9445bbe24a
branches:  trunk
changeset: 498000:0d9445bbe24a
user:      xtraeme <xtraeme%pkgsrc.org@localhost>
date:      Wed Aug 10 01:33:48 2005 +0000

description:
Update to 0.3.

Changes:

* Pluggable sound driver architecture, sound output drivers configurable
  at runtime: oss, alsa, ao, sdl, solaris.
* Fixed joystick when using softx video refresher.
* ALSA and libao sound drivers added -- configurable at compile time.
* Updates to fix compile errors with gcc 3.3.

diffstat:

 games/quake2forge/Makefile         |  17 +++++++++-----
 games/quake2forge/PLIST            |   6 ++++-
 games/quake2forge/distinfo         |   9 +++----
 games/quake2forge/patches/patch-aa |  44 --------------------------------------
 4 files changed, 20 insertions(+), 56 deletions(-)

diffs (133 lines):

diff -r 1822de003976 -r 0d9445bbe24a games/quake2forge/Makefile
--- a/games/quake2forge/Makefile        Tue Aug 09 22:47:29 2005 +0000
+++ b/games/quake2forge/Makefile        Wed Aug 10 01:33:48 2005 +0000
@@ -1,12 +1,10 @@
-# $NetBSD: Makefile,v 1.15 2005/06/01 18:02:52 jlam Exp $
+# $NetBSD: Makefile,v 1.16 2005/08/10 01:33:48 xtraeme Exp $
 #
 
-DISTNAME=      quake2-0.2.1
+DISTNAME=      quake2-0.3
 PKGNAME=       ${DISTNAME:S/quake2/quake2forge/}
-PKGREVISION=   2
 CATEGORIES=    games
-MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=quake/}
-EXTRACT_SUFX=  .tar.bz2
+MASTER_SITES=  http://www.quakeforge.net/files/quake2forge/
 
 MAINTAINER=    tech-pkg%NetBSD.org@localhost
 HOMEPAGE=      http://www.quakeforge.net/
@@ -34,9 +32,16 @@
 SUBST_MESSAGE.snd=     "Fixing harcoded audio device."
 SUBST_STAGE.data=      post-patch
 SUBST_FILES.data=      configure
-SUBST_SED.data=                -e "s|PACKAGE=quake2|PACKAGE=${PKGBASE}|g"
+SUBST_SED.data=                -e "s|PACKAGE=\'quake2\'|PACKAGE=\'${PKGBASE}\'|g"
 SUBST_MESSAGE.data=    "Fixing installation directories."
 
+.include "../../mk/bsd.prefs.mk"
+
+# Don't try to build the Sun Solaris sound module, it's broken.
+.if !empty(OPSYS:MNetBSD) || !empty(OPSYS:MOpenBSD)
+CONFIGURE_ENV+=                ac_cv_header_sys_audioio_h=no
+.endif
+
 .include "../../devel/SDL/buildlink3.mk"
 .include "../../mk/ossaudio.buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
diff -r 1822de003976 -r 0d9445bbe24a games/quake2forge/PLIST
--- a/games/quake2forge/PLIST   Tue Aug 09 22:47:29 2005 +0000
+++ b/games/quake2forge/PLIST   Wed Aug 10 01:33:48 2005 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2004/09/22 08:09:31 jlam Exp $
+@comment $NetBSD: PLIST,v 1.4 2005/08/10 01:33:48 xtraeme Exp $
 bin/quake2forge
 lib/quake2forge/baseq2/game.la
 lib/quake2forge/ctf/game.la
@@ -6,6 +6,8 @@
 lib/quake2forge/ref_sdlgl.la
 lib/quake2forge/ref_softsdl.la
 lib/quake2forge/ref_softx.la
+lib/quake2forge/snd_oss.la
+lib/quake2forge/snd_sdl.la
 share/doc/quake2forge/README.Solaris
 share/doc/quake2forge/README.axp
 share/doc/quake2forge/README.install
@@ -13,6 +15,7 @@
 share/doc/quake2forge/README.linux
 share/doc/quake2forge/README.sdl
 share/doc/quake2forge/README.solaris
+share/doc/quake2forge/README.sound
 share/doc/quake2forge/TODO-ctf.txt
 share/doc/quake2forge/changes-ctf.txt
 share/doc/quake2forge/changes.txt
@@ -20,6 +23,7 @@
 share/doc/quake2forge/readme.txt
 share/quake2forge/baseq2/config.cfg
 @dirrm share/quake2forge/baseq2
+@dirrm share/quake2forge
 @dirrm share/doc/quake2forge
 @exec ${MKDIR} %D/lib/quake2forge/xatrix
 @dirrm lib/quake2forge/xatrix
diff -r 1822de003976 -r 0d9445bbe24a games/quake2forge/distinfo
--- a/games/quake2forge/distinfo        Tue Aug 09 22:47:29 2005 +0000
+++ b/games/quake2forge/distinfo        Wed Aug 10 01:33:48 2005 +0000
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.4 2005/02/23 23:12:01 agc Exp $
+$NetBSD: distinfo,v 1.5 2005/08/10 01:33:48 xtraeme Exp $
 
-SHA1 (quake2-0.2.1.tar.bz2) = 258a391f54dd58e59924f78c074e614b228ff773
-RMD160 (quake2-0.2.1.tar.bz2) = 0998bcd4ce75ebde8d16af60644a6dbbcf0ab428
-Size (quake2-0.2.1.tar.bz2) = 1286703 bytes
-SHA1 (patch-aa) = 380078cc177fcc8b7d7c5bf2fd59620d67349d55
+SHA1 (quake2-0.3.tar.gz) = 9daf646b02799de01aa77824f648ef6c5f66b3ec
+RMD160 (quake2-0.3.tar.gz) = 81b6abdf83782d1bd227df9e4511aa25c673b5bb
+Size (quake2-0.3.tar.gz) = 1757285 bytes
diff -r 1822de003976 -r 0d9445bbe24a games/quake2forge/patches/patch-aa
--- a/games/quake2forge/patches/patch-aa        Tue Aug 09 22:47:29 2005 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,44 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2004/04/16 15:03:21 xtraeme Exp $
-
---- src/main.c.orig    Fri Feb  7 14:25:46 2003
-+++ src/main.c Fri Feb  7 14:34:14 2003
-@@ -49,12 +49,21 @@
-       #include <mntent.h>
- #elif defined(__FreeBSD__) || defined(__bsd__) || defined (__NetBSD__)
-       #include <fstab.h>
-+      #include <pthread.h>
- #elif defined(__sun__)
-       #include <sys/file.h>
- #endif
- 
- #ifdef HAVE_DLOPEN
- # include <dlfcn.h>
-+#endif
-+
-+/* This should probably go into configure
-+ * BSDs and Linux have SIGIO, Solaris needs SIGPOLL
-+ * This should probably be changed the other way round
-+ * SIGIO as default and SIGPOLL only for Solrais */
-+#ifndef SIGPOLL
-+#define SIGPOLL SIGIO
- #endif
- 
- #include "qcommon.h"
-@@ -518,7 +527,7 @@
-     ret = fread(ptr, size, nitems, fp);
-     err = errno;
-     if (ret != nitems) {
--      printf("verify_fread(...,%d,%d,...): return value: %d\n", size, nitems, ret);
-+      printf("verify_fread(...,%lu,%lu,...): return value: %lu\n", (unsigned long)size, (unsigned long)nitems, (unsigned long)ret);
-       if (ret == 0 && ferror(fp)) {
-           printf("   error: %s\n", strerror(err));
-           printf("   fileno=%d\n", fileno(fp));
-@@ -536,7 +545,7 @@
-     ret = fwrite(ptr, size, nitems, fp);
-     err = errno;
-     if (ret != nitems) {
--      printf("verify_fwrite(...,%d,%d,...) = %d\n", size, nitems, ret);
-+      printf("verify_fwrite(...,%lu,%lu,...) = %lu\n", (unsigned long)size, (unsigned long)nitems, (unsigned long)ret);
-       if (ret == 0 && ferror(fp)) {
-           printf("   error: %s\n", strerror(err));
-           printf("   fileno=%d\n", fileno(fp));