23 files changed, 84 insertions, 83 deletions

diff --git a/games/heretic/Makefile b/games/heretic/Makefile
index 92daad98c877..036b78a0f2d5 100644
--- a/games/heretic/Makefile
+++ b/games/heretic/Makefile
@@ -12,7 +12,8 @@ DISTNAME=	gl${PORTNAME}-${PORTVERSION}
 MAINTAINER=	oliver@FreeBSD.org
 COMMENT=	Unix source-port of the famous Heretic game by id Software
 
-USES=		gmake
+USES=		dos2unix gmake
+DOS2UNIX_FILES=	opengl/gl_struct.h
 USE_XORG=	x11 xi xpm xau
 
 OPTIONS_DEFINE=	WAD DOCS
diff --git a/games/heretic/files/patch-Makefile b/games/heretic/files/patch-Makefile
index a7deddb7ff94..bc3f8bb4295a 100644
--- a/games/heretic/files/patch-Makefile
+++ b/games/heretic/files/patch-Makefile
@@ -1,5 +1,5 @@
---- Makefile.orig	Mon May  1 22:56:45 2000
-+++ Makefile	Fri Aug 30 01:43:32 2002
+--- Makefile.orig	2000-05-02 01:57:07 UTC
++++ Makefile
 @@ -1,19 +1,19 @@
  # Makefile for Linux Heretic/GLHeretic
  
@@ -23,7 +23,7 @@
  
  #
  # For old SVGALIB, comment out -D__NEWVGALIB__
-@@ -21,7 +21,7 @@
+@@ -21,7 +21,7 @@ CC = gcc -pipe
  CDEFS.ipx = -DUNIX -DHAVE_USLEEP -DHAVE_MATH_H -DHAVE_VALUES_H -DLINUX_MOUSE \
  	-DIPX_PROTOCOL -DI_GGI_HERETIC -DNEED_SHMGETEVENTBASE \
  	-D__NEWVGALIB__ # -DIPX_DEBUG -DEXTRA_WADS
@@ -32,7 +32,7 @@
  	-DUDP_PROTOCOL -DI_GGI_HERETIC -DNEED_SHMGETEVENTBASE \
  	-D__NEWVGALIB__ # -DEXTRA_WADS
  
-@@ -38,7 +38,7 @@
+@@ -38,7 +38,7 @@ COPT.m68k = -m68020-60 -O2 -fomit-frame-
  
  COPT.alpha = -O2 -D__64BIT__ -DHAVE_ALLOCA_H
  
@@ -41,7 +41,7 @@
  
  COPT.arm = -O2 -D__32BIT__ -fsigned-char -fomit-frame-pointer \
             -DHAVE_ALLOCA_H -D__PACKED__=__attribute__\ \(\(packed\)\)
-@@ -57,12 +57,12 @@
+@@ -57,12 +57,12 @@ endif
  endif
  
  # Change this to change the platform
@@ -57,7 +57,7 @@
  
  # Uncomment the line below if you want to use original "[" and "]" keys
  # for inventory access, instead of "k" and "l".
-@@ -85,18 +85,18 @@
+@@ -85,18 +85,18 @@ SOUND_REFS = soundclient/i_sound.c sound
  COPT.sound = -D__DOSOUND__ -DSNDSERV -Isoundclient -D__DOMUSIC__ -DMUSSERV # -D_DEBUGSOUND
  X11LIBS = -lXext -lX11
  
@@ -80,7 +80,7 @@
  
  OBJS =	am_map.o ct_chat.o d_main.o d_net.o f_finale.o g_game.o \
  	p_ceilng.o p_doors.o p_enemy.o p_floor.o p_inter.o p_lights.o \
-@@ -104,7 +104,7 @@
+@@ -104,7 +104,7 @@ OBJS =	am_map.o ct_chat.o d_main.o d_net
  	p_spec.o p_switch.o p_telept.o  p_tick.o p_user.o r_bsp.o r_data.o \
  	r_draw.o r_plane.o r_segs.o r_things.o r_main.o mn_menu.o sb_bar.o \
  	tables.o v_video.o w_wad.o z_zone.o in_lude.o \
diff --git a/games/heretic/files/patch-d_main.c b/games/heretic/files/patch-d__main.c
index 298ac1c3d75d..54687d3ac295 100644
--- a/games/heretic/files/patch-d_main.c
+++ b/games/heretic/files/patch-d__main.c
@@ -1,6 +1,6 @@
---- d_main.c.ori	Sun Mar 11 16:31:49 2007
-+++ d_main.c	Sun Mar 11 16:33:46 2007
-@@ -690,6 +690,7 @@
+--- d_main.c.orig	2003-12-08 23:21:25 UTC
++++ d_main.c
+@@ -690,6 +690,7 @@ void D_DoomMain(void)
    setbuf(stdout, NULL);
    nomonsters = M_CheckParm("-nomonsters");
    respawnparm = M_CheckParm("-respawn");
@@ -8,7 +8,7 @@
    ravpic = M_CheckParm("-ravpic");
    noartiskip = M_CheckParm("-noartiskip");
    debugmode = M_CheckParm("-debug");
-@@ -778,7 +779,13 @@
+@@ -778,7 +779,13 @@ void D_DoomMain(void)
      {
        deathmatch = true;
      }
diff --git a/games/heretic/files/patch-doc-Gamekeys.txt b/games/heretic/files/patch-doc_Gamekeys.txt
index d32c5471e67c..ff4dced18c48 100644
--- a/games/heretic/files/patch-doc-Gamekeys.txt
+++ b/games/heretic/files/patch-doc_Gamekeys.txt
@@ -1,6 +1,6 @@
---- doc/Gamekeys.txt.orig	1999-04-06 14:58:18.000000000 +0200
-+++ doc/Gamekeys.txt	2011-04-21 01:30:38.000000000 +0200
-@@ -9,6 +9,10 @@
+--- doc/Gamekeys.txt.orig	1999-04-06 12:58:18 UTC
++++ doc/Gamekeys.txt
+@@ -9,6 +9,10 @@ key-strafe-right:    '.'
  
  key_fire:            Control-key 
  key_use:             Space-key 
diff --git a/games/heretic/files/patch-doc-README.opengl b/games/heretic/files/patch-doc_README.opengl
index f8ec2e3472c6..ff8448518123 100644
--- a/games/heretic/files/patch-doc-README.opengl
+++ b/games/heretic/files/patch-doc_README.opengl
@@ -1,6 +1,6 @@
---- doc/README.opengl.orig	2000-05-15 22:46:24.000000000 +0200
-+++ doc/README.opengl	2011-04-21 01:36:33.000000000 +0200
-@@ -71,6 +71,9 @@
+--- doc/README.opengl.orig	2000-05-15 20:46:24 UTC
++++ doc/README.opengl
+@@ -71,6 +71,9 @@ To start the game in windowed mode, use 
  7. -mlook
  With this switch you enable free mouse look in the game. Normaly it makes sense to use this switch together with the -grabmouse switch. Mouselook is enabled by default, but it can be switched inside the game.
  
diff --git a/games/heretic/files/patch-doomdef.h b/games/heretic/files/patch-doomdef.h
index 7a6d1685e5f9..143b72dee090 100644
--- a/games/heretic/files/patch-doomdef.h
+++ b/games/heretic/files/patch-doomdef.h
@@ -1,6 +1,6 @@
---- doomdef.h.ori	Sun Mar  4 15:43:44 2007
-+++ doomdef.h	Sun Mar  4 15:57:04 2007
-@@ -681,6 +681,7 @@
+--- doomdef.h.orig	2000-05-01 23:42:01 UTC
++++ doomdef.h
+@@ -681,6 +681,7 @@ typedef struct
    short	ticdup  __PACKED__ ;			     /* 1 = no duplication, 2-5 = dup for slow nets */
    short	extratics  __PACKED__ ;		     /* 1 = send a backup tic in every packet */
    short	deathmatch  __PACKED__ ;		     /* 1 = deathmatch */
