Hi,
Here is a diff to update games/mvdsv from 0.34 to 0.35.
A few notable changes:
* Github project changed from 'deurk' to 'QW-Group'
* meson build dropped -- only uses cmake
* devel/pcre no longer used -- dropped in favor of wraps
* New patch for CMakeLists.txt to stop trying to link
'dl' which is already in OpenBSD's libc
Thanks,
Tom
Index: Makefile
===================================================================
RCS file: /cvs/ports/games/mvdsv/Makefile,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 Makefile
--- Makefile 11 Mar 2022 19:04:41 -0000 1.5
+++ Makefile 3 Aug 2022 16:57:23 -0000
@@ -1,8 +1,8 @@
COMMENT = QuakeWorld server
-GH_ACCOUNT = deurk
+GH_ACCOUNT = QW-Group
GH_PROJECT = mvdsv
-GH_TAGNAME = 0.34
+GH_TAGNAME = 0.35
CATEGORIES = games
@@ -17,19 +17,15 @@ MASTER_SITES0 = https://raw.githubuserco
# GPLv2+
PERMIT_PACKAGE = Yes
-WANTLIB += c curl m pcre pthread
+WANTLIB += c curl m pthread
DISTFILES = mvdsv-{}${GH_TAGNAME}.tar.gz \
qwprogs-${QWP_VERSION}{qwprogs}.dat:0
EXTRACT_ONLY = mvdsv-${GH_TAGNAME}.tar.gz
-MODULES = devel/meson
+MODULES = devel/cmake
-LIB_DEPENDS = devel/pcre \
- net/curl
-
-# help ld.bfd find libnghttp2
-LDFLAGS = -L${LOCALBASE}/lib
+LIB_DEPENDS = net/curl
NO_TEST = Yes
Index: distinfo
===================================================================
RCS file: /cvs/ports/games/mvdsv/distinfo,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 distinfo
--- distinfo 16 Oct 2021 14:43:12 -0000 1.3
+++ distinfo 3 Aug 2022 16:57:23 -0000
@@ -1,4 +1,4 @@
-SHA256 (mvdsv-0.34.tar.gz) = gZBxjf4QiPTxKmYXfusBwaUn9fRl5w3sT7uP7tSZTGo=
+SHA256 (mvdsv-0.35.tar.gz) = bk7yLKpr85yxLjGLd9gFmVXb+fxBmttPbnR2aOYAC5o=
SHA256 (qwprogs-20120131.dat) = /1HLXnc2DXK5NIfYkZjc+UYpuS+LrhAPxupIpsEqeDA=
-SIZE (mvdsv-0.34.tar.gz) = 597476
+SIZE (mvdsv-0.35.tar.gz) = 555708
SIZE (qwprogs-20120131.dat) = 197684
Index: patches/patch-CMakeLists_txt
===================================================================
RCS file: patches/patch-CMakeLists_txt
diff -N patches/patch-CMakeLists_txt
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-CMakeLists_txt 3 Aug 2022 16:57:23 -0000
@@ -0,0 +1,12 @@
+Remove link to dl as it is in OpenBSD's libc
+Index: CMakeLists.txt
+--- CMakeLists.txt.orig
++++ CMakeLists.txt
+@@ -118,7 +118,6 @@ target_include_directories(${PROJECT_NAME} PRIVATE ${C
+ # Check build target, and included sources and libs
+ if(UNIX)
+ target_link_libraries(${PROJECT_NAME} m)
+- target_link_libraries(${PROJECT_NAME} dl)
+ else()
+ target_link_libraries(${PROJECT_NAME} ws2_32)
+ target_link_libraries(${PROJECT_NAME} winmm)
Index: patches/patch-meson_build
===================================================================
RCS file: patches/patch-meson_build
diff -N patches/patch-meson_build
--- patches/patch-meson_build 11 Mar 2022 19:04:41 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,14 +0,0 @@
-Index: meson.build
---- meson.build.orig
-+++ meson.build
-@@ -86,8 +86,8 @@ if target_machine.system() == 'windows'
- else
- mvdsv_sources += 'src/sv_sys_unix.c'
- deps += [
-- meson.get_compiler('c').find_library('m'),
-- meson.get_compiler('c').find_library('dl'),
-+ meson.get_compiler('c').find_library('m', required: false),
-+ meson.get_compiler('c').find_library('dl', required: false),
- ]
- endif
-
Index: patches/patch-src_sv_ccmds_c
===================================================================
RCS file: /cvs/ports/games/mvdsv/patches/patch-src_sv_ccmds_c,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 patch-src_sv_ccmds_c
--- patches/patch-src_sv_ccmds_c 11 Mar 2022 19:04:41 -0000 1.2
+++ patches/patch-src_sv_ccmds_c 3 Aug 2022 16:57:23 -0000
@@ -5,7 +5,7 @@ at: https://github.com/deurk/mvdsv/pull/
Index: src/sv_ccmds.c
--- src/sv_ccmds.c.orig
+++ src/sv_ccmds.c
-@@ -738,54 +738,6 @@ void SV_ChmodFile_f (void)
+@@ -741,54 +741,6 @@ void SV_ChmodFile_f (void)
}
#endif //_WIN32
@@ -60,7 +60,7 @@ Index: src/sv_ccmds.c
/*
==================
SV_Kick_f
-@@ -1844,8 +1796,6 @@ void SV_InitOperatorCommands (void)
+@@ -1847,8 +1799,6 @@ void SV_InitOperatorCommands (void)
Cmd_AddCommand ("chmod", SV_ChmodFile_f);
#endif //_WIN32
//<-
