From 942e4eb666ff86f08f699b17a812f98f77a6a754 Mon Sep 17 00:00:00 2001 From: Alexey Dokuchaev Date: Wed, 5 Mar 2025 16:48:04 +0000 Subject: [PATCH] games/mvdsv: belatedly update the port to version 1.11 - The project was moved under QW-Group GitHub account - Chase commit ac2f79786331 and drop now needless ?= conditional assignments; transfer maintainership - Builds itself with CMake now, hence GC the patches, outdated knobs and options - Install the manual page and some documentation files PR: 280374 Submitted by: vvd --- games/mvdsv/Makefile | 48 +++++++++-------- games/mvdsv/distinfo | 6 +-- games/mvdsv/files/patch-Makefile.BSD | 50 ----------------- .../patch-tools_qwdtools_source_Makefile.BSD | 53 ------------------- 4 files changed, 28 insertions(+), 129 deletions(-) delete mode 100644 games/mvdsv/files/patch-Makefile.BSD delete mode 100644 games/mvdsv/files/patch-tools_qwdtools_source_Makefile.BSD diff --git a/games/mvdsv/Makefile b/games/mvdsv/Makefile index e861ac43dbb9..681b52935211 100644 --- a/games/mvdsv/Makefile +++ b/games/mvdsv/Makefile @@ -1,37 +1,39 @@ -PORTNAME?= mvdsv -PORTVERSION= 0.34 +PORTNAME= mvdsv +DISTVERSION= 1.11 PORTEPOCH= 2 -CATEGORIES?= games +CATEGORIES= games +MASTER_SITES= ${WWW}/releases/download/${DISTVERSION}/ +DISTNAME= ${PORTNAME}-source-with-submodules-${DISTVERSION} -MAINTAINER= danfe@FreeBSD.org -COMMENT?= Enhanced QuakeWorld server with multi-view demos capability -WWW= https://github.com/deurk/mvdsv +MAINTAINER= vvd@FreeBSD.org +COMMENT= Enhanced QuakeWorld server with multi-view demos capability +WWW= https://github.com/QW-Group/mvdsv -LICENSE= GPLv2 +LICENSE= GPLv2+ +LICENSE_FILE= ${WRKSRC}/LICENSE.md -.if ${PORTNAME} == mvdsv LIB_DEPENDS= libcurl.so:ftp/curl \ libpcre.so:devel/pcre -USES= localbase:ldflags -.endif -USE_GITHUB= yes -GH_ACCOUNT= deurk +USES= cmake zip +NO_WRKSUBDIR= yes -MAKEFILE= Makefile.BSD -MAKE_ARGS= UNAME=${OPSYS} +PLIST_FILES= bin/${PORTNAME} share/man/man6/${PORTNAME}.6.gz \ + ${DATADIR_REL}/${PORTNAME}.png +PORTDOCS= CODE_OF_CONDUCT.md README.md -PLIST_FILES= bin/${PORTNAME} - -OPTIONS_DEFINE= OPTIMIZED_CFLAGS -OPTIONS_DEFINE_i386= ASM -OPTIONS_DEFAULT_i386= ASM -ASM_IMPLIES= OPTIMIZED_CFLAGS - -ASM_MAKE_ARGS_OFF= -DWITHOUT_X86_ASM -OPTIMIZED_CFLAGS_MAKE_ARGS= -DWITH_OPTIMIZED_CFLAGS +OPTIONS_DEFINE= DOCS do-install: ${INSTALL_PROGRAM} ${BUILD_WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin + ${INSTALL_MAN} ${WRKSRC}/docs/man/man6/${PORTNAME}.6 \ + ${STAGEDIR}${PREFIX}/share/man/man6 + @${MKDIR} ${STAGEDIR}${DATADIR} + ${INSTALL_DATA} ${WRKSRC}/resources/logo/${PORTNAME}.png \ + ${STAGEDIR}${DATADIR} + +do-install-DOCS-on: + @${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR} .include diff --git a/games/mvdsv/distinfo b/games/mvdsv/distinfo index baf7e664e387..300f72df90ab 100644 --- a/games/mvdsv/distinfo +++ b/games/mvdsv/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1632262916 -SHA256 (deurk-mvdsv-0.34_GH0.tar.gz) = 8190718dfe1088f4f12a66177eeb01c1a527f5f465e70dec4fbb8feed4994c6a -SIZE (deurk-mvdsv-0.34_GH0.tar.gz) = 597476 +TIMESTAMP = 1740683104 +SHA256 (mvdsv-source-with-submodules-1.11.zip) = a1312d109587fdc62d6373b3ba321926730d08de82ad6a9f4360ca81b9398e31 +SIZE (mvdsv-source-with-submodules-1.11.zip) = 637189 diff --git a/games/mvdsv/files/patch-Makefile.BSD b/games/mvdsv/files/patch-Makefile.BSD deleted file mode 100644 index cbea6f6e23ea..000000000000 --- a/games/mvdsv/files/patch-Makefile.BSD +++ /dev/null @@ -1,50 +0,0 @@ ---- Makefile.BSD.orig 2021-09-21 22:21:56 UTC -+++ Makefile.BSD -@@ -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 -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__ __ORDER\(.*_ENDIAN__\),_\1,p' -+DO_CFLAGS = ${CFLAGS} -Wall -pipe -funsigned-char -DWWW_INTEGRATION -DSERVERONLY -DUSE_PR2 -D${BYTE_ORDER}Q__ ${FORCE32BITFLAGS} - --WITH_OPTIMIZED_CFLAGS = YES -- - .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) - 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 - - .ifdef USE_ASM -@@ -106,10 +102,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 diff --git a/games/mvdsv/files/patch-tools_qwdtools_source_Makefile.BSD b/games/mvdsv/files/patch-tools_qwdtools_source_Makefile.BSD deleted file mode 100644 index a606fdf847dd..000000000000 --- a/games/mvdsv/files/patch-tools_qwdtools_source_Makefile.BSD +++ /dev/null @@ -1,53 +0,0 @@ ---- tools/qwdtools/source/Makefile.BSD.orig 2020-03-18 18:17:05 UTC -+++ tools/qwdtools/source/Makefile.BSD -@@ -12,24 +12,19 @@ - # - - 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} -+BYTE_ORDER!= ${CC} -x c -dM -E /usr/include/machine/endian.h | sed -n 's,\#define __BYTE_ORDER__ __ORDER\(.*_ENDIAN__\),_\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 -- - 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 +55,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 +65,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