Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_171542300462310"
MIME-Version: 1.0
Date: Sat, 11 May 2024 10:23:24 +0000
From: "Nia Alarie" <nia@netbsd.org>
Subject: CVS commit: pkgsrc/games/openarena
To: pkgsrc-changes@NetBSD.org
Reply-To: nia@netbsd.org
Message-Id: <20240511102324.0C01BFA2C@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_171542300462310
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	nia
Date:		Sat May 11 10:23:23 UTC 2024

Modified Files:
	pkgsrc/games/openarena: Makefile PLIST distinfo
Removed Files:
	pkgsrc/games/openarena/patches: patch-Makefile
	    patch-code_game_g__cmds.c patch-code_q3__ui_ui__firstconnect.c
	    patch-code_q3__ui_ui__local.h patch-code_q3__ui_ui__preferences.c
	    patch-code_qcommon_q__platform.h

Log Message:
openarena: Stop building anything at all, it's not necessary


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 pkgsrc/games/openarena/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/games/openarena/PLIST
cvs rdiff -u -r1.4 -r1.5 pkgsrc/games/openarena/distinfo
cvs rdiff -u -r1.1 -r0 pkgsrc/games/openarena/patches/patch-Makefile \
    pkgsrc/games/openarena/patches/patch-code_game_g__cmds.c \
    pkgsrc/games/openarena/patches/patch-code_q3__ui_ui__firstconnect.c \
    pkgsrc/games/openarena/patches/patch-code_q3__ui_ui__local.h \
    pkgsrc/games/openarena/patches/patch-code_q3__ui_ui__preferences.c \
    pkgsrc/games/openarena/patches/patch-code_qcommon_q__platform.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


--_----------=_171542300462310
Content-Disposition: inline
Content-Length: 5152
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/games/openarena/Makefile
diff -u pkgsrc/games/openarena/Makefile:1.3 pkgsrc/games/openarena/Makefile:1.4
--- pkgsrc/games/openarena/Makefile:1.3	Tue May  7 21:48:54 2024
+++ pkgsrc/games/openarena/Makefile	Sat May 11 10:23:23 2024
@@ -1,37 +1,17 @@
-# $NetBSD: Makefile,v 1.3 2024/05/07 21:48:54 nia Exp $
+# $NetBSD: Makefile,v 1.4 2024/05/11 10:23:23 nia Exp $
 
-#
-# There will be warnings about missing dependencies while building.
-# In reality, building the "baseoa" mod requires zero dependencies.
-#
-# Please do not add them.
-#
-
-OA_VER=		0.8.8
-PKGNAME=	openarena-${OA_VER}
-PKGREVISION=	1
+DISTNAME=	openarena-0.8.8
+PKGREVISION=	2
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=oarena/}
 CATEGORIES=	games
-
-# This contains the code for the "baseoa" mod
-DISTFILES=	oa-${OA_VER}.tar.bz2
-
-# This contains the pk3 files (graphics, etc)
-DISTFILES+=	openarena-${OA_VER}.zip
+EXTRACT_SUFX=	.zip
 
 MAINTAINER=	nia@NetBSD.org
 HOMEPAGE=	http://www.openarena.ws/
 COMMENT=	Community-produced deathmatch FPS
 LICENSE=	gnu-gpl-v2
 
-WRKSRC=		${WRKDIR}/oa-${OA_VER}
-
-USE_TOOLS+=	pkg-config gmake
-
-MAKE_FLAGS+=	COPYDIR=${DESTDIR}${PREFIX}/lib/openarena
-
-BUILD_TARGET=	release
-INSTALL_TARGET=	copyfiles
+NO_BUILD=	yes
 
 .include "../../games/ioquake3/arch.mk"
 
@@ -43,17 +23,6 @@ DEPENDS+=	ioquake3-[0-9]*:../../games/io
 IOQ3_BIN=	${PREFIX}/lib/ioquake3/ioquake3.${QUAKE_ARCH}
 .endif
 
-PLIST_SUBST+=	QUAKE_ARCH=${QUAKE_ARCH:Q}
-MAKE_FLAGS+=	COMPILE_ARCH=${QUAKE_ARCH}
-CFLAGS+=	-DARCH_STRING="\"${QUAKE_ARCH}\""
-
-.if !empty(USE_CROSS_COMPILE:M[yY][eE][sS])
-MAKE_FLAGS+=	ARCH=${NATIVE_MACHINE_ARCH}
-.endif
-
-# do not use lib64
-MAKE_FLAGS.Linux+=	LIB=lib
-
 INSTALLATION_DIRS+=	bin
 INSTALLATION_DIRS+=	${PKGMANDIR}/man6
 INSTALLATION_DIRS+=	share/applications
