ioquake3-snapshot: update to ioquake3-20200526 (git snapshot)

No changelog provided. Pkgsrc changes: * prefer pkgsrc libraries instead of internal libraries. * install convenience scripts for ioquake3 and ioq3ded.
NetBSD · Jan 3, 2021 · caabb54 · caabb54
1 parent 08bb4e2
commit caabb54
Show file tree

Hide file tree

Showing 7 changed files with 45 additions and 11 deletions.
diff --git a/ioquake3-snapshot/Makefile b/ioquake3-snapshot/Makefile
@@ -1,9 +1,9 @@
 # $NetBSD$
 
 GITHUB_PROJECT=	ioq3
-GITHUB_TAG=	c65d2c2657fa6aecf498a5e1c20ffa706a80e818
+GITHUB_TAG=	05180e32dcfb9a4552e1b9652b56127248a9950c
 DISTNAME=	${GITHUB_TAG}
-PKGNAME=	ioquake3-20170521
+PKGNAME=	ioquake3-20200526
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_GITHUB:=ioquake/}
 DIST_SUBDIR=	${GITHUB_PROJECT}
@@ -16,14 +16,29 @@ LICENSE=	gnu-gpl-v2
 
 WRKSRC=	${WRKDIR}/ioq3-${GITHUB_TAG}
 
-USE_TOOLS+=	gmake
+USE_TOOLS+=	gmake pkg-config
 BUILD_TARGET=	release
+MAKE_FLAGS+=	USE_INTERNAL_LIBS=0
 
 NOT_PAX_MPROTECT_SAFE=	lib/ioquake3/ioquake3.${QUAKE_ARCH}
 
+INSTALLATION_DIRS+=	bin lib/ioquake3
+SUBST_CLASSES+=		scripts
+SUBST_STAGE.scripts=	pre-configure
+SUBST_MESSAGE.scripts=	Setting scripts prefix and architecture.
+SUBST_FILES.scripts=	ioq3ded.sh ioquake3.sh
+SUBST_VARS.scripts=	PREFIX QUAKE_ARCH
+
+post-extract:
+	cp ${FILESDIR}/ioquake3.sh ${WRKSRC}
+	cp ${FILESDIR}/ioq3ded.sh ${WRKSRC}
+
 do-install:
-	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/lib/ioquake3
-	cd ${WRKSRC} && ${GMAKE} copyfiles COPYDIR=${DESTDIR}${PREFIX}/lib/ioquake3
+	cd ${WRKSRC} && \
+		${GMAKE} ${MAKE_FLAGS} ${INSTALL_MAKE_FLAGS} \
+			COPYDIR=${DESTDIR}${PREFIX}/lib/ioquake3 copyfiles
+	${INSTALL_SCRIPT} ${WRKSRC}/ioquake3.sh ${DESTDIR}${PREFIX}/bin/ioquake3
+	${INSTALL_SCRIPT} ${WRKSRC}/ioq3ded.sh ${DESTDIR}${PREFIX}/bin/ioq3ded
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -36,6 +51,13 @@ QUAKE_ARCH=	${MACHINE_ARCH:i386=x86}
 PLIST_SUBST+=	QUAKE_ARCH=${QUAKE_ARCH:Q}
 
 .include "../../audio/openal-soft/buildlink3.mk"
+.include "../../audio/libopus/buildlink3.mk"
+.include "../../audio/libvorbis/buildlink3.mk"
+.include "../../audio/opusfile/buildlink3.mk"
 .include "../../devel/SDL2/buildlink3.mk"
+.include "../../devel/zlib/buildlink3.mk"
 .include "../../graphics/MesaLib/buildlink3.mk"
+.include "../../multimedia/libogg/buildlink3.mk"
+.include "../../www/curl/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/ioquake3-snapshot/PLIST b/ioquake3-snapshot/PLIST
@@ -1,4 +1,6 @@
 @comment $NetBSD$
+bin/ioq3ded
+bin/ioquake3
 lib/ioquake3/ioquake3.${QUAKE_ARCH}
 lib/ioquake3/baseq3/cgame${QUAKE_ARCH}.so
 lib/ioquake3/baseq3/qagame${QUAKE_ARCH}.so

diff --git a/ioquake3-snapshot/distinfo b/ioquake3-snapshot/distinfo
@@ -1,8 +1,8 @@
 $NetBSD$
 
