Index: head/games/mvdsv/Makefile
===================================================================
--- head/games/mvdsv/Makefile	(revision 406863)
+++ head/games/mvdsv/Makefile	(revision 406864)
@@ -1,47 +1,49 @@
 # Created by: Alexey Dokuchaev <danfe@regency.nsu.ru>
 # $FreeBSD$
 
 PORTNAME?=	mvdsv
 PORTVERSION=	0.30
 DISTVERSIONPREFIX=	v
 PORTEPOCH=	2
 CATEGORIES?=	games
 
 MAINTAINER=	danfe@FreeBSD.org
 COMMENT?=	Enhanced QuakeWorld server with multi-view demos capability
 
 LICENSE=	GPLv2
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	deurk
 
 BUILD_WRKSRC?=	${WRKSRC}/build/make
 MAKEFILE=	Makefile.BSD
 MAKE_ARGS=	UNAME=${OPSYS}
 
 PLIST_FILES=	bin/${PORTNAME}
 
+OPTIONS_DEFINE=		OPTIMIZED_CFLAGS
 OPTIONS_DEFINE_i386=	ASM
 OPTIONS_DEFINE_amd64=	ASM
 OPTIONS_DEFAULT_i386=	ASM
 OPTIONS_DEFAULT_amd64=	ASM
 
 .if ${PORTNAME} == mvdsv
 OPTIONS_DEFINE+=	KQUEUE
 OPTIONS_DEFAULT+=	KQUEUE
 .endif
 
 KQUEUE_DESC=	Kqueue support
 
 KQUEUE_MAKE_ARGS_OFF=	-DNOKQUEUE
 ASM_MAKE_ARGS_OFF=	-DWITHOUT_X86_ASM
