DragonFly support. Use imake man variables.

6 files changed, 29 insertions, 19 deletions

diff --git a/games/xblast/Makefile b/games/xblast/Makefile
index 0d0b38bcb92..e51270d2f1b 100644
--- a/games/xblast/Makefile
+++ b/games/xblast/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2004/12/31 12:10:04 minskim Exp $
+# $NetBSD: Makefile,v 1.19 2006/01/12 23:49:58 joerg Exp $
 #
 
 DISTNAME=		xblast-2.6.beta-sound
@@ -31,6 +31,6 @@ post-build:
 	cd ${WRKSRC}/tkXBlast && ${MAKE_ENV} ${MAKE}
 
 post-install:
-	${RM} ${PREFIX}/man/cat1/xbsndsrv.0
+	${RM} ${PREFIX}/${IMAKE_MAN_DIR}/xbsndsrv.${IMAKE_MAN_SUFFIX}
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/xblast/PLIST b/games/xblast/PLIST
index 7ffb1a25890..aff22f032fd 100644
--- a/games/xblast/PLIST
+++ b/games/xblast/PLIST
@@ -1,6 +1,6 @@
-@comment $NetBSD: PLIST,v 1.2 2003/02/26 04:07:48 jschauma Exp $
-${IMAKE_MAN_DIR}/xblast.${IMAKE_MANNEWSUFFIX}
-${IMAKE_MAN_DIR}/tkXBlast.${IMAKE_MANNEWSUFFIX}
+@comment $NetBSD: PLIST,v 1.3 2006/01/12 23:49:58 joerg Exp $
+${IMAKE_MAN_DIR}/xblast.${IMAKE_MAN_SUFFIX}
+${IMAKE_MAN_DIR}/tkXBlast.${IMAKE_MAN_SUFFIX}
 lib/X11/app-defaults/XBlast
 share/xblast/bitmap/block/air_pump.pbm
 share/xblast/bitmap/block/bomb.pbm
diff --git a/games/xblast/distinfo b/games/xblast/distinfo
index 217fb1e544c..fa52913b9d3 100644
--- a/games/xblast/distinfo
+++ b/games/xblast/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.3 2005/02/23 23:12:03 agc Exp $
+$NetBSD: distinfo,v 1.4 2006/01/12 23:49:58 joerg Exp $
 
 SHA1 (xblast-2.6.beta-sound.tar.gz) = 3700f50d54e1c5fa4bbf97da964cf8cae5261292
 RMD160 (xblast-2.6.beta-sound.tar.gz) = bf9be037b7e3ff426a861d40c266ddd160a4b159
 Size (xblast-2.6.beta-sound.tar.gz) = 2471921 bytes
-SHA1 (patch-aa) = cc76f6814b2f37ad221ade5a7261fbdfb4aa0429
-SHA1 (patch-ab) = 964b7139513baef671280e1ced905095fe83cfb6
-SHA1 (patch-ac) = 8d830c9b640d18a7d3387fdb13394f20076c08cc
+SHA1 (patch-aa) = fd7f62e05f3a4ac3994d1bafca276e6144576f19
+SHA1 (patch-ab) = 4b66875ef5a07c81e940d2783cfe8defd36e22c9
+SHA1 (patch-ac) = 40ba3765dd56c95ed3f2d564fdc1a04ed4409bee
 SHA1 (patch-ad) = cbc06cfe4c846fc5ed43060b2b20b7b93929e0ad
 SHA1 (patch-ae) = f373cc9a7d031c4ef707ab18ea399d9b59fb8d4f
 SHA1 (patch-ag) = 947980be4b1975e9ced6f872a2989ab9c0933496
diff --git a/games/xblast/patches/patch-aa b/games/xblast/patches/patch-aa
index 3f08617694c..88d6f5d76f6 100644
--- a/games/xblast/patches/patch-aa
+++ b/games/xblast/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.1.1.1 1998/11/10 08:32:36 garbled Exp $
+$NetBSD: patch-aa,v 1.2 2006/01/12 23:49:59 joerg Exp $
 --- Imakefile.orig	Thu Oct 16 02:54:01 1997
 +++ Imakefile	Tue Nov 10 00:41:26 1998
 @@ -12,9 +12,9 @@
@@ -18,7 +18,7 @@ $NetBSD: patch-aa,v 1.1.1.1 1998/11/10 08:32:36 garbled Exp $
  OBJS2  = xbsndsrv.o
  
 -ComplexProgramTarget_2(xbsndsrv,NullParameter,NullParameter)
-+ComplexProgramTarget_2(xbsndsrv,-lossaudio,NullParameter)
++ComplexProgramTarget_2(xbsndsrv,${LIBOSSAUDIO},NullParameter)
  
  /*
   * Part 3: install Application Defaults
diff --git a/games/xblast/patches/patch-ab b/games/xblast/patches/patch-ab
index 963a10932b9..ab095cad022 100644
--- a/games/xblast/patches/patch-ab
+++ b/games/xblast/patches/patch-ab
@@ -1,12 +1,17 @@
-$NetBSD: patch-ab,v 1.1.1.1 1998/11/10 08:32:36 garbled Exp $
---- xbsndsrv.c.orig	Mon Nov  9 23:01:52 1998
-+++ xbsndsrv.c	Mon Nov  9 23:02:26 1998
-@@ -100,7 +100,7 @@
+$NetBSD: patch-ab,v 1.2 2006/01/12 23:49:59 joerg Exp $
+
+--- xbsndsrv.c.orig	1997-10-16 08:48:27.000000000 +0000
++++ xbsndsrv.c
+@@ -100,7 +100,11 @@
  #include <sys/stat.h>
  #include <sys/ioctl.h>
  #include <sys/time.h>
 -#include <linux/soundcard.h>
++#if defined(__DragonFly__) || defined(__FreeBSD__)
++#include <sys/soundcard.h>
++#else
 +#include <soundcard.h>
++#endif
  #include <signal.h>
  #include "sound.h"
  
diff --git a/games/xblast/patches/patch-ac b/games/xblast/patches/patch-ac
index 86b86fd6080..0604e25a55a 100644
--- a/games/xblast/patches/patch-ac
+++ b/games/xblast/patches/patch-ac
@@ -1,12 +1,17 @@
-$NetBSD: patch-ac,v 1.1.1.1 1998/11/10 08:32:36 garbled Exp $
---- sound.c.orig	Mon Nov  9 23:01:48 1998
-+++ sound.c	Mon Nov  9 23:02:10 1998
-@@ -80,7 +80,7 @@
+$NetBSD: patch-ac,v 1.2 2006/01/12 23:49:59 joerg Exp $
+
+--- sound.c.orig	1997-10-16 08:48:27.000000000 +0000
++++ sound.c
+@@ -80,7 +80,11 @@
  #include <sys/fcntl.h>
  #include <sys/stat.h>
  #include <sys/wait.h>
 -#include <linux/soundcard.h>
++#if defined(__DragonFly__) || defined(__FreeBSD__)
++#include <sys/soundcard.h>
++#else
 +#include <soundcard.h>
++#endif
  #include <signal.h>
  #include "sound.h"