Received: by mail.netbsd.org (Postfix, from userid 605) id 5F99D84D67; Sun, 17 Nov 2019 17:56:50 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id DACF484D65 for ; Sun, 17 Nov 2019 17:56:49 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id 3oPKo5J-S6RR for ; Sun, 17 Nov 2019 17:56:48 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id D6B5984C81 for ; Sun, 17 Nov 2019 17:56:48 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id D072AFA97; Sun, 17 Nov 2019 17:56:48 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1574013408185650" MIME-Version: 1.0 Date: Sun, 17 Nov 2019 17:56:48 +0000 From: "Nia Alarie" Subject: CVS commit: pkgsrc/games To: pkgsrc-changes@NetBSD.org Reply-To: nia@netbsd.org X-Mailer: log_accum Message-Id: <20191117175648.D072AFA97@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1574013408185650 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: nia Date: Sun Nov 17 17:56:48 UTC 2019 Modified Files: pkgsrc/games: Makefile Added Files: pkgsrc/games/iortcw: DESCR MESSAGE Makefile PLIST distinfo pkgsrc/games/iortcw/files: iortcw.sh.in iowolfmp.desktop iowolfsp.desktop pkgsrc/games/iortcw/patches: patch-MP_Makefile patch-MP_code_qcommon_q__platform.h patch-SP_Makefile patch-SP_code_qcommon_q__platform.h Log Message: Add games/iortcw. Return to Castle Wolfenstein is a World War II-based first person shooter with occult themes, developed by Gray Matter Interactive and released in 2001. iortcw merges features and fixes from the ioquake3 version of the id Tech 3 game engine into the open source release of Return to Castle Wolfenstein. A copy of the Return to Castle Wolfenstein data files is required to play iortcw. To generate a diff of this commit: cvs rdiff -u -r1.469 -r1.470 pkgsrc/games/Makefile cvs rdiff -u -r0 -r1.1 pkgsrc/games/iortcw/DESCR pkgsrc/games/iortcw/MESSAGE \ pkgsrc/games/iortcw/Makefile pkgsrc/games/iortcw/PLIST \ pkgsrc/games/iortcw/distinfo cvs rdiff -u -r0 -r1.1 pkgsrc/games/iortcw/files/iortcw.sh.in \ pkgsrc/games/iortcw/files/iowolfmp.desktop \ pkgsrc/games/iortcw/files/iowolfsp.desktop cvs rdiff -u -r0 -r1.1 pkgsrc/games/iortcw/patches/patch-MP_Makefile \ pkgsrc/games/iortcw/patches/patch-MP_code_qcommon_q__platform.h \ pkgsrc/games/iortcw/patches/patch-SP_Makefile \ pkgsrc/games/iortcw/patches/patch-SP_code_qcommon_q__platform.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1574013408185650 Content-Disposition: inline Content-Length: 11398 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/games/Makefile diff -u pkgsrc/games/Makefile:1.469 pkgsrc/games/Makefile:1.470 --- pkgsrc/games/Makefile:1.469 Sun Nov 17 16:19:57 2019 +++ pkgsrc/games/Makefile Sun Nov 17 17:56:48 2019 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.469 2019/11/17 16:19:57 nia Exp $ +# $NetBSD: Makefile,v 1.470 2019/11/17 17:56:48 nia Exp $ # COMMENT= Games @@ -185,6 +185,7 @@ SUBDIR+= imaze SUBDIR+= ioquake3 SUBDIR+= ioquake3-pk3 SUBDIR+= ioquake3-raspberrypi +SUBDIR+= iortcw SUBDIR+= ivan SUBDIR+= jetpack SUBDIR+= jin Added files: Index: pkgsrc/games/iortcw/DESCR diff -u /dev/null pkgsrc/games/iortcw/DESCR:1.1 --- /dev/null Sun Nov 17 17:56:48 2019 +++ pkgsrc/games/iortcw/DESCR Sun Nov 17 17:56:48 2019 @@ -0,0 +1,9 @@ +Return to Castle Wolfenstein is a World War II-based first person shooter +with occult themes, developed by Gray Matter Interactive and released in +2001. + +iortcw merges features and fixes from the ioquake3 version of the id Tech +3 game engine into the open source release of Return to Castle Wolfenstein. + +A copy of the Return to Castle Wolfenstein data files is required to play +iortcw. Index: pkgsrc/games/iortcw/MESSAGE diff -u /dev/null pkgsrc/games/iortcw/MESSAGE:1.1 --- /dev/null Sun Nov 17 17:56:48 2019 +++ pkgsrc/games/iortcw/MESSAGE Sun Nov 17 17:56:48 2019 @@ -0,0 +1,9 @@ +=========================================================================== +$NetBSD: MESSAGE,v 1.1 2019/11/17 17:56:48 nia Exp $ + +The .pk3 files from a copy of Return to Castle Wolfenstein are needed +to play iortcw. + +They should be copied to ~/.wolf/main. + +=========================================================================== Index: pkgsrc/games/iortcw/Makefile diff -u /dev/null pkgsrc/games/iortcw/Makefile:1.1 --- /dev/null Sun Nov 17 17:56:48 2019 +++ pkgsrc/games/iortcw/Makefile Sun Nov 17 17:56:48 2019 @@ -0,0 +1,108 @@ +# $NetBSD: Makefile,v 1.1 2019/11/17 17:56:48 nia Exp $ + +DISTNAME= iortcw-1.51c +CATEGORIES= games +MASTER_SITES= ${MASTER_SITE_GITHUB:=iortcw/} + +MAINTAINER= pkgsrc-users@NetBSD.org +HOMEPAGE= https://github.com/iortcw/iortcw +COMMENT= Game engine for Return to Castle Wolfenstein +LICENSE= gnu-gpl-v3 + +USE_TOOLS+= gmake pkg-config +USE_LANGUAGES= c c++ + +BUILD_DIRS= SP MP +BUILD_TARGET= release +INSTALL_DIRS= SP MP +INSTALL_TARGET= copyfiles + +MAKE_FLAGS+= V=1 +MAKE_FLAGS+= BUILD_SERVER=1 +MAKE_FLAGS+= BUILD_CLIENT=1 +MAKE_FLAGS+= BUILD_GAME_SO=1 +MAKE_FLAGS+= BUILD_GAME_QVM=0 +MAKE_FLAGS+= USE_RENDERER_DLOPEN=0 +MAKE_FLAGS+= CROSS_COMPILING=0 +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 +MAKE_FLAGS+= USE_CODEC_OPUS=1 +MAKE_FLAGS+= USE_FREETYPE=1 +MAKE_FLAGS+= USE_INTERNAL_ZLIB=0 +MAKE_FLAGS+= USE_INTERNAL_JPEG=0 +MAKE_FLAGS+= USE_INTERNAL_OGG=0 +MAKE_FLAGS+= USE_INTERNAL_OPUS=0 +MAKE_FLAGS+= USE_LOCAL_HEADERS=0 +MAKE_FLAGS+= OPTIMIZEVM="" +MAKE_FLAGS+= OPTIMIZE="" +MAKE_FLAGS+= COPYDIR="${DESTDIR}${PREFIX}/share/iortcw" + +.include "../../mk/bsd.prefs.mk" + +MAKE_FLAGS+= COMPILE_ARCH=${MACHINE_ARCH} + +.if ${MACHINE_ARCH} == "i386" +IORTCW_ARCH= x86 +.elif ${MACHINE_ARCH} == "x86_64" +IORTCW_ARCH= x86_64 +.elif ${MACHINE_ARCH} == "powerpc" +IORTCW_ARCH= ppc +.elif !empty(MACHINE_ARCH:Mpowerpc64*) +IORTCW_ARCH= ppc64 +.elif ${MACHINE_ARCH} == "sparc64" +IORTCW_ARCH= sparc +.else +IORTCW_ARCH= ${MACHINE_ARCH} +.endif + +PLIST_SUBST+= IORTCW_ARCH=${IORTCW_ARCH} + +INSTALLATION_DIRS+= bin +INSTALLATION_DIRS+= share/applications +INSTALLATION_DIRS+= share/icons/hicolor/scalable/apps + +CHECK_PORTABILITY_SKIP+= SP/make-macosx_xcode3.sh +CHECK_PORTABILITY_SKIP+= SP/make-macosx_xcode4.sh +CHECK_PORTABILITY_SKIP+= SP/make-macosx_xcode5.sh +CHECK_PORTABILITY_SKIP+= MP/make-macosx_xcode3.sh +CHECK_PORTABILITY_SKIP+= MP/make-macosx_xcode4.sh +CHECK_PORTABILITY_SKIP+= MP/make-macosx_xcode5.sh + +post-build: +.for bin in iowolfded iowolfmp iowolfsp + ${SED} -e 's,@PREFIX@,${PREFIX},g' \ + -e 's,@WOLFBIN@,${PREFIX}/share/iortcw/${bin}.${IORTCW_ARCH},g' \ + ${FILESDIR}/iortcw.sh.in > ${WRKDIR}/${bin} +.endfor + +post-install: + ${INSTALL_SCRIPT} ${WRKDIR}/iowolfded ${DESTDIR}${PREFIX}/bin + ${INSTALL_SCRIPT} ${WRKDIR}/iowolfmp ${DESTDIR}${PREFIX}/bin + ${INSTALL_SCRIPT} ${WRKDIR}/iowolfsp ${DESTDIR}${PREFIX}/bin + ${INSTALL_DATA} ${FILESDIR}/iowolfmp.desktop \ + ${DESTDIR}${PREFIX}/share/applications + ${INSTALL_DATA} ${FILESDIR}/iowolfsp.desktop \ + ${DESTDIR}${PREFIX}/share/applications + ${INSTALL_DATA} ${WRKSRC}/MP/misc/iortcw.svg \ + ${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/apps/wolfmp.svg + ${INSTALL_DATA} ${WRKSRC}/SP/misc/iortcw.svg \ + ${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/apps/wolfsp.svg + +.include "../../audio/openal-soft/buildlink3.mk" +.include "../../audio/opusfile/buildlink3.mk" +.include "../../audio/libvorbis/buildlink3.mk" +.include "../../devel/SDL2/buildlink3.mk" +.include "../../devel/zlib/buildlink3.mk" +.include "../../graphics/freetype2/buildlink3.mk" +.include "../../graphics/hicolor-icon-theme/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" +.include "../../sysutils/desktop-file-utils/desktopdb.mk" +.include "../../www/curl/buildlink3.mk" +.include "../../mk/bsd.pkg.mk" Index: pkgsrc/games/iortcw/PLIST diff -u /dev/null pkgsrc/games/iortcw/PLIST:1.1 --- /dev/null Sun Nov 17 17:56:48 2019 +++ pkgsrc/games/iortcw/PLIST Sun Nov 17 17:56:48 2019 @@ -0,0 +1,20 @@ +@comment $NetBSD: PLIST,v 1.1 2019/11/17 17:56:48 nia Exp $ +bin/iowolfded +bin/iowolfmp +bin/iowolfsp +share/applications/iowolfmp.desktop +share/applications/iowolfsp.desktop +share/icons/hicolor/scalable/apps/wolfmp.svg +share/icons/hicolor/scalable/apps/wolfsp.svg +share/iortcw/iowolfded.x86_64 +share/iortcw/iowolfmp.x86_64 +share/iortcw/iowolfmp_rend2.x86_64 +share/iortcw/iowolfsp.x86_64 +share/iortcw/iowolfsp_rend2.x86_64 +share/iortcw/iowolfspded.x86_64 +share/iortcw/main/cgame.mp.x86_64.so +share/iortcw/main/cgame.sp.x86_64.so +share/iortcw/main/qagame.mp.x86_64.so +share/iortcw/main/qagame.sp.x86_64.so +share/iortcw/main/ui.mp.x86_64.so +share/iortcw/main/ui.sp.x86_64.so Index: pkgsrc/games/iortcw/distinfo diff -u /dev/null pkgsrc/games/iortcw/distinfo:1.1 --- /dev/null Sun Nov 17 17:56:48 2019 +++ pkgsrc/games/iortcw/distinfo Sun Nov 17 17:56:48 2019 @@ -0,0 +1,10 @@ +$NetBSD: distinfo,v 1.1 2019/11/17 17:56:48 nia Exp $ + +SHA1 (iortcw-1.51c.tar.gz) = a418f9747f3250ad855885368924dead48006909 +RMD160 (iortcw-1.51c.tar.gz) = db33fd67b58b7163864c6b434a86f4cdd58fb308 +SHA512 (iortcw-1.51c.tar.gz) = bed985e00ba117bfe8c5fae20671575af2fa1c2eeaaba9ef69e6b82485d883084138f7f949299cfdad8171b40209d9baf111879acfd01e5eae16859b63ce77c6 +Size (iortcw-1.51c.tar.gz) = 27246236 bytes +SHA1 (patch-MP_Makefile) = d1e7ab17dac10a923396bfe71c82deac97ffe1af +SHA1 (patch-MP_code_qcommon_q__platform.h) = 5bd7cb759a1072589401dae7f13517ecf03e111d +SHA1 (patch-SP_Makefile) = 61da55b573bebc4349cba29aacf31193736e2a9d +SHA1 (patch-SP_code_qcommon_q__platform.h) = 69308492c4ac5f928ded4359b1a96b09801dabf7 Index: pkgsrc/games/iortcw/files/iortcw.sh.in diff -u /dev/null pkgsrc/games/iortcw/files/iortcw.sh.in:1.1 --- /dev/null Sun Nov 17 17:56:48 2019 +++ pkgsrc/games/iortcw/files/iortcw.sh.in Sun Nov 17 17:56:48 2019 @@ -0,0 +1,2 @@ +#!/bin/sh +cd @PREFIX@/share/iortcw && exec @WOLFBIN@ $@ Index: pkgsrc/games/iortcw/files/iowolfmp.desktop diff -u /dev/null pkgsrc/games/iortcw/files/iowolfmp.desktop:1.1 --- /dev/null Sun Nov 17 17:56:48 2019 +++ pkgsrc/games/iortcw/files/iowolfmp.desktop Sun Nov 17 17:56:48 2019 @@ -0,0 +1,8 @@ +[Desktop Entry] +Name=Return to Castle Wolfenstein multiplayer +Exec=iowolfmp +Terminal=false +Icon=wolfmp +Type=Application +Categories=Game;ActionGame; +Keywords=multi-player;online;fps;team;first person shooter;id;gray matter; Index: pkgsrc/games/iortcw/files/iowolfsp.desktop diff -u /dev/null pkgsrc/games/iortcw/files/iowolfsp.desktop:1.1 --- /dev/null Sun Nov 17 17:56:48 2019 +++ pkgsrc/games/iortcw/files/iowolfsp.desktop Sun Nov 17 17:56:48 2019 @@ -0,0 +1,8 @@ +[Desktop Entry] +Name=Return to Castle Wolfenstein +Exec=iowolfsp +Terminal=false +Icon=wolfsp +Type=Application +Categories=Game;ActionGame; +Keywords=fps;first person shooter;id;gray matter; Index: pkgsrc/games/iortcw/patches/patch-MP_Makefile diff -u /dev/null pkgsrc/games/iortcw/patches/patch-MP_Makefile:1.1 --- /dev/null Sun Nov 17 17:56:48 2019 +++ pkgsrc/games/iortcw/patches/patch-MP_Makefile Sun Nov 17 17:56:48 2019 @@ -0,0 +1,14 @@ +$NetBSD: patch-MP_Makefile,v 1.1 2019/11/17 17:56:48 nia Exp $ + +Always call it x86_64 regardless of operating system. + +--- MP/Makefile.orig 2019-03-16 18:09:48.000000000 +0000 ++++ MP/Makefile +@@ -761,7 +761,6 @@ ifneq (,$(findstring "$(PLATFORM)", "fre + ifeq ($(ARCH),x86_64) + OPTIMIZEVM = -O3 + OPTIMIZE = $(OPTIMIZEVM) -ffast-math +- FILE_ARCH = amd64 + endif + ifeq ($(ARCH),x86) + OPTIMIZEVM = -O3 -march=i586 Index: pkgsrc/games/iortcw/patches/patch-MP_code_qcommon_q__platform.h diff -u /dev/null pkgsrc/games/iortcw/patches/patch-MP_code_qcommon_q__platform.h:1.1 --- /dev/null Sun Nov 17 17:56:48 2019 +++ pkgsrc/games/iortcw/patches/patch-MP_code_qcommon_q__platform.h Sun Nov 17 17:56:48 2019 @@ -0,0 +1,15 @@ +$NetBSD: patch-MP_code_qcommon_q__platform.h,v 1.1 2019/11/17 17:56:48 nia Exp $ + +Always call it x86_64 regardless of operating system. + +--- MP/code/qcommon/q_platform.h.orig 2019-03-16 18:09:48.000000000 +0000 ++++ MP/code/qcommon/q_platform.h +@@ -226,7 +226,7 @@ Foundation, Inc., 51 Franklin St, Fifth + #elif defined __amd64__ + #undef idx64 + #define idx64 1 +-#define ARCH_STRING "amd64" ++#define ARCH_STRING "x86_64" + #elif defined __axp__ + #define ARCH_STRING "alpha" + #endif Index: pkgsrc/games/iortcw/patches/patch-SP_Makefile diff -u /dev/null pkgsrc/games/iortcw/patches/patch-SP_Makefile:1.1 --- /dev/null Sun Nov 17 17:56:48 2019 +++ pkgsrc/games/iortcw/patches/patch-SP_Makefile Sun Nov 17 17:56:48 2019 @@ -0,0 +1,14 @@ +$NetBSD: patch-SP_Makefile,v 1.1 2019/11/17 17:56:48 nia Exp $ + +Always call it x86_64 regardless of operating system. + +--- SP/Makefile.orig 2019-03-16 18:09:48.000000000 +0000 ++++ SP/Makefile +@@ -750,7 +750,6 @@ ifneq (,$(findstring "$(PLATFORM)", "fre + ifeq ($(ARCH),x86_64) + OPTIMIZEVM = -O3 + OPTIMIZE = $(OPTIMIZEVM) -ffast-math +- FILE_ARCH = amd64 + endif + ifeq ($(ARCH),x86) + OPTIMIZEVM = -O3 -march=i586 Index: pkgsrc/games/iortcw/patches/patch-SP_code_qcommon_q__platform.h diff -u /dev/null pkgsrc/games/iortcw/patches/patch-SP_code_qcommon_q__platform.h:1.1 --- /dev/null Sun Nov 17 17:56:48 2019 +++ pkgsrc/games/iortcw/patches/patch-SP_code_qcommon_q__platform.h Sun Nov 17 17:56:48 2019 @@ -0,0 +1,15 @@ +$NetBSD: patch-SP_code_qcommon_q__platform.h,v 1.1 2019/11/17 17:56:48 nia Exp $ + +Always call it x86_64 regardless of operating system. + +--- SP/code/qcommon/q_platform.h.orig 2019-03-16 18:09:48.000000000 +0000 ++++ SP/code/qcommon/q_platform.h +@@ -226,7 +226,7 @@ Foundation, Inc., 51 Franklin St, Fifth + #elif defined __amd64__ + #undef idx64 + #define idx64 1 +-#define ARCH_STRING "amd64" ++#define ARCH_STRING "x86_64" + #elif defined __axp__ + #define ARCH_STRING "alpha" + #endif --_----------=_1574013408185650--