diff options
| author | minskim <minskim@pkgsrc.org> | 2004-04-09 00:10:25 +0000 |
|---|---|---|
| committer | minskim <minskim@pkgsrc.org> | 2004-04-09 00:10:25 +0000 |
| commit | a8f96c0bb810e7aafd03524a22702c6e2addd106 (patch) | |
| tree | 9f2b19cdb412e95668e9515c33971a4061db7630 /games/xscavenger/patches | |
| parent | 45d5961f55925e321c2f25ec83db741af680f3b3 (diff) | |
| download | pkgsrc-a8f96c0bb810e7aafd03524a22702c6e2addd106.tar.gz | |
Use variables defined in ossaudio.buildlink3.mk. This fixes a build
problem caused by hardcoded "-lossaudio" on Linux.
OK'ed by wiz@, the maintainer.
Diffstat (limited to 'games/xscavenger/patches')
| -rw-r--r-- | games/xscavenger/patches/patch-aa | 21 | ||||
| -rw-r--r-- | games/xscavenger/patches/patch-ab | 4 |
2 files changed, 10 insertions, 15 deletions
diff --git a/games/xscavenger/patches/patch-aa b/games/xscavenger/patches/patch-aa index 514c184c0a9..1bc53d35942 100644 --- a/games/xscavenger/patches/patch-aa +++ b/games/xscavenger/patches/patch-aa @@ -1,26 +1,21 @@ -$NetBSD: patch-aa,v 1.1.1.1 2000/01/08 18:26:00 wiz Exp $ +$NetBSD: patch-aa,v 1.2 2004/04/09 00:10:25 minskim Exp $ -diff -r -u -b sound.c.orig sound.c ---- sound.c.orig Thu Jan 6 07:23:56 2000 -+++ sound.c Sat Jan 8 17:09:02 2000 -@@ -5,7 +5,13 @@ +--- sound.c.orig 2002-12-02 00:03:54.000000000 -0600 ++++ sound.c +@@ -5,7 +5,7 @@ #include <unistd.h> #include <fcntl.h> #include <sys/ioctl.h> -+#ifdef __NetBSD__ -+#include <soundcard.h> -+#define SOUNDDEV "/dev/sound" -+#else - #include <linux/soundcard.h> -+#define SOUNDDEV "/dev/dsp" -+#endif +-#include <linux/soundcard.h> ++#include <sys/soundcard.h> #include <sys/time.h> #include <signal.h> #include <string.h> -@@ -14,7 +20,6 @@ +@@ -14,7 +15,6 @@ #include "scav.h" #include "sound.h" -#define SOUNDDEV "/dev/dsp" char dirlist[512]; + diff --git a/games/xscavenger/patches/patch-ab b/games/xscavenger/patches/patch-ab index d16dc404d34..c3126718500 100644 --- a/games/xscavenger/patches/patch-ab +++ b/games/xscavenger/patches/patch-ab @@ -1,4 +1,4 @@ -$NetBSD: patch-ab,v 1.1.1.1 2000/01/08 18:26:00 wiz Exp $ +$NetBSD: patch-ab,v 1.2 2004/04/09 00:10:25 minskim Exp $ --- Imakefile.orig Thu Jan 6 06:47:22 2000 +++ Imakefile Sat Jan 8 18:10:48 2000 @@ -16,7 +16,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2000/01/08 18:26:00 wiz Exp $ ../data/victory.raw -LOCAL_LIBRARIES = $(XLIB) -+LOCAL_LIBRARIES = $(XLIB) -lossaudio ++LOCAL_LIBRARIES = $(XLIB) ${LIBOSSAUDIO} EXTRA_DEFINES = -DLIBNAME=\"$(LIBNAME)\" -ComplexProgramTarget(scavenger) |