Index: head/games/q2pro/Makefile
===================================================================
--- head/games/q2pro/Makefile	(revision 414185)
+++ head/games/q2pro/Makefile	(revision 414186)
@@ -1,135 +1,135 @@
 # Created by: Alejandro Pulver <alepulver@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	q2pro
 PORTVERSION=	${SVN_REV}
-PORTREVISION=	10
+PORTREVISION=	11
 CATEGORIES=	games
 MASTER_SITES=	LOCAL/alepulver
 
 MAINTAINER=	danfe@FreeBSD.org
 COMMENT=	Quake II engine modification compatible with R1Q2
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/gnu.txt
 
 USES=		dos2unix gmake tar:bzip2
 WRKSRC=		${WRKDIR}/${PORTNAME}
 ALL_TARGET=	#
 
 SVN_REV=	142
 
 MAKE_ENV=	LIBDIR="${LIBDIR}"
 PLIST_SUB=	LIBDIR="${LIBDIR:S|${PREFIX}/||}"
 LIBDIR=		${PREFIX}/lib/${PORTNAME}
 
-OPTIONS_DEFINE=		GAME GL SOFT UI
+OPTIONS_DEFINE=		CLIENT DEDICATED GAME GL SOFT UI
 OPTIONS_DEFINE_i386=	ASM
-OPTIONS_MULTI=		FLAVOR
-OPTIONS_MULTI_FLAVOR=	CLIENT DEDICATED
 OPTIONS_DEFAULT=	CLIENT DEDICATED GL SOFT UI
-OPTIONS_DEFAULT_I386=	ASM
+OPTIONS_DEFAULT_i386=	ASM
 
 CLIENT_DESC=	Build client
 DEDICATED_DESC=	Build dedicated server
 GAME_DESC=	Build main game (default mod)
-GL_DESC=	Build OpenGL render
-SOFT_DESC=	Build software render
+GL_DESC=	Build OpenGL renderer
+SOFT_DESC=	Build software renderer
 UI_DESC=	Build user interface (for client menus)
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MCLIENT}
 USE_SDL+=	sdl
 ALL_TARGET+=	client
 PLIST_SUB+=	CLIENT=""
 .else
 PLIST_SUB+=	CLIENT="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MDEDICATED}
 ALL_TARGET+=	server
 PLIST_SUB+=	DEDICATED=""
 .else
 PLIST_SUB+=	DEDICATED="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MGAME}
 ALL_TARGET+=	game
 PLIST_SUB+=	GAME=""
 .else
 PLIST_SUB+=	GAME="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MGL}
 LIB_DEPENDS+=	libpng.so:graphics/png
 USES+=		jpeg
 USE_GL=		gl
 ALL_TARGET+=	ref_newgl
 PLIST_SUB+=	GL=""
 .else
 PLIST_SUB+=	GL="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MSOFT}
 ALL_TARGET+=	ref_soft
 PLIST_SUB+=	SOFT=""
 .else
 PLIST_SUB+=	SOFT="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MUI}
 ALL_TARGET+=	ui
 PLIST_SUB+=	UI=""
 .else
 PLIST_SUB+=	UI="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MASM}
 MAKE_ENV+=	USE_X86_ASM=yes
 .endif
 
 post-patch:
-# Resolve name collision with jpeg-8
 	@${REINPLACE_CMD} -e 's|jpeg_mem_src|local_jpeg_mem_src|' \