@@ -63,17 +32,17 @@ CHECK_WRKREF_SKIP+=	lib/openarena/baseoa
 INSTALLATION_DIRS+=	lib/openarena/missionpack
 CHECK_WRKREF_SKIP+=	lib/openarena/missionpack/*.pk3
 
-post-build:
+pre-configure:
 	${SED} -e 's,@PREFIX@,${PREFIX},g' \
 	    -e 's,@IOQ3_BIN@,${IOQ3_BIN},g' \
 	    ${FILESDIR}/openarena.in > ${WRKDIR}/openarena.sh
 
-post-install:
+do-install:
 	${INSTALL_SCRIPT} ${WRKDIR}/openarena.sh \
 	    ${DESTDIR}${PREFIX}/bin/openarena
-	${INSTALL_DATA} ${WRKDIR}/openarena-${OA_VER}/baseoa/*.pk3 \
+	${INSTALL_DATA} ${WRKSRC}/baseoa/*.pk3 \
 	    ${DESTDIR}${PREFIX}/lib/openarena/baseoa
-	${INSTALL_DATA} ${WRKDIR}/openarena-${OA_VER}/missionpack/*.pk3 \
+	${INSTALL_DATA} ${WRKSRC}/missionpack/*.pk3 \
 	    ${DESTDIR}${PREFIX}/lib/openarena/missionpack
 	${INSTALL_MAN} ${FILESDIR}/openarena.6 \
 	    ${DESTDIR}${PREFIX}/${PKGMANDIR}/man6

Index: pkgsrc/games/openarena/PLIST
diff -u pkgsrc/games/openarena/PLIST:1.2 pkgsrc/games/openarena/PLIST:1.3
--- pkgsrc/games/openarena/PLIST:1.2	Sat Apr  3 18:55:35 2021
+++ pkgsrc/games/openarena/PLIST	Sat May 11 10:23:23 2024
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2021/04/03 18:55:35 nia Exp $
+@comment $NetBSD: PLIST,v 1.3 2024/05/11 10:23:23 nia Exp $
 bin/openarena
 lib/openarena/baseoa/pak0.pk3
 lib/openarena/baseoa/pak1-maps.pk3
@@ -9,13 +9,7 @@ lib/openarena/baseoa/pak5-TA.pk3
 lib/openarena/baseoa/pak6-misc.pk3
 lib/openarena/baseoa/pak6-patch085.pk3
 lib/openarena/baseoa/pak6-patch088.pk3
-lib/openarena/baseq3/cgame${QUAKE_ARCH}.so
-lib/openarena/baseq3/qagame${QUAKE_ARCH}.so
-lib/openarena/baseq3/ui${QUAKE_ARCH}.so
-lib/openarena/missionpack/cgame${QUAKE_ARCH}.so
 lib/openarena/missionpack/mp-pak0.pk3
-lib/openarena/missionpack/qagame${QUAKE_ARCH}.so
-lib/openarena/missionpack/ui${QUAKE_ARCH}.so
 man/man6/openarena.6
 share/applications/openarena.desktop
 share/pixmaps/openarena.png

Index: pkgsrc/games/openarena/distinfo
diff -u pkgsrc/games/openarena/distinfo:1.4 pkgsrc/games/openarena/distinfo:1.5
--- pkgsrc/games/openarena/distinfo:1.4	Sat Jul 22 09:43:26 2023
+++ pkgsrc/games/openarena/distinfo	Sat May 11 10:23:23 2024
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.4 2023/07/22 09:43:26 nia Exp $
+$NetBSD: distinfo,v 1.5 2024/05/11 10:23:23 nia Exp $
 
 BLAKE2s (oa-0.8.8.tar.bz2) = 397a8ff51d1ee16ad38f2b0a99d7b74cc07273e9d43a0b18de482d993a9b3d4a
 SHA512 (oa-0.8.8.tar.bz2) = 517517ea8d8377a6d91d957faf0a55690815b01d8f3e8b1e4a3e6be64750968a6074d26499e707fe2ec5fa7d630ceec022fdc879fdebcbfebbcff8195dd03e2f
@@ -6,9 +6,3 @@ Size (oa-0.8.8.tar.bz2) = 1257831 bytes
 BLAKE2s (openarena-0.8.8.zip) = 8f1c97f354a7167788554e9ee0085ed8ba1c4ece322e3fd2b35be40cbc07efe1
 SHA512 (openarena-0.8.8.zip) = 9fa4dabe8a3428dc3cbec97f3b4d20c04569c14cdd00b60e6391c6dd61e310f246ff5ec97e7549821b3d6f5f94b140eb5411a2ddd83dafcad66937b7f78ea8dd
 Size (openarena-0.8.8.zip) = 425189255 bytes
-SHA1 (patch-Makefile) = 38d8ef69dd9dda1b8c3b1f804db1f84e7b1cec4b
-SHA1 (patch-code_game_g__cmds.c) = a28f1f32e8b0d4461d1d6ac2c64e83abf3777c0b
-SHA1 (patch-code_q3__ui_ui__firstconnect.c) = 999c9040336b790711711f1c96a1af0f04f743be
-SHA1 (patch-code_q3__ui_ui__local.h) = aff4decfa18aed05239af5103dc603c6ca949429
-SHA1 (patch-code_q3__ui_ui__preferences.c) = 06f606580f594509c0bfcc9cc60e970beba394aa
-SHA1 (patch-code_qcommon_q__platform.h) = 523fbe0eccfdde0391fef23f728f0ac01bd7d85d


--_----------=_171542300462310--