From alejandro@varnet.biz  Thu Sep 22 00:29:09 2005
Return-Path: <alejandro@varnet.biz>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 7B16F16A41F
	for <FreeBSD-gnats-submit@freebsd.org>; Thu, 22 Sep 2005 00:29:09 +0000 (GMT)
	(envelope-from alejandro@varnet.biz)
Received: from relay03.pair.com (relay03.pair.com [209.68.5.17])
	by mx1.FreeBSD.org (Postfix) with SMTP id 082A043D45
	for <FreeBSD-gnats-submit@freebsd.org>; Thu, 22 Sep 2005 00:29:08 +0000 (GMT)
	(envelope-from alejandro@varnet.biz)
Received: (qmail 2351 invoked from network); 22 Sep 2005 00:29:06 -0000
Received: from unknown (HELO phobos.mars.bsd) (unknown)
  by unknown with SMTP; 22 Sep 2005 00:29:06 -0000
Message-Id: <1127348957.0@phobos.mars.bsd>
Date: Wed, 21 Sep 2005 21:29:17 -0300
From: "Alejandro Pulver" <alejandro@varnet.biz>
To: "FreeBSD gnats submit" <FreeBSD-gnats-submit@freebsd.org>
Subject: [UPDATE] games/vavoom: integrate with "doom-data", remove ONLY_FOR_ARCHS
X-Send-Pr-Version: gtk-send-pr 0.4.6 
X-GNATS-Notify:

>Number:         86448
>Category:       ports
>Synopsis:       [UPDATE] games/vavoom: integrate with "doom-data", remove ONLY_FOR_ARCHS
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    barner
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Thu Sep 22 00:30:07 GMT 2005
>Closed-Date:    Thu Nov 17 12:09:42 GMT 2005
>Last-Modified:  Thu Nov 17 12:09:42 GMT 2005
>Originator:     Alejandro Pulver
>Release:        FreeBSD 5.4-RELEASE i386
>Organization:
>Environment:





>Description:


Changes:
* Integrate with "doom-data".
* Remove ONLY_FOR_ARCHS (works).
* Add OPTIONS.
* Use program's install target.
* Make wrapper scripts.


>How-To-Repeat:





>Fix:


--- vavoom.diff begins here ---
diff -urN /usr/ports/games/vavoom/Makefile vavoom/Makefile
--- /usr/ports/games/vavoom/Makefile	Wed Jul 27 18:15:59 2005
+++ vavoom/Makefile	Wed Sep 21 15:49:34 2005
@@ -17,24 +17,24 @@
 
 LIB_DEPENDS=	png.5:${PORTSDIR}/graphics/png
 
-.ifdef (WITH_OPENAL)
-LIB_DEPENDS+=	openal.0:${PORTSDIR}/audio/openal
-.endif
-
-USE_ZIP=	yes
 USE_GMAKE=	yes
 USE_REINPLACE=	yes
-USE_SDL=	mixer sdl
+USE_ZIP=	yes
 USE_GL=		yes
-ALL_TARGET=	all sv
-ONLY_FOR_ARCHS=	i386
+USE_SDL=	mixer sdl
 
 EXTRACT_AFTER_ARGS=	-d ${WRKSRC}
-MAKE_ARGS=	"USE_SDL=1"
 
-.ifdef (WITH_OPENAL)
-MAKE_ARGS+=	"USE_AL=1"
-.endif
+ALL_TARGET=	all sv
+INSTALL_TARGET=	install installsv
+MAKE_ARGS=	USE_SDL=1 DATADIR=${DATADIR}
+
+OPTIONS=	OPENAL "Enable 3D sound support" off \
+		OPTIMIZED_CFLAGS "Enable compilation optimizations" on
+
+SUB_FILES=	vavoom vavoomsv
+
+.include "${.CURDIR}/../doom-data/Makefile.include"
 
 .include <bsd.port.pre.mk>
 
@@ -42,11 +42,13 @@
 BROKEN=		Does not build on FreeBSD 6.X
 .endif
 
-.ifndef (WITH_OPENAL)
-pre-everything::
-	@${ECHO_CMD} "********************************************************************"
-	@${ECHO_CMD} "You can define WITH_OPENAL=yes to build Vavoom with 3D sound support"
-	@${ECHO_CMD} "********************************************************************"
+.ifdef (WITH_OPENAL)
+LIB_DEPENDS+=	openal.0:${PORTSDIR}/audio/openal
+MAKE_ARGS+=	USE_AL=1
+.endif
+
+.ifdef (WITH_OPTIMIZED_CFLAGS)
+CFLAGS+=	-O3 -ffast-math -fomit-frame-pointer
 .endif
 
 post-patch:
@@ -56,33 +58,13 @@
 		${WRKSRC}/utils/acc/strlist.c
 .endif
 
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/Vavoom ${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/VavoomSV ${PREFIX}/bin
-
-	@${MKDIR} ${DATADIR}
-	@${MKDIR} ${DATADIR}/basev
-	${INSTALL_DATA} ${WRKSRC}/basev/default.cfg ${DATADIR}/basev
-	${INSTALL_DATA} ${WRKSRC}/basev/startup.vs ${DATADIR}/basev
-	${INSTALL_DATA} ${WRKSRC}/basev/games.txt ${DATADIR}/basev
-.for i in doom heretic hexen strife
-	@${MKDIR} ${DATADIR}/basev/${i}
-	${INSTALL_DATA} ${WRKSRC}/basev/${i}/wad0.wad ${DATADIR}/basev/${i}
-.endfor
-.for i in doom1 doom2 tnt plutonia
-	@${MKDIR} ${DATADIR}/basev/${i}
-	${INSTALL_DATA} ${WRKSRC}/basev/${i}/wad0.wad ${DATADIR}/basev/${i}
-	${INSTALL_DATA} ${WRKSRC}/basev/${i}/base.txt ${DATADIR}/basev/${i}
-.endfor
-
+post-install:
+	${INSTALL_SCRIPT} ${WRKDIR}/vavoom ${PREFIX}/bin
+	${INSTALL_SCRIPT} ${WRKDIR}/vavoomsv ${PREFIX}/bin
 .ifndef (NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/docs/vavmref.txt ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/docs/vavoom.txt ${DOCSDIR}
 .endif
-
-post-install:
-	@${SED} -e 's|%%PREFIX%%|${PREFIX}|; s|%%DATADIR%%|${DATADIR}|' \
-		<${PKGMESSAGE}
 
 .include <bsd.port.post.mk>
diff -urN /usr/ports/games/vavoom/files/patch-Makefile vavoom/files/patch-Makefile
--- /usr/ports/games/vavoom/files/patch-Makefile	Wed Jul 27 18:15:59 2005
+++ vavoom/files/patch-Makefile	Sun Sep 18 18:52:45 2005
@@ -1,5 +1,5 @@
---- Makefile.orig
-+++ Makefile
+--- Makefile.orig	Sun Apr  3 15:44:46 2005
++++ Makefile	Sun Sep 18 18:52:35 2005
 @@ -63,7 +63,7 @@
  ifdef USE_SDL
  #-- Linux with SDL --
@@ -27,7 +27,7 @@
  endif
  endif
  
-@@ -319,11 +319,11 @@
+@@ -319,12 +319,11 @@
  
  # ---------------------------------------
  
@@ -36,15 +36,25 @@
 -C_ARGS   = -c -W -Wall $(ARCH) -ffast-math
 -CPP_ARGS = -c -W -Wall $(ARCH) -ffast-math
 -ASM_ARGS = -c -W -Wall $(ARCH) -x assembler-with-cpp
+-LINK_ARGS = -Wall
 +#ARCH	?= -march=pentiumpro
 +#export ARCH
-+C_ARGS   = -c ${CFLAGS} -I${X11BASE}/include `${SDL_CONFIG} --cflags` -W -Wall -ffast-math
-+CPP_ARGS = -c ${CXXFLAGS} -I${X11BASE}/include `${SDL_CONFIG} --cflags` -W -Wall -ffast-math
-+ASM_ARGS = -c ${CFLAGS} -I${X11BASE}/include `${SDL_CONFIG} --cflags` -W -Wall -x assembler-with-cpp
- LINK_ARGS = -Wall
++C_ARGS   = -c ${CFLAGS} -I${X11BASE}/include `${SDL_CONFIG} --cflags`
++CPP_ARGS = -c ${CXXFLAGS} -I${X11BASE}/include `${SDL_CONFIG} --cflags`
++ASM_ARGS = -c ${CFLAGS} -I${X11BASE}/include `${SDL_CONFIG} --cflags` -x assembler-with-cpp
  
  ifdef DEBUG
-@@ -350,7 +350,7 @@
+ 
+@@ -333,8 +332,6 @@
+ 
+ else
+ 
+-C_ARGS   += -O3 -fomit-frame-pointer
+-CPP_ARGS += -O3 -fomit-frame-pointer
+ LINK_ARGS += -s
+ 
+ endif
+@@ -350,7 +347,7 @@
  exe: Vavoom$(EXE)
  
  Vavoom$(EXE): $(OBJ_FILES) $(LIB_FILES)
@@ -53,7 +63,7 @@
  
  suid:
  	chown root.root Vavoom
-@@ -360,13 +360,13 @@
+@@ -360,13 +357,13 @@
  	addr2line -e Vavoom -f < crash.txt >> basev/debug.txt
  
  obj/%.o : source/%.c
@@ -70,7 +80,7 @@
  
  # ---------------------------------------
  
-@@ -383,16 +383,16 @@
+@@ -383,16 +380,16 @@
  svexe: VavoomSV$(EXE)
  
  VavoomSV$(EXE): $(SV_OBJ_FILES)
@@ -91,7 +101,7 @@
  
  # ---------------------------------------
  
-@@ -439,7 +439,7 @@
+@@ -439,7 +436,7 @@
  endif
  
  ifndef INSTALL_DIR
@@ -100,3 +110,38 @@
  endif
  
  ifndef INSTALL_GROUP
+@@ -472,22 +469,22 @@
+ 		$(INSTALL_DIR)/basev/strife
+ 
+ install: installdata
+-	$(INSTALL) $(INSTALL_EXEPARMS) Vavoom$(EXE) $(INSTALL_DIR)
++	$(BSD_INSTALL_PROGRAM) Vavoom$(EXE) $(INSTALL_DIR)
+ 
+ installsv: installdata
+-	$(INSTALL) $(INSTALL_PARMS) VavoomSV$(EXE) $(INSTALL_DIR)
++	$(BSD_INSTALL_PROGRAM) VavoomSV$(EXE) $(INSTALL_DIR)
+ 
+ installdata:
+-	$(INSTALL) $(INSTALL_DIRPARMS) $(INSTALL_DIRS)
+-	$(INSTALL) $(INSTALL_PARMS) basev/default.cfg basev/startup.vs basev/games.txt $(INSTALL_DIR)/basev
+-	$(INSTALL) $(INSTALL_PARMS) basev/doom/wad0.wad $(INSTALL_DIR)/basev/doom
+-	$(INSTALL) $(INSTALL_PARMS) basev/doom1/wad0.wad basev/doom1/base.txt $(INSTALL_DIR)/basev/doom1
+-	$(INSTALL) $(INSTALL_PARMS) basev/doom2/wad0.wad basev/doom2/base.txt $(INSTALL_DIR)/basev/doom2
+-	$(INSTALL) $(INSTALL_PARMS) basev/tnt/wad0.wad basev/tnt/base.txt $(INSTALL_DIR)/basev/tnt
+-	$(INSTALL) $(INSTALL_PARMS) basev/plutonia/wad0.wad basev/plutonia/base.txt $(INSTALL_DIR)/basev/plutonia
+-	$(INSTALL) $(INSTALL_PARMS) basev/heretic/wad0.wad $(INSTALL_DIR)/basev/heretic
+-	$(INSTALL) $(INSTALL_PARMS) basev/hexen/wad0.wad $(INSTALL_DIR)/basev/hexen
+-	$(INSTALL) $(INSTALL_PARMS) basev/strife/wad0.wad $(INSTALL_DIR)/basev/strife
++	$(INSTALL) -d $(INSTALL_DIRS)
++	$(BSD_INSTALL_DATA) basev/default.cfg basev/startup.vs basev/games.txt $(INSTALL_DIR)/basev
++	$(BSD_INSTALL_DATA) basev/doom/wad0.wad $(INSTALL_DIR)/basev/doom
++	$(BSD_INSTALL_DATA) basev/doom1/wad0.wad basev/doom1/base.txt $(INSTALL_DIR)/basev/doom1
++	$(BSD_INSTALL_DATA) basev/doom2/wad0.wad basev/doom2/base.txt $(INSTALL_DIR)/basev/doom2
++	$(BSD_INSTALL_DATA) basev/tnt/wad0.wad basev/tnt/base.txt $(INSTALL_DIR)/basev/tnt
++	$(BSD_INSTALL_DATA) basev/plutonia/wad0.wad basev/plutonia/base.txt $(INSTALL_DIR)/basev/plutonia
++	$(BSD_INSTALL_DATA) basev/heretic/wad0.wad $(INSTALL_DIR)/basev/heretic
++	$(BSD_INSTALL_DATA) basev/hexen/wad0.wad $(INSTALL_DIR)/basev/hexen
++	$(BSD_INSTALL_DATA) basev/strife/wad0.wad $(INSTALL_DIR)/basev/strife
+ 
+ # ---------------------------------------
+ 
diff -urN /usr/ports/games/vavoom/files/patch-source_sys__sdl.cpp vavoom/files/patch-source_sys__sdl.cpp
--- /usr/ports/games/vavoom/files/patch-source_sys__sdl.cpp	Wed May  4 09:42:28 2005
+++ vavoom/files/patch-source_sys__sdl.cpp	Sun Sep 18 17:55:57 2005
@@ -1,17 +1,24 @@
---- source/sys_sdl.cpp.orig
-+++ source/sys_sdl.cpp
-@@ -61,8 +61,8 @@
+--- source/sys_sdl.cpp.orig	Mon Dec 27 15:23:18 2004
++++ source/sys_sdl.cpp	Sun Sep 18 17:55:30 2005
+@@ -33,7 +33,7 @@
+ #include <signal.h>
+ #include <dirent.h>
+ 
+-#include <SDL/SDL.h>
++#include <SDL.h>
+ 
+ #include "gamedefs.h"
+ 
+@@ -61,8 +61,6 @@
  
  // PUBLIC DATA DEFINITIONS -------------------------------------------------
  
 -jmp_buf __Context::Env;
 -const char* __Context::ErrToThrow;
-+//jmp_buf __Context::Env;
-+//const char* __Context::ErrToThrow;
  
  // PRIVATE DATA DEFINITIONS ------------------------------------------------
  
-@@ -733,33 +733,33 @@
+@@ -733,33 +731,32 @@
  	switch (s)
  	{
  	case SIGABRT:
@@ -51,7 +58,6 @@
 +		throw VavoomError("Terminated by signal");
  	}
 -	longjmp(__Context::Env, 1);
-+//	longjmp(__Context::Env, 1);
  }
  
  //==========================================================================
diff -urN /usr/ports/games/vavoom/files/patch-utils_acc_Makefile vavoom/files/patch-utils_acc_Makefile
--- /usr/ports/games/vavoom/files/patch-utils_acc_Makefile	Wed Jul 27 18:15:59 2005
+++ vavoom/files/patch-utils_acc_Makefile	Sun Sep 18 18:46:50 2005
@@ -1,15 +1,14 @@
---- utils/acc/Makefile.orig
-+++ utils/acc/Makefile
-@@ -6,7 +6,7 @@
+--- utils/acc/Makefile.orig	Mon Oct 11 19:33:20 2004
++++ utils/acc/Makefile	Sun Sep 18 18:46:15 2005
+@@ -6,7 +6,6 @@
  #LIBS=-lstdc++
  endif
  
 -CFLAGS = -Wall -O3 -ffast-math -fomit-frame-pointer -march=pentiumpro
-+CFLAGS += -Wall -O3 -ffast-math -fomit-frame-pointer
  
  OBJS = \
  	acc.o \
-@@ -21,7 +21,7 @@
+@@ -21,7 +20,7 @@
  all: ../bin/acc$(EXE)
  
  ../bin/acc$(EXE): $(OBJS)
diff -urN /usr/ports/games/vavoom/files/patch-utils_glbsp_Plugin.mak vavoom/files/patch-utils_glbsp_Plugin.mak
--- /usr/ports/games/vavoom/files/patch-utils_glbsp_Plugin.mak	Wed Jul 27 18:16:00 2005
+++ vavoom/files/patch-utils_glbsp_Plugin.mak	Sun Sep 18 18:47:48 2005
@@ -1,19 +1,17 @@
---- utils/glbsp/Plugin.mak.orig
-+++ utils/glbsp/Plugin.mak
-@@ -6,9 +6,9 @@
+--- utils/glbsp/Plugin.mak.orig	Mon Oct 11 14:14:08 2004
++++ utils/glbsp/Plugin.mak	Sun Sep 18 18:05:08 2005
+@@ -6,9 +6,7 @@
  
  OUTNAME=libglbsp.a
  
 -CC=gcc
 -CFLAGS=-O3 -Wall -DGLBSP_PLUGIN -DUNIX -DINLINE_G=inline
 -AR=ar rc
-+#CC=gcc
-+CFLAGS+=-O3 -Wall -DGLBSP_PLUGIN -DUNIX -DINLINE_G=inline
-+#AR=ar rc
++CFLAGS+=-DGLBSP_PLUGIN -DUNIX -DINLINE_G=inline
  RANLIB=ranlib
  
  OBJS=$(MAIN)/analyze.o  \
-@@ -31,7 +31,7 @@
+@@ -31,7 +29,7 @@
  	rm -f $(OUTNAME) $(MAIN)/*.o
  
  $(OUTNAME): $(OBJS)
diff -urN /usr/ports/games/vavoom/files/patch-utils_glvis_Makefile vavoom/files/patch-utils_glvis_Makefile
--- /usr/ports/games/vavoom/files/patch-utils_glvis_Makefile	Wed Jul 27 18:16:00 2005
+++ vavoom/files/patch-utils_glvis_Makefile	Sun Sep 18 18:48:34 2005
@@ -1,15 +1,14 @@
---- utils/glvis/Makefile.orig
-+++ utils/glvis/Makefile
-@@ -6,7 +6,7 @@
+--- utils/glvis/Makefile.orig	Sun Dec 26 20:50:50 2004
++++ utils/glvis/Makefile	Sun Sep 18 18:48:14 2005
+@@ -6,7 +6,6 @@
  LIBS=-lstdc++
  endif
  
 -CFLAGS = -Wall -O3 -ffast-math -fomit-frame-pointer -march=pentiumpro
-+CFLAGS += -Wall -O3 -ffast-math -fomit-frame-pointer
  LIB_OBJS = cmdlib.o wadlib.o level.o flow.o
  OBJS = glvis.o
  LIBS += -lm
-@@ -14,15 +14,15 @@
+@@ -14,15 +13,15 @@
  all: ../bin/glvis$(EXE)
  
  ../bin/glvis$(EXE): $(OBJS) libglvis.a
diff -urN /usr/ports/games/vavoom/files/patch-utils_vcc_Makefile vavoom/files/patch-utils_vcc_Makefile
--- /usr/ports/games/vavoom/files/patch-utils_vcc_Makefile	Wed Jul 27 18:16:00 2005
+++ vavoom/files/patch-utils_vcc_Makefile	Sun Sep 18 18:07:15 2005
@@ -1,15 +1,14 @@
---- utils/vcc/Makefile.orig
-+++ utils/vcc/Makefile
-@@ -8,7 +8,7 @@
+--- utils/vcc/Makefile.orig	Sun Dec 26 20:50:50 2004
++++ utils/vcc/Makefile	Sun Sep 18 18:06:58 2005
+@@ -8,7 +8,6 @@
  
  #CFLAGS = -Wall -O3 -ffast-math -fomit-frame-pointer -march=pentiumpro
  #CFLAGS = -Wall -O2 -ffast-math
 -CFLAGS = -Wall -g
-+CFLAGS += -Wall -g
  
  OBJS = \
  	cmdlib.o \
-@@ -38,17 +38,17 @@
+@@ -38,17 +37,17 @@
  all: ../bin/vcc$(EXE)
  
  ../bin/vcc$(EXE): $(OBJS) vcpp/libcpp.a
diff -urN /usr/ports/games/vavoom/files/patch-utils_vlumpy_Makefile vavoom/files/patch-utils_vlumpy_Makefile
--- /usr/ports/games/vavoom/files/patch-utils_vlumpy_Makefile	Wed Jul 27 18:16:00 2005
+++ vavoom/files/patch-utils_vlumpy_Makefile	Sun Sep 18 18:49:19 2005
@@ -1,11 +1,10 @@
---- utils/vlumpy/Makefile.orig
-+++ utils/vlumpy/Makefile
-@@ -6,17 +6,17 @@
+--- utils/vlumpy/Makefile.orig	Sun Dec 26 20:50:50 2004
++++ utils/vlumpy/Makefile	Sun Sep 18 18:49:06 2005
+@@ -6,17 +6,16 @@
  LIBS=-lm -lstdc++
  endif
  
 -CFLAGS = -Wall -O3 -ffast-math -fomit-frame-pointer -march=pentiumpro
-+CFLAGS += -Wall -O3 -ffast-math -fomit-frame-pointer
  OBJS = cmdlib.o imglib.o scrlib.o wadlib.o vlumpy.o
  
  all: ../bin/vlumpy$(EXE)
diff -urN /usr/ports/games/vavoom/files/vavoom.in vavoom/files/vavoom.in
--- /usr/ports/games/vavoom/files/vavoom.in	Wed Dec 31 21:00:00 1969
+++ vavoom/files/vavoom.in	Sun Sep 18 18:13:32 2005
@@ -0,0 +1,19 @@
+#!/bin/sh
+
+# The executable needs to run from a directory with the Vavoom data files, and
+# executables, and Doom WAD files. So we mirror the Vavoom and Doom (WAD
+# files) data directory to ~/.vavoom, and create symlinks to the data files.
+
+cd %%DATADIR%% || exit 1
+
+find * -type d -exec mkdir -p ~/.vavoom/{} \; || exit 1
+find * -type f -exec ln -sf %%DATADIR%%/{} ~/.vavoom/{} \; || exit 1
+
+cd %%DMDIR%% || exit 1
+
+find * -type d -exec mkdir -p ~/.vavoom/{} \; || exit 1
+find * -type f -exec ln -sf %%DMDIR%%/{} ~/.vavoom/{} \; || exit 1
+
+cd ~/.vavoom || exit 1
+
+exec ./Vavoom $*
diff -urN /usr/ports/games/vavoom/files/vavoomsv.in vavoom/files/vavoomsv.in
--- /usr/ports/games/vavoom/files/vavoomsv.in	Wed Dec 31 21:00:00 1969
+++ vavoom/files/vavoomsv.in	Sun Sep 18 18:13:52 2005
@@ -0,0 +1,19 @@
+#!/bin/sh
+
+# The executable needs to run from a directory with the Vavoom data files, and
+# executables, and Doom WAD files. So we mirror the Vavoom and Doom (WAD
+# files) data directory to ~/.vavoom, and create symlinks to the data files.
+
+cd %%DATADIR%% || exit 1
+
+find * -type d -exec mkdir -p ~/.vavoom/{} \; || exit 1
+find * -type f -exec ln -sf %%DATADIR%%/{} ~/.vavoom/{} \; || exit 1
+
+cd %%DMDIR%% || exit 1
+
+find * -type d -exec mkdir -p ~/.vavoom/{} \; || exit 1
+find * -type f -exec ln -sf %%DMDIR%%/{} ~/.vavoom/{} \; || exit 1
+
+cd ~/.vavoom || exit 1
+
+exec ./VavoomSV $*
diff -urN /usr/ports/games/vavoom/pkg-message vavoom/pkg-message
--- /usr/ports/games/vavoom/pkg-message	Fri Jan 23 12:31:15 2004
+++ vavoom/pkg-message	Wed Dec 31 21:00:00 1969
@@ -1,17 +0,0 @@
-*****************************************************************************
-* In order to run Vavoom you will need original IWAD file from either:
-* 	Doom, Doom II, TNT, Plutonia, Heretic, Hexen or Strife.
-*
-* Manually do the following:
-*  1. Make directory for Vavoom data
-*	mkdir ${HOME}/vavoom
-*  2. Copy Vavoom data into this directory
-*	cp -r %%DATADIR%%/basev ${HOME}/vavoom
-*  3. Copy IWAD from original game here as well
-*	cp /where/is/doom.wad ${HOME}/vavoom
-*  4. Execute Vavoom from directory with game data
-*	cd ${HOME}/vavoom && %%PREFIX%%/bin/Vavoom -opengl
-*		or
-*	cd ${HOME}/vavoom && %%PREFIX%%/bin/Vavoom -opengl -openal
-*     if you compiled Vavoom with OpenAL support	
-*****************************************************************************
diff -urN /usr/ports/games/vavoom/pkg-plist vavoom/pkg-plist
--- /usr/ports/games/vavoom/pkg-plist	Fri Jan 23 12:31:15 2004
+++ vavoom/pkg-plist	Sun Sep 18 18:19:48 2005
@@ -1,30 +1,31 @@
-bin/Vavoom
-bin/VavoomSV
+bin/vavoom
+bin/vavoomsv
+%%PORTDOCS%%%%DOCSDIR%%/vavmref.txt
+%%PORTDOCS%%%%DOCSDIR%%/vavoom.txt
+%%DATADIR%%/Vavoom
+%%DATADIR%%/VavoomSV
+%%DATADIR%%/basev/default.cfg
 %%DATADIR%%/basev/doom/wad0.wad
-@dirrm %%DATADIR%%/basev/doom
 %%DATADIR%%/basev/doom1/base.txt
 %%DATADIR%%/basev/doom1/wad0.wad
-@dirrm %%DATADIR%%/basev/doom1
 %%DATADIR%%/basev/doom2/base.txt
 %%DATADIR%%/basev/doom2/wad0.wad
-@dirrm %%DATADIR%%/basev/doom2
+%%DATADIR%%/basev/games.txt
 %%DATADIR%%/basev/heretic/wad0.wad
-@dirrm %%DATADIR%%/basev/heretic
 %%DATADIR%%/basev/hexen/wad0.wad
-@dirrm %%DATADIR%%/basev/hexen
 %%DATADIR%%/basev/plutonia/base.txt
 %%DATADIR%%/basev/plutonia/wad0.wad
-@dirrm %%DATADIR%%/basev/plutonia
+%%DATADIR%%/basev/startup.vs
 %%DATADIR%%/basev/strife/wad0.wad
-@dirrm %%DATADIR%%/basev/strife
 %%DATADIR%%/basev/tnt/base.txt
 %%DATADIR%%/basev/tnt/wad0.wad
 @dirrm %%DATADIR%%/basev/tnt
-%%DATADIR%%/basev/default.cfg
-%%DATADIR%%/basev/games.txt
-%%DATADIR%%/basev/startup.vs
+@dirrm %%DATADIR%%/basev/strife
+@dirrm %%DATADIR%%/basev/plutonia
+@dirrm %%DATADIR%%/basev/hexen
+@dirrm %%DATADIR%%/basev/heretic
+@dirrm %%DATADIR%%/basev/doom2
+@dirrm %%DATADIR%%/basev/doom1
+@dirrm %%DATADIR%%/basev/doom
 @dirrm %%DATADIR%%/basev
 @dirrm %%DATADIR%%
-%%PORTDOCS%%%%DOCSDIR%%/vavmref.txt
-%%PORTDOCS%%%%DOCSDIR%%/vavoom.txt
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
--- vavoom.diff ends here ---



>Release-Note:
>Audit-Trail:

From: "Alejandro Pulver" <alejandro@varnet.biz>
To: "FreeBSD gnats submit" <bug-followup@freebsd.org>
Cc:  
Subject: Re: ports/86448: [UPDATE] games/vavoom: integrate with "doom-data", remove ONLY_FOR_ARCHS
Date: Wed, 21 Sep 2005 22:01:32 -0300

 >Submitter-Id:	current-users 
 >Originator:	Alejandro Pulver 
 >Organization:	 
 >Confidential:	no 
 >Synopsis:	Re: ports/86448: [UPDATE] games/vavoom: integrate with "doom-data", remove ONLY_FOR_ARCHS 
 >Severity:	non-critical 
 >Priority:	low 
 >Category:	ports 
 >Class:		update 
 >Release:	FreeBSD 5.4-RELEASE i386 
 >Environment:
 
 
 
 
 
 >Description:
 
 
 This patch has to be applied to the previous patch.
 
 Changes:
 * Fix pkg-plist (missing @dirrm).
 * Don't use optimizations when building "vcc" (doesn't work with optimizations).
 
 
 >How-To-Repeat:
 
 
 
 
 
 >Fix:
 
 
 --- vavoom-patch.diff begins here ---
 --- pkgd/sent/doom/vavoom.diff	Wed Sep 21 19:08:30 2005
 +++ vavoom.diff	Wed Sep 21 21:56:36 2005
 @@ -1,6 +1,6 @@
  diff -urN /usr/ports/games/vavoom/Makefile vavoom/Makefile
  --- /usr/ports/games/vavoom/Makefile	Wed Jul 27 18:15:59 2005
 -+++ vavoom/Makefile	Wed Sep 21 15:49:34 2005
 ++++ vavoom/Makefile	Wed Sep 21 21:45:59 2005
  @@ -17,24 +17,24 @@
   
   LIB_DEPENDS=	png.5:${PORTSDIR}/graphics/png
 @@ -53,7 +53,7 @@
  +.endif
  +
  +.ifdef (WITH_OPTIMIZED_CFLAGS)
 -+CFLAGS+=	-O3 -ffast-math -fomit-frame-pointer
 ++MAKE_ARGS+=	OPT_CFLAGS="-O3 -ffast-math -fomit-frame-pointer"
   .endif
   
   post-patch:
 @@ -96,7 +96,7 @@
   .include <bsd.port.post.mk>
  diff -urN /usr/ports/games/vavoom/files/patch-Makefile vavoom/files/patch-Makefile
  --- /usr/ports/games/vavoom/files/patch-Makefile	Wed Jul 27 18:15:59 2005
 -+++ vavoom/files/patch-Makefile	Sun Sep 18 18:52:45 2005
 ++++ vavoom/files/patch-Makefile	Wed Sep 21 21:51:07 2005
  @@ -1,5 +1,5 @@
  ---- Makefile.orig
  -+++ Makefile
 @@ -125,9 +125,9 @@
  -+CPP_ARGS = -c ${CXXFLAGS} -I${X11BASE}/include `${SDL_CONFIG} --cflags` -W -Wall -ffast-math
  -+ASM_ARGS = -c ${CFLAGS} -I${X11BASE}/include `${SDL_CONFIG} --cflags` -W -Wall -x assembler-with-cpp
  - LINK_ARGS = -Wall
 -++C_ARGS   = -c ${CFLAGS} -I${X11BASE}/include `${SDL_CONFIG} --cflags`
 -++CPP_ARGS = -c ${CXXFLAGS} -I${X11BASE}/include `${SDL_CONFIG} --cflags`
 -++ASM_ARGS = -c ${CFLAGS} -I${X11BASE}/include `${SDL_CONFIG} --cflags` -x assembler-with-cpp
 +++C_ARGS   = -c ${CFLAGS} ${OPT_CFLAGS} -I${X11BASE}/include `${SDL_CONFIG} --cflags`
 +++CPP_ARGS = -c ${CXXFLAGS} ${OPT_CFLAGS} -I${X11BASE}/include `${SDL_CONFIG} --cflags`
 +++ASM_ARGS = -c ${CFLAGS} ${OPT_CFLAGS} -I${X11BASE}/include `${SDL_CONFIG} --cflags` -x assembler-with-cpp
    
    ifdef DEBUG
  -@@ -350,7 +350,7 @@
 @@ -255,19 +255,19 @@
    //==========================================================================
  diff -urN /usr/ports/games/vavoom/files/patch-utils_acc_Makefile vavoom/files/patch-utils_acc_Makefile
  --- /usr/ports/games/vavoom/files/patch-utils_acc_Makefile	Wed Jul 27 18:15:59 2005
 -+++ vavoom/files/patch-utils_acc_Makefile	Sun Sep 18 18:46:50 2005
 -@@ -1,15 +1,14 @@
 ++++ vavoom/files/patch-utils_acc_Makefile	Wed Sep 21 21:44:10 2005
 +@@ -1,15 +1,15 @@
  ---- utils/acc/Makefile.orig
  -+++ utils/acc/Makefile
 --@@ -6,7 +6,7 @@
  +--- utils/acc/Makefile.orig	Mon Oct 11 19:33:20 2004
  ++++ utils/acc/Makefile	Sun Sep 18 18:46:15 2005
 -+@@ -6,7 +6,6 @@
 + @@ -6,7 +6,7 @@
    #LIBS=-lstdc++
    endif
    
   -CFLAGS = -Wall -O3 -ffast-math -fomit-frame-pointer -march=pentiumpro
  -+CFLAGS += -Wall -O3 -ffast-math -fomit-frame-pointer
 +++CFLAGS += ${OPT_CFLAGS}
    
    OBJS = \
    	acc.o \
 @@ -278,7 +278,7 @@
    ../bin/acc$(EXE): $(OBJS)
  diff -urN /usr/ports/games/vavoom/files/patch-utils_glbsp_Plugin.mak vavoom/files/patch-utils_glbsp_Plugin.mak
  --- /usr/ports/games/vavoom/files/patch-utils_glbsp_Plugin.mak	Wed Jul 27 18:16:00 2005
 -+++ vavoom/files/patch-utils_glbsp_Plugin.mak	Sun Sep 18 18:47:48 2005
 ++++ vavoom/files/patch-utils_glbsp_Plugin.mak	Wed Sep 21 21:44:26 2005
  @@ -1,19 +1,17 @@
  ---- utils/glbsp/Plugin.mak.orig
  -+++ utils/glbsp/Plugin.mak
 @@ -295,7 +295,7 @@
  -+#CC=gcc
  -+CFLAGS+=-O3 -Wall -DGLBSP_PLUGIN -DUNIX -DINLINE_G=inline
  -+#AR=ar rc
 -++CFLAGS+=-DGLBSP_PLUGIN -DUNIX -DINLINE_G=inline
 +++CFLAGS+=${OPT_CFLAGS} -DGLBSP_PLUGIN -DUNIX -DINLINE_G=inline
    RANLIB=ranlib
    
    OBJS=$(MAIN)/analyze.o  \
 @@ -306,19 +306,19 @@
    $(OUTNAME): $(OBJS)
  diff -urN /usr/ports/games/vavoom/files/patch-utils_glvis_Makefile vavoom/files/patch-utils_glvis_Makefile
  --- /usr/ports/games/vavoom/files/patch-utils_glvis_Makefile	Wed Jul 27 18:16:00 2005
 -+++ vavoom/files/patch-utils_glvis_Makefile	Sun Sep 18 18:48:34 2005
 -@@ -1,15 +1,14 @@
 ++++ vavoom/files/patch-utils_glvis_Makefile	Wed Sep 21 21:44:44 2005
 +@@ -1,15 +1,15 @@
  ---- utils/glvis/Makefile.orig
  -+++ utils/glvis/Makefile
 --@@ -6,7 +6,7 @@
  +--- utils/glvis/Makefile.orig	Sun Dec 26 20:50:50 2004
  ++++ utils/glvis/Makefile	Sun Sep 18 18:48:14 2005
 -+@@ -6,7 +6,6 @@
 + @@ -6,7 +6,7 @@
    LIBS=-lstdc++
    endif
    
   -CFLAGS = -Wall -O3 -ffast-math -fomit-frame-pointer -march=pentiumpro
  -+CFLAGS += -Wall -O3 -ffast-math -fomit-frame-pointer
 +++CFLAGS += ${OPT_CFLAGS}
    LIB_OBJS = cmdlib.o wadlib.o level.o flow.o
    OBJS = glvis.o
    LIBS += -lm
 @@ -329,7 +329,7 @@
    ../bin/glvis$(EXE): $(OBJS) libglvis.a
  diff -urN /usr/ports/games/vavoom/files/patch-utils_vcc_Makefile vavoom/files/patch-utils_vcc_Makefile
  --- /usr/ports/games/vavoom/files/patch-utils_vcc_Makefile	Wed Jul 27 18:16:00 2005
 -+++ vavoom/files/patch-utils_vcc_Makefile	Sun Sep 18 18:07:15 2005
 ++++ vavoom/files/patch-utils_vcc_Makefile	Wed Sep 21 21:45:01 2005
  @@ -1,15 +1,14 @@
  ---- utils/vcc/Makefile.orig
  -+++ utils/vcc/Makefile
 @@ -352,19 +352,19 @@
    ../bin/vcc$(EXE): $(OBJS) vcpp/libcpp.a
  diff -urN /usr/ports/games/vavoom/files/patch-utils_vlumpy_Makefile vavoom/files/patch-utils_vlumpy_Makefile
  --- /usr/ports/games/vavoom/files/patch-utils_vlumpy_Makefile	Wed Jul 27 18:16:00 2005
 -+++ vavoom/files/patch-utils_vlumpy_Makefile	Sun Sep 18 18:49:19 2005
 -@@ -1,11 +1,10 @@
 ++++ vavoom/files/patch-utils_vlumpy_Makefile	Wed Sep 21 21:45:21 2005
 +@@ -1,11 +1,11 @@
  ---- utils/vlumpy/Makefile.orig
  -+++ utils/vlumpy/Makefile
 --@@ -6,17 +6,17 @@
  +--- utils/vlumpy/Makefile.orig	Sun Dec 26 20:50:50 2004
  ++++ utils/vlumpy/Makefile	Sun Sep 18 18:49:06 2005
 -+@@ -6,17 +6,16 @@
 + @@ -6,17 +6,17 @@
    LIBS=-lm -lstdc++
    endif
    
   -CFLAGS = -Wall -O3 -ffast-math -fomit-frame-pointer -march=pentiumpro
  -+CFLAGS += -Wall -O3 -ffast-math -fomit-frame-pointer
 +++CFLAGS += ${OPT_CFLAGS}
    OBJS = cmdlib.o imglib.o scrlib.o wadlib.o vlumpy.o
    
    all: ../bin/vlumpy$(EXE)
 @@ -437,8 +437,8 @@
  -*****************************************************************************
  diff -urN /usr/ports/games/vavoom/pkg-plist vavoom/pkg-plist
  --- /usr/ports/games/vavoom/pkg-plist	Fri Jan 23 12:31:15 2004
 -+++ vavoom/pkg-plist	Sun Sep 18 18:19:48 2005
 -@@ -1,30 +1,31 @@
 ++++ vavoom/pkg-plist	Wed Sep 21 21:33:13 2005
 +@@ -1,30 +1,32 @@
  -bin/Vavoom
  -bin/VavoomSV
  +bin/vavoom
 @@ -469,6 +469,7 @@
  -@dirrm %%DATADIR%%/basev/strife
   %%DATADIR%%/basev/tnt/base.txt
   %%DATADIR%%/basev/tnt/wad0.wad
 ++%%PORTDOCS%%@dirrm %%DOCSDIR%%
   @dirrm %%DATADIR%%/basev/tnt
  -%%DATADIR%%/basev/default.cfg
  -%%DATADIR%%/basev/games.txt
 --- vavoom-patch.diff ends here ---
 
 
 

From: Simon Barner <barner@FreeBSD.org>
To: ip@doom.homeunix.org
Cc: FreeBSD gnats submit <FreeBSD-gnats-submit@FreeBSD.org>
Subject: Re: ports/86448: [UPDATE] games/vavoom: integrate with "doom-data", remove ONLY_FOR_ARCHS
Date: Thu, 22 Sep 2005 15:26:30 +0200

 Dear maintainer,
 
 Alejandro Pulver <alejandro@varnet.biz> submitted a various PRs in an
 effort to the clean up DooM based ports on in the FreeBSD ports
 collection.
 
 He suggests adding a new port for the datafiles (ports/86439), and
 modifying all doom ports to make use of it.
 
 Please have a look at the changes, and say, if you approve them:
 
 http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/86448
 
 Simon
State-Changed-From-To: open->feedback 
State-Changed-By: barner 
State-Changed-When: Thu Sep 22 13:32:25 GMT 2005 
State-Changed-Why:  
Awaiting maintainer's reply. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=86448 

From: Igor Pokrovsky <ip@doom.homeunix.org>
To: Simon Barner <barner@freebsd.org>
Cc: FreeBSD gnats submit <FreeBSD-gnats-submit@freebsd.org>
Subject: Re: ports/86448: [UPDATE] games/vavoom: integrate with "doom-data", remove ONLY_FOR_ARCHS
Date: Thu, 22 Sep 2005 22:59:19 +0400

 On Thu, Sep 22, 2005 at 03:26:30PM +0200, Simon Barner wrote:
 > Dear maintainer,
 > 
 > Alejandro Pulver <alejandro@varnet.biz> submitted a various PRs in an
 > effort to the clean up DooM based ports on in the FreeBSD ports
 > collection.
 > 
 > He suggests adding a new port for the datafiles (ports/86439), and
 > modifying all doom ports to make use of it.
 
 Here is the same answer as in case with patches against games/deng.
 I think I'll make required changes myself once/if doom-data port is committed.
 
 Regards,
 
 -ip
 
 -- 
 Whenever you cut your fingernails you will find a
 need for them an hour later.

From: Igor Pokrovsky <ip@doom.homeunix.org>
To: Simon Barner <barner@freebsd.org>
Cc: FreeBSD gnats submit <FreeBSD-gnats-submit@freebsd.org>
Subject: Re: ports/86448: [UPDATE] games/vavoom: integrate with "doom-data", remove ONLY_FOR_ARCHS
Date: Thu, 22 Sep 2005 23:08:07 +0400

 Just one remark. I think it would be better to depend doom ports
 on doom-data port through RUN_DEPENDS, not through plain include.
 
 -ip
 
 -- 
 Whenever you cut your fingernails you will find a
 need for them an hour later.
Responsible-Changed-From-To: freebsd-ports-bugs->barner 
Responsible-Changed-By: barner 
Responsible-Changed-When: Thu Sep 22 21:10:59 GMT 2005 
Responsible-Changed-Why:  
Grab. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=86448 

From: "Alejandro Pulver" <alejandro@varnet.biz>
To: "FreeBSD gnats submit" <bug-followup@freebsd.org>
Cc:  
Subject: Re: ports/86448: [UPDATE] games/vavoom: integrate with "doom-data", remove ONLY_FOR_ARCHS
Date: Sun, 25 Sep 2005 22:01:57 -0300

 >Submitter-Id:	current-users 
 >Originator:	Alejandro Pulver 
 >Organization:	 
 >Confidential:	no 
 >Synopsis:	Re: ports/86448: [UPDATE] games/vavoom: integrate with "doom-data", remove ONLY_FOR_ARCHS 
 >Severity:	non-critical 
 >Priority:	low 
 >Category:	ports 
 >Class:		update 
 >Release:	FreeBSD 5.4-RELEASE i386 
 >Environment:
 
 
 
 
 
 >Description:
 
 
 This patch has to be applied to the previous patch.
 
 Changes:
 * Bring back "ONLY_FOR_ARCHS=i386" (compiles but doesn't run - produces a segmentation fault).
 
 
 >How-To-Repeat:
 
 
 
 
 
 >Fix:
 
 
 --- new.diff begins here ---
 --- ../../pkgd/sent/doom/vavoom.diff	Wed Sep 21 19:08:30 2005
 +++ vavoom.diff	Sun Sep 25 21:57:44 2005
 @@ -1,14 +1,15 @@
  diff -urN /usr/ports/games/vavoom/Makefile vavoom/Makefile
  --- /usr/ports/games/vavoom/Makefile	Wed Jul 27 18:15:59 2005
 -+++ vavoom/Makefile	Wed Sep 21 15:49:34 2005
 -@@ -17,24 +17,24 @@
 ++++ vavoom/Makefile	Sun Sep 25 21:57:26 2005
 +@@ -17,24 +17,26 @@
   
   LIB_DEPENDS=	png.5:${PORTSDIR}/graphics/png
   
  -.ifdef (WITH_OPENAL)
  -LIB_DEPENDS+=	openal.0:${PORTSDIR}/audio/openal
  -.endif
 --
 ++ONLY_FOR_ARCHS=	i386
 + 
  -USE_ZIP=	yes
   USE_GMAKE=	yes
   USE_REINPLACE=	yes
 @@ -38,7 +39,7 @@
   
   .include <bsd.port.pre.mk>
   
 -@@ -42,11 +42,13 @@
 +@@ -42,11 +44,13 @@
   BROKEN=		Does not build on FreeBSD 6.X
   .endif
   
 @@ -53,11 +54,11 @@
  +.endif
  +
  +.ifdef (WITH_OPTIMIZED_CFLAGS)
 -+CFLAGS+=	-O3 -ffast-math -fomit-frame-pointer
 ++MAKE_ARGS+=	OPT_CFLAGS="-O3 -ffast-math -fomit-frame-pointer"
   .endif
   
   post-patch:
 -@@ -56,33 +58,13 @@
 +@@ -56,33 +60,13 @@
   		${WRKSRC}/utils/acc/strlist.c
   .endif
   
 @@ -96,7 +97,7 @@
   .include <bsd.port.post.mk>
  diff -urN /usr/ports/games/vavoom/files/patch-Makefile vavoom/files/patch-Makefile
  --- /usr/ports/games/vavoom/files/patch-Makefile	Wed Jul 27 18:15:59 2005
 -+++ vavoom/files/patch-Makefile	Sun Sep 18 18:52:45 2005
 ++++ vavoom/files/patch-Makefile	Wed Sep 21 21:51:07 2005
  @@ -1,5 +1,5 @@
  ---- Makefile.orig
  -+++ Makefile
 @@ -125,9 +126,9 @@
  -+CPP_ARGS = -c ${CXXFLAGS} -I${X11BASE}/include `${SDL_CONFIG} --cflags` -W -Wall -ffast-math
  -+ASM_ARGS = -c ${CFLAGS} -I${X11BASE}/include `${SDL_CONFIG} --cflags` -W -Wall -x assembler-with-cpp
  - LINK_ARGS = -Wall
 -++C_ARGS   = -c ${CFLAGS} -I${X11BASE}/include `${SDL_CONFIG} --cflags`
 -++CPP_ARGS = -c ${CXXFLAGS} -I${X11BASE}/include `${SDL_CONFIG} --cflags`
 -++ASM_ARGS = -c ${CFLAGS} -I${X11BASE}/include `${SDL_CONFIG} --cflags` -x assembler-with-cpp
 +++C_ARGS   = -c ${CFLAGS} ${OPT_CFLAGS} -I${X11BASE}/include `${SDL_CONFIG} --cflags`
 +++CPP_ARGS = -c ${CXXFLAGS} ${OPT_CFLAGS} -I${X11BASE}/include `${SDL_CONFIG} --cflags`
 +++ASM_ARGS = -c ${CFLAGS} ${OPT_CFLAGS} -I${X11BASE}/include `${SDL_CONFIG} --cflags` -x assembler-with-cpp
    
    ifdef DEBUG
  -@@ -350,7 +350,7 @@
 @@ -255,19 +256,19 @@
    //==========================================================================
  diff -urN /usr/ports/games/vavoom/files/patch-utils_acc_Makefile vavoom/files/patch-utils_acc_Makefile
  --- /usr/ports/games/vavoom/files/patch-utils_acc_Makefile	Wed Jul 27 18:15:59 2005
 -+++ vavoom/files/patch-utils_acc_Makefile	Sun Sep 18 18:46:50 2005
 -@@ -1,15 +1,14 @@
 ++++ vavoom/files/patch-utils_acc_Makefile	Wed Sep 21 21:44:10 2005
 +@@ -1,15 +1,15 @@
  ---- utils/acc/Makefile.orig
  -+++ utils/acc/Makefile
 --@@ -6,7 +6,7 @@
  +--- utils/acc/Makefile.orig	Mon Oct 11 19:33:20 2004
  ++++ utils/acc/Makefile	Sun Sep 18 18:46:15 2005
 -+@@ -6,7 +6,6 @@
 + @@ -6,7 +6,7 @@
    #LIBS=-lstdc++
    endif
    
   -CFLAGS = -Wall -O3 -ffast-math -fomit-frame-pointer -march=pentiumpro
  -+CFLAGS += -Wall -O3 -ffast-math -fomit-frame-pointer
 +++CFLAGS += ${OPT_CFLAGS}
    
    OBJS = \
    	acc.o \
 @@ -278,7 +279,7 @@
    ../bin/acc$(EXE): $(OBJS)
  diff -urN /usr/ports/games/vavoom/files/patch-utils_glbsp_Plugin.mak vavoom/files/patch-utils_glbsp_Plugin.mak
  --- /usr/ports/games/vavoom/files/patch-utils_glbsp_Plugin.mak	Wed Jul 27 18:16:00 2005
 -+++ vavoom/files/patch-utils_glbsp_Plugin.mak	Sun Sep 18 18:47:48 2005
 ++++ vavoom/files/patch-utils_glbsp_Plugin.mak	Wed Sep 21 21:44:26 2005
  @@ -1,19 +1,17 @@
  ---- utils/glbsp/Plugin.mak.orig
  -+++ utils/glbsp/Plugin.mak
 @@ -295,7 +296,7 @@
  -+#CC=gcc
  -+CFLAGS+=-O3 -Wall -DGLBSP_PLUGIN -DUNIX -DINLINE_G=inline
  -+#AR=ar rc
 -++CFLAGS+=-DGLBSP_PLUGIN -DUNIX -DINLINE_G=inline
 +++CFLAGS+=${OPT_CFLAGS} -DGLBSP_PLUGIN -DUNIX -DINLINE_G=inline
    RANLIB=ranlib
    
    OBJS=$(MAIN)/analyze.o  \
 @@ -306,19 +307,19 @@
    $(OUTNAME): $(OBJS)
  diff -urN /usr/ports/games/vavoom/files/patch-utils_glvis_Makefile vavoom/files/patch-utils_glvis_Makefile
  --- /usr/ports/games/vavoom/files/patch-utils_glvis_Makefile	Wed Jul 27 18:16:00 2005
 -+++ vavoom/files/patch-utils_glvis_Makefile	Sun Sep 18 18:48:34 2005
 -@@ -1,15 +1,14 @@
 ++++ vavoom/files/patch-utils_glvis_Makefile	Wed Sep 21 21:44:44 2005
 +@@ -1,15 +1,15 @@
  ---- utils/glvis/Makefile.orig
  -+++ utils/glvis/Makefile
 --@@ -6,7 +6,7 @@
  +--- utils/glvis/Makefile.orig	Sun Dec 26 20:50:50 2004
  ++++ utils/glvis/Makefile	Sun Sep 18 18:48:14 2005
 -+@@ -6,7 +6,6 @@
 + @@ -6,7 +6,7 @@
    LIBS=-lstdc++
    endif
    
   -CFLAGS = -Wall -O3 -ffast-math -fomit-frame-pointer -march=pentiumpro
  -+CFLAGS += -Wall -O3 -ffast-math -fomit-frame-pointer
 +++CFLAGS += ${OPT_CFLAGS}
    LIB_OBJS = cmdlib.o wadlib.o level.o flow.o
    OBJS = glvis.o
    LIBS += -lm
 @@ -329,7 +330,7 @@
    ../bin/glvis$(EXE): $(OBJS) libglvis.a
  diff -urN /usr/ports/games/vavoom/files/patch-utils_vcc_Makefile vavoom/files/patch-utils_vcc_Makefile
  --- /usr/ports/games/vavoom/files/patch-utils_vcc_Makefile	Wed Jul 27 18:16:00 2005
 -+++ vavoom/files/patch-utils_vcc_Makefile	Sun Sep 18 18:07:15 2005
 ++++ vavoom/files/patch-utils_vcc_Makefile	Wed Sep 21 21:45:01 2005
  @@ -1,15 +1,14 @@
  ---- utils/vcc/Makefile.orig
  -+++ utils/vcc/Makefile
 @@ -352,19 +353,19 @@
    ../bin/vcc$(EXE): $(OBJS) vcpp/libcpp.a
  diff -urN /usr/ports/games/vavoom/files/patch-utils_vlumpy_Makefile vavoom/files/patch-utils_vlumpy_Makefile
  --- /usr/ports/games/vavoom/files/patch-utils_vlumpy_Makefile	Wed Jul 27 18:16:00 2005
 -+++ vavoom/files/patch-utils_vlumpy_Makefile	Sun Sep 18 18:49:19 2005
 -@@ -1,11 +1,10 @@
 ++++ vavoom/files/patch-utils_vlumpy_Makefile	Wed Sep 21 21:45:21 2005
 +@@ -1,11 +1,11 @@
  ---- utils/vlumpy/Makefile.orig
  -+++ utils/vlumpy/Makefile
 --@@ -6,17 +6,17 @@
  +--- utils/vlumpy/Makefile.orig	Sun Dec 26 20:50:50 2004
  ++++ utils/vlumpy/Makefile	Sun Sep 18 18:49:06 2005
 -+@@ -6,17 +6,16 @@
 + @@ -6,17 +6,17 @@
    LIBS=-lm -lstdc++
    endif
    
   -CFLAGS = -Wall -O3 -ffast-math -fomit-frame-pointer -march=pentiumpro
  -+CFLAGS += -Wall -O3 -ffast-math -fomit-frame-pointer
 +++CFLAGS += ${OPT_CFLAGS}
    OBJS = cmdlib.o imglib.o scrlib.o wadlib.o vlumpy.o
    
    all: ../bin/vlumpy$(EXE)
 @@ -437,8 +438,8 @@
  -*****************************************************************************
  diff -urN /usr/ports/games/vavoom/pkg-plist vavoom/pkg-plist
  --- /usr/ports/games/vavoom/pkg-plist	Fri Jan 23 12:31:15 2004
 -+++ vavoom/pkg-plist	Sun Sep 18 18:19:48 2005
 -@@ -1,30 +1,31 @@
 ++++ vavoom/pkg-plist	Wed Sep 21 21:33:13 2005
 +@@ -1,30 +1,32 @@
  -bin/Vavoom
  -bin/VavoomSV
  +bin/vavoom
 @@ -469,6 +470,7 @@
  -@dirrm %%DATADIR%%/basev/strife
   %%DATADIR%%/basev/tnt/base.txt
   %%DATADIR%%/basev/tnt/wad0.wad
 ++%%PORTDOCS%%@dirrm %%DOCSDIR%%
   @dirrm %%DATADIR%%/basev/tnt
  -%%DATADIR%%/basev/default.cfg
  -%%DATADIR%%/basev/games.txt
 --- new.diff ends here ---
 
 
 

From: Igor Pokrovsky <ip@doom.homeunix.org>
To: Simon Barner <barner@FreeBSD.org>
Cc: FreeBSD gnats submit <FreeBSD-gnats-submit@FreeBSD.org>
Subject: Re: ports/86448: [UPDATE] games/vavoom: integrate with "doom-data", remove ONLY_FOR_ARCHS
Date: Sat, 5 Nov 2005 21:02:53 +0300

 Hi Simon,
 
 Here is the patch for games/vavoom I promised. Hopefully I haven't missed
 anything.
 
 Changes made:
 	Rely on games/doom-data port for game's WADs
 	Added WITH_OPTIMIZED_CFLAGS knob
 	Added installuser target to prepare user for Vavoom
 	Added wrapper script for easier execution
 
 Removed files:
 	pkg-message
 
 Added files:
 	files/pkg-message.in
 	files/vavoom.in
 
 
 diff -ruN /usr/ports/games/vavoom/Makefile vavoom/Makefile
 --- /usr/ports/games/vavoom/Makefile	Fri May  6 21:51:03 2005
 +++ vavoom/Makefile	Sat Nov  5 20:44:01 2005
 @@ -36,18 +36,30 @@
  MAKE_ARGS+=	"USE_AL=1"
  .endif
  
 +.ifdef (WITH_OPTIMIZED_CFLAGS)
 +MAKE_ARGS+=	OPT_CFLAGS="-O3 -ffast-math -fomit-frame-pointer"
 +.endif
 +
 +SUB_FILES=	pkg-message vavoom
 +SUB_LIST=	"PREFIX=${PREFIX}" "PORTSDIR=${PORTSDIR}"
 +
 +.include "${.CURDIR}/../doom-data/Makefile.include"
 +
  .include <bsd.port.pre.mk>
  
  .if ${OSVERSION} >= 600000
  BROKEN=		Does not build on FreeBSD 6.X
  .endif
  
 -.ifndef (WITH_OPENAL)
  pre-everything::
 -	@${ECHO_CMD} "********************************************************************"
 -	@${ECHO_CMD} "You can define WITH_OPENAL=yes to build Vavoom with 3D sound support"
 -	@${ECHO_CMD} "********************************************************************"
 +	@${ECHO_CMD} ""
 +.ifndef (WITH_OPENAL)
 +	@${ECHO_CMD} "Define WITH_OPENAL=yes to build Vavoom with 3D sound support"
 +.endif
 +.ifndef (WITH_OPTIMIZED_CFLAGS)
 +	@${ECHO_CMD} "Define WITH_OPTIMIZED_CFLAGS=yes to build Vavoom optimized for speed"
  .endif
 +	@${ECHO_CMD} ""
  
  post-patch:
  	@${REINPLACE_CMD} -i '' -e 's|SDL\/||g' ${WRKSRC}/source/*.cpp
 @@ -60,6 +72,9 @@
  	${INSTALL_PROGRAM} ${WRKSRC}/Vavoom ${PREFIX}/bin
  	${INSTALL_PROGRAM} ${WRKSRC}/VavoomSV ${PREFIX}/bin
  
 +# install wrapper script
 +	${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME} ${PREFIX}/bin
 +
  	@${MKDIR} ${DATADIR}
  	@${MKDIR} ${DATADIR}/basev
  	${INSTALL_DATA} ${WRKSRC}/basev/default.cfg ${DATADIR}/basev
 @@ -80,9 +95,18 @@
  	${INSTALL_DATA} ${WRKSRC}/docs/vavmref.txt ${DOCSDIR}
  	${INSTALL_DATA} ${WRKSRC}/docs/vavoom.txt ${DOCSDIR}
  .endif
 +	@${CAT} ${PKGMESSAGE}
  
 -post-install:
 -	@${SED} -e 's|%%PREFIX%%|${PREFIX}|; s|%%DATADIR%%|${DATADIR}|' \
 -		<${PKGMESSAGE}
 +# Run this target as a user from which you will play Vavoom. It will create
 +# required symlinks in users home directory. This should be done only once.
 +installuser:
 +	cd ${DATADIR} && \
 +	${FIND} . -type d -exec ${MKDIR} -p ~/.${PORTNAME}/{} \; && \
 +	${FIND} . -type f -exec ${LN} -sf ${DATADIR}/{} ~/.${PORTNAME}/{} \;
 +.if exists(${DMDIR})
 +	cd ${DMDIR} && \
 +	${FIND} . -type d -exec ${MKDIR} -p ~/.${PORTNAME}/{} \; && \
 +	${FIND} . -type f -exec ${LN} -sf ${DMDIR}/{} ~/.${PORTNAME}/{} \;
 +.endif
  
  .include <bsd.port.post.mk>
 diff -ruN /usr/ports/games/vavoom/files/patch-Makefile vavoom/files/patch-Makefile
 --- /usr/ports/games/vavoom/files/patch-Makefile	Wed May  4 16:42:28 2005
 +++ vavoom/files/patch-Makefile	Sat Nov  5 19:33:42 2005
 @@ -38,12 +38,23 @@
  -ASM_ARGS = -c -W -Wall $(ARCH) -x assembler-with-cpp
  +#ARCH	?= -march=pentiumpro
  +#export ARCH
 -+C_ARGS   = -c ${CFLAGS} -I${X11BASE}/include `${SDL_CONFIG} --cflags` -W -Wall -ffast-math
 -+CPP_ARGS = -c ${CXXFLAGS} -I${X11BASE}/include `${SDL_CONFIG} --cflags` -W -Wall -ffast-math
 ++C_ARGS   = -c ${CFLAGS} -I${X11BASE}/include `${SDL_CONFIG} --cflags` -W -Wall
 ++CPP_ARGS = -c ${CXXFLAGS} -I${X11BASE}/include `${SDL_CONFIG} --cflags` -W -Wall
  +ASM_ARGS = -c ${CFLAGS} -I${X11BASE}/include `${SDL_CONFIG} --cflags` -W -Wall -x assembler-with-cpp
   LINK_ARGS = -Wall
   
   ifdef DEBUG
 +@@ -333,8 +333,8 @@
 + 
 + else
 + 
 +-C_ARGS   += -O3 -fomit-frame-pointer
 +-CPP_ARGS += -O3 -fomit-frame-pointer
 ++C_ARGS   += ${OPT_CFLAGS}
 ++CPP_ARGS += ${OPT_CFLAGS}
 + LINK_ARGS += -s
 + 
 + endif
  @@ -350,7 +350,7 @@
   exe: Vavoom$(EXE)
   
 diff -ruN /usr/ports/games/vavoom/files/patch-utils_acc_Makefile vavoom/files/patch-utils_acc_Makefile
 --- /usr/ports/games/vavoom/files/patch-utils_acc_Makefile	Wed May  4 16:42:28 2005
 +++ vavoom/files/patch-utils_acc_Makefile	Sat Nov  5 19:33:49 2005
 @@ -5,7 +5,7 @@
   endif
   
  -CFLAGS = -Wall -O3 -ffast-math -fomit-frame-pointer -march=pentiumpro
 -+CFLAGS += -Wall -O3 -ffast-math -fomit-frame-pointer
 ++CFLAGS += -Wall ${OPT_CFLAGS}
   
   OBJS = \
   	acc.o \
 diff -ruN /usr/ports/games/vavoom/files/patch-utils_glbsp_Plugin.mak vavoom/files/patch-utils_glbsp_Plugin.mak
 --- /usr/ports/games/vavoom/files/patch-utils_glbsp_Plugin.mak	Wed May  4 16:42:28 2005
 +++ vavoom/files/patch-utils_glbsp_Plugin.mak	Sat Nov  5 19:34:21 2005
 @@ -8,7 +8,7 @@
  -CFLAGS=-O3 -Wall -DGLBSP_PLUGIN -DUNIX -DINLINE_G=inline
  -AR=ar rc
  +#CC=gcc
 -+CFLAGS+=-O3 -Wall -DGLBSP_PLUGIN -DUNIX -DINLINE_G=inline
 ++CFLAGS+=${OPT_CFLAGS} -Wall -DGLBSP_PLUGIN -DUNIX -DINLINE_G=inline
  +#AR=ar rc
   RANLIB=ranlib
   
 diff -ruN /usr/ports/games/vavoom/files/patch-utils_glvis_Makefile vavoom/files/patch-utils_glvis_Makefile
 --- /usr/ports/games/vavoom/files/patch-utils_glvis_Makefile	Wed May  4 16:42:28 2005
 +++ vavoom/files/patch-utils_glvis_Makefile	Sat Nov  5 19:34:00 2005
 @@ -5,7 +5,7 @@
   endif
   
  -CFLAGS = -Wall -O3 -ffast-math -fomit-frame-pointer -march=pentiumpro
 -+CFLAGS += -Wall -O3 -ffast-math -fomit-frame-pointer
 ++CFLAGS += -Wall ${OPT_CFLAGS}
   LIB_OBJS = cmdlib.o wadlib.o level.o flow.o
   OBJS = glvis.o
   LIBS += -lm
 diff -ruN /usr/ports/games/vavoom/files/patch-utils_vlumpy_Makefile vavoom/files/patch-utils_vlumpy_Makefile
 --- /usr/ports/games/vavoom/files/patch-utils_vlumpy_Makefile	Wed May  4 16:42:28 2005
 +++ vavoom/files/patch-utils_vlumpy_Makefile	Sat Nov  5 19:34:12 2005
 @@ -5,7 +5,7 @@
   endif
   
  -CFLAGS = -Wall -O3 -ffast-math -fomit-frame-pointer -march=pentiumpro
 -+CFLAGS += -Wall -O3 -ffast-math -fomit-frame-pointer
 ++CFLAGS += -Wall ${OPT_CFLAGS}
   OBJS = cmdlib.o imglib.o scrlib.o wadlib.o vlumpy.o
   
   all: ../bin/vlumpy$(EXE)
 diff -ruN /usr/ports/games/vavoom/files/pkg-message.in vavoom/files/pkg-message.in
 --- /usr/ports/games/vavoom/files/pkg-message.in	Thu Jan  1 03:00:00 1970
 +++ vavoom/files/pkg-message.in	Sat Nov  5 20:50:30 2005
 @@ -0,0 +1,19 @@
 +*****************************************************************************
 +* In order to run Vavoom you will need original IWAD file from either:
 +* 	Doom, Doom II, TNT, Plutonia, Heretic, Hexen or Strife.
 +* You should install any of them using games/doom-data meta port.
 +*
 +* Vavoom needs to be run from a directory containing its data files and
 +* IWAD files taken from original games. So before starting to play Vavoom
 +* you should create required symlinks in users home directory.
 +* This process is automated by 'installuser' target in vavoom port makefile.
 +* You can run something like this after installing the port:
 +*	cd %%PORTSDIR%%/games/vavoom && make installuser
 +* This should be done only once on per user basis.
 +*
 +* Once done you are ready to play Vavoom. Run it as
 +*	%%PREFIX%%/bin/vavoom ...
 +* or as
 +*	%%PREFIX%%/bin/vavoom -s ...
 +* to start its dedicated server.
 +*****************************************************************************
 diff -ruN /usr/ports/games/vavoom/files/vavoom.in vavoom/files/vavoom.in
 --- /usr/ports/games/vavoom/files/vavoom.in	Thu Jan  1 03:00:00 1970
 +++ vavoom/files/vavoom.in	Sat Nov  5 20:42:45 2005
 @@ -0,0 +1,10 @@
 +#!/bin/sh
 +
 +if [ $1 = "-s" ]; then
 +	EXE="VavoomSV"
 +	shift
 +else
 +	EXE="Vavoom"
 +fi
 +
 +cd ~/.vavoom && %%PREFIX%%/bin/${EXE} $*
 diff -ruN /usr/ports/games/vavoom/pkg-message vavoom/pkg-message
 --- /usr/ports/games/vavoom/pkg-message	Fri Jan 23 18:31:15 2004
 +++ vavoom/pkg-message	Thu Jan  1 03:00:00 1970
 @@ -1,17 +0,0 @@
 -*****************************************************************************
 -* In order to run Vavoom you will need original IWAD file from either:
 -* 	Doom, Doom II, TNT, Plutonia, Heretic, Hexen or Strife.
 -*
 -* Manually do the following:
 -*  1. Make directory for Vavoom data
 -*	mkdir ${HOME}/vavoom
 -*  2. Copy Vavoom data into this directory
 -*	cp -r %%DATADIR%%/basev ${HOME}/vavoom
 -*  3. Copy IWAD from original game here as well
 -*	cp /where/is/doom.wad ${HOME}/vavoom
 -*  4. Execute Vavoom from directory with game data
 -*	cd ${HOME}/vavoom && %%PREFIX%%/bin/Vavoom -opengl
 -*		or
 -*	cd ${HOME}/vavoom && %%PREFIX%%/bin/Vavoom -opengl -openal
 -*     if you compiled Vavoom with OpenAL support	
 -*****************************************************************************
 diff -ruN /usr/ports/games/vavoom/pkg-plist vavoom/pkg-plist
 --- /usr/ports/games/vavoom/pkg-plist	Fri Jan 23 18:31:15 2004
 +++ vavoom/pkg-plist	Sat Nov  5 20:36:19 2005
 @@ -1,3 +1,4 @@
 +bin/vavoom
  bin/Vavoom
  bin/VavoomSV
  %%DATADIR%%/basev/doom/wad0.wad
 
 
 -ip
 
 -- 
 If you have to ask, you are not entitled to know.
State-Changed-From-To: feedback->patched 
State-Changed-By: barner 
State-Changed-When: Tue Nov 15 20:18:47 GMT 2005 
State-Changed-Why:  
PR analysed, ready commit. Waiting for feedback on ports/86445, so we 
can do the whole DooM conversion in one sweep. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=86448 
State-Changed-From-To: patched->closed 
State-Changed-By: barner 
State-Changed-When: Thu Nov 17 12:09:41 GMT 2005 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=86448 
>Unformatted:
