From igor@doom.homeunix.org  Tue Nov  2 20:10:48 2004
Return-Path: <igor@doom.homeunix.org>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id D6E9816A4CE
	for <FreeBSD-gnats-submit@freebsd.org>; Tue,  2 Nov 2004 20:10:48 +0000 (GMT)
Received: from voodoo.oberon.net (voodoo.oberon.net [212.118.165.100])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 2241243D41
	for <FreeBSD-gnats-submit@freebsd.org>; Tue,  2 Nov 2004 20:10:48 +0000 (GMT)
	(envelope-from igor@doom.homeunix.org)
Received: from dialup84127-155.ip.peterstar.net ([84.204.127.155] helo=doom.homeunix.org)
	by voodoo.oberon.net with esmtps (TLSv1:AES256-SHA:256)
	(Exim 4.43 (FreeBSD))
	id 1CP4zG-0005Ru-Dg
	for FreeBSD-gnats-submit@freebsd.org; Tue, 02 Nov 2004 21:10:47 +0100
Received: from doom.homeunix.org (localhost [127.0.0.1])
	by doom.homeunix.org (8.13.1/8.13.1) with ESMTP id iA2K9oqE095459
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 2 Nov 2004 23:09:51 +0300 (MSK)
	(envelope-from igor@doom.homeunix.org)
Received: (from igor@localhost)
	by doom.homeunix.org (8.13.1/8.13.1/Submit) id iA2JwNns095414;
	Tue, 2 Nov 2004 22:58:23 +0300 (MSK)
	(envelope-from igor)
Message-Id: <200411021958.iA2JwNns095414@doom.homeunix.org>
Date: Tue, 2 Nov 2004 22:58:23 +0300 (MSK)
From: Igor Pokrovsky <ip@doom.homeunix.org>
Reply-To: Igor Pokrovsky <ip@doom.homeunix.org>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: Update port: games/vavoom 1.15.2 -> 1.15.3
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         73432
>Category:       ports
>Synopsis:       Update port: games/vavoom 1.15.2 -> 1.15.3
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    vs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Tue Nov 02 20:20:16 GMT 2004
>Closed-Date:    Wed Nov 10 16:02:43 GMT 2004
>Last-Modified:  Wed Nov 10 16:02:43 GMT 2004
>Originator:     Igor Pokrovsky
>Release:        FreeBSD 4.10-STABLE i386
>Organization:
>Environment:
System: FreeBSD doom.homeunix.org 4.10-STABLE FreeBSD 4.10-STABLE #0: Wed Oct 13 20:27:55 MSD 2004 root@doom.homeunix.org:/usr/obj/usr/src/sys/KERNEL i386


	
>Description:
Update to 1.15.3.
Sound and music support is still very poor.
	
>How-To-Repeat:
	
>Fix:

	

--- vavoom.diff begins here ---
diff -ruN /usr/ports/games/vavoom/Makefile vavoom/Makefile
--- /usr/ports/games/vavoom/Makefile	Wed Oct 27 19:45:36 2004
+++ vavoom/Makefile	Tue Nov  2 21:33:41 2004
@@ -6,11 +6,11 @@
 #
 
 PORTNAME=	vavoom
-PORTVERSION=	1.15.2
+PORTVERSION=	1.15.3
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
-DISTNAME=	v115_2_src
+DISTNAME=	v115_3_src
 
 MAINTAINER=	ip@doom.homeunix.org
 COMMENT=	Doom, Doom II, Heretic, Hexen and Strife source port
@@ -47,7 +47,7 @@
 .endif
 
 post-patch:
-	cd ${WRKSRC} && ${SH} ${WRKSRC}/fixunix.sh
+	cd ${WRKSRC} && ${TR} -d '\r' <${WRKSRC}/fixunix.sh | ${SH}
 	@${REINPLACE_CMD} -e 's|SDL\/||g' ${WRKSRC}/source/*.cpp
 
 do-install:
diff -ruN /usr/ports/games/vavoom/distinfo vavoom/distinfo
--- /usr/ports/games/vavoom/distinfo	Wed Mar 31 10:16:02 2004
+++ vavoom/distinfo	Tue Nov  2 21:15:52 2004
@@ -1,2 +1,2 @@
-MD5 (v115_2_src.zip) = 635e5ba761c1d91a3aa03ee5adb802b8
-SIZE (v115_2_src.zip) = 4292268
+MD5 (v115_3_src.zip) = ba834b78d74947bc31182009f5c13580
+SIZE (v115_3_src.zip) = 4328768
diff -ruN /usr/ports/games/vavoom/files/patch-Makefile vavoom/files/patch-Makefile
--- /usr/ports/games/vavoom/files/patch-Makefile	Fri Jan 23 18:31:16 2004
+++ vavoom/files/patch-Makefile	Tue Nov  2 22:15:26 2004
@@ -1,5 +1,5 @@
---- Makefile.orig	Fri Dec 19 20:00:14 2003
-+++ Makefile	Fri Jan 23 16:41:34 2004
+--- Makefile.orig
++++ Makefile
 @@ -8,7 +8,7 @@
  #DEBUG = 1
  
@@ -9,7 +9,7 @@
  
  # Uncomment to compile without OpenGL driver
  #NOGL = 1
-@@ -70,7 +70,7 @@
+@@ -73,7 +73,7 @@
  	obj/sys_i386.o \
  	obj/sys_sdl.o
  GL_SYS_OBJ = obj/gl_sdl.o
@@ -18,7 +18,7 @@
  else
  #-- Linux with Allegro --
  SYS_OBJS = \
-@@ -214,7 +214,7 @@
+@@ -213,7 +213,7 @@
  ifdef MESAGL
  LIBS := -lMesaGL $(LIBS)
  else
@@ -27,18 +27,24 @@
  endif
  endif
  
-@@ -308,8 +308,8 @@
+@@ -317,11 +317,11 @@
  
  # ---------------------------------------
  
--C_ARGS   = -c -W -Wall -march=pentiumpro -ffast-math
--CPP_ARGS = -c -W -Wall -march=pentiumpro -ffast-math
+-ARCH	?= -march=pentiumpro
+-export ARCH
+-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
++#ARCH	?= -march=pentiumpro
++#export ARCH
 +C_ARGS   = -c ${CFLAGS} -I${X11BASE}/include `${SDL_CONFIG} --cflags` -W -Wall -ffast-math
-+CPP_ARGS = -c ${CFLAGS} -I${X11BASE}/include `${SDL_CONFIG} --cflags` -W -Wall -ffast-math
- ASM_ARGS = -c -W -Wall -x assembler-with-cpp
++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
  
-@@ -337,7 +337,7 @@
+ ifdef DEBUG
+@@ -348,7 +348,7 @@
  exe: Vavoom$(EXE)
  
  Vavoom$(EXE): $(OBJ_FILES) $(LIB_FILES)
@@ -47,7 +53,7 @@
  
  suid:
  	chown root.root Vavoom
-@@ -347,13 +347,13 @@
+@@ -358,13 +358,13 @@
  	addr2line -e Vavoom -f < crash.txt >> basev/debug.txt
  
  obj/%.o : source/%.c
@@ -64,7 +70,7 @@
  
  # ---------------------------------------
  
-@@ -370,16 +370,16 @@
+@@ -381,16 +381,16 @@
  svexe: VavoomSV$(EXE)
  
  VavoomSV$(EXE): $(SV_OBJ_FILES)
@@ -85,7 +91,7 @@
  
  # ---------------------------------------
  
-@@ -415,11 +415,11 @@
+@@ -433,11 +433,11 @@
  # ---------------------------------------
  
  ifndef INSTALL
@@ -99,7 +105,7 @@
  endif
  
  ifndef INSTALL_GROUP
-@@ -511,8 +511,8 @@
+@@ -529,8 +529,8 @@
  asm: $(ASM_FILES)
  
  source/%.asm : source/%.s source/asm_i386.h source/gas2tasm.exe
diff -ruN /usr/ports/games/vavoom/files/patch-source-s_sdl.cpp vavoom/files/patch-source-s_sdl.cpp
--- /usr/ports/games/vavoom/files/patch-source-s_sdl.cpp	Fri Jan 23 18:31:16 2004
+++ vavoom/files/patch-source-s_sdl.cpp	Thu Jan  1 03:00:00 1970
@@ -1,150 +0,0 @@
---- source/s_sdl.cpp.orig	Sat Mar  8 14:08:04 2003
-+++ source/s_sdl.cpp	Wed Jan 21 15:41:52 2004
-@@ -82,8 +82,8 @@
- 
- IMPLEMENT_CLASS(VDefaultSoundDevice);
- 
--static TCvarI mix_frequency		("mix_frequency", "22050", CVAR_ARCHIVE);
--static TCvarI mix_bits			("mix_bits",      "16",    CVAR_ARCHIVE);
-+static TCvarI mix_frequency		("mix_frequency", "44100", CVAR_ARCHIVE);
-+static TCvarI mix_bits			("mix_bits",      "8",    CVAR_ARCHIVE);
- static TCvarI mix_channels		("mix_channels",  "2",     CVAR_ARCHIVE);
- 
- static TCvarI mix_chunksize		("mix_chunksize", "4096",  CVAR_ARCHIVE);
-@@ -107,6 +107,8 @@
- static TVec listener_forward;
- static TVec listener_right;
- static TVec listener_up;
-+
-+SDL_AudioCVT wavecvt;
- 
- // CODE --------------------------------------------------------------------
- 
-@@ -337,6 +339,12 @@
- 	mix_bits = fmt & 0xFF;
- 	mix_channels = ch;
- 
-+        if (SDL_BuildAudioCVT(&wavecvt, AUDIO_S8, 2, 4096,
-+                fmt, mix_channels, mix_frequency) == -1) {
-+	  Sys_Error("SDL_BuildAudioCVT: failed.\n");
-+	  return;
-+        }
-+
- 	channels = Z_CNew<channel_t>(mix_voices);
- 	for (i = 0; i < mix_voices; i++)
- 	{
-@@ -425,13 +433,23 @@
- 		return;
- 	}
- 
--	// copy the lump to a SDL_Mixer chunk...
--	chunk = Mix_LoadRAW_RW(SDL_RWFromMem((void*)S_sfx[sound_id].data, 
--		S_sfx[sound_id].len), 0, S_sfx[sound_id].freq, AUDIO_U8, 1);
--	if (chunk == NULL)
--		Sys_Error("Mix_LoadRAW_RW() failed!\n");
--	voice = Mix_LoadChannel(-1, chunk, 0);
--
-+        wavecvt.len = S_sfx[sound_id].len;
-+        wavecvt.buf = (Uint8*)malloc(wavecvt.len*wavecvt.len_mult);
-+        memcpy(wavecvt.buf, S_sfx[sound_id].data, S_sfx[sound_id].len);
-+        
-+        if (SDL_ConvertAudio(&wavecvt) == -1) {
-+          Sys_Error("SDL_ConvertAudio: error during conversion\n");
-+          return;
-+        }
-+        
-+        // copy the lump to a SDL_Mixer chunk...
-+        chunk = Mix_QuickLoad_RAW((Uint8*)wavecvt.buf,
-+                        wavecvt.len*wavecvt.len_mult);                        
-+        if (chunk == NULL)
-+                Sys_Error("Mix_QuickLoad_RAW() failed!\n");
-+                
-+        voice = Mix_PlayChannel(-1, chunk, 0);
-+
- 	if (voice < 0)
- 	{
- 		S_DoneWithLump(sound_id);
-@@ -448,9 +466,6 @@
- 	pitch = CalcPitch(S_sfx[sound_id].freq, sound_id);
- #warning how to set the pitch? (CS)
- 
--	// ready to go...
--	Mix_Play(voice);
--
- 	channels[chan].origin_id = origin_id;
- 	channels[chan].origin    = origin;
- 	channels[chan].channel   = channel;
-@@ -501,22 +516,28 @@
- 		return;
- 	}
- 
--	// copy the lump to a SDL_Mixer chunk...
--	chunk = Mix_LoadRAW_RW(SDL_RWFromMem((void*)S_VoiceInfo.data, 
--		S_VoiceInfo.len), 0, S_VoiceInfo.freq, AUDIO_U8, 1);
--	if (chunk == NULL)
--		Sys_Error("Mix_LoadRAW_RW() failed!\n");
--	voice = Mix_LoadChannel(-1, chunk, 0);
--
-+        wavecvt.len = S_sfx[VOICE_SOUND_ID].len;
-+        wavecvt.buf = (Uint8*)malloc(wavecvt.len*wavecvt.len_mult);
-+        memcpy(wavecvt.buf, S_sfx[VOICE_SOUND_ID].data, S_sfx[VOICE_SOUND_ID].len);
-+        
-+        if (SDL_ConvertAudio(&wavecvt) == -1) {
-+          Sys_Error("SDL_ConvertAudio: error during conversion\n");
-+          return;
-+        }
-+        // copy the lump to a SDL_Mixer chunk...
-+        chunk = Mix_QuickLoad_RAW((Uint8*)wavecvt.buf,
-+                        wavecvt.len*wavecvt.len_mult);
-+        if (chunk == NULL)
-+                Sys_Error("Mix_QuickLoad_RAW() failed!\n");
-+                
-+        voice = Mix_PlayChannel(-1, chunk, 0);
-+        
- 	if (voice < 0)
- 	{
- 		S_DoneWithLump(VOICE_SOUND_ID);
- 		return;
- 	}
- 
--	// ready to go...
--	Mix_Play(voice);
--
- 	channels[chan].origin_id = 0;
- 	channels[chan].origin    = TVec(0, 0, 0);
- 	channels[chan].channel   = 1;
-@@ -558,19 +579,26 @@
- 		return;
- 	}
- 
--	chunk = Mix_LoadRAW_RW(SDL_RWFromMem((void*)S_sfx[sound_id].data,
--		S_sfx[sound_id].len), 0, S_sfx[sound_id].freq, AUDIO_U8, 1);
--	if (chunk == NULL)
--		Sys_Error("Mix_LoadRAW_RW() failed!\n");
--
--	voice = Mix_LoadChannel(-1, chunk, 0);
-+        wavecvt.len = S_sfx[sound_id].len;
-+        wavecvt.buf = (Uint8*)malloc(wavecvt.len*wavecvt.len_mult);
-+        memcpy(wavecvt.buf, S_sfx[sound_id].data, S_sfx[sound_id].len);
-+        
-+        if (SDL_ConvertAudio(&wavecvt) == -1) {
-+          Sys_Error("SDL_ConvertAudio: error during conversion\n");
-+          return;
-+        }
-+        // copy the lump to a SDL_Mixer chunk...
-+        chunk = Mix_QuickLoad_RAW((Uint8*)wavecvt.buf,
-+                        wavecvt.len*wavecvt.len_mult);
-+        if (chunk == NULL)
-+                Sys_Error("Mix_QuickLoad_RAW() failed!\n");
-+                
-+        voice = Mix_PlayChannel(-1, chunk, 0);
- 
- 	if (voice < 0)
- 	{
- 		return;
- 	}
--
--	Mix_Play(voice);
- 
- 	start = Sys_Time();
- 	while (1)
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	Thu Jan  1 03:00:00 1970
+++ vavoom/files/patch-utils_acc_Makefile	Tue Nov  2 22:15:39 2004
@@ -0,0 +1,21 @@
+--- utils/acc/Makefile.orig
++++ utils/acc/Makefile
+@@ -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
+ 
+ OBJS = \
+ 	acc.o \
+@@ -21,7 +21,7 @@
+ all: ../bin/acc$(EXE)
+ 
+ ../bin/acc$(EXE): $(OBJS)
+-	gcc -s -o $@ $^ $(LIBS)
++	${CC} -s -o $@ $^ $(LIBS)
+ 
+ %.o : %.c *.h
+-	gcc $(CFLAGS) -c -o $@ $<
++	${CC} $(CFLAGS) -c -o $@ $<
diff -ruN /usr/ports/games/vavoom/files/patch-utils_acc_misc.c vavoom/files/patch-utils_acc_misc.c
--- /usr/ports/games/vavoom/files/patch-utils_acc_misc.c	Thu Jan  1 03:00:00 1970
+++ vavoom/files/patch-utils_acc_misc.c	Tue Nov  2 22:11:00 2004
@@ -0,0 +1,11 @@
+--- utils/acc/misc.c.orig
++++ utils/acc/misc.c
+@@ -12,7 +12,7 @@
+ #else
+ #include <fcntl.h>
+ #include <stdlib.h>
+-#ifndef __linux__
++#if !defined(__linux__) && !defined(__FreeBSD__)
+ #include <io.h>
+ #endif
+ #include <sys/stat.h>
diff -ruN /usr/ports/games/vavoom/files/patch-utils_acc_token.c vavoom/files/patch-utils_acc_token.c
--- /usr/ports/games/vavoom/files/patch-utils_acc_token.c	Thu Jan  1 03:00:00 1970
+++ vavoom/files/patch-utils_acc_token.c	Tue Nov  2 22:30:17 2004
@@ -0,0 +1,11 @@
+--- utils/acc/token.c.orig
++++ utils/acc/token.c
+@@ -10,7 +10,7 @@
+ #ifdef __NeXT__
+ #include <libc.h>
+ #else
+-#ifndef __linux__
++#if !defined(__linux__) && !defined(__FreeBSD__)
+ #include <io.h>
+ #endif
+ #include <fcntl.h>
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	Thu Jan  1 03:00:00 1970
+++ vavoom/files/patch-utils_glbsp_Plugin.mak	Tue Nov  2 22:47:23 2004
@@ -0,0 +1,24 @@
+--- utils/glbsp/Plugin.mak.orig
++++ utils/glbsp/Plugin.mak
+@@ -6,9 +6,9 @@
+ 
+ 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
+ RANLIB=ranlib
+ 
+ OBJS=$(MAIN)/analyze.o  \
+@@ -31,7 +31,7 @@
+ 	rm -f $(OUTNAME) $(MAIN)/*.o
+ 
+ $(OUTNAME): $(OBJS)
+-	$(AR) $(OUTNAME) $(OBJS)
++	$(AR) rc $(OUTNAME) $(OBJS)
+ 	$(RANLIB) $(OUTNAME)
+ 
+ .PHONY: all clean
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	Thu Jan  1 03:00:00 1970
+++ vavoom/files/patch-utils_glvis_Makefile	Tue Nov  2 22:47:10 2004
@@ -0,0 +1,31 @@
+--- utils/glvis/Makefile.orig
++++ utils/glvis/Makefile
+@@ -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
+ LIB_OBJS = cmdlib.o wadlib.o level.o flow.o
+ OBJS = glvis.o
+ LIBS += -lm
+@@ -14,15 +14,15 @@
+ all: ../bin/glvis$(EXE)
+ 
+ ../bin/glvis$(EXE): $(OBJS) libglvis.a
+-	gcc -s -o $@ $^ $(LIBS)
++	${CC} -s -o $@ $^ $(LIBS)
+ 
+ libglvis.a: $(LIB_OBJS)
+-	ar rc $@ $^
++	${AR} rc $@ $^
+ 	ranlib $@
+ 
+ %.o: %.cpp *.h ../common/*.h
+-	gcc $(CFLAGS) -I../common -c -o $@ $<
++	${CC} $(CFLAGS) -I../common -c -o $@ $<
+ 
+ %.o: ../common/%.cpp ../common/*.h
+-	gcc $(CFLAGS) -c -o $@ $<
++	${CC} $(CFLAGS) -c -o $@ $<
+ 
diff -ruN /usr/ports/games/vavoom/files/patch-utils_vcc_Makefile vavoom/files/patch-utils_vcc_Makefile
--- /usr/ports/games/vavoom/files/patch-utils_vcc_Makefile	Thu Jan  1 03:00:00 1970
+++ vavoom/files/patch-utils_vcc_Makefile	Tue Nov  2 22:51:09 2004
@@ -0,0 +1,41 @@
+--- utils/vcc/Makefile.orig
++++ utils/vcc/Makefile
+@@ -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
+ 
+ OBJS = \
+ 	cmdlib.o \
+@@ -35,19 +35,23 @@
+ 
+ all: ../bin/vcc$(EXE)
+ 
+-../bin/vcc$(EXE): $(OBJS) vcpp/libcpp.a
+-	gcc -s -o $@ $^ $(LIBS)
++../bin/vcc$(EXE): $(OBJS) clean_libcpp vcpp/libcpp.a
++	${CC} -s -o $@ $(OBJS) vcpp/libcpp.a $(LIBS)
+ 
++.PHONY: all clean_libcpp
++clean_libcpp:
++	${RM} -rf vcpp/*.o vcpp/libcpp.a
++
+ vcpp/libcpp.a: $(CPP_OBJS)
+-	ar rc $@ $^
++	${AR} rc $@ $^
+ 	ranlib $@
+ 
+ %.o : %.cpp vcc.h ../../source/progdefs.h ../common/cmdlib.h
+-	gcc $(CFLAGS) -I../common -c -o $@ $<
++	${CC} $(CFLAGS) -I../common -c -o $@ $<
+ 
+ %.o : ../common/%.cpp ../common/cmdlib.h
+-	gcc $(CFLAGS) -c -o $@ $<
++	${CC} $(CFLAGS) -c -o $@ $<
+ 
+ vcpp/%.o : vcpp/%.cpp vcpp/cpp.h
+-	gcc $(CFLAGS) -c -o $@ $<
++	${CC} $(CFLAGS) -c -o $@ $<
+ 
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	Thu Jan  1 03:00:00 1970
+++ vavoom/files/patch-utils_vlumpy_Makefile	Tue Nov  2 22:30:28 2004
@@ -0,0 +1,24 @@
+--- utils/vlumpy/Makefile.orig
++++ utils/vlumpy/Makefile
+@@ -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
+ OBJS = cmdlib.o imglib.o scrlib.o wadlib.o vlumpy.o
+ 
+ all: ../bin/vlumpy$(EXE)
+ 
+ ../bin/vlumpy$(EXE): $(OBJS)
+-	gcc -s -o $@ $(OBJS) $(LIBS)
++	${CC} -s -o $@ $(OBJS) $(LIBS)
+ 
+ %.o: %.cpp ../common/*.h
+-	gcc $(CFLAGS) -I../common -c -o $@ $<
++	${CC} $(CFLAGS) -I../common -c -o $@ $<
+ 
+ %.o: ../common/%.cpp ../common/*.h
+-	gcc $(CFLAGS) -c -o $@ $<
++	${CC} $(CFLAGS) -c -o $@ $<
+ 
diff -ruN /usr/ports/games/vavoom/pkg-descr vavoom/pkg-descr
--- /usr/ports/games/vavoom/pkg-descr	Fri Jan 23 18:31:15 2004
+++ vavoom/pkg-descr	Tue Nov  2 22:54:42 2004
@@ -14,9 +14,6 @@
 * Jumping;
 ....
 
-No music support is available in SDL compiled version at the moment.
-Sound effects are 8 bit, 44100KHz, stereo.
-
 WWW:	http://www.vavoom-engine.com/
 
 - Igor Pokrovsky
--- vavoom.diff ends here ---


>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->feedback 
State-Changed-By: vs 
State-Changed-When: Fri Nov 5 08:45:28 GMT 2004 
State-Changed-Why:  
Patch does not apply: 
files@menelaos [09:45:08]> ls -l *.rej 
-rw-r--r--  1 stolz  wheel  3376 Nov  5 09:44 patch-Makefile.rej 
-rw-r--r--  1 stolz  wheel  5076 Nov  5 09:44 patch-source-s_sdl.cpp.rej 


Responsible-Changed-From-To: freebsd-ports-bugs->vs 
Responsible-Changed-By: vs 
Responsible-Changed-When: Fri Nov 5 08:45:28 GMT 2004 
Responsible-Changed-Why:  
I'll track this. 

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

From: Igor Pokrovsky <ip@doom.homeunix.org>
To: FreeBSD-gnats-submit@freebsd.org, freebsd-ports-bugs@freebsd.org
Cc: vs@freebsd.org
Subject: Re: ports/73432: Update port: games/vavoom 1.15.2 -> 1.15.3
Date: Fri, 5 Nov 2004 21:53:07 +0300

 --mYCpIKhGyMATD0i+
 Content-Type: text/plain; charset=us-ascii
 Content-Disposition: inline
 
 Sorry. Looks like my mailer striped '\r's.
 I've attached uuencoded and gzip'd patch.
 
 
 --mYCpIKhGyMATD0i+
 Content-Type: text/plain; charset=us-ascii
 Content-Disposition: attachment; filename="vavoom.diff.gz.uu"
 
 begin 644 vavoom.diff.gz
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
 IS<U-D3=*)-84U\Y%K*Q$?S`H0F]J.W!N?W;LM?OY+OLO[LGKS?HZ````
 `
 end
 
 --mYCpIKhGyMATD0i+--
State-Changed-From-To: feedback->closed 
State-Changed-By: vs 
State-Changed-When: Wed Nov 10 16:01:45 GMT 2004 
State-Changed-Why:  
Committed with minor modification to DISTNAME. 
Please remember to list added/removed files separately in the PR. 

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