@@ -8,12 +8,12 @@
    short	savegame  __PACKED__ ;		     /* -1 = new game, 0-5 = load savegame */
    short	episode  __PACKED__ ;		     /* 1-3 */
    short	map  __PACKED__ ;			     /* 1-9 */
-@@ -753,6 +754,8 @@
- extern boolean cdrom;       /* true if cd-rom mode active ("-cdrom") */
+@@ -754,6 +755,8 @@ extern boolean cdrom;       /* true if c
  
  extern boolean deathmatch;  /* only if started as net death */
-+
-+extern boolean respawnartifacts; /* respawn the artifacts */
  
++extern boolean respawnartifacts; /* respawn the artifacts */
++
  extern boolean netgame;     /* only true if >1 player */
  
+ extern boolean playeringame[MAXPLAYERS];
diff --git a/games/heretic/files/patch-doomtype.h b/games/heretic/files/patch-doomtype.h
index f2eca026e66b..7ab841449a55 100644
--- a/games/heretic/files/patch-doomtype.h
+++ b/games/heretic/files/patch-doomtype.h
@@ -1,6 +1,6 @@
---- doomtype.h.orig	Wed Oct  5 07:40:18 2005
-+++ doomtype.h	Wed Oct  5 07:40:41 2005
-@@ -59,9 +59,7 @@
+--- doomtype.h.orig	2000-01-07 20:42:41 UTC
++++ doomtype.h
+@@ -59,9 +59,7 @@ typedef unsigned char byte;
  #define MININT		((int)0x80000000)
  #define MINLONG		((long)0x8000000000000000)
  
diff --git a/games/heretic/files/patch-g_game.c b/games/heretic/files/patch-g__game.c
index b4349c583f0a..0f6c980831e2 100644
--- a/games/heretic/files/patch-g_game.c
+++ b/games/heretic/files/patch-g__game.c
@@ -1,6 +1,6 @@
---- g_game.c.ori	Sun Mar  4 15:44:07 2007
-+++ g_game.c	Sun Mar  4 15:50:29 2007
-@@ -91,6 +91,7 @@
+--- g_game.c.orig	2000-05-01 23:54:51 UTC
++++ g_game.c
+@@ -91,6 +91,7 @@ int             starttime;              
  boolean         viewactive;
  
  boolean         deathmatch;             /* only if started as net death */
@@ -8,7 +8,7 @@
  boolean         netgame;                /* only true if packets are broadcast */
  boolean         playeringame[MAXPLAYERS];
  player_t        players[MAXPLAYERS];
-@@ -122,6 +123,7 @@
+@@ -122,6 +123,7 @@ extern char* homedir;
  long            key_right, key_left, key_up, key_down;
  long            key_strafeleft, key_straferight;
  long            key_fire, key_use, key_strafe, key_speed;
@@ -16,7 +16,7 @@
  long            key_flyup, key_flydown, key_flycenter;
  long            key_lookup, key_lookdown, key_lookcenter;
  long            key_invleft, key_invright, key_useartifact;
-@@ -361,13 +363,34 @@
+@@ -361,13 +363,34 @@ void G_BuildTiccmd (ticcmd_t *cmd)
  	    }
  	}
      }
diff --git a/games/heretic/files/patch-graphics__i_sdl.c b/games/heretic/files/patch-graphics_i__sdl.c
index 928a8bce6639..a963f21b9637 100644
--- a/games/heretic/files/patch-graphics__i_sdl.c
+++ b/games/heretic/files/patch-graphics_i__sdl.c
@@ -1,5 +1,5 @@
---- graphics/i_sdl.c	2002/04/17 17:57:00	1.1
-+++ graphics/i_sdl.c	2002/04/17 17:57:08
+--- graphics/i_sdl.c.orig	2000-05-01 23:49:49 UTC
++++ graphics/i_sdl.c
 @@ -7,7 +7,7 @@
  #include <sys/time.h>
  #include "doomdef.h"
diff --git a/games/heretic/files/patch-graphics__i_sdl_gl.c b/games/heretic/files/patch-graphics_i__sdl__gl.c
index 032fde580f45..796b1c8a31e0 100644
--- a/games/heretic/files/patch-graphics__i_sdl_gl.c
+++ b/games/heretic/files/patch-graphics_i__sdl__gl.c
@@ -1,5 +1,5 @@
---- graphics/i_sdl_gl.c	2002/04/17 17:57:00	1.1
-+++ graphics/i_sdl_gl.c	2002/04/17 17:57:14
+--- graphics/i_sdl_gl.c.orig	2000-05-01 23:49:05 UTC
++++ graphics/i_sdl_gl.c
 @@ -4,7 +4,7 @@
  #include <sys/time.h>
  #include "doomdef.h"
diff --git a/games/heretic/files/patch-graphics-i_x11_fast.c b/games/heretic/files/patch-graphics_i__x11__fast.c
index 4d4fcc7d7178..7825c50dbace 100644
--- a/games/heretic/files/patch-graphics-i_x11_fast.c
+++ b/games/heretic/files/patch-graphics_i__x11__fast.c
@@ -1,6 +1,6 @@
---- graphics/i_x11_fast.c.orig	Fri Dec 29 20:03:37 2006
-+++ graphics/i_x11_fast.c	Fri Dec 29 20:03:59 2006
-@@ -201,13 +201,9 @@
+--- graphics/i_x11_fast.c.orig	2003-12-08 22:48:58 UTC
++++ graphics/i_x11_fast.c
+@@ -201,13 +201,9 @@ int xlatekey(void)
        /* This is an ugly PC-ism. Better switch to XLookupKeysym() ? */
        case XK_KP_Insert:       rc = '0';       break;
        case XK_KP_End:          rc = '1';       break;
diff --git a/games/heretic/files/patch-i_udp.c b/games/heretic/files/patch-i__udp.c
index e7e198b51796..e0ee0bc209c5 100644
--- a/games/heretic/files/patch-i_udp.c
+++ b/games/heretic/files/patch-i__udp.c
@@ -1,5 +1,5 @@
---- i_udp.c.old Sun Oct 20 22:21:11 2002
-+++ i_udp.c     Sun Oct 20 22:21:26 2002
+--- i_udp.c.orig	2000-05-01 10:24:52 UTC
++++ i_udp.c
 @@ -31,7 +31,7 @@
  
  boolean server = 0;
diff --git a/games/heretic/files/patch-m_misc.c b/games/heretic/files/patch-m__misc.c
index 8a4d803602af..b8d376dd1c30 100644
--- a/games/heretic/files/patch-m_misc.c
+++ b/games/heretic/files/patch-m__misc.c
@@ -1,6 +1,6 @@
---- m_misc.c.ori	Sun Mar  4 15:50:54 2007
-+++ m_misc.c	Sun Mar  4 15:52:40 2007
-@@ -365,6 +365,7 @@
+--- m_misc.c.orig	2000-05-02 00:01:29 UTC
++++ m_misc.c
+@@ -365,6 +365,7 @@ long		usejoystick;
  extern	long	key_right, key_left, key_up, key_down;
  extern	long	key_strafeleft, key_straferight;
  extern	long	key_fire, key_use, key_strafe, key_speed;
@@ -8,7 +8,7 @@
  extern	long	key_flyup, key_flydown, key_flycenter;
  extern	long	key_lookup, key_lookdown, key_lookcenter;
  extern	long	key_invleft, key_invright, key_useartifact;
-@@ -447,6 +448,10 @@
+@@ -447,6 +448,10 @@ default_t defaults[] =
  
    { "key_fire", &key_fire, KEY_RCTRL, 1 }, 
    { "key_use", &key_use, ' ', 1 }, 
diff --git a/games/heretic/files/patch-opengl_gl_fonts.c b/games/heretic/files/patch-opengl_gl__fonts.c
index 26a1436394ef..f6a61eb83c04 100644
--- a/games/heretic/files/patch-opengl_gl_fonts.c
+++ b/games/heretic/files/patch-opengl_gl__fonts.c
@@ -1,5 +1,5 @@
---- opengl/gl_fonts.c	Sun Jan 30 05:58:21 2000
-+++ opengl/gl_fonts.c.new	Sun Feb 13 03:54:46 2000
+--- opengl/gl_fonts.c.orig	2000-05-01 19:17:31 UTC
++++ opengl/gl_fonts.c
 @@ -1,5 +1,5 @@
  #include <stdio.h>
 -#include <malloc.h>
