From fa1f06e21d4277a2650da7fbbba2f904947e250b Mon Sep 17 00:00:00 2001
From: ben <ben@pkgsrc.org>
Date: Wed, 3 Dec 2003 23:45:29 +0000
Subject: Change fkiss to use ossaudio.buildlink2.mk's DEVOSSSOUND macro.

---
 games/fkiss/Makefile         |  4 +++-
 games/fkiss/distinfo         |  4 ++--
 games/fkiss/patches/patch-ad | 19 +++++++++----------
 3 files changed, 14 insertions(+), 13 deletions(-)

(limited to 'games')

diff --git a/games/fkiss/Makefile b/games/fkiss/Makefile
index 1fa0149bc10..7dc6e257f7b 100644
--- a/games/fkiss/Makefile
+++ b/games/fkiss/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2003/07/21 16:49:45 martti Exp $
+# $NetBSD: Makefile,v 1.7 2003/12/03 23:45:29 ben Exp $
 #
 
 DISTNAME=		fkiss-0.32
+PKGREVISION=		1
 CATEGORIES=		games
 MASTER_SITES=		http://www.oersted.co.jp/~yav/soft/fkiss/
 
@@ -16,6 +17,7 @@ USE_X11=		yes
 USE_GMAKE=		yes
 GNU_CONFIGURE=		yes
 CFLAGS+=		-DUSE_STDARG -DHAVE_STDARG_H
+CFLAGS+=		-DDEV_SOUND=\"\\\"${DEVOSSSOUND}\\\"\"
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/fkiss ${PREFIX}/bin
diff --git a/games/fkiss/distinfo b/games/fkiss/distinfo
index 2d839502ad7..9dcb224d8d4 100644
--- a/games/fkiss/distinfo
+++ b/games/fkiss/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.2 2002/09/21 12:55:07 jlam Exp $
+$NetBSD: distinfo,v 1.3 2003/12/03 23:45:29 ben Exp $
 
 SHA1 (fkiss-0.32.tar.gz) = 401cfddfbe117de15c1ff36de404a2c360f17d97
 Size (fkiss-0.32.tar.gz) = 160128 bytes
 SHA1 (patch-ab) = 4b387d82c310bb3d256fff9b1ba7e8f90cc610a8
 SHA1 (patch-ac) = 40e190d4d40dd3bcbc7f803e1f0e0c8155e69bf1
-SHA1 (patch-ad) = d22771c05d3eea81c95d003e89e4b9dffae70fef
+SHA1 (patch-ad) = c0aa04ce5b030fb82af325d739197149d37766b3
 SHA1 (patch-ae) = 517086e4a5273725b6e4c0928b8bb01804e33b55
 SHA1 (patch-af) = c5104a21e9935a4d44741341f792dabb59f09382
 SHA1 (patch-ag) = 2732e7a219a8002686e10abe9c0688da24d4d4f5
diff --git a/games/fkiss/patches/patch-ad b/games/fkiss/patches/patch-ad
index 8b53174dc22..69907d1464c 100644
--- a/games/fkiss/patches/patch-ad
+++ b/games/fkiss/patches/patch-ad
@@ -1,14 +1,13 @@
-$NetBSD: patch-ad,v 1.1.1.1 2002/07/14 09:40:30 rh Exp $
+$NetBSD: patch-ad,v 1.2 2003/12/03 23:45:29 ben Exp $
 
---- sound.c.orig	Mon Oct 16 22:10:55 2000
+--- sound.c.orig	2000-10-16 22:10:55.000000000 -0700
 +++ sound.c
-@@ -43,6 +43,13 @@
+@@ -43,6 +43,12 @@
  # include <machine/soundcard.h>
  #endif
  
 +#ifdef __NetBSD__
 +# define USE_DSP
-+# define DEV_SOUND	"/dev/sound"
 +# include <sys/ioctl.h>
 +# include <soundcard.h>
 +#endif
@@ -16,7 +15,7 @@ $NetBSD: patch-ad,v 1.1.1.1 2002/07/14 09:40:30 rh Exp $
  #ifndef DEV_SOUND
  # define DEV_SOUND	"/dev/audio"
  #endif
-@@ -61,7 +68,7 @@
+@@ -61,7 +67,7 @@
  
  #include "ulaw.h"
  
@@ -25,7 +24,7 @@ $NetBSD: patch-ad,v 1.1.1.1 2002/07/14 09:40:30 rh Exp $
  char *sound_device = DEV_SOUND;
  int sound_debug = 1;		/* debug information print level
  				 * 0: print nothing, silent
-@@ -218,7 +225,7 @@
+@@ -218,7 +224,7 @@
  {
    if (sound_debug >= 2)
      fputs("sync", stderr);
@@ -34,11 +33,10 @@ $NetBSD: patch-ad,v 1.1.1.1 2002/07/14 09:40:30 rh Exp $
    if (sound_debug >= 2)
      fputs(" ", stderr);
  }
-@@ -639,6 +646,17 @@
-   
+@@ -640,6 +646,17 @@
    if (!sound_enable)
      return 0;
-+
+ 
 +  bufp = name;
 +  while (strstr(bufp + 1, ".mid") != NULL) bufp = strstr(bufp + 1, ".mid");
 +  while (strstr(bufp + 1, ".MID") != NULL) bufp = strstr(bufp + 1, ".MID");
@@ -49,6 +47,7 @@ $NetBSD: patch-ad,v 1.1.1.1 2002/07/14 09:40:30 rh Exp $
 +    ks_system2(buf);
 +    return 0;
 +  }
- 
++
    bzero(&sf, sizeof(sf));
    bzero(buf, sizeof(buf));
+   if (name == NULL) {
-- 
cgit v1.2.3