Sat Apr 18 20:44:08 2015 UTC ()
Allow building on NetBSD/arm.


(joerg)
diff -r1.3 -r1.4 pkgsrc/games/ioquake3/Makefile
diff -r1.2 -r1.3 pkgsrc/games/ioquake3/PLIST
diff -r1.4 -r1.5 pkgsrc/games/ioquake3/distinfo
diff -r1.2 -r1.3 pkgsrc/games/ioquake3/patches/patch-aa
cvs diff -r1.3 -r1.4 pkgsrc/games/ioquake3/Makefile (expand / switch to unified diff)

--- pkgsrc/games/ioquake3/Makefile 2012/10/06 11:54:43 1.3
+++ pkgsrc/games/ioquake3/Makefile 2015/04/18 20:44:08 1.4
@@ -1,23 +1,33 @@ @@ -1,23 +1,33 @@
1# $NetBSD: Makefile,v 1.3 2012/10/06 11:54:43 asau Exp $ 1# $NetBSD: Makefile,v 1.4 2015/04/18 20:44:08 joerg Exp $
2# 2#
3 3
4DISTNAME= ioquake3-1.36 4DISTNAME= ioquake3-1.36
5CATEGORIES= games 5CATEGORIES= games
6MASTER_SITES= http://ioquake3.org/files/1.36/ 6MASTER_SITES= http://ioquake3.org/files/1.36/
7EXTRACT_SUFX= .tar.bz2 7EXTRACT_SUFX= .tar.bz2
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://www.ioquake3.org/ 10HOMEPAGE= http://www.ioquake3.org/
11COMMENT= Open source Quake 3 distribution 11COMMENT= Open source Quake 3 distribution
12 12
13USE_TOOLS+= gmake 13USE_TOOLS+= gmake
14BUILD_TARGET= release 14BUILD_TARGET= release
15 15
16do-install: 16do-install:
17 ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/lib/ioquake3 17 ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/lib/ioquake3
18 cd ${WRKSRC} && ${GMAKE} copyfiles COPYDIR=${DESTDIR}${PREFIX}/lib/ioquake3 18 cd ${WRKSRC} && ${GMAKE} copyfiles COPYDIR=${DESTDIR}${PREFIX}/lib/ioquake3
19 19
 20.include "../../mk/bsd.prefs.mk"
 21
 22.if ${OPSYS} == "NetBSD" && ${MACHINE_CPU:U} == "arm"
 23QUAKE_ARCH!= uname -m
 24.else
 25QUAKE_ARCH= ${MACHINE_ARCH}
 26.endif
 27
 28PLIST_SUBST+= QUAKE_ARCH=${QUAKE_ARCH:Q}
 29
20.include "../../audio/openal/buildlink3.mk" 30.include "../../audio/openal/buildlink3.mk"
21.include "../../devel/SDL/buildlink3.mk" 31.include "../../devel/SDL/buildlink3.mk"
22.include "../../graphics/MesaLib/buildlink3.mk" 32.include "../../graphics/MesaLib/buildlink3.mk"
23.include "../../mk/bsd.pkg.mk" 33.include "../../mk/bsd.pkg.mk"
cvs diff -r1.2 -r1.3 pkgsrc/games/ioquake3/PLIST (expand / switch to unified diff)

--- pkgsrc/games/ioquake3/PLIST 2009/06/14 17:56:48 1.2
+++ pkgsrc/games/ioquake3/PLIST 2015/04/18 20:44:08 1.3
@@ -1,9 +1,9 @@ @@ -1,9 +1,9 @@
1@comment $NetBSD: PLIST,v 1.2 2009/06/14 17:56:48 joerg Exp $ 1@comment $NetBSD: PLIST,v 1.3 2015/04/18 20:44:08 joerg Exp $
2lib/ioquake3/baseq3/cgame${MACHINE_ARCH}.so 2lib/ioquake3/baseq3/cgame${QUAKE_ARCH}.so
3lib/ioquake3/baseq3/qagame${MACHINE_ARCH}.so 3lib/ioquake3/baseq3/qagame${QUAKE_ARCH}.so
4lib/ioquake3/baseq3/ui${MACHINE_ARCH}.so 4lib/ioquake3/baseq3/ui${QUAKE_ARCH}.so
5lib/ioquake3/ioq3ded.${MACHINE_ARCH} 5lib/ioquake3/ioq3ded.${QUAKE_ARCH}
6lib/ioquake3/ioquake3.${MACHINE_ARCH} 6lib/ioquake3/ioquake3.${QUAKE_ARCH}
7lib/ioquake3/missionpack/cgame${MACHINE_ARCH}.so 7lib/ioquake3/missionpack/cgame${QUAKE_ARCH}.so
8lib/ioquake3/missionpack/qagame${MACHINE_ARCH}.so 8lib/ioquake3/missionpack/qagame${QUAKE_ARCH}.so
9lib/ioquake3/missionpack/ui${MACHINE_ARCH}.so 9lib/ioquake3/missionpack/ui${QUAKE_ARCH}.so
cvs diff -r1.4 -r1.5 pkgsrc/games/ioquake3/distinfo (expand / switch to unified diff)

