Take maintainership. Update to 2.2.5.

Changes:
- fix crash caused by long messages in HUD
- live monster counter on HUD
- notify server if client quits during startup wait
- improved response file parser
- fast forward to given map # in demo playback
- fixes for various sound bugs (no more delay in NetBSD!)
- fix doom2 demos at levels with >10 deathmatch starts
- and more compatibility and demo fixes
- support higher-turning-resolution demos from v1.91
- fix compilation with gcc 3.4.x

5 files changed, 32 insertions, 33 deletions

diff --git a/games/prboom/Makefile b/games/prboom/Makefile
index aca1e246733..129424e0c5a 100644
--- a/games/prboom/Makefile
+++ b/games/prboom/Makefile
@@ -1,12 +1,10 @@
-# $NetBSD: Makefile,v 1.15 2004/04/17 20:47:57 zuntum Exp $
-#
+# $NetBSD: Makefile,v 1.16 2004/09/25 20:02:54 snj Exp $
 
-DISTNAME=	prboom-2.2.4
-PKGREVISION=	1
+DISTNAME=	prboom-2.2.5
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=prboom/}
 
-MAINTAINER=	tech-pkg@NetBSD.org
+MAINTAINER=	snj@NetBSD.org
 HOMEPAGE=	http://prboom.sourceforge.net/
 COMMENT=	Multiplayer-capable and modified version of DOOM
 
@@ -17,4 +15,5 @@ GNU_CONFIGURE=		YES
 
 .include "../../audio/SDL_mixer/buildlink3.mk"
 .include "../../net/SDL_net/buildlink3.mk"
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/prboom/distinfo b/games/prboom/distinfo
index 228935e831e..6a07c8a2e30 100644
--- a/games/prboom/distinfo
+++ b/games/prboom/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.4 2003/11/05 04:32:01 xtraeme Exp $
+$NetBSD: distinfo,v 1.5 2004/09/25 20:02:55 snj Exp $
 
-SHA1 (prboom-2.2.4.tar.gz) = 008a4baa7bee5142978badeb59ad0bba85d86bf7
-Size (prboom-2.2.4.tar.gz) = 1001103 bytes
-SHA1 (patch-aa) = 3578b8c1a32db0ff804a75c35bfa4fbc9782901c
-SHA1 (patch-ab) = 0f805aead21ce92fcaac17f060ded0e15a807e1d
-SHA1 (patch-ac) = 7bf1bc9061cacc93549596c56d769714cb432b88
+SHA1 (prboom-2.2.5.tar.gz) = 4a0f46345952d659e8c49a612e493bd63f2b24ea
+Size (prboom-2.2.5.tar.gz) = 1046392 bytes
+SHA1 (patch-aa) = 19a4069837236a0d451bb309dc00c5c301b99a1c
+SHA1 (patch-ab) = 15383a7d31852955c06c6c1a3045b071accf08cf
+SHA1 (patch-ac) = cd334a29dd37840b7f2d80f46216b0b0487f44a4
diff --git a/games/prboom/patches/patch-aa b/games/prboom/patches/patch-aa
index 74302549fe8..51795f30615 100644
--- a/games/prboom/patches/patch-aa
+++ b/games/prboom/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.1.1.1 2001/07/26 12:33:59 zuntum Exp $
+$NetBSD: patch-aa,v 1.2 2004/09/25 20:02:55 snj Exp $
 
---- configure.orig	Mon Jun 18 00:14:24 2001
-+++ configure
-@@ -922,9 +922,9 @@
+--- configure.orig	2004-09-22 04:14:32.000000000 -0700
++++ configure	2004-09-25 12:37:19.000000000 -0700
+@@ -1859,9 +1859,9 @@ INSTALL_STRIP_PROGRAM="\${SHELL} \$(inst
  
  
  if test "x$prefix" != xNONE; then
@@ -12,5 +12,5 @@ $NetBSD: patch-aa,v 1.1.1.1 2001/07/26 12:33:59 zuntum Exp $
 -  DOOMWADDIR="$ac_default_prefix/share/games/doom"
 +  DOOMWADDIR="$ac_default_prefix/share/doom"
  fi
- cat >> confdefs.h <<EOF
+ cat >>confdefs.h <<_ACEOF
  #define DOOMWADDIR "$DOOMWADDIR"
diff --git a/games/prboom/patches/patch-ab b/games/prboom/patches/patch-ab
index 59ab351983b..db9ef3437bc 100644
--- a/games/prboom/patches/patch-ab
+++ b/games/prboom/patches/patch-ab
@@ -1,13 +1,13 @@
-$NetBSD: patch-ab,v 1.1.1.1 2001/07/26 12:33:59 zuntum Exp $
+$NetBSD: patch-ab,v 1.2 2004/09/25 20:02:55 snj Exp $
 
---- data/Makefile.in.orig	Sat Jun 23 11:57:48 2001
-+++ data/Makefile.in
-@@ -91,7 +91,7 @@
- VERSION = @VERSION@
- ac_aux_dir = @ac_aux_dir@
- 
+--- data/Makefile.in.orig	2004-09-22 04:14:30.000000000 -0700
++++ data/Makefile.in	2004-09-25 12:38:02.000000000 -0700
+@@ -163,7 +163,7 @@ target_alias = @target_alias@
+ target_cpu = @target_cpu@
+ target_os = @target_os@
+ target_vendor = @target_vendor@
 -waddir = $(datadir)/games/doom
 +waddir = $(datadir)/doom
  wad_DATA = prboom.wad
  EXTRA_DIST = prboom.wad
- mkinstalldirs = $(SHELL) $(top_srcdir)/autotools/mkinstalldirs
+ all: all-am
diff --git a/games/prboom/patches/patch-ac b/games/prboom/patches/patch-ac
index d054acbe72d..809f64112c7 100644
--- a/games/prboom/patches/patch-ac
+++ b/games/prboom/patches/patch-ac
@@ -1,13 +1,13 @@
-$NetBSD: patch-ac,v 1.1.1.1 2001/07/26 12:33:59 zuntum Exp $
+$NetBSD: patch-ac,v 1.2 2004/09/25 20:02:55 snj Exp $
 
---- src/Makefile.in.orig	Sat Jun 23 11:57:51 2001
-+++ src/Makefile.in
-@@ -97,7 +97,7 @@
- 
+--- src/Makefile.in.orig	2004-09-22 04:14:31.000000000 -0700
++++ src/Makefile.in	2004-09-25 12:38:41.000000000 -0700
+@@ -276,7 +276,7 @@ target_os = @target_os@
+ target_vendor = @target_vendor@
+ EXTRA_SUBDIRS = Posix SDL
  SUBDIRS = SDL POSIX
- 
 -gamesdir = $(prefix)/games
 +gamesdir = $(prefix)/bin
- EXTRA_PROGRAMS = prboom-game-server
- games_PROGRAMS = prboom @BUILD_SERVER@
- 
+ prboom_game_server_SOURCES = d_server.c i_udp_sdl.c protocol.h
+ prboom_game_server_LDADD = POSIX/libposixdoom.a @NET_LIBS@ @SDL_LIBS@
+ COMMON_SRC = \