-		${WRKSRC}/ref_shared/r_images.c
+		-e '/png_set_gray_1_2_4_to_8/s|png_set|&_expand|' \
+			${WRKSRC}/ref_shared/r_images.c
+	@${REINPLACE_CMD} -E 's|[[:digit:]]+|${SVN_REV}|' \
+		${WRKSRC}/include/version.h
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${LIBDIR}/baseq2
 .if ${PORT_OPTIONS:MCLIENT}
 	${INSTALL_PROGRAM} ${WRKSRC}/build/release/q2pro \
 		${STAGEDIR}${PREFIX}/bin
 .endif
 .if ${PORT_OPTIONS:MDEDICATED}
 	${INSTALL_PROGRAM} ${WRKSRC}/build/release/q2proded \
 		${STAGEDIR}${PREFIX}/bin
 .endif
 .if ${PORT_OPTIONS:MGAME}
 	${INSTALL_PROGRAM} ${WRKSRC}/build/release/game.so \
 		${STAGEDIR}${LIBDIR}/baseq2
 .endif
 .if ${PORT_OPTIONS:MGL}
 	${INSTALL_PROGRAM} ${WRKSRC}/build/release/ref_newgl.so \
 		${STAGEDIR}${LIBDIR}
 .endif
 .if ${PORT_OPTIONS:MSOFT}
 	${INSTALL_PROGRAM} ${WRKSRC}/build/release/ref_soft.so \
 		${STAGEDIR}${LIBDIR}
 .endif
 .if ${PORT_OPTIONS:MUI}
 	${INSTALL_PROGRAM} ${WRKSRC}/build/release/ui.so \
 		${STAGEDIR}${LIBDIR}
 .endif
 
 generate-distfile:
 	@if [ -f ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX} ]; then \
 		${ECHO_CMD} "ERROR: the distfile already exists."; \
 		${FALSE}; \
 	fi
 	svn export -r${SVN_REV} \
 		https://svn.sourceforge.net/svnroot/q2pro/q2pro q2pro
 	${TAR} jcf ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX} q2pro
 	${RM} -rf q2pro
 
 .include "${.CURDIR}/../quake2-data/Makefile.include"
 .include <bsd.port.mk>
Index: head/games/q2pro/files/patch-build__pre.mk
===================================================================
--- head/games/q2pro/files/patch-build__pre.mk	(revision 414185)
+++ head/games/q2pro/files/patch-build__pre.mk	(revision 414186)
@@ -1,17 +1,26 @@
 --- build/pre.mk.orig	Sun Feb  4 16:13:21 2007
 +++ build/pre.mk	Sun Feb  4 16:27:54 2007
-@@ -48,10 +48,10 @@
+@@ -25,7 +25,7 @@ CFLAGS+=-g 
+ LDFLAGS+=-g
+ else
+ #CFLAGS += -march=i686 -msse2 -mfpmath=sse -O2 -fno-strict-aliasing -DNDEBUG
+-CFLAGS+=-ffloat-store -O2 -fno-strict-aliasing -DNDEBUG
++CFLAGS+= -DNDEBUG
+ LDFLAGS+=-s
+ endif
+ 
+@@ -48,10 +48,10 @@ SRCFILES_WIN32=#blank
  ASMFILES_WIN32=#blank
  VPATH_WIN32=$(RCDIR)
  
 -DATADIR?=/usr/share/games/quake2
 -LIBDIR?=/usr/lib/games/quake2
 -CFLAGS_LINUX=-DDATADIR='"$(DATADIR)"' -DLIBDIR='"$(LIBDIR)"'
 -LDFLAGS_LINUX=#blank
 +DATADIR?=$(Q2DIR)
 +LIBDIR?=$(PREFIX)/lib/q2pro
 +CFLAGS_LINUX=-I$(LOCALBASE)/include -DDATADIR='"$(DATADIR)"' -DLIBDIR='"$(LIBDIR)"'
 +LDFLAGS_LINUX=-L$(LOCALBASE)/lib
  SRCFILES_LINUX=#blank
  ASMFILES_LINUX=#blank
  
Index: head/games/q2pro/files/patch-build__ref_soft.mk
===================================================================
--- head/games/q2pro/files/patch-build__ref_soft.mk	(revision 414185)
+++ head/games/q2pro/files/patch-build__ref_soft.mk	(revision 414186)
@@ -1,19 +1,22 @@
 --- build/ref_soft.mk.orig	Wed Feb 14 18:10:04 2007
 +++ build/ref_soft.mk	Wed Feb 14 18:15:42 2007
-@@ -43,6 +43,7 @@
+@@ -43,6 +43,7 @@ SRCFILES = q_shared.c \
  	   sw_sird.c   \
  	   r_images.c
  
 +ifdef USE_X86_ASM
  ASMFILES = r_aclipa.s \
  		 r_draw16.s \
  		 r_drawa.s  \
-@@ -53,7 +54,7 @@
+@@ -53,7 +54,10 @@ ASMFILES = r_aclipa.s \
  		 r_varsa.s  \
  		 d_polysa.s \
  		 sys_dosa.s
 -		 		 
++else
++CFLAGS += -DC_ONLY
 +endif
++
  RESFILES += ref_soft.rc
  
  SRCFILES_WIN32 = q_shwin.c