--- pkgsrc/games/ioquake3/distinfo 2013/10/28 23:45:59 1.4
+++ pkgsrc/games/ioquake3/distinfo 2015/04/18 20:44:08 1.5
@@ -1,9 +1,9 @@ @@ -1,9 +1,9 @@
1$NetBSD: distinfo,v 1.4 2013/10/28 23:45:59 joerg Exp $ 1$NetBSD: distinfo,v 1.5 2015/04/18 20:44:08 joerg Exp $
2 2
3SHA1 (ioquake3-1.36.tar.bz2) = 0f92891e2b174253d02f666fd22e147c886089b4 3SHA1 (ioquake3-1.36.tar.bz2) = 0f92891e2b174253d02f666fd22e147c886089b4
4RMD160 (ioquake3-1.36.tar.bz2) = af9f65bbde2fe5531fa371ec6d2023126a523293 4RMD160 (ioquake3-1.36.tar.bz2) = af9f65bbde2fe5531fa371ec6d2023126a523293
5Size (ioquake3-1.36.tar.bz2) = 3503058 bytes 5Size (ioquake3-1.36.tar.bz2) = 3503058 bytes
6SHA1 (patch-aa) = 3f89e248cb2e64657f37ccb4f77b837fc7e7a012 6SHA1 (patch-aa) = 6faee94e1a194b904d1ad72968f0b652ab7d8ec2
7SHA1 (patch-ab) = 7808f9c26160ae1931c96fe1bc5e898b69afbde2 7SHA1 (patch-ab) = 7808f9c26160ae1931c96fe1bc5e898b69afbde2
8SHA1 (patch-ac) = 4631bdda582aa105b661f45e09e0d5eb68713978 8SHA1 (patch-ac) = 4631bdda582aa105b661f45e09e0d5eb68713978
9SHA1 (patch-ad) = 577ca1c8fab64289d6f91e9e02542094cf7f2800 9SHA1 (patch-ad) = 577ca1c8fab64289d6f91e9e02542094cf7f2800
cvs diff -r1.2 -r1.3 pkgsrc/games/ioquake3/patches/Attic/patch-aa (expand / switch to unified diff)

--- pkgsrc/games/ioquake3/patches/Attic/patch-aa 2009/03/23 09:57:37 1.2
+++ pkgsrc/games/ioquake3/patches/Attic/patch-aa 2015/04/18 20:44:08 1.3
@@ -1,31 +1,42 @@ @@ -1,31 +1,42 @@
1$NetBSD: patch-aa,v 1.2 2009/03/23 09:57:37 hasso Exp $ 1$NetBSD: patch-aa,v 1.3 2015/04/18 20:44:08 joerg Exp $
2 2
3--- code/qcommon/q_platform.h.orig 2009-01-12 19:28:35 +0200 3--- code/qcommon/q_platform.h.orig 2009-03-02 17:29:30.000000000 +0000
4+++ code/qcommon/q_platform.h 2009-03-23 11:14:03 +0200 4+++ code/qcommon/q_platform.h
5@@ -170,7 +170,7 @@ Foundation, Inc., 51 Franklin St, Fifth  5@@ -163,6 +163,8 @@ Foundation, Inc., 51 Franklin St, Fifth
 6 #define ARCH_STRING "mips"
 7 #elif defined __sh__
 8 #define ARCH_STRING "sh"
 9+#elif defined __arm__
 10+#define ARCH_STRING "arm"
 11 #endif
 12
 13 #if __FLOAT_WORD_ORDER == __BIG_ENDIAN
 14@@ -177,7 +179,7 @@ Foundation, Inc., 51 Franklin St, Fifth
6  15
7 //=================================================================== BSD === 16 //=================================================================== BSD ===
8  17
9-#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) 18-#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)
10+#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__DragonFly__) 19+#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
11  20
12 #include <sys/types.h> 21 #include <sys/types.h>
13 #include <machine/endian.h> 22 #include <machine/endian.h>
14@@ -185,6 +185,8 @@ Foundation, Inc., 51 Franklin St, Fifth  23@@ -192,6 +194,8 @@ Foundation, Inc., 51 Franklin St, Fifth
15 #define OS_STRING "openbsd" 24 #define OS_STRING "openbsd"
16 #elif defined(__NetBSD__) 25 #elif defined(__NetBSD__)
17 #define OS_STRING "netbsd" 26 #define OS_STRING "netbsd"
18+#elif defined(__DragonFly__) 27+#elif defined(__DragonFly__)
19+#define OS_STRING "dragonfly" 28+#define OS_STRING "dragonfly"
20 #endif 29 #endif
21  30
22 #define ID_INLINE inline 31 #define ID_INLINE inline
23@@ -194,6 +196,8 @@ Foundation, Inc., 51 Franklin St, Fifth  32@@ -201,6 +205,10 @@ Foundation, Inc., 51 Franklin St, Fifth
24 #define ARCH_STRING "i386" 33 #define ARCH_STRING "i386"
25 #elif defined __axp__ 34 #elif defined __axp__
26 #define ARCH_STRING "alpha" 35 #define ARCH_STRING "alpha"
27+#elif defined __x86_64__ 36+#elif defined __x86_64__
28+#define ARCH_STRING "x86_64" 37+#define ARCH_STRING "x86_64"
 38+#elif defined __arm__
 39+#define ARCH_STRING "arm"
29 #endif 40 #endif
30  41
31 #if BYTE_ORDER == BIG_ENDIAN 42 #if BYTE_ORDER == BIG_ENDIAN