- Belatedly update MVDSV and QWDtools to version 0.32

- Explicitly deduce endianness instead of patching sources
- Do not build bundled PCRE code, use the one from ports
- ASM option is 32-bit only and implies OPTIMIZED_CFLAGS
- Unfortunately, upstream had removed BSD Kqueue support
- Actualize WWW line in the port descriptions while here

8 files changed, 49 insertions, 71 deletions

diff --git a/games/mvdsv/Makefile b/games/mvdsv/Makefile
index 77dc2425abcc..f3b559c10e5c 100644
--- a/games/mvdsv/Makefile
+++ b/games/mvdsv/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME?=	mvdsv
-PORTVERSION=	0.30
-DISTVERSIONPREFIX=	v
+PORTVERSION=	0.32
 PORTEPOCH=	2
 CATEGORIES?=	games
 
@@ -12,6 +11,12 @@ COMMENT?=	Enhanced QuakeWorld server with multi-view demos capability
 
 LICENSE=	GPLv2
 
+.if ${PORTNAME} == mvdsv
+LIB_DEPENDS=	libcurl.so:ftp/curl \
+		libpcre.so:devel/pcre
+USES=		localbase:ldflags
+.endif
+
 USE_GITHUB=	yes
 GH_ACCOUNT=	deurk
 
@@ -23,23 +28,13 @@ 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
+ASM_IMPLIES=	OPTIMIZED_CFLAGS
 
-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
 
diff --git a/games/mvdsv/distinfo b/games/mvdsv/distinfo
index 78d0b56be540..de942fce2127 100644
--- a/games/mvdsv/distinfo
+++ b/games/mvdsv/distinfo
@@ -1,2 +1,3 @@
-SHA256 (deurk-mvdsv-v0.30_GH0.tar.gz) = 6ebcca9b9807f72eda090ee618587e4b7b6d0f51447f59aec86eae4d4e218486
-SIZE (deurk-mvdsv-v0.30_GH0.tar.gz) = 664943
+TIMESTAMP = 1584600585
+SHA256 (deurk-mvdsv-0.32_GH0.tar.gz) = bee408166984bcd6422d15dca677fedd1d44da1d3f7b18e1244f4a8e2dd1d3c8
+SIZE (deurk-mvdsv-0.32_GH0.tar.gz) = 710497
diff --git a/games/mvdsv/files/patch-build_make_Makefile.BSD b/games/mvdsv/files/patch-build_make_Makefile.BSD
index 4c83de5ec99b..b9c83f435da1 100644
--- a/games/mvdsv/files/patch-build_make_Makefile.BSD
+++ b/games/mvdsv/files/patch-build_make_Makefile.BSD
@@ -1,35 +1,41 @@
---- build/make/Makefile.BSD.orig	2011-10-06 07:24:17 UTC
+--- build/make/Makefile.BSD.orig	2018-06-30 09:20:48 UTC
 +++ build/make/Makefile.BSD
-@@ -17,17 +17,15 @@ SV_DIR = ../../src
+@@ -17,12 +17,11 @@ 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
- .endif
+-DO_CFLAGS		=	${CFLAGS} -Wall -pipe -pthread -funsigned-char -DSERVERONLY -DUSE_PR2 -D${BYTE_ORDER}Q__ ${FORCE32BITFLAGS}
++BYTE_ORDER!=	${CC} -x c -dM -E /usr/include/machine/endian.h | sed -n 's,\#define _BYTE_ORDER \(.*\),_\1__,p'
++DO_CFLAGS		=	${CFLAGS} -Wall -pipe -funsigned-char -DWWW_INTEGRATION -DSERVERONLY -DUSE_PR2 -D${BYTE_ORDER}Q__ ${FORCE32BITFLAGS}
  
 -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
+ USE_ASM=-Did386
+ DO_CFLAGS		+=	${USE_ASM}
+@@ -35,7 +34,7 @@ STRIP_FLAGS		=	--strip-unneeded
+ .endif
+ STRIP_FLAGS		+=	--remove-section=.comment
+ 
+-LDFLAGS			=	-lm
++LDFLAGS			+=	-lm -lpthread -lpcre -lcurl
+ 
+ #############################################################################
+ # SERVER
+@@ -90,9 +89,6 @@ SV_OBJS = \
+ 		${SV_DIR}/world.o \
+ 		${SV_DIR}/zone.o \
+ \
+-		${SV_DIR}/pcre/get.o \
+-		${SV_DIR}/pcre/pcre.o \
+-\
+ 		${SV_DIR}/central.o
  
--.if ${USE_ASM} == ${ASM}
-+.if defined(ASM) && ${USE_ASM} == ${ASM}
- SV_ASM_OBJS = \
- 		${SV_DIR}/bothtoolsa.o \
- 		${SV_DIR}/math.o
-@@ -105,10 +103,10 @@ SV_ASM_OBJS = \
+ .ifdef USE_ASM
+@@ -106,10 +102,10 @@ SV_ASM_OBJS = \
  #############################################################################
  
  .c.o:
