diff options
-rw-r--r-- | games/xscavenger/Makefile | 7 | ||||
-rw-r--r-- | games/xscavenger/distinfo | 6 | ||||
-rw-r--r-- | games/xscavenger/patches/patch-aa | 21 | ||||
-rw-r--r-- | games/xscavenger/patches/patch-ab | 4 |
4 files changed, 19 insertions, 19 deletions
diff --git a/games/xscavenger/Makefile b/games/xscavenger/Makefile index e5d0eac25a9..ba0fd8e40e6 100644 --- a/games/xscavenger/Makefile +++ b/games/xscavenger/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2004/01/20 12:15:42 agc Exp $ +# $NetBSD: Makefile,v 1.6 2004/04/09 00:10:25 minskim Exp $ # DISTNAME= xscavenger-1.4.4 @@ -11,9 +11,14 @@ HOMEPAGE= http://www.xdr.com/dash/scavenger.html COMMENT= Loderunner clone with sound for X11 WRKSRC= ${WRKDIR}/${DISTNAME}/src +USE_BUILDLINK3= yes USE_IMAKE= yes NO_INSTALL_MANPAGES= yes +CPPFLAGS+= -DSOUNDDEV=\\\"${DEVOSSSOUND}\\\" + +.include "../../mk/ossaudio.buildlink3.mk" + post-install: @ ${INSTALL_MAN} ${WRKSRC}/scavenger.6 ${PREFIX}/man/man6/ @ ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/scavenger diff --git a/games/xscavenger/distinfo b/games/xscavenger/distinfo index 41324911db5..2af015af4df 100644 --- a/games/xscavenger/distinfo +++ b/games/xscavenger/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.3 2003/09/03 17:42:20 wiz Exp $ +$NetBSD: distinfo,v 1.4 2004/04/09 00:10:25 minskim Exp $ SHA1 (xscavenger-1.4.4.tgz) = d9ef34d2ec1a9dfeca398004725cae4878bf9f2e Size (xscavenger-1.4.4.tgz) = 193346 bytes -SHA1 (patch-aa) = 387e4f8fc87f5cbc939d28f972b769506fe8d048 -SHA1 (patch-ab) = 57ab1655f7e748fc59d4f474393426a06ca06d36 +SHA1 (patch-aa) = 41145bdd7b44a53b0fea555e232915dc4a64f646 +SHA1 (patch-ab) = 64b844663ac8167f98751650b29b6faf1c126c53 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) |