Received: by mail.netbsd.org (Postfix, from userid 605) id 1B05384DCA; Tue, 1 Oct 2019 12:32:28 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 96AA184CDC for ; Tue, 1 Oct 2019 12:32:27 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id J7s1ZLrLorSf for ; Tue, 1 Oct 2019 12:32:26 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 98CB884CD3 for ; Tue, 1 Oct 2019 12:32:26 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 92BB7FBF4; Tue, 1 Oct 2019 12:32:26 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1569933146173110" MIME-Version: 1.0 Date: Tue, 1 Oct 2019 12:32:26 +0000 From: "Nia Alarie" Subject: CVS commit: pkgsrc/games/xonotic To: pkgsrc-changes@NetBSD.org Reply-To: nia@netbsd.org X-Mailer: log_accum Message-Id: <20191001123226.92BB7FBF4@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. --_----------=_1569933146173110 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: nia Date: Tue Oct 1 12:32:26 UTC 2019 Added Files: pkgsrc/games/xonotic: DESCR Makefile PLIST distinfo pkgsrc/games/xonotic/files: xonotic.desktop pkgsrc/games/xonotic/patches: patch-Makefile patch-source_darkplaces_hmac.c patch-source_darkplaces_hmac.h patch-source_darkplaces_makefile.inc patch-source_gmqcc_Makefile patch-source_gmqcc_gmqcc.h Log Message: Add games/xonotic. Based on work by Charlotte Koch in pkgsrc-wip. Xonotic is an addictive, arena-style first person shooter with crisp movement and a wide array of weapons. It combines intuitive mechanics with in-your-face action to elevate your heart rate. Xonotic is and will always be free-to-play. To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 pkgsrc/games/xonotic/DESCR \ pkgsrc/games/xonotic/Makefile pkgsrc/games/xonotic/PLIST \ pkgsrc/games/xonotic/distinfo cvs rdiff -u -r0 -r1.1 pkgsrc/games/xonotic/files/xonotic.desktop cvs rdiff -u -r0 -r1.1 pkgsrc/games/xonotic/patches/patch-Makefile \ pkgsrc/games/xonotic/patches/patch-source_darkplaces_hmac.c \ pkgsrc/games/xonotic/patches/patch-source_darkplaces_hmac.h \ pkgsrc/games/xonotic/patches/patch-source_darkplaces_makefile.inc \ pkgsrc/games/xonotic/patches/patch-source_gmqcc_Makefile \ pkgsrc/games/xonotic/patches/patch-source_gmqcc_gmqcc.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1569933146173110 Content-Disposition: inline Content-Length: 10913 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Added files: Index: pkgsrc/games/xonotic/DESCR diff -u /dev/null pkgsrc/games/xonotic/DESCR:1.1 --- /dev/null Tue Oct 1 12:32:26 2019 +++ pkgsrc/games/xonotic/DESCR Tue Oct 1 12:32:26 2019 @@ -0,0 +1,4 @@ +Xonotic is an addictive, arena-style first person shooter with crisp +movement and a wide array of weapons. It combines intuitive mechanics with +in-your-face action to elevate your heart rate. Xonotic is and will always +be free-to-play. Index: pkgsrc/games/xonotic/Makefile diff -u /dev/null pkgsrc/games/xonotic/Makefile:1.1 --- /dev/null Tue Oct 1 12:32:26 2019 +++ pkgsrc/games/xonotic/Makefile Tue Oct 1 12:32:26 2019 @@ -0,0 +1,49 @@ +# $NetBSD: Makefile,v 1.1 2019/10/01 12:32:26 nia Exp $ + +DISTNAME= xonotic-0.8.2 +CATEGORIES= games +MASTER_SITES= https://dl.xonotic.org/ +EXTRACT_SUFX= .zip + +MAINTAINER= cfkoch@edgebsd.org +HOMEPAGE= https://xonotic.org/ +COMMENT= Fast arena-style FPS +LICENSE= gnu-gpl-v2 + +USE_TOOLS+= gmake gsed 7za +USE_LANGUAGES= c c++11 + +# C++11 +GCC_REQD+= 4.7 + +WRKSRC= ${WRKDIR}/Xonotic +BUILD_TARGET= all-zip-source +INSTALL_TARGET= install-data-zip-source install-engine-zip-source install-links +INSTALL_ENV+= LIBDIR=${PREFIX}/share/xonotic + +ICON_SIZES= 16 24 32 64 128 256 512 + +INSTALLATION_DIRS+= share/applications +.for s in ${ICON_SIZES} +INSTALLATION_DIRS+= share/icons/hicolor/${s}x${s}/apps +.endfor + +post-install: + ${INSTALL_DATA} ${FILESDIR}/xonotic.desktop \ + ${DESTDIR}${PREFIX}/share/applications +.for s in ${ICON_SIZES} + ${INSTALL_DATA} ${WRKSRC}/misc/logos/icons_png/xonotic_${s}.png \ + ${DESTDIR}${PREFIX}/share/icons/hicolor/${s}x${s}/apps/xonotic.png +.endfor + +.include "../../devel/SDL2/buildlink3.mk" +.include "../../devel/gmp/buildlink3.mk" +.include "../../devel/zlib/buildlink3.mk" +.include "../../graphics/hicolor-icon-theme/buildlink3.mk" +.include "../../sysutils/desktop-file-utils/desktopdb.mk" +.include "../../x11/libX11/buildlink3.mk" +.include "../../x11/libXext/buildlink3.mk" +.include "../../x11/libXpm/buildlink3.mk" +.include "../../x11/libXxf86vm/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" +.include "../../mk/bsd.pkg.mk" Index: pkgsrc/games/xonotic/PLIST diff -u /dev/null pkgsrc/games/xonotic/PLIST:1.1 --- /dev/null Tue Oct 1 12:32:26 2019 +++ pkgsrc/games/xonotic/PLIST Tue Oct 1 12:32:26 2019 @@ -0,0 +1,24 @@ +@comment $NetBSD: PLIST,v 1.1 2019/10/01 12:32:26 nia Exp $ +bin/xonotic-dedicated +bin/xonotic-glx +bin/xonotic-sdl +share/applications/xonotic.desktop +share/icons/hicolor/128x128/apps/xonotic.png +share/icons/hicolor/16x16/apps/xonotic.png +share/icons/hicolor/24x24/apps/xonotic.png +share/icons/hicolor/256x256/apps/xonotic.png +share/icons/hicolor/32x32/apps/xonotic.png +share/icons/hicolor/512x512/apps/xonotic.png +share/icons/hicolor/64x64/apps/xonotic.png +share/xonotic/data/font-unifont-20170401.pk3 +share/xonotic/data/font-xolonium-20170401.pk3 +share/xonotic/data/xonotic-20170401-data.pk3 +share/xonotic/data/xonotic-20170401-maps.pk3 +share/xonotic/data/xonotic-20170401-music.pk3 +share/xonotic/data/xonotic-20170401-nexcompat.pk3 +share/xonotic/xonotic-linux-dedicated.sh +share/xonotic/xonotic-linux-glx.sh +share/xonotic/xonotic-linux-sdl.sh +share/xonotic/xonotic-linux32-dedicated +share/xonotic/xonotic-linux32-glx +share/xonotic/xonotic-linux32-sdl Index: pkgsrc/games/xonotic/distinfo diff -u /dev/null pkgsrc/games/xonotic/distinfo:1.1 --- /dev/null Tue Oct 1 12:32:26 2019 +++ pkgsrc/games/xonotic/distinfo Tue Oct 1 12:32:26 2019 @@ -0,0 +1,12 @@ +$NetBSD: distinfo,v 1.1 2019/10/01 12:32:26 nia Exp $ + +SHA1 (xonotic-0.8.2.zip) = 9a1726e3d0d4e5e23c1e799734397c63e5df6ec9 +RMD160 (xonotic-0.8.2.zip) = d57c9e0fd6f1a4325410d87af4b0109351e6ae30 +SHA512 (xonotic-0.8.2.zip) = 0787fcf326827ae0292e5917c7ff2c7fd79947209d4b62e7f83b8b828bec15b575da304e0631f9f163c9b0bd93bed13616e142398ff08cbdaaea890a939dfca5 +Size (xonotic-0.8.2.zip) = 991045679 bytes +SHA1 (patch-Makefile) = 6c667df4048fd2cbec1c5c8cccb9d525390358ab +SHA1 (patch-source_darkplaces_hmac.c) = 58f6da84843f82fabd35e6a166e897fa1679a48a +SHA1 (patch-source_darkplaces_hmac.h) = aa3dd533c2a6ccc0bb8836c5f6284c01db0fb0d4 +SHA1 (patch-source_darkplaces_makefile.inc) = c440ebb63b5c6561e8643f2ff725eb6d49a8ced0 +SHA1 (patch-source_gmqcc_Makefile) = a70657f928f43087fc4de97f206200fd78dd8a4b +SHA1 (patch-source_gmqcc_gmqcc.h) = 8cf08c5d6b218c042b96fad904b1a35c37cb260d Index: pkgsrc/games/xonotic/files/xonotic.desktop diff -u /dev/null pkgsrc/games/xonotic/files/xonotic.desktop:1.1 --- /dev/null Tue Oct 1 12:32:26 2019 +++ pkgsrc/games/xonotic/files/xonotic.desktop Tue Oct 1 12:32:26 2019 @@ -0,0 +1,9 @@ +[Desktop Entry] +Type=Application +Encoding=UTF-8 +Name=Xonotic +Comment=Fast arena-style FPS +Icon=xonotic +Exec=xonotic-sdl +Terminal=false +Categories=Game;Shooter; Index: pkgsrc/games/xonotic/patches/patch-Makefile diff -u /dev/null pkgsrc/games/xonotic/patches/patch-Makefile:1.1 --- /dev/null Tue Oct 1 12:32:26 2019 +++ pkgsrc/games/xonotic/patches/patch-Makefile Tue Oct 1 12:32:26 2019 @@ -0,0 +1,24 @@ +$NetBSD: patch-Makefile,v 1.1 2019/10/01 12:32:26 nia Exp $ + +Use DESTDIR. + +--- ./Makefile.orig 2015-08-25 15:05:04.000000000 -0700 ++++ ./Makefile 2017-01-29 22:14:53.212882308 -0800 +@@ -30,7 +30,7 @@ + ( cd source/d0_blind_id && ./configure --enable-static --disable-shared $(RIJNDAELDETECT_CONFIGURE) ) + $(MAKE) -C source/d0_blind_id + $(MAKE) -C source/gmqcc +- $(MAKE) -C source/qcsrc FTEQCC=$(CURDIR)/source/gmqcc/gmqcc ++ $(MAKE) -C source/qcsrc QCC=$(CURDIR)/source/gmqcc/gmqcc + $(MAKE) -C source/darkplaces sv-release DP_CRYPTO_STATIC_LIBDIR=$(CURDIR)/source/d0_blind_id/.libs + $(MAKE) -C source/darkplaces cl-release DP_CRYPTO_STATIC_LIBDIR=$(CURDIR)/source/d0_blind_id/.libs + $(MAKE) -C source/darkplaces sdl-release DP_CRYPTO_STATIC_LIBDIR=$(CURDIR)/source/d0_blind_id/.libs +@@ -115,7 +115,7 @@ + + .PHONY: install-links + install-links: +- $(INSTALL) -d $(BINDIR) ++ $(INSTALL) -d $(DESTDIR)$(BINDIR) + $(LN) -snf $(LIBDIR)/xonotic-linux-sdl.sh $(DESTDIR)$(BINDIR)/xonotic-sdl + $(LN) -snf $(LIBDIR)/xonotic-linux-glx.sh $(DESTDIR)$(BINDIR)/xonotic-glx + $(LN) -snf $(LIBDIR)/xonotic-linux-dedicated.sh $(DESTDIR)$(BINDIR)/xonotic-dedicated Index: pkgsrc/games/xonotic/patches/patch-source_darkplaces_hmac.c diff -u /dev/null pkgsrc/games/xonotic/patches/patch-source_darkplaces_hmac.c:1.1 --- /dev/null Tue Oct 1 12:32:26 2019 +++ pkgsrc/games/xonotic/patches/patch-source_darkplaces_hmac.c Tue Oct 1 12:32:26 2019 @@ -0,0 +1,15 @@ +$NetBSD: patch-source_darkplaces_hmac.c,v 1.1 2019/10/01 12:32:26 nia Exp $ + +Avoid conflicting with NetBSD libc. + +--- source/darkplaces/hmac.c.orig 2017-04-01 13:26:56.000000000 +0000 ++++ source/darkplaces/hmac.c +@@ -1,7 +1,7 @@ + #include "quakedef.h" + #include "hmac.h" + +-qboolean hmac( ++qboolean darkplaces_hmac( + hashfunc_t hfunc, int hlen, int hblock, + unsigned char *out, + const unsigned char *in, int n, Index: pkgsrc/games/xonotic/patches/patch-source_darkplaces_hmac.h diff -u /dev/null pkgsrc/games/xonotic/patches/patch-source_darkplaces_hmac.h:1.1 --- /dev/null Tue Oct 1 12:32:26 2019 +++ pkgsrc/games/xonotic/patches/patch-source_darkplaces_hmac.h Tue Oct 1 12:32:26 2019 @@ -0,0 +1,24 @@ +$NetBSD: patch-source_darkplaces_hmac.h,v 1.1 2019/10/01 12:32:26 nia Exp $ + +Avoid conflicting with NetBSD libc. + +--- source/darkplaces/hmac.h.orig 2017-04-01 13:26:56.000000000 +0000 ++++ source/darkplaces/hmac.h +@@ -2,14 +2,14 @@ + #define HMAC_H + + typedef void (*hashfunc_t) (unsigned char *out, const unsigned char *in, int n); +-qboolean hmac( ++qboolean darkplaces_hmac( + hashfunc_t hfunc, int hlen, int hblock, + unsigned char *out, + const unsigned char *in, int n, + const unsigned char *key, int k + ); + +-#define HMAC_MDFOUR_16BYTES(out, in, n, key, k) hmac(mdfour, 16, 64, out, in, n, key, k) +-#define HMAC_SHA256_32BYTES(out, in, n, key, k) hmac(sha256, 32, 64, out, in, n, key, k) ++#define HMAC_MDFOUR_16BYTES(out, in, n, key, k) darkplaces_hmac(mdfour, 16, 64, out, in, n, key, k) ++#define HMAC_SHA256_32BYTES(out, in, n, key, k) darkplaces_hmac(sha256, 32, 64, out, in, n, key, k) + + #endif Index: pkgsrc/games/xonotic/patches/patch-source_darkplaces_makefile.inc diff -u /dev/null pkgsrc/games/xonotic/patches/patch-source_darkplaces_makefile.inc:1.1 --- /dev/null Tue Oct 1 12:32:26 2019 +++ pkgsrc/games/xonotic/patches/patch-source_darkplaces_makefile.inc Tue Oct 1 12:32:26 2019 @@ -0,0 +1,15 @@ +$NetBSD: patch-source_darkplaces_makefile.inc,v 1.1 2019/10/01 12:32:26 nia Exp $ + +Allow pkgsrc to set LDFLAGS. + +--- source/darkplaces/makefile.inc.orig 2017-04-01 13:26:56.000000000 +0000 ++++ source/darkplaces/makefile.inc +@@ -209,7 +209,7 @@ LDFLAGS_RELEASE=$(OPTIM_RELEASE) -DSVNRE + + OBJ_GLX= builddate.c sys_linux.o vid_glx.o thread_pthread.o keysym2ucs.o $(OBJ_MENU) $(OBJ_SOUND) $(OBJ_CD) $(OBJ_VIDEO_CAPTURE) $(OBJ_COMMON) + +-LDFLAGS_UNIXCOMMON=-lm $(LIB_ODE) $(LIB_Z) $(LIB_JPEG) $(LIB_CRYPTO) $(LIB_CRYPTO_RIJNDAEL) ++LDFLAGS_UNIXCOMMON=$(LDFLAGS) -lm $(LIB_ODE) $(LIB_Z) $(LIB_JPEG) $(LIB_CRYPTO) $(LIB_CRYPTO_RIJNDAEL) + LDFLAGS_UNIXCL=-L$(UNIX_X11LIBPATH) -lX11 -lXpm -lXext -lXxf86vm -pthread $(LIB_SOUND) + LDFLAGS_UNIXCL_PRELOAD=-lz -ljpeg -lpng -logg -ltheora -lvorbis -lvorbisenc -lvorbisfile -lcurl + LDFLAGS_UNIXSV_PRELOAD=-lz -ljpeg -lpng -lcurl Index: pkgsrc/games/xonotic/patches/patch-source_gmqcc_Makefile diff -u /dev/null pkgsrc/games/xonotic/patches/patch-source_gmqcc_Makefile:1.1 --- /dev/null Tue Oct 1 12:32:26 2019 +++ pkgsrc/games/xonotic/patches/patch-source_gmqcc_Makefile Tue Oct 1 12:32:26 2019 @@ -0,0 +1,15 @@ +$NetBSD: patch-source_gmqcc_Makefile,v 1.1 2019/10/01 12:32:26 nia Exp $ + +Allow pkgsrc to set CXXFLAGS. + +--- source/gmqcc/Makefile.orig 2017-04-01 13:28:34.000000000 +0000 ++++ source/gmqcc/Makefile +@@ -10,7 +10,7 @@ WINDOWS=1 + endif + + CXX ?= clang++ +-CXXFLAGS = \ ++CXXFLAGS += \ + -std=c++11 \ + -Wall \ + -Wextra \ Index: pkgsrc/games/xonotic/patches/patch-source_gmqcc_gmqcc.h diff -u /dev/null pkgsrc/games/xonotic/patches/patch-source_gmqcc_gmqcc.h:1.1 --- /dev/null Tue Oct 1 12:32:26 2019 +++ pkgsrc/games/xonotic/patches/patch-source_gmqcc_gmqcc.h Tue Oct 1 12:32:26 2019 @@ -0,0 +1,15 @@ +$NetBSD: patch-source_gmqcc_gmqcc.h,v 1.1 2019/10/01 12:32:26 nia Exp $ + +Support NetBSD. + +--- ./source/gmqcc/gmqcc.h.old 2017-01-29 00:50:17.690470085 -0800 ++++ ./source/gmqcc/gmqcc.h 2017-01-29 00:50:41.735428133 -0800 +@@ -104,7 +104,7 @@ + #define GMQCC_BYTE_ORDER_BIG 4321 + + #if defined (__GNUC__) || defined (__GNU_LIBRARY__) +-# if defined (__FreeBSD__) || defined (__OpenBSD__) ++# if defined (__FreeBSD__) || defined (__OpenBSD__) || defined(__NetBSD__) + # include + # elif defined (BSD) && (BSD >= 199103) || defined (__DJGPP__) || defined (__CYGWIN32__) + # include --_----------=_1569933146173110--