diff options
| -rw-r--r-- | audio/cam/Makefile | 11 | ||||
| -rw-r--r-- | audio/cam/distinfo | 6 | ||||
| -rw-r--r-- | audio/cam/patches/patch-ab | 19 | ||||
| -rw-r--r-- | audio/cam/patches/patch-ac | 4 |
4 files changed, 19 insertions, 21 deletions
diff --git a/audio/cam/Makefile b/audio/cam/Makefile index f6d943959bb..c8fb098c7c8 100644 --- a/audio/cam/Makefile +++ b/audio/cam/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2004/03/31 10:11:45 minskim Exp $ +# $NetBSD: Makefile,v 1.16 2004/03/31 10:40:29 minskim Exp $ # DISTNAME= cam-1.02 @@ -11,4 +11,13 @@ COMMENT= Cpu's Audio Mixer [curses based] CONFLICTS+= feh<1.2.6nb3 +PKG_INSTALLATION_TYPES= overwrite pkgviews + +USE_BUILDLINK3= yes +NO_CONFIGURE= yes + +INSTALLATION_DIRS= bin man/man1 + +.include "../../mk/curses.buildlink3.mk" +.include "../../mk/ossaudio.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/audio/cam/distinfo b/audio/cam/distinfo index 33ee297b77c..cc73fc07cc8 100644 --- a/audio/cam/distinfo +++ b/audio/cam/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.2 2001/04/18 13:04:18 agc Exp $ +$NetBSD: distinfo,v 1.3 2004/03/31 10:40:29 minskim Exp $ SHA1 (cam-1.02.tgz) = 3bdd11137cfe637bc3c0a77ab1bdbe3df89cbfa3 Size (cam-1.02.tgz) = 26307 bytes SHA1 (patch-aa) = 39ebb8450eab5317ec743a5d8ed3a2e5a565acbd -SHA1 (patch-ab) = 81cdcb9535c40c91257b0d873c9648d61e8cab4d -SHA1 (patch-ac) = 7cd10a672df67bbd236e5a735957100f12fc73bb +SHA1 (patch-ab) = a422c75b3a78a482d24e3ce73289835b5e0a508e +SHA1 (patch-ac) = dc328c8f930dd3f5369871d9ec4c10de9b838f64 SHA1 (patch-ad) = e9e398143aa7f4d7c06f78fff8279a49bbf21f81 SHA1 (patch-ae) = 570f663a3288d53ae7365d088edefc4146ddba74 diff --git a/audio/cam/patches/patch-ab b/audio/cam/patches/patch-ab index 3a41a924be7..50100e00d26 100644 --- a/audio/cam/patches/patch-ab +++ b/audio/cam/patches/patch-ab @@ -1,24 +1,13 @@ -$NetBSD: patch-ab,v 1.5 2000/09/30 17:24:50 hubertf Exp $ +$NetBSD: patch-ab,v 1.6 2004/03/31 10:40:29 minskim Exp $ ---- cam.h.orig Mon Oct 21 20:08:08 1996 +--- cam.h.orig 1996-10-21 13:08:08.000000000 -0500 +++ cam.h -@@ -21,9 +21,19 @@ +@@ -21,7 +21,7 @@ */ #include <stdio.h> -+#ifdef __NetBSD__ +-#include <ncurses.h> +#include <curses.h> -+#else - #include <ncurses.h> -+#endif #include <signal.h> -+#if defined(__FreeBSD__) -+#include <machine/soundcard.h> -+#elif defined(__NetBSD__) -+#include <soundcard.h> -+#else #include <sys/soundcard.h> -+#endif #include <fcntl.h> - - #include "sounds.h" diff --git a/audio/cam/patches/patch-ac b/audio/cam/patches/patch-ac index eabc49741fd..9cd76cb3b7a 100644 --- a/audio/cam/patches/patch-ac +++ b/audio/cam/patches/patch-ac @@ -1,4 +1,4 @@ -$NetBSD: patch-ac,v 1.5 2000/09/30 17:24:50 hubertf Exp $ +$NetBSD: patch-ac,v 1.6 2004/03/31 10:40:29 minskim Exp $ --- Makefile.orig Thu Sep 19 19:18:29 1996 +++ Makefile Sat Sep 30 16:51:14 2000 @@ -7,7 +7,7 @@ $NetBSD: patch-ac,v 1.5 2000/09/30 17:24:50 hubertf Exp $ CC = gcc CFLAGS = -Wall -O2 -LIBS = -lncurses -+LIBS = -lcurses -lossaudio ++LIBS = -lcurses ${LIBOSSAUDIO} INSTALL = install -BINDIR = /usr/local/bin +BINDIR = ${PREFIX}/bin |