New port for Linux port of Heretic. Currently the port only

supports X11 library graphics. I will fix it later to allow the
use of OpenGL/Mesa well as the other libraries that Heretic
has been ported to work with in the Unix world.

PR:		17194

13 files changed, 253 insertions, 0 deletions

diff --git a/games/heretic/Makefile b/games/heretic/Makefile
new file mode 100644
index 000000000000..9481e9521c57
--- /dev/null
+++ b/games/heretic/Makefile
@@ -0,0 +1,39 @@
+# New ports collection makefile for:	glheretic
+# Version required:	1.0
+# Date created:		04 Feb 2000
+# Whom:			Will Andrews <andrews@technologist.com>
+#
+# $FreeBSD$
+#
+
+DISTNAME=	glheretic-1.0
+PKGNAME=	heretic-1.0
+CATEGORIES=	games
+MASTER_SITES=	http://www.raven-games.com/linuxheretic/heretic/src/ \
+		http://www.raven-games.com/linuxheretic/wad/
+.if !defined(NO_WAD)
+DISTFILES+=	heretic_share.wad.gz
+EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
+.endif
+
+MAINTAINER=	will@FreeBSD.org
+
+FETCH_BEFORE_ARGS+=	-b
+USE_X_PREFIX=	yes
+USE_GMAKE=	yes
+ALL_TARGET=	fastx11
+MAKE_ENV=	WANT_OGL="no" WANT_OGL_FULLSCREEN="no" WANT_NICE_OGL="no"
+BINARY=		xaheretic
+.if !defined(NO_WAD)
+PLIST=		${PKGDIR}/PLIST.nowad
+.endif
+
+do-install:
+	@${MKDIR} ${PREFIX}/share/heretic
+	@${INSTALL_PROGRAM} ${WRKSRC}/${BINARY} ${PREFIX}/bin/heretic
+.if !defined(NO_WAD)
+	@${GZIP_CMD} ${EXTRACT_BEFORE_ARGS} ${DISTDIR}/heretic_share.wad.gz \
+		> ${PREFIX}/share/heretic/heretic_share.wad
+.endif
+
+.include <bsd.port.mk>
diff --git a/games/heretic/distinfo b/games/heretic/distinfo
new file mode 100644
index 000000000000..b90d2b9b88d2
--- /dev/null
+++ b/games/heretic/distinfo
@@ -0,0 +1,2 @@
+MD5 (glheretic-1.0.tar.gz) = 82874571b280c6907a2c781377393f6e
+MD5 (heretic_share.wad.gz) = 8aa0b891681fc04726bbeae031bddea5
diff --git a/games/heretic/files/patch-aa b/games/heretic/files/patch-aa
new file mode 100644
index 000000000000..4f3acae47e25
--- /dev/null
+++ b/games/heretic/files/patch-aa
@@ -0,0 +1,117 @@
+--- Makefile	Thu Feb  3 17:56:16 2000
++++ Makefile.new	Sun Feb 13 04:15:18 2000
+@@ -1,24 +1,24 @@
+ # Makefile for Linux Heretic/GLHeretic
+ 
+ # Comment the line below if you don't want to build GLHeretic.
+-WANT_OGL = yes
++WANT_OGL ?= yes
+ 
+ # Comment the line below if you don't want fullscreen 
+ # support under GLHeretic.
+ # (Only if you have WANT_OGL !)
+-WANT_OGL_FULLSCREEN = yes
++WANT_OGL_FULLSCREEN ?= yes
+ 
+ # Comment this if you don't want to build GLHeretic 
+ # with highest quality options.
+ # (Only if you have WANT_OGL !)
+-WANT_NICE_OGL = yes
++WANT_NICE_OGL ?= yes
+ 
+ 
+ # Uncomment the line below if you want to use GSI for sound.
+ # (doesn't really work yet. :-()
+ #WANT_GSI = yes
+ 
+-CC = gcc
++CC ?= gcc
+ 
+ #
+ # For old SVGALIB, comment out -D__NEWVGALIB__
+@@ -26,7 +26,7 @@
+ 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
+-CDEFS.udp = -DUNIX -DHAVE_USLEEP -DHAVE_MATH_H -DHAVE_VALUES_H -DLINUX_MOUSE \
++CDEFS.udp = -DUNIX -DHAVE_USLEEP -DHAVE_MATH_H -DLINUX_MOUSE -DHOMEDIR="\"/usr/X11R6/share/heretic\"" \
+ 	-DUDP_PROTOCOL -DI_GGI_HERETIC -DNEED_SHMGETEVENTBASE \
+ 	-D__NEWVGALIB__ # -DEXTRA_WADS
+ 
+@@ -61,11 +61,11 @@
+ endif
+ 
+ # Change this to change the platform
+-COPT.arch = $(COPT.x86)
++COPT.arch = $(COPT.FreeBSD)
+ 
+ # If you want IPX-netcode compiled, replace $(CDEFS.udp) with $(CDEFS.ipx)
+ 
+-CFLAGS = -Wall $(CDEFS.udp) $(COPT.arch) \
++CFLAGS = $(PCFLAGS) -Wall $(CDEFS.udp) $(COPT.arch) \
+ 	 -I. -I.. -I/usr/X11R6/include $(COPT.sound) $(COPT.opengl)
+ 
+ # Uncomment the line below if you want to use original "[" and "]" keys
+@@ -94,10 +94,10 @@
+ 
+ endif
+ 
+-X_LDFLAGS = -L/usr/X11R6/lib
++X_LDFLAGS = -L$(X11BASE)/lib
+ 
+ X11LIBS = -lXext -lX11
+-GLLIBS  = -lXmu -lXi -lm -ldl
++GLLIBS  = -lXmu -lXi -lm -lGL -lGLU
+ GGILIBS = -lggi -lm
+ VGALIBS = -lvga
+ SDLLIBS = -lSDL -lpthread 
+@@ -108,7 +108,7 @@
+ 	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 \
+-	info.o i_net.o i_system.o i_udp.o i_ipx.o i_main.o $(SOUND_OBJS)
++	info.o i_net.o i_system.o i_udp.o i_main.o $(SOUND_OBJS)
+ 
+ GLOBJS = opengl/gl_effects.o opengl/gl_floorceil.o opengl/gl_fonts.o \
+ 	 opengl/gl_func.o opengl/gl_init.o opengl/gl_lights.o \
+@@ -184,17 +184,17 @@
+ 	$(CC) -E -M $(CFLAGS) $(X_LDFLAGS) *.c $(SOUND_REFS) \
+ 	graphics/i_sdl.c > .depend                                                               
+ 
+-x11:	depx11 $(OBJS) graphics/i_x11.o $(MUSSERV) $(SNDSERV)
++x11:	depx11 $(OBJS) graphics/i_x11.o
+ 	$(CC) $(CFLAGS) $(X_LDFLAGS) $(X11LIBS) $(OBJS) \
+ 	graphics/i_x11.o -o xheretic
+ 
+-fastx11:depx11f $(OBJS) graphics/i_x11_fast.o $(MUSSERV) $(SNDSERV)
+-	$(CC) $(CFLAGS) $(X_LDFLAGS) $(X11LIBS) $(OBJS) \
++fastx11:depx11f $(OBJS) graphics/i_x11_fast.o
++	$(CC) $(CFLAGS) $(X_LDFLAGS) $(GLLIBS) $(X11LIBS) $(OBJS) \
+ 	graphics/i_x11_fast.o -o xaheretic
+ 
+ 
+ glheretic:depx11ogl $(OBJS) $(GLOBJS) graphics/i_x11_ogl.o \
+-	$(MUSSERV) $(SNDSERV) sgi-libtess
++	  sgi-libtess
+ ifeq ($(WANT_OGL_FULLSCREEN),yes)
+ 	$(CC) $(CFLAGS) $(X_LDFLAGS) $(X11LIBS) $(GLLIBS) \
+ 	$(OBJS) $(GLOBJS) /usr/X11R6/lib/libXxf86vm.a \
+@@ -205,15 +205,15 @@
+ endif
+ 
+ 
+-ggi:	depggi $(OBJS) graphics/i_ggi.o $(MUSSERV) $(SNDSERV)
++ggi:	depggi $(OBJS) graphics/i_ggi.o
+ 	$(CC) $(CFLAGS) $(GGILIBS) $(OBJS) \
+ 	graphics/i_ggi.o -o ggiheretic
+ 
+-vga:	depvga $(OBJS) graphics/i_vga.o $(MUSSERV) $(SNDSERV)
++vga:	depvga $(OBJS) graphics/i_vga.o
+ 	$(CC) $(CFLAGS) $(VGALIBS) $(OBJS) \
+ 	graphics/i_vga.o -o vgaheretic
+ 
+-sdl:    depsdl $(OBJS) graphics/i_sdl.o $(MUSSERV) $(SNDSERV)
++sdl:    depsdl $(OBJS) graphics/i_sdl.o
+ 	$(CC) $(CFLAGS) $(X_LDFLAGS) $(SDLLIBS) $(OBJS) \
+ 	graphics/i_sdl.o -o sdlheretic
+ 
diff --git a/games/heretic/files/patch-ac b/games/heretic/files/patch-ac
new file mode 100644
index 000000000000..74df663cd98a
--- /dev/null
+++ b/games/heretic/files/patch-ac
@@ -0,0 +1,19 @@
+--- w_wad.c	Sat Oct 23 05:02:21 1999
++++ w_wad.c.new	Sun Feb 13 03:52:25 2000
+@@ -15,7 +15,6 @@
+ #include <string.h>
+ #include <unistd.h>
+ #include <stdlib.h>
+-#include <malloc.h>
+ #include <assert.h>
+ #include <fcntl.h>
+ #include <sys/stat.h>
+@@ -26,8 +25,6 @@
+ 
+ #define O_BINARY		0
+ #endif   /* UNIX */
+-
+-#include <malloc.h>
+ 
+ #ifdef __GLIBC__
+ #include <sys/io.h>
diff --git a/games/heretic/files/patch-ad b/games/heretic/files/patch-ad
new file mode 100644
index 000000000000..1e6ec40a0817
--- /dev/null
+++ b/games/heretic/files/patch-ad
@@ -0,0 +1,11 @@
+--- 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
+@@ -42,7 +42,7 @@
+ #ifndef __memalloc_simple_h_
+ #define __memalloc_simple_h_
+ 
+-#include <malloc.h>
++#include <stdlib.h>
+ 
+ #define memRealloc	realloc
+ #define memFree		free
diff --git a/games/heretic/files/patch-ae b/games/heretic/files/patch-ae
new file mode 100644
index 000000000000..8754ef9bf068
--- /dev/null
+++ b/games/heretic/files/patch-ae
@@ -0,0 +1,11 @@
+--- opengl/gl_struct.h	Wed Jan 26 14:38:19 2000
++++ opengl/gl_struct.h.new	Sun Feb 13 03:54:46 2000
+@@ -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>
diff --git a/games/heretic/files/patch-af b/games/heretic/files/patch-af
new file mode 100644
index 000000000000..e7446904c5af
--- /dev/null
+++ b/games/heretic/files/patch-af
@@ -0,0 +1,11 @@
+--- sndserv/soundsrv.c	Mon Mar 22 20:06:59 1999
++++ sndserv/soundsrv.c.new	Sun Feb 13 03:54:46 2000
+@@ -43,7 +43,7 @@
+ #include <sys/ioctl.h>
+ #include <unistd.h>
+ #include <stdlib.h>
+-#include <malloc.h>
++#include <stdlib.h>
+ #include <sys/stat.h>
+ #include <sys/time.h>
+ 
diff --git a/games/heretic/files/patch-ag b/games/heretic/files/patch-ag
new file mode 100644
index 000000000000..d878db7c6405
--- /dev/null
+++ b/games/heretic/files/patch-ag
@@ -0,0 +1,11 @@
+--- sndserv/wadread.c	Thu Nov 25 05:24:49 1999
++++ sndserv/wadread.c.new	Sun Feb 13 03:54:46 2000
+@@ -39,7 +39,7 @@
+  */
+ 
+ 
+-#include <malloc.h>
++#include <stdlib.h>
+ #include <fcntl.h>
+ #include <sys/stat.h>
+ #include <stdio.h>
diff --git a/games/heretic/files/patch-ah b/games/heretic/files/patch-ah
new file mode 100644
index 000000000000..26a1436394ef
--- /dev/null
+++ b/games/heretic/files/patch-ah
@@ -0,0 +1,9 @@
+--- opengl/gl_fonts.c	Sun Jan 30 05:58:21 2000
++++ opengl/gl_fonts.c.new	Sun Feb 13 03:54:46 2000
+@@ -1,5 +1,5 @@
+ #include <stdio.h>
+-#include <malloc.h>
++#include <stdlib.h>
+ #include <string.h>
+ #include <math.h>
+ 
diff --git a/games/heretic/files/patch-ai b/games/heretic/files/patch-ai
new file mode 100644
index 000000000000..8014af8e6897
--- /dev/null
+++ b/games/heretic/files/patch-ai
@@ -0,0 +1,11 @@
+--- i_ipx.c	Sat Oct 23 05:02:21 1999
++++ i_ipx.c.new	Sun Feb 13 03:59:27 2000
+@@ -20,7 +20,7 @@
+ #include <netipx/ipx.h>
+ #else
+ #define MYSOCKLEN_T int
+-#include <linux/ipx.h>
++#include <netipx/ipx.h>
+ #endif /* __GLIBC__ */
+ 
+ #define IPXSETUP_COMPAT    /* be compatible with ipxsetup.exe */
diff --git a/games/heretic/pkg-comment b/games/heretic/pkg-comment
new file mode 100644
index 000000000000..74636f2c1e84
--- /dev/null
+++ b/games/heretic/pkg-comment
@@ -0,0 +1 @@
+Unix source-port of the famous Heretic game by id Software
diff --git a/games/heretic/pkg-descr b/games/heretic/pkg-descr
new file mode 100644
index 000000000000..db768d4d0d04
--- /dev/null
+++ b/games/heretic/pkg-descr
@@ -0,0 +1,8 @@
+This is the "Linux" port of the great Heretic game
+by id Software. It is an addicting game of sorcery
+with blood and gore that reminds people of the old
+Doom and Wolfenstein 3D games.
+
+WWW: http://www.raven-games.com/linuxheretic/
+
+--Will <andrews@technologist.com>
diff --git a/games/heretic/pkg-plist b/games/heretic/pkg-plist
new file mode 100644
index 000000000000..a08e4b9a88ec
--- /dev/null
+++ b/games/heretic/pkg-plist
@@ -0,0 +1,3 @@
+bin/heretic
+share/heretic/heretic_share.wad
+@dirrm share/heretic