5 files changed, 37 insertions, 84 deletions

diff --git a/games/darkplaces/Makefile b/games/darkplaces/Makefile
index 882999135aa2..62e86eb2cb6e 100644
--- a/games/darkplaces/Makefile
+++ b/games/darkplaces/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	darkplaces
-PORTVERSION=	20050818
-PORTREVISION=	1
+PORTVERSION=	20060606
 CATEGORIES=	games
 MASTER_SITES=	http://offload1.icculus.org/twilight/darkplaces/files/
 DISTNAME=	${PORTNAME}engine${PORTVERSION}
@@ -15,18 +14,17 @@ DISTNAME=	${PORTNAME}engine${PORTVERSION}
 MAINTAINER=	alepulver@FreeBSD.org
 COMMENT=	Quake engine modification
 
-WRKSRC=		${WRKDIR}/${PORTNAME}
-
-USE_GMAKE=	yes
 USE_ZIP=	yes
+USE_GMAKE=	yes
+WRKSRC=		${WRKDIR}/${PORTNAME}
 
 MAKEFILE=	makefile
 ALL_TARGET=	#
 
-OPTIONS=	CLIENT "Build GLX client" on \
+OPTIONS=	CLIENT "Build GLX client" off \
 		DEDICATED "Build dedicated server" on \
 		OPTIMIZED_CFLAGS "Enable compilation optimizations" on \
-		SDL_CLIENT "Build SDL client" on
+		SDL "Build SDL client" on
 
 PLIST_FILES=	%%DATADIR%%/dummy
 PLIST_DIRS=	%%DATADIR%%
@@ -35,42 +33,48 @@ PLIST_DIRS=	%%DATADIR%%
 
 .include <bsd.port.pre.mk>
 
-.if defined(WITHOUT_CLIENT) && defined(WITHOUT_SDL_CLIENT) && \
-    defined(WITHOUT_DEDICATED)
-IGNORE=		needs at least one of CLIENT, SDL_CLIENT and DEDICATED options
+.if !defined(WITH_CLIENT) && !defined(WITH_DEDICATED) && !defined(WITH_SDL)
+IGNORE=		needs at least one of CLIENT, DEDICATED and SDL options
 .endif
 
-.if !defined(WITHOUT_CLIENT) || !defined(WITHOUT_SDL_CLIENT)
+.if defined(WITH_CLIENT) || defined(WITH_SDL)
+USE_GL=		yes
 # Loads libraries at run-time, thus RUN_DEPENDS.
 RUN_DEPENDS+=	${LOCALBASE}/lib/libjpeg.so:${PORTSDIR}/graphics/jpeg \
 		${LOCALBASE}/lib/libvorbis.so:${PORTSDIR}/audio/libvorbis
 .endif
 
-.if !defined(WITHOUT_CLIENT)
-USE_GL=		yes
+.if defined(WITH_CLIENT)
 ALL_TARGET+=	cl-release
 EXE_TARGETS+=	${PORTNAME}-glx
 PLIST_SUB+=	CLIENT=""
 PLIST_FILES+=	bin/${PORTNAME}-glx
 .endif
 
-.if !defined(WITHOUT_DEDICATED)
+.if defined(WITH_DEDICATED)
 ALL_TARGET+=	sv-release
 EXE_TARGETS+=	${PORTNAME}-dedicated
 PLIST_FILES+=	bin/${PORTNAME}-dedicated
 .endif
 
-.if !defined(WITHOUT_OPTIMIZED_CFLAGS)
+.if defined(WITH_OPTIMIZED_CFLAGS)
 MAKE_ENV+=	WITH_OPTIMIZED_CFLAGS=YES
 .endif
 
-.if !defined(WITHOUT_SDL_CLIENT)
+.if defined(WITH_SDL)
 USE_SDL=	sdl
 ALL_TARGET+=	sdl-release
 EXE_TARGETS+=	${PORTNAME}-sdl
 PLIST_FILES+=	bin/${PORTNAME}-sdl
 .endif
 
+.if defined(WITH_GLX)
+pre-everything::
+	@${ECHO_CMD}
+	@${ECHO_CMD} "WARNING: currently the sound is broken in the GLX client. The problem has been reported to the developers, who are working on it. For the moment please use the SDL client instead as a workaround." | ${FMT}
+	@${ECHO_CMD}
+.endif
+
 post-extract:
 	@${UNZIP_CMD} -aq \
 		-o ${WRKDIR}/${PORTNAME}enginesource${PORTVERSION}.zip \