diff --git a/games/mvdsv/files/patch-src_bothdefs.h b/games/mvdsv/files/patch-src_bothdefs.h
deleted file mode 100644
index b4dc2a7703b7..000000000000
--- a/games/mvdsv/files/patch-src_bothdefs.h
+++ /dev/null
@@ -1,27 +0,0 @@
---- src/bothdefs.h.orig	2011-10-06 07:24:17 UTC
-+++ src/bothdefs.h
-@@ -174,21 +174,21 @@ float	FloatSwap (float f);
- }  /* extern "C" */
- #endif
- 
--#ifdef __BIG_ENDIAN__Q__
-+#if _BYTE_ORDER == _BIG_ENDIAN
- #define BigShort(x)		(x)
- #define BigLong(x)		(x)
- #define BigFloat(x)		(x)
- #define LittleShort(x)	ShortSwap(x)
- #define LittleLong(x)	LongSwap(x)
- #define LittleFloat(x)	FloatSwap(x)
--#elif defined(__LITTLE_ENDIAN__Q__)
-+#elif _BYTE_ORDER == _LITTLE_ENDIAN
- #define BigShort(x)		ShortSwap(x)
- #define BigLong(x)		LongSwap(x)
- #define BigFloat(x)		FloatSwap(x)
- #define LittleShort(x)	(x)
- #define LittleLong(x)	(x)
- #define LittleFloat(x)	(x)
--#elif defined(__PDP_ENDIAN__Q__)
-+#elif _BYTE_ORDER == _PDP_ENDIAN
- int		LongSwapPDP2Big (int l);
- int		LongSwapPDP2Lit (int l);
- float	FloatSwapPDP2Big (float f);
diff --git a/games/mvdsv/files/patch-tools_qwdtools_source_Makefile.BSD b/games/mvdsv/files/patch-tools_qwdtools_source_Makefile.BSD
index fd21fadbaee4..65d6ac1fd450 100644
--- a/games/mvdsv/files/patch-tools_qwdtools_source_Makefile.BSD
+++ b/games/mvdsv/files/patch-tools_qwdtools_source_Makefile.BSD
@@ -1,6 +1,6 @@
---- tools/qwdtools/source/Makefile.BSD.orig	2011-10-06 07:24:17 UTC
+--- tools/qwdtools/source/Makefile.BSD.orig	2020-03-18 18:17:05 UTC
 +++ tools/qwdtools/source/Makefile.BSD
-@@ -12,24 +12,18 @@
+@@ -12,24 +12,19 @@
  #
  
  MAINDIR = ../../..
@@ -13,14 +13,15 @@
  # configure script add FORCE32BITFLAGS=-m32
  
 -DO_CFLAGS		=	${CFLAGS} -Wall -pipe -pthread -funsigned-char -DUSE_PR2 -D${BYTE_ORDER}Q__ ${FORCE32BITFLAGS}
--
++BYTE_ORDER!=	${CC} -x c -dM -E /usr/include/machine/endian.h | sed -n 's,\#define _BYTE_ORDER \(.*\),_\1__,p'
++DO_CFLAGS		=	${CFLAGS} -Wall -pipe -funsigned-char -DSERVERONLY -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}
- 
+-
  USE_ASM=-Did386
  .if defined(WITH_OPTIMIZED_CFLAGS)
 -DO_CFLAGS		+=	-O2 -fno-strict-aliasing -ffast-math -funroll-loops
@@ -28,7 +29,7 @@
  . if ${MACHINE_ARCH} == "i386" && !defined(WITHOUT_X86_ASM)
  ASM=${USE_ASM}
  DO_CFLAGS		+=	${ASM}
-@@ -60,7 +54,7 @@ QWDTOOLS_OBJS = \
+@@ -60,7 +55,7 @@ QWDTOOLS_OBJS = \
  		${QWDTOOLS_DIR}/sync.o \
  		${QWDTOOLS_DIR}/tools.o
  
@@ -37,7 +38,7 @@
  QWDTOOLS_ASM_OBJS = \
  		${SV_DIR}/bothtoolsa.o
  .endif
-@@ -70,10 +64,10 @@ QWDTOOLS_ASM_OBJS = \
+@@ -70,10 +65,10 @@ QWDTOOLS_ASM_OBJS = \
  #############################################################################
  
  .c.o:
diff --git a/games/mvdsv/pkg-descr b/games/mvdsv/pkg-descr
index 6074f9e9d1b6..4a4436475864 100644
--- a/games/mvdsv/pkg-descr
+++ b/games/mvdsv/pkg-descr
@@ -4,4 +4,4 @@ biggest step in QuakeWorld since Qizmo release.  MVDSV is also the best
 server to use with KTeams Pro deathmatch mod, and in fact is required
 for the latter's full functionality.
 
-WWW: http://mvdsv.qw-dev.net/
+WWW: https://github.com/deurk/mvdsv
diff --git a/games/qwdtools/Makefile b/games/qwdtools/Makefile
index 22b41aaca828..b9a6ced68f56 100644
--- a/games/qwdtools/Makefile
+++ b/games/qwdtools/Makefile
@@ -10,6 +10,8 @@ PKGMESSAGE=	/nonexistent
 BUILD_WRKSRC=	${WRKSRC}/tools/qwdtools/source
 GH_PROJECT=	mvdsv
 
+CFLAGS+=	-DQWE_VERSION=\\\"${PORTVERSION}\\\"
+
 MASTERDIR=	${.CURDIR}/../mvdsv
 
 .include "${MASTERDIR}/Makefile"
diff --git a/games/qwdtools/pkg-descr b/games/qwdtools/pkg-descr
index fda4347d8f3a..fdcdec3b220b 100644
--- a/games/qwdtools/pkg-descr
+++ b/games/qwdtools/pkg-descr
@@ -4,4 +4,4 @@ QuakeWorld demo files (in QWD format) to new-era multi-view format.
 No QWZ format support yet, but one can always convert them to QWD
 manually with Qizmo and run them through QWDtools after that.
 
-WWW: http://mvdsv.qw-dev.net/
+WWW: https://github.com/deurk/mvdsv