ports/86448: [UPDATE] games/vavoom: integrate with "doom-data", remove ONLY_FOR_ARCHS

Thu Sep 22 01:10:06 UTC 2005

The following reply was made to PR ports/86448; it has been noted by GNATS.

From: "Alejandro Pulver" <alejandro at varnet.biz>
To: "FreeBSD gnats submit" <bug-followup at 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 @@
  - at 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 ---