diff --git a/games/darkplaces/distinfo b/games/darkplaces/distinfo
index 4149d7cbbf20..1f8ff404aa85 100644
--- a/games/darkplaces/distinfo
+++ b/games/darkplaces/distinfo
@@ -1,3 +1,3 @@
-MD5 (darkplacesengine20050818.zip) = 004713d24b3e4cc886cdda2c77494b03
-SHA256 (darkplacesengine20050818.zip) = ec12e0abc93d4c26363707c87e12f00dddebaad9bc2857927333586445e7e755
-SIZE (darkplacesengine20050818.zip) = 6284553
+MD5 (darkplacesengine20060606.zip) = a1ae6ad57fc1a95a0afb98e2fd66cb71
+SHA256 (darkplacesengine20060606.zip) = 1c52af7160ada4655348570852c7aa304fb69440d746802975ea54aa153d0041
+SIZE (darkplacesengine20060606.zip) = 8272705
diff --git a/games/darkplaces/files/patch-fs.c b/games/darkplaces/files/patch-fs.c
index 373ba2a3d07e..305b11b0a7ea 100644
--- a/games/darkplaces/files/patch-fs.c
+++ b/games/darkplaces/files/patch-fs.c
@@ -1,10 +1,10 @@
---- fs.c.orig	Tue Aug  2 23:18:34 2005
-+++ fs.c	Sun Jan 15 17:38:11 2006
-@@ -933,7 +933,7 @@
+--- fs.c.orig	Sun May 28 18:26:08 2006
++++ fs.c	Sun Jul 23 16:31:17 2006
+@@ -1061,7 +1061,7 @@
  
  	fs_mempool = Mem_AllocPool("file management", 0, NULL);
  
--	strcpy(fs_basedir, ".");
+-	strcpy(fs_basedir, "");
 +	strcpy(fs_basedir, Q1DIR);
  	strcpy(fs_gamedir, "");
  