+OPTIMIZED_CFLAGS_MAKE_ARGS=	-DWITH_OPTIMIZED_CFLAGS
 
 post-patch:
 	@${REINPLACE_CMD} -e 's,^inline ,,' ${WRKSRC}/src/sv_sys_unix.c
 	@${REINPLACE_CMD} -e '/#include/s,/source,/src,' \
 		${WRKSRC}/tools/qwdtools/source/defs.h
 
 do-install:
 	${INSTALL_PROGRAM} ${BUILD_WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
 
 .include <bsd.port.mk>
Index: head/games/mvdsv/files/patch-build_make_Makefile.BSD
===================================================================
--- head/games/mvdsv/files/patch-build_make_Makefile.BSD	(revision 406863)
+++ head/games/mvdsv/files/patch-build_make_Makefile.BSD	(revision 406864)
@@ -1,33 +1,44 @@
 --- build/make/Makefile.BSD.orig	2011-10-06 07:24:17 UTC
 +++ build/make/Makefile.BSD
-@@ -17,7 +17,7 @@ SV_DIR = ../../src
+@@ -17,17 +17,15 @@ SV_DIR = ../../src
  # for gcc its like: make mvdsv FORCE32BITFLAGS=-m32
  # configure script add FORCE32BITFLAGS=-m32
  
 -DO_CFLAGS		=	${CFLAGS} -Wall -pipe -pthread -funsigned-char -DUSE_PR2 -D${BYTE_ORDER}Q__ ${FORCE32BITFLAGS}
 +DO_CFLAGS		=	${CFLAGS} -Wall -pipe -pthread -funsigned-char -DUSE_PR2 ${FORCE32BITFLAGS}
  
  .if !defined(NOKQUEUE) && (${UNAME} == "FreeBSD" || ${UNAME} == "DragonFly")
  DO_CFLAGS		+=	-DKQUEUE
-@@ -94,7 +94,7 @@ SV_OBJS = \
+ .endif
+ 
+-WITH_OPTIMIZED_CFLAGS = YES
+-
+ USE_ASM=-Did386
+ .if defined(WITH_OPTIMIZED_CFLAGS)
+-DO_CFLAGS		+=	-O2 -fno-strict-aliasing -ffast-math -funroll-loops
++DO_CFLAGS		+=	-ffast-math -funroll-loops
+ . if ${MACHINE_ARCH} == "i386" && !defined(WITHOUT_X86_ASM)
+ ASM=${USE_ASM}
+ DO_CFLAGS		+=	${ASM}
+@@ -94,7 +92,7 @@ SV_OBJS = \
  		${SV_DIR}/pcre/get.o \
  		${SV_DIR}/pcre/pcre.o
  
 -.if ${USE_ASM} == ${ASM}
 +.if defined(ASM) && ${USE_ASM} == ${ASM}
  SV_ASM_OBJS = \
  		${SV_DIR}/bothtoolsa.o \
  		${SV_DIR}/math.o
-@@ -105,10 +105,10 @@ SV_ASM_OBJS = \
+@@ -105,10 +103,10 @@ SV_ASM_OBJS = \
  #############################################################################
  
  .c.o:
 -		${CC} ${DO_CFLAGS} -c $< -o $*.o
 +		${CC} ${DO_CFLAGS} -c $< -o $@
  
  .s.o:
 -		${CC} ${DO_CFLAGS} -DELF -x assembler-with-cpp -c $< -o $*.o
 +		${CC} ${DO_CFLAGS} -DELF -x assembler-with-cpp -c $< -o $@
  		
  all:	mvdsv
  		${STRIP} ${STRIP_FLAGS} mvdsv
Index: head/games/mvdsv/files/patch-tools_qwdtools_source_Makefile.BSD
===================================================================
--- head/games/mvdsv/files/patch-tools_qwdtools_source_Makefile.BSD	(revision 406863)
+++ head/games/mvdsv/files/patch-tools_qwdtools_source_Makefile.BSD	(revision 406864)
@@ -1,45 +1,52 @@
 --- tools/qwdtools/source/Makefile.BSD.orig	2011-10-06 07:24:17 UTC
 +++ tools/qwdtools/source/Makefile.BSD
-@@ -12,18 +12,14 @@
+@@ -12,24 +12,18 @@
  #
  
  MAINDIR = ../../..
 -SV_DIR = $(MAINDIR)/source
 +SV_DIR = $(MAINDIR)/src
  QWDTOOLS_DIR = $(MAINDIR)/tools/qwdtools/source
  
  # To compile qwdtools as 32bit on 64bit target platform use next:
  # for gcc its like: make qwdtools FORCE32BITFLAGS=-m32
  # configure script add FORCE32BITFLAGS=-m32
  
 -DO_CFLAGS		=	${CFLAGS} -Wall -pipe -pthread -funsigned-char -DUSE_PR2 -D${BYTE_ORDER}Q__ ${FORCE32BITFLAGS}
 -
 -.if !defined(NOKQUEUE) && (${UNAME} == "FreeBSD" || ${UNAME} == "DragonFly")
 -DO_CFLAGS		+=	-DKQUEUE
 -.endif
+-
+-WITH_OPTIMIZED_CFLAGS = YES
 +DO_CFLAGS		=	${CFLAGS} -Wall -pipe -pthread -funsigned-char -DUSE_PR2 ${FORCE32BITFLAGS}
  
- WITH_OPTIMIZED_CFLAGS = YES
- 
-@@ -60,7 +56,7 @@ QWDTOOLS_OBJS = \
+ USE_ASM=-Did386
+ .if defined(WITH_OPTIMIZED_CFLAGS)
+-DO_CFLAGS		+=	-O2 -fno-strict-aliasing -ffast-math -funroll-loops
++DO_CFLAGS		+=	-ffast-math -funroll-loops
+ . if ${MACHINE_ARCH} == "i386" && !defined(WITHOUT_X86_ASM)
+ ASM=${USE_ASM}
+ DO_CFLAGS		+=	${ASM}
+@@ -60,7 +54,7 @@ QWDTOOLS_OBJS = \
  		${QWDTOOLS_DIR}/sync.o \
  		${QWDTOOLS_DIR}/tools.o
  
 -.if ${USE_ASM} == ${ASM}
 +.if defined(ASM) && ${USE_ASM} == ${ASM}
  QWDTOOLS_ASM_OBJS = \
  		${SV_DIR}/bothtoolsa.o
  .endif
-@@ -70,10 +66,10 @@ QWDTOOLS_ASM_OBJS = \
+@@ -70,10 +64,10 @@ QWDTOOLS_ASM_OBJS = \
  #############################################################################
  
  .c.o:
 -		${CC} ${DO_CFLAGS} -c $< -o $*.o
 +		${CC} ${DO_CFLAGS} -c $< -o $@
  
  .s.o:
 -		${CC} ${DO_CFLAGS} -DELF -x assembler-with-cpp -c $< -o $*.o
 +		${CC} ${DO_CFLAGS} -DELF -x assembler-with-cpp -c $< -o $@
  		
  all:	qwdtools
  		${STRIP} ${STRIP_FLAGS} qwdtools