diff --git a/games/heretic/files/patch-opengl_gl_struct.h b/games/heretic/files/patch-opengl_gl__struct.h
index 009be366cda1..6030b1346549 100644
--- a/games/heretic/files/patch-opengl_gl_struct.h
+++ b/games/heretic/files/patch-opengl_gl__struct.h
@@ -1,11 +1,11 @@
---- opengl/gl_struct.h.orig	Wed Jan 26 14:38:19 2000
-+++ opengl/gl_struct.h	Sun Apr  2 16:43:51 2000
+--- opengl/gl_struct.h.orig	2016-06-20 13:32:45 UTC
++++ opengl/gl_struct.h
 @@ -2,7 +2,7 @@
- #define __GL_STRUCT_H__

- 

- #include <stdio.h>

--#include <malloc.h>

-+#include <stdlib.h>

- #include <string.h>

- #include <GL/gl.h>

- #include <GL/glu.h>

+ #define __GL_STRUCT_H__
+ 
+ #include <stdio.h>
+-#include <malloc.h>
++#include <stdlib.h>
+ #include <string.h>
+ #include <GL/gl.h>
+ #include <GL/glu.h>
diff --git a/games/heretic/files/patch-opengl_sgi-si_libtess_memalloc.h b/games/heretic/files/patch-opengl_sgi-si_libtess_memalloc.h
index 1e6ec40a0817..67d61f3d3928 100644
--- a/games/heretic/files/patch-opengl_sgi-si_libtess_memalloc.h
+++ b/games/heretic/files/patch-opengl_sgi-si_libtess_memalloc.h
@@ -1,5 +1,5 @@
---- opengl/sgi-si/libtess/memalloc.h	Wed Jan 26 05:30:44 2000
-+++ opengl/sgi-si/libtess/memalloc.h.new	Sun Feb 13 03:54:46 2000
+--- opengl/sgi-si/libtess/memalloc.h.orig	2000-01-26 10:30:44 UTC
++++ opengl/sgi-si/libtess/memalloc.h
 @@ -42,7 +42,7 @@
  #ifndef __memalloc_simple_h_
  #define __memalloc_simple_h_
