diff options
Diffstat (limited to 'audio/cam')
| -rw-r--r-- | audio/cam/Makefile | 11 | ||||
| -rw-r--r-- | audio/cam/distinfo | 6 | ||||
| -rw-r--r-- | audio/cam/patches/patch-ab | 9 | ||||
| -rw-r--r-- | audio/cam/patches/patch-ac | 18 |
4 files changed, 29 insertions, 15 deletions
diff --git a/audio/cam/Makefile b/audio/cam/Makefile index c8fb098c7c8..7738a9485b8 100644 --- a/audio/cam/Makefile +++ b/audio/cam/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2004/03/31 10:40:29 minskim Exp $ +# $NetBSD: Makefile,v 1.17 2004/06/02 20:28:59 jschauma Exp $ # DISTNAME= cam-1.02 @@ -18,6 +18,15 @@ NO_CONFIGURE= yes INSTALLATION_DIRS= bin man/man1 +.include "../../mk/bsd.prefs.mk" + +CAMLIBS= -lcurses +.if ${OPSYS} == "NetBSD" +CAMLIBS+= -lossaudio +.endif + +MAKE_ENV+= CAMLIBS="${CAMLIBS}" + .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 cc73fc07cc8..a4a7df1bb97 100644 --- a/audio/cam/distinfo +++ b/audio/cam/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.3 2004/03/31 10:40:29 minskim Exp $ +$NetBSD: distinfo,v 1.4 2004/06/02 20:28:59 jschauma Exp $ SHA1 (cam-1.02.tgz) = 3bdd11137cfe637bc3c0a77ab1bdbe3df89cbfa3 Size (cam-1.02.tgz) = 26307 bytes SHA1 (patch-aa) = 39ebb8450eab5317ec743a5d8ed3a2e5a565acbd -SHA1 (patch-ab) = a422c75b3a78a482d24e3ce73289835b5e0a508e -SHA1 (patch-ac) = dc328c8f930dd3f5369871d9ec4c10de9b838f64 +SHA1 (patch-ab) = 6537cf1cecef47ab99b52d3d0942ca7ea6b435e4 +SHA1 (patch-ac) = e4458def4576321293dac5bb66c4c4e162eaaf82 SHA1 (patch-ad) = e9e398143aa7f4d7c06f78fff8279a49bbf21f81 SHA1 (patch-ae) = 570f663a3288d53ae7365d088edefc4146ddba74 diff --git a/audio/cam/patches/patch-ab b/audio/cam/patches/patch-ab index 50100e00d26..bfa427af7a2 100644 --- a/audio/cam/patches/patch-ab +++ b/audio/cam/patches/patch-ab @@ -1,12 +1,13 @@ -$NetBSD: patch-ab,v 1.6 2004/03/31 10:40:29 minskim Exp $ +$NetBSD: patch-ab,v 1.7 2004/06/02 20:28:59 jschauma Exp $ ---- cam.h.orig 1996-10-21 13:08:08.000000000 -0500 -+++ cam.h -@@ -21,7 +21,7 @@ +--- cam.h.orig 1996-10-21 14:08:08.000000000 -0400 ++++ cam.h 2004-06-02 16:31:19.000000000 -0400 +@@ -21,7 +21,8 @@ */ #include <stdio.h> -#include <ncurses.h> ++#include <string.h> +#include <curses.h> #include <signal.h> #include <sys/soundcard.h> diff --git a/audio/cam/patches/patch-ac b/audio/cam/patches/patch-ac index 9cd76cb3b7a..dd821136d1c 100644 --- a/audio/cam/patches/patch-ac +++ b/audio/cam/patches/patch-ac @@ -1,13 +1,17 @@ -$NetBSD: patch-ac,v 1.6 2004/03/31 10:40:29 minskim Exp $ +$NetBSD: patch-ac,v 1.7 2004/06/02 20:28:59 jschauma Exp $ ---- Makefile.orig Thu Sep 19 19:18:29 1996 -+++ Makefile Sat Sep 30 16:51:14 2000 -@@ -6,11 +6,11 @@ +--- Makefile.orig 1996-09-19 13:18:29.000000000 -0400 ++++ Makefile 2004-06-02 16:31:54.000000000 -0400 +@@ -4,13 +4,13 @@ + # jvdbergh@uia.ua.ac.be # + ############################################################################### - CC = gcc - CFLAGS = -Wall -O2 +-CC = gcc +-CFLAGS = -Wall -O2 -LIBS = -lncurses -+LIBS = -lcurses ${LIBOSSAUDIO} ++#CC = gcc ++#CFLAGS = -Wall -O2 ++LIBS = ${CAMLIBS} INSTALL = install -BINDIR = /usr/local/bin +BINDIR = ${PREFIX}/bin |