From 92b98173e2f3a18f4c61d320b464022509cda892 Mon Sep 17 00:00:00 2001
From: joerg <joerg>
Date: Wed, 12 Apr 2006 21:30:56 +0000
Subject: Use normal make. Be a setgid game. No sound server included, so don't
 try to build one on FreeBSD and DragonFly.

---
 games/tanked/Makefile         |  8 ++++----
 games/tanked/distinfo         |  5 +++--
 games/tanked/patches/patch-aa | 22 +++++++++++-----------
 games/tanked/patches/patch-ak | 17 +++++++++++++++++
 4 files changed, 35 insertions(+), 17 deletions(-)
 create mode 100644 games/tanked/patches/patch-ak

diff --git a/games/tanked/Makefile b/games/tanked/Makefile
index 672d68b1a47..6a807d89983 100644
--- a/games/tanked/Makefile
+++ b/games/tanked/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.12 2006/02/05 23:09:23 joerg Exp $
+# $NetBSD: Makefile,v 1.13 2006/04/12 21:30:56 joerg Exp $
 #
 
 DISTNAME=		tanked-0.90
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		games x11
 MASTER_SITES=		# empty
 
@@ -10,8 +10,8 @@ MAINTAINER=		root@garbled.net
 #HOMEPAGE=		http://ogresoft.dyn.ml.org/tanked.html
 COMMENT=		Multiplayer internet tank game for X11
 
-USE_X11BASE=		YES
-USE_TOOLS+=		imake gmake
+USE_TOOLS=		imake
+SETGIDGAME=		yes
 
 post-patch:
 	@${TOUCH} ${WRKSRC}/client/tanked.man
diff --git a/games/tanked/distinfo b/games/tanked/distinfo
index f962f579fc4..f779a8d9b3f 100644
--- a/games/tanked/distinfo
+++ b/games/tanked/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.4 2005/02/23 23:12:03 agc Exp $
+$NetBSD: distinfo,v 1.5 2006/04/12 21:30:56 joerg Exp $
 
 SHA1 (tanked-0.90.tar.gz) = 781e4d23e5b59bfff53e921e9b20d94a15609f23
 RMD160 (tanked-0.90.tar.gz) = 5473310798a9cf4a7403bd90fe9a7c241920baa1
 Size (tanked-0.90.tar.gz) = 151105 bytes
-SHA1 (patch-aa) = 798cb65c99cdd1414b45b54a44632c6b415bacaa
+SHA1 (patch-aa) = e4f3ce95a20b1bab3591aa2875244776dfe9e7c5
 SHA1 (patch-ab) = f25cd592b5571c4e35d9e3160a1f5bcfacee1ad7
 SHA1 (patch-ac) = 097e1252deabeb2a6a9b9981bfb51b9c6c409672
 SHA1 (patch-ad) = 09931ca419399dbcbcea690381f7b68916fb0efa
@@ -13,3 +13,4 @@ SHA1 (patch-ag) = 5a4c6ae3a7d7f8f62c871e826214e801e204ec8c
 SHA1 (patch-ah) = d2af312f3a99585ba3e940be67b8a9d13a431d26
 SHA1 (patch-ai) = ae0ddf9b1fcc7fcafb58aa8a12c4a79cf147899e
 SHA1 (patch-aj) = 532ae66c09b87ea94a2fbc48f920d9e199330b60
+SHA1 (patch-ak) = e3d99e6c4ec5269e8b5ae5621d20197a00cc00e2
diff --git a/games/tanked/patches/patch-aa b/games/tanked/patches/patch-aa
index dee610896b8..c232b45837b 100644
--- a/games/tanked/patches/patch-aa
+++ b/games/tanked/patches/patch-aa
@@ -1,17 +1,17 @@
-$NetBSD: patch-aa,v 1.3 2002/10/21 12:11:05 wiz Exp $
+$NetBSD: patch-aa,v 1.4 2006/04/12 21:30:56 joerg Exp $
 
 --- /dev/null	Fri Jul 31 02:54:09 1998
 +++ Makefile	Fri Jul 31 04:12:51 1998
 @@ -0,0 +1,12 @@
 +all:
-+	cd server && make
-+	cd client && xmkmf -a && make
++	cd server && ${MAKE}
++	cd client && xmkmf -a && ${MAKE}
 +install:
-+	/usr/bin/install -o bin -g games -m 0755 client/tanked $(X11PREFIX)/bin
-+	/usr/bin/install -o bin -g games -m 2755 server/tankedserv $(X11PREFIX)/bin
-+	/usr/bin/install -d -o bin -g games -m 0775 $(X11PREFIX)/share/tanked/logs
-+	/usr/bin/install -d -o bin -g games -m 0775 $(X11PREFIX)/share/tanked/maps
-+	/usr/bin/install -o bin -g bin -m 0644 server/maps/* $(X11PREFIX)/share/tanked/maps
-+	/usr/bin/install -o bin -g bin -m 0644 server/maps.list $(X11PREFIX)/share/tanked
-+	/usr/bin/install -o bin -g bin -m 0644 server/.motd $(X11PREFIX)/share/tanked/motd
-+	/usr/bin/install -o bin -g bin -m 0644 server/.players $(X11PREFIX)/share/tanked/players
++	${BSD_INSTALL_PROGRAM} client/tanked $(PREFIX)/bin
++	${BSD_INSTALL_GAME} server/tankedserv $(PREFIX)/bin
++	${BSD_INSTALL_GAME_DIR} $(PREFIX)/share/tanked/logs
++	${BSD_INSTALL_GAME_DIR} $(PREFIX)/share/tanked/maps
++	${BSD_INSTALL_DATA} server/maps/* $(PREFIX)/share/tanked/maps
++	${BSD_INSTALL_DATA} server/maps.list $(PREFIX)/share/tanked
++	${BSD_INSTALL_DATA} server/.motd $(PREFIX)/share/tanked/motd
++	${BSD_INSTALL_DATA} server/.players $(PREFIX)/share/tanked/players
diff --git a/games/tanked/patches/patch-ak b/games/tanked/patches/patch-ak
new file mode 100644
index 00000000000..ef342f68720
--- /dev/null
+++ b/games/tanked/patches/patch-ak
@@ -0,0 +1,17 @@
+$NetBSD: patch-ak,v 1.1 2006/04/12 21:30:56 joerg Exp $
+
+--- client/Imakefile.orig	2006-03-29 23:38:42.000000000 +0000
++++ client/Imakefile
+@@ -86,10 +86,9 @@ XCOMM **** and you need something change
+ #endif
+ 
+ #if defined(FreeBSDArchitecture)
+-#define SOUND
+ SYSDEFS = 
+-SOUNDSERVER = tanked.sndsrv.freebsd
+-SOUNDOBJS = sound.o
++SOUNDSERVER =
++SOUNDOBJS =
+ SOUNDDEV = /dev/dsp
+ #endif
+ 
-- 
cgit v1.2.3