Authentication-Results: name.execsw.org; dkim=pass (1024-bit key) header.d=netbsd.org header.i=@netbsd.org header.b=IpFPme0L; dkim=pass (1024-bit key) header.d=netbsd.org header.i=@netbsd.org header.b=JnNXCHCc Received: by mail.netbsd.org (Postfix, from userid 605) id B14BD84FBF; Sun, 12 May 2024 17:51:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=netbsd.org; s=20240131; t=1715536317; bh=73c1xiGXjMXkKRrAEWgxzEAE4YdaVvFmGxVKOaMoXm0=; h=Date:From:Subject:To:Reply-To:List-Id:List-Unsubscribe; b=IpFPme0LHC/JNkjem+TvBuLr/Weqv3AUU6TU31Bfp8yr4XJZRi3wTNup9/vdN+c4c ZdAiQEeXlUblnreyJ5VOQQeR1gfMpuyAhifV8NjowhUyrrrtHbbbEPkWNcdgpLfb1j 4iNUWAAkLsV1RE6jEw8cccOJ1AXkMLUmUvs4ChZI= Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 700C784D47 for ; Sun, 12 May 2024 17:51:56 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Authentication-Results: mail.netbsd.org (amavisd-new); dkim=pass (1024-bit key) header.d=netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id HowLDrPzxCxF for ; Sun, 12 May 2024 17:51:55 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 5214884FB5 for ; Sun, 12 May 2024 17:51:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=netbsd.org; s=20240131; t=1715536315; bh=73c1xiGXjMXkKRrAEWgxzEAE4YdaVvFmGxVKOaMoXm0=; h=Date:From:Subject:To:Reply-To; b=JnNXCHCcCNrNsk8ITUMTtyxbLNkcVzgcPg1FBsd8gj/jcPsEdio7x8E7nDkMEt0Au 7AOP2HZq8k0xpsYQaV9/DSTvLn/qAzzlLKtQGah2kqaC756oCNbOuAckLJ2tTo0K/8 T6PwIAIZv8Du2WFyij+CJIfvKFysGi/YJ9N7D9kU= Received: by cvs.NetBSD.org (Postfix, from userid 500) id 479A7FA2C; Sun, 12 May 2024 17:51:55 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1715536315129000" MIME-Version: 1.0 Date: Sun, 12 May 2024 17:51:55 +0000 From: "Nia Alarie" Subject: CVS commit: pkgsrc/games/iortcw To: pkgsrc-changes@NetBSD.org Reply-To: nia@netbsd.org X-Mailer: log_accum Message-Id: <20240512175155.479A7FA2C@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1715536315129000 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: nia Date: Sun May 12 17:51:55 UTC 2024 Modified Files: pkgsrc/games/iortcw: Makefile PLIST distinfo pkgsrc/games/iortcw/patches: patch-MP_Makefile patch-SP_Makefile Added Files: pkgsrc/games/iortcw: options.mk pkgsrc/games/iortcw/patches: patch-MP_code_splines_util__str.cpp patch-SP_code_splines_util__str.cpp Log Message: iortcw: Darwin support To generate a diff of this commit: cvs rdiff -u -r1.27 -r1.28 pkgsrc/games/iortcw/Makefile cvs rdiff -u -r1.2 -r1.3 pkgsrc/games/iortcw/PLIST cvs rdiff -u -r1.4 -r1.5 pkgsrc/games/iortcw/distinfo cvs rdiff -u -r0 -r1.1 pkgsrc/games/iortcw/options.mk cvs rdiff -u -r1.2 -r1.3 pkgsrc/games/iortcw/patches/patch-MP_Makefile \ pkgsrc/games/iortcw/patches/patch-SP_Makefile cvs rdiff -u -r0 -r1.1 \ pkgsrc/games/iortcw/patches/patch-MP_code_splines_util__str.cpp \ pkgsrc/games/iortcw/patches/patch-SP_code_splines_util__str.cpp Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1715536315129000 Content-Disposition: inline Content-Length: 8555 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/games/iortcw/Makefile diff -u pkgsrc/games/iortcw/Makefile:1.27 pkgsrc/games/iortcw/Makefile:1.28 --- pkgsrc/games/iortcw/Makefile:1.27 Sat Apr 6 08:05:27 2024 +++ pkgsrc/games/iortcw/Makefile Sun May 12 17:51:54 2024 @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.27 2024/04/06 08:05:27 wiz Exp $ +# $NetBSD: Makefile,v 1.28 2024/05/12 17:51:54 nia Exp $ DISTNAME= iortcw-1.51c -PKGREVISION= 24 +PKGREVISION= 25 CATEGORIES= games MASTER_SITES= ${MASTER_SITE_GITHUB:=iortcw/} @@ -29,8 +29,6 @@ MAKE_FLAGS+= CC=${CC:Q} MAKE_FLAGS+= CXX=${CXX:Q} MAKE_FLAGS+= TOOLS_CC=${CC:Q} MAKE_FLAGS+= BUILD_BASEGAME=1 -MAKE_FLAGS+= USE_OPENAL=1 -MAKE_FLAGS+= USE_OPENAL_DLOPEN=0 MAKE_FLAGS+= USE_CURL=1 MAKE_FLAGS+= USE_CURL_DLOPEN=0 MAKE_FLAGS+= USE_CODEC_VORBIS=1 @@ -58,6 +56,12 @@ IORTCW_ARCH= sparc IORTCW_ARCH= ${MACHINE_ARCH} .endif +.if ${SHLIB_TYPE} == "dylib" +PLIST_SUBST+= SO_EXT="dylib" +.else +PLIST_SUBST+= SO_EXT="so" +.endif + # shm_open() LDFLAGS.NetBSD+= -lrt @@ -94,7 +98,7 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/SP/misc/iortcw.svg \ ${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/apps/wolfsp.svg -.include "../../audio/openal-soft/buildlink3.mk" +.include "options.mk" .include "../../audio/opusfile/buildlink3.mk" .include "../../audio/libvorbis/buildlink3.mk" .include "../../devel/SDL2/buildlink3.mk" Index: pkgsrc/games/iortcw/PLIST diff -u pkgsrc/games/iortcw/PLIST:1.2 pkgsrc/games/iortcw/PLIST:1.3 --- pkgsrc/games/iortcw/PLIST:1.2 Mon Nov 18 16:20:02 2019 +++ pkgsrc/games/iortcw/PLIST Sun May 12 17:51:54 2024 @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.2 2019/11/18 16:20:02 nia Exp $ +@comment $NetBSD: PLIST,v 1.3 2024/05/12 17:51:54 nia Exp $ bin/iowolfded bin/iowolfmp bin/iowolfsp @@ -12,9 +12,9 @@ share/iortcw/iowolfmp_rend2.${IORTCW_ARC share/iortcw/iowolfsp.${IORTCW_ARCH} share/iortcw/iowolfsp_rend2.${IORTCW_ARCH} share/iortcw/iowolfspded.${IORTCW_ARCH} -share/iortcw/main/cgame.mp.${IORTCW_ARCH}.so -share/iortcw/main/cgame.sp.${IORTCW_ARCH}.so -share/iortcw/main/qagame.mp.${IORTCW_ARCH}.so -share/iortcw/main/qagame.sp.${IORTCW_ARCH}.so -share/iortcw/main/ui.mp.${IORTCW_ARCH}.so -share/iortcw/main/ui.sp.${IORTCW_ARCH}.so +share/iortcw/main/cgame.mp.${IORTCW_ARCH}.${SO_EXT} +share/iortcw/main/cgame.sp.${IORTCW_ARCH}.${SO_EXT} +share/iortcw/main/qagame.mp.${IORTCW_ARCH}.${SO_EXT} +share/iortcw/main/qagame.sp.${IORTCW_ARCH}.${SO_EXT} +share/iortcw/main/ui.mp.${IORTCW_ARCH}.${SO_EXT} +share/iortcw/main/ui.sp.${IORTCW_ARCH}.${SO_EXT} Index: pkgsrc/games/iortcw/distinfo diff -u pkgsrc/games/iortcw/distinfo:1.4 pkgsrc/games/iortcw/distinfo:1.5 --- pkgsrc/games/iortcw/distinfo:1.4 Tue Oct 26 10:44:05 2021 +++ pkgsrc/games/iortcw/distinfo Sun May 12 17:51:54 2024 @@ -1,9 +1,11 @@ -$NetBSD: distinfo,v 1.4 2021/10/26 10:44:05 nia Exp $ +$NetBSD: distinfo,v 1.5 2024/05/12 17:51:54 nia Exp $ BLAKE2s (iortcw-1.51c.tar.gz) = 968e1aef1ab2190f6a3b5ecc5a59186a325d0d2306a7b944d7fe998e8e3f1782 SHA512 (iortcw-1.51c.tar.gz) = bed985e00ba117bfe8c5fae20671575af2fa1c2eeaaba9ef69e6b82485d883084138f7f949299cfdad8171b40209d9baf111879acfd01e5eae16859b63ce77c6 Size (iortcw-1.51c.tar.gz) = 27246236 bytes -SHA1 (patch-MP_Makefile) = c3614773c88bbe619a2a049820c0958cbb8ec879 +SHA1 (patch-MP_Makefile) = e9764e935e33916d8d1cac5ad45f73299b26cf4c SHA1 (patch-MP_code_qcommon_q__platform.h) = 70a91097da12aef4737feda2c3e3de1767f1e603 -SHA1 (patch-SP_Makefile) = ec6f37f38454c6112aa7443df4baa75feff11582 +SHA1 (patch-MP_code_splines_util__str.cpp) = 57cfb31d04dcf078d48f4253c1d9630cb3817cd1 +SHA1 (patch-SP_Makefile) = 7521a31961811458c438a67426a3a70e18c01e05 SHA1 (patch-SP_code_qcommon_q__platform.h) = e469aefba31c26bf161a47533c8468b97aabed27 +SHA1 (patch-SP_code_splines_util__str.cpp) = 62c4c7e35ed0cfc46da617149da631f841bfc4a3 Index: pkgsrc/games/iortcw/patches/patch-MP_Makefile diff -u pkgsrc/games/iortcw/patches/patch-MP_Makefile:1.2 pkgsrc/games/iortcw/patches/patch-MP_Makefile:1.3 --- pkgsrc/games/iortcw/patches/patch-MP_Makefile:1.2 Wed Sep 9 11:22:27 2020 +++ pkgsrc/games/iortcw/patches/patch-MP_Makefile Sun May 12 17:51:54 2024 @@ -1,4 +1,4 @@ -$NetBSD: patch-MP_Makefile,v 1.2 2020/09/09 11:22:27 nia Exp $ +$NetBSD: patch-MP_Makefile,v 1.3 2024/05/12 17:51:54 nia Exp $ Pass through ARCH_STRING properly on *BSD. @@ -24,6 +24,15 @@ Pass through ARCH_STRING properly on *BS TOOLS_CFLAGS += -DARCH_STRING=\"$(COMPILE_ARCH)\" endif +@@ -574,7 +574,7 @@ ifeq ($(PLATFORM),darwin) + + SHLIBEXT=dylib + SHLIBCFLAGS=-fPIC -fno-common +- SHLIBLDFLAGS=-dynamiclib $(LDFLAGS) -Wl,-U,_com_altivec ++ SHLIBLDFLAGS=-dynamiclib $(LDFLAGS) + + NOTSHLIBCFLAGS=-mdynamic-no-pic + @@ -752,7 +752,8 @@ else # ifdef MINGW ifneq (,$(findstring "$(PLATFORM)", "freebsd" "openbsd" "netbsd")) Index: pkgsrc/games/iortcw/patches/patch-SP_Makefile diff -u pkgsrc/games/iortcw/patches/patch-SP_Makefile:1.2 pkgsrc/games/iortcw/patches/patch-SP_Makefile:1.3 --- pkgsrc/games/iortcw/patches/patch-SP_Makefile:1.2 Wed Sep 9 11:22:27 2020 +++ pkgsrc/games/iortcw/patches/patch-SP_Makefile Sun May 12 17:51:54 2024 @@ -1,4 +1,4 @@ -$NetBSD: patch-SP_Makefile,v 1.2 2020/09/09 11:22:27 nia Exp $ +$NetBSD: patch-SP_Makefile,v 1.3 2024/05/12 17:51:54 nia Exp $ Pass through ARCH_STRING properly on *BSD. @@ -24,6 +24,15 @@ Pass through ARCH_STRING properly on *BS TOOLS_CFLAGS += -DARCH_STRING=\"$(COMPILE_ARCH)\" endif +@@ -563,7 +563,7 @@ ifeq ($(PLATFORM),darwin) + + SHLIBEXT=dylib + SHLIBCFLAGS=-fPIC -fno-common +- SHLIBLDFLAGS=-dynamiclib $(LDFLAGS) -Wl,-U,_com_altivec ++ SHLIBLDFLAGS=-dynamiclib $(LDFLAGS) + + NOTSHLIBCFLAGS=-mdynamic-no-pic + @@ -741,7 +741,8 @@ else # ifdef MINGW ifneq (,$(findstring "$(PLATFORM)", "freebsd" "openbsd" "netbsd")) Added files: Index: pkgsrc/games/iortcw/options.mk diff -u /dev/null pkgsrc/games/iortcw/options.mk:1.1 --- /dev/null Sun May 12 17:51:55 2024 +++ pkgsrc/games/iortcw/options.mk Sun May 12 17:51:54 2024 @@ -0,0 +1,15 @@ +# $NetBSD: options.mk,v 1.1 2024/05/12 17:51:54 nia Exp $ + +PKG_OPTIONS_VAR= PKG_OPTIONS.iortctw +PKG_SUPPORTED_OPTIONS= openal + +.include "../../mk/bsd.options.mk" + +.if !empty(PKG_OPTIONS:Mopenal) +MAKE_FLAGS+= USE_OPENAL=1 +MAKE_FLAGS+= USE_OPENAL_DLOPEN=0 +. include "../../audio/openal-soft/buildlink3.mk" +.else +MAKE_FLAGS+= USE_OPENAL=0 +MAKE_FLAGS+= USE_OPENAL_DLOPEN=0 +.endif Index: pkgsrc/games/iortcw/patches/patch-MP_code_splines_util__str.cpp diff -u /dev/null pkgsrc/games/iortcw/patches/patch-MP_code_splines_util__str.cpp:1.1 --- /dev/null Sun May 12 17:51:55 2024 +++ pkgsrc/games/iortcw/patches/patch-MP_code_splines_util__str.cpp Sun May 12 17:51:54 2024 @@ -0,0 +1,33 @@ +$NetBSD: patch-MP_code_splines_util__str.cpp,v 1.1 2024/05/12 17:51:54 nia Exp $ + +Fix building with older C++ compilers (e.g. GCC 4) + +--- MP/code/splines/util_str.cpp.orig 2024-05-12 16:36:08.000000000 +0000 ++++ MP/code/splines/util_str.cpp +@@ -31,7 +31,7 @@ If you have questions concerning this li + #include "util_str.h" + #include "q_splineshared.h" + #include +-#include ++#include + #include + #include + +@@ -51,7 +51,7 @@ char *idStr::tolower + s = s1; + while ( *s ) + { +- *s = ::tolower( *s ); ++ *s = std::tolower( *s ); + s++; + } + +@@ -67,7 +67,7 @@ char *idStr::toupper + s = s1; + while ( *s ) + { +- *s = ::toupper( *s ); ++ *s = std::toupper( *s ); + s++; + } + Index: pkgsrc/games/iortcw/patches/patch-SP_code_splines_util__str.cpp diff -u /dev/null pkgsrc/games/iortcw/patches/patch-SP_code_splines_util__str.cpp:1.1 --- /dev/null Sun May 12 17:51:55 2024 +++ pkgsrc/games/iortcw/patches/patch-SP_code_splines_util__str.cpp Sun May 12 17:51:55 2024 @@ -0,0 +1,33 @@ +$NetBSD: patch-SP_code_splines_util__str.cpp,v 1.1 2024/05/12 17:51:55 nia Exp $ + +Fix building with older C++ compilers (e.g. GCC 4) + +--- SP/code/splines/util_str.cpp.orig 2024-05-12 16:37:17.000000000 +0000 ++++ SP/code/splines/util_str.cpp +@@ -31,7 +31,7 @@ If you have questions concerning this li + #include "util_str.h" + #include "q_splineshared.h" + #include +-#include ++#include + #include + #include + +@@ -51,7 +51,7 @@ char *idStr::tolower + s = s1; + while ( *s ) + { +- *s = ::tolower( *s ); ++ *s = std::tolower( *s ); + s++; + } + +@@ -67,7 +67,7 @@ char *idStr::toupper + s = s1; + while ( *s ) + { +- *s = ::toupper( *s ); ++ *s = std::toupper( *s ); + s++; + } + --_----------=_1715536315129000--