summaryrefslogtreecommitdiff
path: root/audio
diff options
context:
space:
mode:
authorjlam <jlam@pkgsrc.org>1999-07-06 07:54:05 +0000
committerjlam <jlam@pkgsrc.org>1999-07-06 07:54:05 +0000
commit6462de2c86cf0d27f8108072cac71bd9c3ff127b (patch)
tree990df2f1ddf8dd4ee0d3049b9f115e2581fd0c0b /audio
parent573317f6c010251455bb6b866d89e55e95b56c7c (diff)
downloadpkgsrc-6462de2c86cf0d27f8108072cac71bd9c3ff127b.tar.gz
* Update ncurses dependency.
* Split multi-file patch-aa. * Pass correct linker options to make this ELF-aware.
Diffstat (limited to 'audio')
-rw-r--r--audio/cam/Makefile4
-rw-r--r--audio/cam/patches/patch-aa26
-rw-r--r--audio/cam/patches/patch-ab20
-rw-r--r--audio/cam/patches/patch-ac33
4 files changed, 34 insertions, 49 deletions
diff --git a/audio/cam/Makefile b/audio/cam/Makefile
index d4a2576b1a1..6b06a8e7b2c 100644
--- a/audio/cam/Makefile
+++ b/audio/cam/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 1999/04/15 20:39:39 tron Exp $
+# $NetBSD: Makefile,v 1.9 1999/07/06 07:54:05 jlam Exp $
#
DISTNAME= cam-1.02
@@ -8,6 +8,6 @@ EXTRACT_SUFX= .tgz
MAINTAINER= packages@netbsd.org
-DEPENDS+= ncurses-1.9.9g:../../devel/ncurses
+DEPENDS+= ncurses-4.2:../../devel/ncurses
.include "../../mk/bsd.pkg.mk"
diff --git a/audio/cam/patches/patch-aa b/audio/cam/patches/patch-aa
index 2c7ae88eb0f..64df1c01079 100644
--- a/audio/cam/patches/patch-aa
+++ b/audio/cam/patches/patch-aa
@@ -1,22 +1,5 @@
-$NetBSD: patch-aa,v 1.3 1998/08/07 10:35:54 agc Exp $
+$NetBSD: patch-aa,v 1.4 1999/07/06 07:54:06 jlam 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,11 @@
- #include <stdio.h>
- #include <ncurses.h>
- #include <signal.h>
-+#ifdef __FreeBSD__
-+#include <machine/soundcard.h>
-+#else
- #include <sys/soundcard.h>
-+#endif
- #include <fcntl.h>
-
- #include "sounds.h"
-Only in .: cam.o
-Only in .: screens.o
diff -ru ../cam-1.02-virgin/sounds.c ./sounds.c
--- ../cam-1.02-virgin/sounds.c Mon Oct 21 13:33:55 1996
+++ ./sounds.c Sun Nov 10 12:20:22 1996
@@ -38,10 +21,3 @@ diff -ru ../cam-1.02-virgin/sounds.c ./sounds.c
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);
-Only in .: sounds.o
-diff -ru ../cam-1.02-virgin/xcam ./xcam
---- ../cam-1.02-virgin/xcam Thu Sep 19 12:10:40 1996
-+++ ./xcam Sun Nov 10 12:21:10 1996
-@@ -1 +1 @@
--color-xterm -tn xterm-color -font vga -geometry 80x25 -bg black -fg gray -e cam
-+color_xterm -tn xterm-color -font vga -geometry 80x25 -bg black -fg gray -e ./cam
diff --git a/audio/cam/patches/patch-ab b/audio/cam/patches/patch-ab
index f3e541a5910..b9dfba9d15c 100644
--- a/audio/cam/patches/patch-ab
+++ b/audio/cam/patches/patch-ab
@@ -1,17 +1,19 @@
-$NetBSD: patch-ab,v 1.3 1998/08/07 10:35:54 agc Exp $
+$NetBSD: patch-ab,v 1.4 1999/07/06 07:54:06 jlam Exp $
-diff -u ../../work/cam-1.02/cam.h ./cam.h
---- ../../work/cam-1.02/cam.h Wed Oct 29 18:59:27 1997
-+++ ./cam.h Wed Oct 29 18:43:33 1997
-@@ -23,8 +23,10 @@
+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 @@
#include <stdio.h>
#include <ncurses.h>
#include <signal.h>
--#ifdef __FreeBSD__
+#if defined(__FreeBSD__)
- #include <machine/soundcard.h>
++#include <machine/soundcard.h>
+#elif defined(__NetBSD__)
+#include <soundcard.h>
- #else
++#else
#include <sys/soundcard.h>
- #endif
++#endif
+ #include <fcntl.h>
+
+ #include "sounds.h"
diff --git a/audio/cam/patches/patch-ac b/audio/cam/patches/patch-ac
index 6f4fd396788..815cb6e2b56 100644
--- a/audio/cam/patches/patch-ac
+++ b/audio/cam/patches/patch-ac
@@ -1,37 +1,44 @@
-$NetBSD: patch-ac,v 1.2 1998/08/07 10:35:54 agc Exp $
+$NetBSD: patch-ac,v 1.3 1999/07/06 07:54:06 jlam Exp $
---- Makefile.orig Mon Feb 23 22:37:07 1998
-+++ Makefile Mon Feb 23 22:37:18 1998
-@@ -6,13 +6,14 @@
+--- Makefile.orig Thu Sep 19 13:18:29 1996
++++ Makefile Fri Jul 2 04:54:32 1999
+@@ -6,11 +6,13 @@
CC = gcc
CFLAGS = -Wall -O2
-LIBS = -lncurses
-+CFLAGS+= -I${PREFIX}/include
-+LIBS = -L${PREFIX}/lib -lncurses -lossaudio
++CFLAGS += -I${LOCALBASE}/include # for ncurses.h
++LDFLAGS+= -L${LOCALBASE}/lib # for -lncurses
++LIBS = -lncurses -lossaudio
INSTALL = install
-BINDIR = /usr/local/bin
+BINDIR = ${PREFIX}/bin
MANFILE= cam.1
-MANDIR = /usr/man/man1
-+MANDIR = ${PREFIX}/man/man1
++MANDIR = ${PREFIX}/man1
EFILE = cam
--XEFILE = xcam
-+#XEFILE = xcam
+ XEFILE = xcam
OBJS = cam.o screens.o sounds.o
- ###############################################################################
+@@ -24,7 +26,7 @@
+ @echo ""
+ @echo " linking ..."
+ @echo ""
+- $(CC) -o $(EFILE) $(OBJS) $(LIBS)
++ $(CC) $(LDFLAGS) -o $(EFILE) $(OBJS) $(LIBS)
+ @echo ""
-@@ -68,11 +69,8 @@
+ ###############################################################################
+@@ -68,11 +70,8 @@
install:$(EFILE) $(MANFILE)
@echo ""
@echo "installing $(EFILE) in directory $(BINDIR)"
- @$(INSTALL) -m 755 -o root -g root $(EFILE) $(BINDIR)
- @$(INSTALL) -m 755 -o root -g root $(XEFILE) $(BINDIR)
-+ @$(INSTALL) -m 755 -o root -g bin $(EFILE) $(BINDIR)
++ @$(BSD_INSTALL_PROGRAM) $(EFILE) $(BINDIR)
@echo ""
@echo "installing manpages for cam"
- @$(INSTALL) -m 644 -o root -g root $(MANFILE) $(MANDIR)
- @echo ""
- @. installvgafont.sh
-+ @$(INSTALL) -m 644 -o root -g bin $(MANFILE) $(MANDIR)
++ @$(BSD_INSTALL_DATA) $(MANFILE) $(MANDIR)
@echo ""