diff options
| author | augustss <augustss> | 1997-10-28 23:53:04 +0000 |
|---|---|---|
| committer | augustss <augustss> | 1997-10-28 23:53:04 +0000 |
| commit | dcd7b5c072a957c2f061089bb9c8092fa0083ec9 (patch) | |
| tree | 4d423f21eb8a0df90582569066e83f8f7b016965 /audio | |
| parent | 9c32f4fc8a5dbc07976b508cd27ff67f8a34b2d5 (diff) | |
| download | pkgsrc-dcd7b5c072a957c2f061089bb9c8092fa0083ec9.tar.gz | |
Change RCS id.
NetBSD port.
Diffstat (limited to 'audio')
| -rw-r--r-- | audio/mikmod/Makefile | 6 | ||||
| -rw-r--r-- | audio/mikmod/patches/patch-ad | 55 |
2 files changed, 60 insertions, 1 deletions
diff --git a/audio/mikmod/Makefile b/audio/mikmod/Makefile index 33139bb34e9..edd3ae2ef5e 100644 --- a/audio/mikmod/Makefile +++ b/audio/mikmod/Makefile @@ -3,7 +3,8 @@ # Date created: 20 April 1997 # Whom: doconnor@ist.flinders.edu.au # -# $Id: Makefile,v 1.1.1.1 1997/10/28 23:18:33 augustss Exp $ +# $NetBSD: Makefile,v 1.2 1997/10/28 23:53:04 augustss Exp $ +# FreeBSD Id: Makefile,v 1.2 1997/09/05 17:40:54 max Exp # DISTNAME= mikmod-2.14-unix @@ -11,6 +12,9 @@ PKGNAME= mikmod-2.14 CATEGORIES= audio MASTER_SITES= http://www.chiark.greenend.org.uk/~stevem/mikmod/ +BUILD_DEPENDS= ${PREFIX}/lib/libncurses.a:${PORTSDIR}/devel/ncurses + +# FreeBSD maintainer MAINTAINER= doconnor@ist.flinders.edu.au RESTRICTED= "Registration required for redistribution and commercial use." diff --git a/audio/mikmod/patches/patch-ad b/audio/mikmod/patches/patch-ad new file mode 100644 index 00000000000..75aedb3c407 --- /dev/null +++ b/audio/mikmod/patches/patch-ad @@ -0,0 +1,55 @@ +diff -u ../../../work/mikmod-2.14-unix/source/Makefile ./Makefile +--- ../../../work/mikmod-2.14-unix/source/Makefile Mon Oct 27 22:04:48 1997 ++++ ./Makefile Mon Oct 27 21:31:45 1997 +@@ -42,6 +42,10 @@ + LIBS=-lncurses -lm $(ULTRALIB) + DRIVERS = drv_nos.o drv_raw.o drv_vox.o $(ULTRADRV) + ++# NetBSD needs to find ncurses and the oss audio library ++OSFLAGS += -I${PREFIX}/include ++LIBS= -L${PREFIX}/lib -lncurses -lossaudio -lm ++ + ############################################################################ + # + # SUN / Solaris definitions (including Solaris/i386) +diff -u ../../../work/mikmod-2.14-unix/source/drv_vox.c ./drv_vox.c +--- ../../../work/mikmod-2.14-unix/source/drv_vox.c Tue Dec 17 01:21:12 1996 ++++ ./drv_vox.c Mon Oct 27 21:52:18 1997 +@@ -35,8 +35,10 @@ + #include <sys/time.h> + #include <sys/stat.h> + #include <fcntl.h> +-#ifdef __FreeBSD__ ++#if defined(__FreeBSD__) + #include <machine/soundcard.h> ++#elif defined(__NetBSD__) ++#include <soundcard.h> + #else + #include <sys/soundcard.h> + #endif /* __FreeBSD__ */ +@@ -52,9 +54,15 @@ + static char* audiobuffer; + + ++#ifdef __NetBSD__ ++#define DEV "/dev/audio" ++#else ++#define DEV "/dev/dsp" ++#endif ++ + static BOOL Vox_IsThere(void) + { +- return (access("/dev/dsp",W_OK)==0); ++ return (access(DEV,W_OK)==0); + } + + +@@ -64,7 +72,7 @@ + int play_precision,play_stereo,play_rate; + int fragsize,numfrags; + +- if((sndfd=open("/dev/dsp",O_WRONLY))<0){ ++ if((sndfd=open(DEV,O_WRONLY))<0){ + myerr="Cannot open sounddevice"; + return 0; + } |