*** empty log message ***

games/prboom/Makefile

@@ -1,7 +1,7 @@
-# $OpenBSD: Makefile,v 1.5 2004/11/28 22:41:20 espie Exp $
+# $OpenBSD: Makefile,v 1.6 2005/10/22 20:26:40 canacar Exp $
 
 COMMENT=	"enhanced clone of Id Software's Doom game; multiplayer"
-DISTNAME=	prboom-2.2.4
+DISTNAME=	prboom-2.2.6
 CATEGORIES=	games x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=prboom/}
 

games/prboom/distinfo

@@ -1,4 +1,4 @@
-MD5 (prboom-2.2.4.tar.gz) = a7cd473d5b6bb69f815bf156b93aeacc
-RMD160 (prboom-2.2.4.tar.gz) = 644e018cc94d60841728310c44afdf2cd202a20f
-SHA1 (prboom-2.2.4.tar.gz) = 008a4baa7bee5142978badeb59ad0bba85d86bf7
-SIZE (prboom-2.2.4.tar.gz) = 1001103
+MD5 (prboom-2.2.6.tar.gz) = ef0abe0aad017514857552434b5c6aaa
+RMD160 (prboom-2.2.6.tar.gz) = 8d6d005037a17b1b046f5a51c3e01b014896fbcd
+SHA1 (prboom-2.2.6.tar.gz) = b5d7df2b8627237bc1feb9c864268e887d86cc93
+SIZE (prboom-2.2.6.tar.gz) = 1047612

games/prboom/patches/patch-configure

@@ -1,7 +1,7 @@
-$OpenBSD: patch-configure,v 1.2 2003/09/24 08:30:09 jolan Exp $
---- configure.orig	2003-09-19 11:14:09.000000000 -0500
-+++ configure	2003-09-24 03:23:05.000000000 -0500
-@@ -922,9 +922,9 @@ fi
+$OpenBSD: patch-configure,v 1.3 2005/10/22 20:26:40 canacar Exp $
+--- configure.orig	Mon Sep 27 20:31:33 2004
++++ configure	Fri Oct 21 01:44:00 2005
+@@ -1859,9 +1859,9 @@ INSTALL_STRIP_PROGRAM="\${SHELL} \$(inst
 
 
  if test "x$prefix" != xNONE; then
@@ -11,9 +11,9 @@ $OpenBSD: patch-configure,v 1.2 2003/09/24 08:30:09 jolan Exp $
 -  DOOMWADDIR="$ac_default_prefix/share/games/doom"
 +  DOOMWADDIR="$ac_default_prefix/share/prboom"
  fi
- cat >> confdefs.h <<EOF
+ cat >>confdefs.h <<_ACEOF
  #define DOOMWADDIR "$DOOMWADDIR"
-@@ -1220,7 +1220,6 @@ EOF
+@@ -3073,7 +3073,6 @@ _ACEOF
    echo '    the source to insert the relevant pragmas so structures are packed.'
  fi
 

games/prboom/patches/patch-data_Makefile_in

@@ -1,12 +1,12 @@
-$OpenBSD: patch-data_Makefile_in,v 1.2 2003/09/24 08:30:09 jolan Exp $
---- data/Makefile.in.orig	2003-09-20 08:06:10.000000000 -0500
-+++ data/Makefile.in	2003-09-24 03:21:43.000000000 -0500
-@@ -90,7 +90,7 @@ SDL_LIBS = @SDL_LIBS@
- VERSION = @VERSION@
- ac_aux_dir = @ac_aux_dir@
-
+$OpenBSD: patch-data_Makefile_in,v 1.3 2005/10/22 20:26:40 canacar Exp $
+--- data/Makefile.in.orig	Mon Sep 27 20:31:31 2004
++++ data/Makefile.in	Fri Oct 21 01:44:54 2005
+@@ -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)/prboom
  wad_DATA = prboom.wad
  EXTRA_DIST = prboom.wad
- mkinstalldirs = $(SHELL) $(top_srcdir)/autotools/mkinstalldirs
+ all: all-am

games/prboom/patches/patch-src_Makefile_in

@@ -1,12 +1,12 @@
-$OpenBSD: patch-src_Makefile_in,v 1.2 2003/09/24 08:30:09 jolan Exp $
---- src/Makefile.in.orig	2003-09-20 08:06:11.000000000 -0500
-+++ src/Makefile.in	2003-09-24 03:21:43.000000000 -0500
-@@ -96,7 +96,7 @@ EXTRA_SUBDIRS = Posix SDL
-
+$OpenBSD: patch-src_Makefile_in,v 1.3 2005/10/22 20:26:40 canacar Exp $
+--- src/Makefile.in.orig	Mon Sep 27 20:31:32 2004
++++ src/Makefile.in	Fri Oct 21 01:45:48 2005
+@@ -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 = \

games/prboom/patches/patch-src_r_draw_c

@@ -0,0 +1,21 @@
+$OpenBSD: patch-src_r_draw_c,v 1.1 2005/10/22 20:26:40 canacar Exp $
+--- src/r_draw.c.orig	Fri Oct 21 02:54:37 2005
++++ src/r_draw.c	Fri Oct 21 02:54:06 2005
+@@ -273,7 +273,16 @@ void R_DrawTLColumn (void)
+     register const byte *source = dc_source;
+     register const lighttable_t *colormap = dc_colormap;
+     register unsigned heightmask = dc_texheight-1; // CPhipps - specify type
+-    if (dc_texheight & heightmask)   // not a power of 2 -- killough
++    if (dc_texheight == 0)
++      {
++  /* cea - another special case */
++        while (count--) {
++          *dest = tranmap[(*dest<<8)+colormap[source[frac>>FRACBITS]]]; // phares
++          dest += SCREENWIDTH;
++          frac += fracstep;
++        }
++      }
++    else if (dc_texheight & heightmask)   // not a power of 2 -- killough
+       {
+         heightmask++;
+         heightmask <<= FRACBITS;