diff --git a/games/darkplaces/files/patch-gl_backend.c b/games/darkplaces/files/patch-gl_backend.c
deleted file mode 100644
index f588175a3c9c..000000000000
--- a/games/darkplaces/files/patch-gl_backend.c
+++ /dev/null
@@ -1,46 +0,0 @@
---- gl_backend.c.orig	Fri May 20 00:24:12 2005
-+++ gl_backend.c	Sun Jan 15 17:06:32 2006
-@@ -21,6 +21,8 @@
- cvar_t gl_dither = {CVAR_SAVE, "gl_dither", "1"}; // whether or not to use dithering
- cvar_t gl_lockarrays = {0, "gl_lockarrays", "1"};
- 
-+cvar_t gl_compilelogs = {0, "gl_compilelogs", "0"};
-+
- int gl_maxdrawrangeelementsvertices;
- int gl_maxdrawrangeelementsindices;
- 
-@@ -236,6 +238,7 @@
- 	Cvar_RegisterVariable(&gl_polyblend);
- 	Cvar_RegisterVariable(&gl_dither);
- 	Cvar_RegisterVariable(&gl_lockarrays);
-+	Cvar_RegisterVariable(&gl_compilelogs);
- 	Cvar_RegisterVariable(&gl_paranoid);
- 	Cvar_RegisterVariable(&gl_printcheckerror);
- #ifdef NORENDER
-@@ -780,7 +783,7 @@
- 		CHECKGLERROR
- 		qglGetObjectParameterivARB(vertexshaderobject, GL_OBJECT_COMPILE_STATUS_ARB, &vertexshadercompiled);
- 		qglGetInfoLogARB(vertexshaderobject, sizeof(compilelog), NULL, compilelog);
--		if (compilelog[0])
-+		if (gl_compilelogs.integer && compilelog[0])
- 			Con_Printf("vertex shader compile log:\n%s\n", compilelog);
- 		if (!vertexshadercompiled)
- 		{
-@@ -809,7 +812,7 @@
- 		CHECKGLERROR
- 		qglGetObjectParameterivARB(fragmentshaderobject, GL_OBJECT_COMPILE_STATUS_ARB, &fragmentshadercompiled);
- 		qglGetInfoLogARB(fragmentshaderobject, sizeof(compilelog), NULL, compilelog);
--		if (compilelog[0])
-+		if (gl_compilelogs.integer && compilelog[0])
- 			Con_Printf("fragment shader compile log:\n%s\n", compilelog);
- 		if (!fragmentshadercompiled)
- 		{
-@@ -827,7 +830,7 @@
- 	CHECKGLERROR
- 	qglGetObjectParameterivARB(programobject, GL_OBJECT_LINK_STATUS_ARB, &programlinked);
- 	qglGetInfoLogARB(programobject, sizeof(compilelog), NULL, compilelog);
--	if (compilelog[0])
-+	if (gl_compilelogs.integer && compilelog[0])
- 	{
- 		Con_Printf("program link log:\n%s\n", compilelog);
- 		// software vertex shader is ok but software fragment shader is WAY
diff --git a/games/darkplaces/files/patch-makefile.inc b/games/darkplaces/files/patch-makefile.inc
index fef9538df26c..f3cd02412bb5 100644
--- a/games/darkplaces/files/patch-makefile.inc
+++ b/games/darkplaces/files/patch-makefile.inc
@@ -1,12 +1,12 @@
---- makefile.inc.orig	Thu Aug 18 21:30:57 2005
-+++ makefile.inc	Sun Jan 15 17:16:57 2006
+--- makefile.inc.orig	Sun Apr 16 23:23:11 2006
++++ makefile.inc	Sun Jul 23 16:34:36 2006
 @@ -1,5 +1,4 @@
  # Choose the compiler you want to use
 -CC=gcc
  
  # athlon optimizations
  #CPUOPTIMIZATIONS=-march=athlon
-@@ -135,13 +134,19 @@
+@@ -137,13 +136,19 @@
  
  # Compilation
  # CFLAGS_COMMON=-MD -Wall -Werror
@@ -28,33 +28,28 @@
  
  DO_CC=$(CC) $(CFLAGS) -c $< -o $@
  
-@@ -157,14 +162,14 @@
+@@ -159,9 +164,9 @@
  OBJ_GLX= builddate.c sys_linux.o vid_glx.o $(OBJ_SOUND) $(OBJ_CD) $(OBJ_COMMON)
  
  LDFLAGS_UNIXCOMMON=-lm
--#LDFLAGS_UNIXCL=-L/usr/X11R6/lib -lX11 -lXext -lXxf86dga -lXxf86vm $(LIB_SOUND)
-+#LDFLAGS_UNIXCL=-L$(X11BASE)/lib -lX11 -lXext -lXxf86dga -lXxf86vm $(LIB_SOUND)
- ifeq ($(DP_MAKE_TARGET), sunos)
- 	LDFLAGS_UNIXCL=-R$(UNIX_X11LIBPATH) -L$(UNIX_X11LIBPATH) -lX11 -lXext -lXxf86vm $(LIB_SOUND)
- else
- 	LDFLAGS_UNIXCL=-L$(UNIX_X11LIBPATH) -lX11 -lXext -lXxf86dga -lXxf86vm $(LIB_SOUND)
- endif
+-LDFLAGS_UNIXCL=-L$(UNIX_X11LIBPATH) -lX11 -lXext -lXxf86dga -lXxf86vm $(LIB_SOUND)
++LDFLAGS_UNIXCL=-L$(X11BASE)/lib -lX11 -lXext -lXxf86dga -lXxf86vm $(LIB_SOUND)
  
 -LDFLAGS_UNIXSDL=`sdl-config --libs`
 +LDFLAGS_UNIXSDL=`$(SDL_CONFIG) --libs`
  EXE_UNIXCL=darkplaces-glx
  EXE_UNIXSV=darkplaces-dedicated
  EXE_UNIXSDL=darkplaces-sdl
-@@ -195,7 +200,7 @@
+@@ -193,7 +198,7 @@
  # Link
- LDFLAGS_MACOSXCL=$(LDFLAGS_UNIXCOMMON) -ldl $(LDFLAGS_UNIXCL)
+ LDFLAGS_MACOSXCL=$(LDFLAGS_UNIXCOMMON) -ldl -framework Carbon $(LIB_SOUND)
  LDFLAGS_MACOSXSV=$(LDFLAGS_UNIXCOMMON) -ldl
 -LDFLAGS_MACOSXSDL=$(LDFLAGS_UNIXCOMMON) -ldl `sdl-config --static-libs`
 +LDFLAGS_MACOSXSDL=$(LDFLAGS_UNIXCOMMON) -ldl `$(SDL_CONFIG) --static-libs`
  
  OBJ_AGL= builddate.c sys_linux.o vid_agl.o $(OBJ_SOUND) $(OBJ_CD) $(OBJ_COMMON)
  
-@@ -238,7 +243,7 @@
+@@ -240,7 +245,7 @@
  LDFLAGS_WINCOMMON=-lwinmm -lwsock32
  LDFLAGS_WINCL=$(LDFLAGS_WINCOMMON) -mwindows -luser32 -lgdi32 -ldxguid -ldinput -lcomctl32
  LDFLAGS_WINSV=$(LDFLAGS_WINCOMMON) -mconsole
@@ -63,7 +58,7 @@
  EXE_WINCL=darkplaces.exe
  EXE_WINSV=darkplaces-dedicated.exe
  EXE_WINSDL=darkplaces-sdl.exe
-@@ -330,40 +335,40 @@
+@@ -357,40 +362,40 @@
  	@echo "========== $(EXE) (debug) =========="
  	$(MAKE) $(EXE) \
  		DP_MAKE_TARGET=$(DP_MAKE_TARGET) DP_SOUND_API=$(DP_SOUND_API) \