From 47d9702b229b24ed9761a2dadca1b20f0e7ca709 Mon Sep 17 00:00:00 2001
From: Alexey Dokuchaev <danfe@FreeBSD.org>
Date: Wed, 26 Oct 2005 11:30:27 +0000
Subject: Remove controversial and GCC version-specific optimization options.

---
 games/mvdsv/Makefile       | 19 +------------------
 games/mvdsv/files/Makefile |  5 -----
 2 files changed, 1 insertion(+), 23 deletions(-)

diff --git a/games/mvdsv/Makefile b/games/mvdsv/Makefile
index 836e044d3707..eca575a760fe 100644
--- a/games/mvdsv/Makefile
+++ b/games/mvdsv/Makefile
@@ -19,25 +19,8 @@ COMMENT?=	Enhanced QuakeWorld server with multi-view demos capability
 
 USE_BZIP2=	yes
 
-.include <bsd.port.pre.mk>
-
-.if defined(GCCVERSION)
-. if ${GCCVERSION} < 030000
-GCC_VER=	2
-. else
-GCC_VER=	3
-. endif
-.else
-. if ${OSVERSION} < 500035
-GCC_VER=	2
-. else
-GCC_VER=	3
-. endif
-.endif
-
 MAKEFILE=	${FILESDIR}/Makefile
 ALL_TARGET=	${PORTNAME}
-MAKE_ARGS+=	GCC_VER=${GCC_VER}
 
 PLIST_FILES=	bin/${PORTNAME}
 WRKSRC=		${WRKDIR}/mvdsv_${PORTVERSION}/source
@@ -53,4 +36,4 @@ pre-everything::
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/../${PORTNAME} ${PREFIX}/bin
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/games/mvdsv/files/Makefile b/games/mvdsv/files/Makefile
index 501c08f56dd7..d97059275eb4 100644
--- a/games/mvdsv/files/Makefile
+++ b/games/mvdsv/files/Makefile
@@ -20,11 +20,6 @@ DO_CFLAGS +=	-Did386
 
 .if defined(WITH_OPTIMIZED_CFLAGS)
 DO_CFLAGS +=	-O9 -pipe -s -ffast-math -funroll-loops -fomit-frame-pointer -fexpensive-optimizations
-. if ${GCC_VER} == 2
-DO_CFLAGS +=	-malign-loops=2 -malign-jumps=2 -malign-functions=2
-. elif ${GCC_VER} == 3
-DO_CFLAGS +=	-falign-loops=2 -falign-jumps=2 -falign-functions=2
-. endif
 .endif
 
 ########################################################################
-- 
cgit