* This works fine with out in-tree curses - use it!

 * Make "locked" mode the default.
 * Make me the maintainer of this package

5 files changed, 35 insertions, 25 deletions

diff --git a/audio/cam/Makefile b/audio/cam/Makefile
index 596cc7eb322..ffdc643d72a 100644
--- a/audio/cam/Makefile
+++ b/audio/cam/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2000/01/15 18:46:22 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2000/09/30 17:24:49 hubertf Exp $
 #
 
 DISTNAME=	cam-1.02
@@ -6,8 +6,6 @@ CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SUNSITE:=apps/sound/mixers/}
 EXTRACT_SUFX=	.tgz
 
-MAINTAINER=	packages@netbsd.org
-
-DEPENDS+=	ncurses>=4.2:../../devel/ncurses
+MAINTAINER=	hubertf@netbsd.org
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/cam/files/patch-sum b/audio/cam/files/patch-sum
index 09c9aee1685..08d990811d1 100644
--- a/audio/cam/files/patch-sum
+++ b/audio/cam/files/patch-sum
@@ -1,6 +1,6 @@
-$NetBSD: patch-sum,v 1.6 2000/04/27 20:44:20 mycroft Exp $
+$NetBSD: patch-sum,v 1.7 2000/09/30 17:24:49 hubertf Exp $
 
-MD5 (patch-aa) = 60ff2a4f5414bbb24c39ec3d2bfb415e
-MD5 (patch-ab) = 3b84e793288fae99a40bd949557ae08a
-MD5 (patch-ac) = ca4e653096374554dde227401dc07bec
+MD5 (patch-aa) = facf0caaa0102094b09cacaddfbc75c9
+MD5 (patch-ab) = 1b3871413a37497d2824e8e64dbab7d1
+MD5 (patch-ac) = 44df334d4ad0c60a5ffd478a0e0b1687
 MD5 (patch-ad) = 84ce8af75f555d42f950e2091a5446e0
diff --git a/audio/cam/patches/patch-aa b/audio/cam/patches/patch-aa
index 750adf91f5c..a6c3db3866c 100644
--- a/audio/cam/patches/patch-aa
+++ b/audio/cam/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.6 2000/04/27 16:45:13 mycroft Exp $
+$NetBSD: patch-aa,v 1.7 2000/09/30 17:24:49 hubertf Exp $
 
---- sounds.c.orig	Mon Oct 21 14:33:55 1996
-+++ sounds.c	Sat Apr 15 19:33:31 2000
+--- sounds.c.orig	Mon Oct 21 20:33:55 1996
++++ sounds.c
 @@ -36,7 +36,7 @@
  
  
@@ -20,3 +20,12 @@ $NetBSD: patch-aa,v 1.6 2000/04/27 16:45:13 mycroft Exp $
            draw_handle( Y+1, X+14+dev_vol[dev_count].vol_left, FALSE, 4);
            if (STEREO(dev_nr))
               draw_handle( Y+2, X+14+dev_vol[dev_count].vol_right, FALSE, 4);          
+@@ -301,7 +301,7 @@
+     int ch;
+     int X,Y;
+     int left = TRUE;   
+-    int locked = FALSE;  
++    int locked = TRUE;  
+     FILE *save_file; 
+     int dev_nr = 0; 
+     char *SAVE_FILE; 
diff --git a/audio/cam/patches/patch-ab b/audio/cam/patches/patch-ab
index b9dfba9d15c..3a41a924be7 100644
--- a/audio/cam/patches/patch-ab
+++ b/audio/cam/patches/patch-ab
@@ -1,11 +1,16 @@
-$NetBSD: patch-ab,v 1.4 1999/07/06 07:54:06 jlam Exp $
+$NetBSD: patch-ab,v 1.5 2000/09/30 17:24:50 hubertf Exp $
 
-diff -ru ../cam-1.02-virgin/cam.h ./cam.h
---- ../cam-1.02-virgin/cam.h	Mon Oct 21 13:08:08 1996
-+++ ./cam.h	Sun Nov 10 12:19:52 1996
-@@ -23,7 +23,13 @@
+--- cam.h.orig	Mon Oct 21 20:08:08 1996
++++ cam.h
+@@ -21,9 +21,19 @@
+ */ 
+  
  #include <stdio.h>
++#ifdef __NetBSD__
++#include <curses.h>
++#else
  #include <ncurses.h>
++#endif
  #include <signal.h>
 +#if defined(__FreeBSD__)
 +#include <machine/soundcard.h>
diff --git a/audio/cam/patches/patch-ac b/audio/cam/patches/patch-ac
index e58e5d42a15..eabc49741fd 100644
--- a/audio/cam/patches/patch-ac
+++ b/audio/cam/patches/patch-ac
@@ -1,15 +1,13 @@
-$NetBSD: patch-ac,v 1.4 1999/08/08 03:47:05 hubertf Exp $
+$NetBSD: patch-ac,v 1.5 2000/09/30 17:24:50 hubertf Exp $
 
---- Makefile.orig	Thu Sep 19 13:18:29 1996
-+++ Makefile	Fri Jul  2 04:54:32 1999
-@@ -6,11 +6,13 @@
+--- Makefile.orig	Thu Sep 19 19:18:29 1996
++++ Makefile	Sat Sep 30 16:51:14 2000
+@@ -6,11 +6,11 @@
  
  CC     = gcc
  CFLAGS = -Wall -O2
 -LIBS   = -lncurses
-+CFLAGS += -I${LOCALBASE}/include	# for ncurses.h
-+LDFLAGS+= -L${LOCALBASE}/lib		# for -lncurses
-+LIBS   = -lncurses -lossaudio
++LIBS   = -lcurses -lossaudio
  INSTALL = install
 -BINDIR = /usr/local/bin
 +BINDIR = ${PREFIX}/bin
@@ -19,7 +17,7 @@ $NetBSD: patch-ac,v 1.4 1999/08/08 03:47:05 hubertf Exp $
  EFILE  = cam
  XEFILE = xcam
  OBJS   = cam.o screens.o sounds.o
-@@ -24,7 +26,7 @@
+@@ -24,7 +24,7 @@
  	@echo ""
  	@echo " linking ..."
  	@echo ""
@@ -28,7 +26,7 @@ $NetBSD: patch-ac,v 1.4 1999/08/08 03:47:05 hubertf Exp $
  	@echo ""
  
  ###############################################################################
-@@ -68,11 +70,8 @@
+@@ -68,11 +68,8 @@
  install:$(EFILE) $(MANFILE)
  	@echo ""
  	@echo "installing $(EFILE) in directory $(BINDIR)"