diff --git a/games/heretic/files/patch-p_inter.c b/games/heretic/files/patch-p__inter.c
index 7e82b1270a86..a954ea25bcd1 100644
--- a/games/heretic/files/patch-p_inter.c
+++ b/games/heretic/files/patch-p__inter.c
@@ -1,6 +1,6 @@
---- p_inter.c.ori	Sun Mar  4 15:38:51 2007
-+++ p_inter.c	Sun Mar  4 15:41:50 2007
-@@ -477,8 +477,10 @@
+--- p_inter.c.orig	2000-01-07 17:58:53 UTC
++++ p_inter.c
+@@ -477,8 +477,10 @@ boolean P_GiveArtifact(player_t *player,
  void P_SetDormantArtifact(mobj_t *arti)
  {
    arti->flags &= ~MF_SPECIAL;
diff --git a/games/heretic/files/patch-r_things.c b/games/heretic/files/patch-r__things.c
index 32d15a2484cb..954319b17c9d 100644
--- a/games/heretic/files/patch-r_things.c
+++ b/games/heretic/files/patch-r__things.c
@@ -1,6 +1,6 @@
---- r_things.c.orig	Thu Jan 27 00:49:35 2000
-+++ r_things.c	Fri Dec 29 20:57:02 2006
-@@ -144,7 +144,7 @@
+--- r_things.c.orig	2000-01-26 23:49:35 UTC
++++ r_things.c
+@@ -144,7 +144,7 @@ void R_InitSpriteDefs (char **namelist)
    while (*check != NULL)
      check++;
    
diff --git a/games/heretic/files/patch-sndserv_Makefile b/games/heretic/files/patch-sndserv_Makefile
index 9293acc923aa..03dbd909fabf 100644
--- a/games/heretic/files/patch-sndserv_Makefile
+++ b/games/heretic/files/patch-sndserv_Makefile
@@ -1,5 +1,5 @@
---- sndserv/Makefile.orig	Sat Oct 23 11:02:21 1999
-+++ sndserv/Makefile	Thu Jan 10 19:34:23 2002
+--- sndserv/Makefile.orig	1999-10-23 09:02:21 UTC
++++ sndserv/Makefile
 @@ -1,6 +1,6 @@
 -CC = gcc
 +#CC = gcc
diff --git a/games/heretic/files/patch-sndserv_linux.c b/games/heretic/files/patch-sndserv_linux.c
index 5aac936495f5..97b1a8b3208b 100644
--- a/games/heretic/files/patch-sndserv_linux.c
+++ b/games/heretic/files/patch-sndserv_linux.c
@@ -1,8 +1,8 @@
---- sndserv/linux.c.orig	Thu Jan 10 19:06:58 2002
-+++ sndserv/linux.c	Thu Jan 10 19:07:06 2002
-@@ -32,7 +32,7 @@
- #include <unistd.h>
+--- sndserv/linux.c.orig	2003-12-08 22:44:54 UTC
++++ sndserv/linux.c
+@@ -33,7 +33,7 @@
  #include <sys/ioctl.h>
+ #include <errno.h>
  
 -#include <linux/soundcard.h>
 +#include <soundcard.h>
diff --git a/games/heretic/files/patch-sndserv_soundsrv.c b/games/heretic/files/patch-sndserv_soundsrv.c
index e7446904c5af..002ce7394273 100644
--- a/games/heretic/files/patch-sndserv_soundsrv.c
+++ b/games/heretic/files/patch-sndserv_soundsrv.c
@@ -1,5 +1,5 @@
---- sndserv/soundsrv.c	Mon Mar 22 20:06:59 1999
-+++ sndserv/soundsrv.c.new	Sun Feb 13 03:54:46 2000
+--- sndserv/soundsrv.c.orig	1999-03-23 01:06:59 UTC
++++ sndserv/soundsrv.c
 @@ -43,7 +43,7 @@
  #include <sys/ioctl.h>
  #include <unistd.h>
diff --git a/games/heretic/files/patch-sndserv_wadread.c b/games/heretic/files/patch-sndserv_wadread.c
index d878db7c6405..a5338895eed1 100644
--- a/games/heretic/files/patch-sndserv_wadread.c
+++ b/games/heretic/files/patch-sndserv_wadread.c
@@ -1,5 +1,5 @@
---- sndserv/wadread.c	Thu Nov 25 05:24:49 1999
-+++ sndserv/wadread.c.new	Sun Feb 13 03:54:46 2000
+--- sndserv/wadread.c.orig	1999-11-25 10:24:49 UTC
++++ sndserv/wadread.c
 @@ -39,7 +39,7 @@
   */
  
diff --git a/games/heretic/files/patch-w_wad.c b/games/heretic/files/patch-w__wad.c
index 74df663cd98a..bad6d45cf355 100644
--- a/games/heretic/files/patch-w_wad.c
+++ b/games/heretic/files/patch-w__wad.c
@@ -1,5 +1,5 @@
---- w_wad.c	Sat Oct 23 05:02:21 1999
-+++ w_wad.c.new	Sun Feb 13 03:52:25 2000
+--- w_wad.c.orig	2003-12-08 23:10:35 UTC
++++ w_wad.c
 @@ -15,7 +15,6 @@
  #include <string.h>
  #include <unistd.h>
@@ -8,12 +8,12 @@
  #include <assert.h>
  #include <fcntl.h>
  #include <sys/stat.h>
-@@ -26,8 +25,6 @@
- 
+@@ -27,8 +26,6 @@
  #define O_BINARY		0
  #endif   /* UNIX */
--
--#include <malloc.h>
  
+-#include <malloc.h>
+-
  #ifdef __GLIBC__
- #include <sys/io.h>
+ /* kludge for broken asm-sparc/io.h on linux 2.2.14.? */
+ #ifdef __sparc__