3 files changed, 24 insertions, 12 deletions

diff --git a/games/mvdsv/Makefile b/games/mvdsv/Makefile
index eca575a760fe..1b69aa99bdc2 100644
--- a/games/mvdsv/Makefile
+++ b/games/mvdsv/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME?=	mvdsv
-PORTVERSION=	0.19
+PORTVERSION=	0.20
 PORTEPOCH=	2
 CATEGORIES?=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
@@ -25,15 +25,23 @@ ALL_TARGET=	${PORTNAME}
 PLIST_FILES=	bin/${PORTNAME}
 WRKSRC=		${WRKDIR}/mvdsv_${PORTVERSION}/source
 
+.include <bsd.port.pre.mk>
+
+.if ${ARCH} == "alpha" || ${ARCH} == "amd64" || ${ARCH} == "i386" || ${ARCH} == "ia64"
+MAKE_ARGS+=	BYTE_ORDER=__LITTLE_ENDIAN__
+.else
+MAKE_ARGS+=	BYTE_ORDER=__BIG_ENDIAN__
+.endif
+
 pre-everything::
 .if !defined(WITH_OPTIMIZED_CFLAGS)
 	@${ECHO_MSG} "Define WITH_OPTIMIZED_CFLAGS to enable extra optimization options"
 .endif
-.if ${MACHINE_ARCH} == "i386" && !defined(WITHOUT_X86_ASM)
+.if ${ARCH} == "i386" && !defined(WITHOUT_X86_ASM)
 	@${ECHO_MSG} "Define WITHOUT_X86_ASM to disable x86 assembly code"
 .endif
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/../${PORTNAME} ${PREFIX}/bin
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/games/mvdsv/distinfo b/games/mvdsv/distinfo
index 95548d6c73fe..68bc7879303e 100644
--- a/games/mvdsv/distinfo
+++ b/games/mvdsv/distinfo
@@ -1,3 +1,3 @@
-MD5 (mvdsv_0.19_sources.tar.bz2) = 5caa724ff8d3664886e8824082d019b7
-SHA256 (mvdsv_0.19_sources.tar.bz2) = 585a9213bf687d99ef9d575ef422b2b76f8a6c0c2a4ec61964dcc7fdf1c8071b
-SIZE (mvdsv_0.19_sources.tar.bz2) = 850145
+MD5 (mvdsv_0.20_sources.tar.bz2) = 4bbdf708093a4c9641ce63ca7cc4b99b
+SHA256 (mvdsv_0.20_sources.tar.bz2) = c84798a219ad5b0ad14f3fddc17a5cb686d316aace1222757eca51a6087b032f
+SIZE (mvdsv_0.20_sources.tar.bz2) = 363177
diff --git a/games/mvdsv/files/Makefile b/games/mvdsv/files/Makefile
index 61ec68250b9e..e3b1fd0bf8f9 100644
--- a/games/mvdsv/files/Makefile
+++ b/games/mvdsv/files/Makefile
@@ -12,14 +12,15 @@
 #
 
 DO_CFLAGS =	${CFLAGS} -funsigned-char -I${LOCALBASE}/include -Dstricmp=strcasecmp \
-		-DSERVERONLY -DUSE_PR2
+		-DSERVERONLY -DUSE_PR2 -D${BYTE_ORDER}Q__
 
-.if ${MACHINE_ARCH} == "i386" && !defined(WITHOUT_X86_ASM)
+.if ${ARCH} == "i386" && !defined(WITHOUT_X86_ASM)
 DO_CFLAGS +=	-Did386
 .endif
 
 .if defined(WITH_OPTIMIZED_CFLAGS)
-DO_CFLAGS +=	-O9 -pipe -s -ffast-math -funroll-loops -fomit-frame-pointer -fexpensive-optimizations
+DO_CFLAGS +=	-O9 -pipe -s -fno-strict-aliasing -ffast-math -funroll-loops \
+		-fomit-frame-pointer -fexpensive-optimizations
 .endif
 
 ########################################################################
@@ -42,6 +43,7 @@ SV_OBJS = \
 		sv_init.o \
 		sv_login.o \
 		sv_main.o \
+		sv_master.o \
 		sv_mod_frags.o \
 		sv_model.o \
 		sv_move.o \
@@ -51,14 +53,16 @@ SV_OBJS = \
 		sv_sys_unix.o \
 		sv_user.o \
 \
+		bothtools.o \
 		cmd.o \
 		common.o \
 		crc.o \
 		cvar.o \
+		fs.o \
 		mathlib.o \
 		mdfour.o \
 		net_chan.o \
-		net_udp.o \
+		net.o \
 		pmove.o \
 		pmovetst.o \
 		sha1.o \
@@ -66,11 +70,10 @@ SV_OBJS = \
 		world.o \
 		zone.o \
 \
-		pcre/chartables.o \
 		pcre/get.o \
 		pcre/pcre.o
 
-.if ${MACHINE_ARCH} == "i386" && !defined(WITHOUT_X86_ASM)
+.if ${ARCH} == "i386" && !defined(WITHOUT_X86_ASM)
 SV_AS_OBJS = \
 		math.o \
 		worlda.o
@@ -83,6 +86,7 @@ SV_LIBS = -lm
 ########################################################################
 
 QWDTOOLS_OBJS = \
+		bothtools.o \
 		qwdtools/dem_parse.o \
 		qwdtools/dem_send.o \
 		qwdtools/ini.o \