-SHA1 (ioq3/c65d2c2657fa6aecf498a5e1c20ffa706a80e818-c65d2c2657fa6aecf498a5e1c20ffa706a80e818.zip) = 7f5bad057032da9c0b82bd8597ca9023f469e9b7
-RMD160 (ioq3/c65d2c2657fa6aecf498a5e1c20ffa706a80e818-c65d2c2657fa6aecf498a5e1c20ffa706a80e818.zip) = 83ca4f2b43d00fa4710b98ed03bedecb3df0b55b
-SHA512 (ioq3/c65d2c2657fa6aecf498a5e1c20ffa706a80e818-c65d2c2657fa6aecf498a5e1c20ffa706a80e818.zip) = 6c976bb3cb940911d5e4234fcad712c096c95f81fbc423b356038ceb67baf6f1e368874d905603c8b41d4d5956bc1249d4655e307363f038f9beaab309cfaade
-Size (ioq3/c65d2c2657fa6aecf498a5e1c20ffa706a80e818-c65d2c2657fa6aecf498a5e1c20ffa706a80e818.zip) = 12658523 bytes
-SHA1 (patch-Makefile) = 2fbb0fc959fd640acff84edeb5816940945bfa6b
-SHA1 (patch-code_qcommon_q_platform.h) = 51f4a129dc3b6c622df27a7c610e164d477fc132
+SHA1 (ioq3/05180e32dcfb9a4552e1b9652b56127248a9950c-05180e32dcfb9a4552e1b9652b56127248a9950c.zip) = 73170b24617dba9c04c85cb3ce4120e9fee889b3
+RMD160 (ioq3/05180e32dcfb9a4552e1b9652b56127248a9950c-05180e32dcfb9a4552e1b9652b56127248a9950c.zip) = f6e9d84883b4c72bcc8096b10d65c64334e74576
+SHA512 (ioq3/05180e32dcfb9a4552e1b9652b56127248a9950c-05180e32dcfb9a4552e1b9652b56127248a9950c.zip) = 1d42990b8b69eab1a0875cb045f1de4363587c6b73d0d07ca51f5fea505de5d9e4b1b10c6e961683dd0cc7725b97903d39810a6ca8a35e14f5bf66c5fefc96fd
+Size (ioq3/05180e32dcfb9a4552e1b9652b56127248a9950c-05180e32dcfb9a4552e1b9652b56127248a9950c.zip) = 8753836 bytes
+SHA1 (patch-Makefile) = 0977bef09f0893cb2bcfef81bcaf08558de8f8b7
+SHA1 (patch-code_qcommon_q_platform.h) = 97359afcc2ccfaf0be1223f3093a74b0cd2668b9
diff --git a/ioquake3-snapshot/files/ioq3ded.sh b/ioquake3-snapshot/files/ioq3ded.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+exec @PREFIX@/lib/ioquake3/ioq3ded.@QUAKE_ARCH@ "$@"
diff --git a/ioquake3-snapshot/files/ioquake3.sh b/ioquake3-snapshot/files/ioquake3.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+exec @PREFIX@/lib/ioquake3/ioquake3.@QUAKE_ARCH@ "$@"
diff --git a/ioquake3-snapshot/patches/patch-Makefile b/ioquake3-snapshot/patches/patch-Makefile
@@ -1,5 +1,7 @@
 $NetBSD$
 
+Build definitions for NetBSD and some of its architectures.
+
 --- Makefile.orig	2017-04-28 09:13:25.000000000 +0000
 +++ Makefile
 @@ -794,11 +794,51 @@ ifeq ($(PLATFORM),netbsd)

diff --git a/ioquake3-snapshot/patches/patch-code_qcommon_q_platform.h b/ioquake3-snapshot/patches/patch-code_qcommon_q_platform.h
@@ -1,5 +1,7 @@
 $NetBSD$
 
+Defines for DragonflyBSD and for arm.
+
 --- code/qcommon/q_platform.h.orig	2017-04-28 09:13:25.000000000 +0000
 +++ code/qcommon/q_platform.h
 @@ -201,7 +201,7 @@ Foundation, Inc., 51 Franklin St, Fifth
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		#!/bin/sh

		exec @PREFIX@/lib/ioquake3/ioq3ded.@QUAKE_ARCH@ "$@"
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		#!/bin/sh

		exec @PREFIX@/lib/ioquake3/ioquake3.@QUAKE_ARCH@ "$@"