diff options
author | minskim <minskim> | 2004-05-31 17:35:14 +0000 |
---|---|---|
committer | minskim <minskim> | 2004-05-31 17:35:14 +0000 |
commit | 176805d3edb3da92e105b664b3d8b57436359721 (patch) | |
tree | 27114e7d9849c3d7ef0bbdff2b6aecc74d0d6c66 /audio | |
parent | 2f72f18d3f7a584557bf779b9a6508963d8ba05f (diff) | |
download | pkgsrc-176805d3edb3da92e105b664b3d8b57436359721.tar.gz |
Enable pkgviews installation. Based on Joachim Kuebart's patch in
PR pkg/25751.
- Honor CFLAGS and LDFLAGS set by pkgsrc Makefile.
- Use buildlink3 framework and ossaudio.buildlink3.mk.
Diffstat (limited to 'audio')
-rw-r--r-- | audio/tosha/Makefile | 11 | ||||
-rw-r--r-- | audio/tosha/distinfo | 6 | ||||
-rw-r--r-- | audio/tosha/patches/patch-aa | 22 | ||||
-rw-r--r-- | audio/tosha/patches/patch-af | 22 |
4 files changed, 28 insertions, 33 deletions
diff --git a/audio/tosha/Makefile b/audio/tosha/Makefile index 964f2fc0509..1ff6b1f406f 100644 --- a/audio/tosha/Makefile +++ b/audio/tosha/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2001/02/16 13:30:50 wiz Exp $ +# $NetBSD: Makefile,v 1.8 2004/05/31 17:35:14 minskim Exp $ # FreeBSD Id: Makefile,v 1.2 1997/05/25 08:58:43 andreas Exp # @@ -10,6 +10,13 @@ MAINTAINER= oliver.fromme@heim3.tu-clausthal.de HOMEPAGE= http://www.heim3.tu-clausthal.de/~olli/tosha/ COMMENT= Read CD digital audio data through the SCSI bus -DEPENDS+= libscsi>=1.6:../../devel/libscsi +PKG_INSTALLATION_TYPES= overwrite pkgviews +USE_BUILDLINK3= yes +CPPFLAGS+= -DDEVOSSAUDIO=\\\"${DEVOSSAUDIO}\\\" + +INSTALLATION_DIRS= bin/man/man1 + +.include "../../devel/libscsi/buildlink3.mk" +.include "../../mk/ossaudio.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/audio/tosha/distinfo b/audio/tosha/distinfo index 993d8d4c0ee..c91239fc858 100644 --- a/audio/tosha/distinfo +++ b/audio/tosha/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.2 2001/04/18 12:14:38 agc Exp $ +$NetBSD: distinfo,v 1.3 2004/05/31 17:35:14 minskim Exp $ SHA1 (tosha-0.05.tar.gz) = b567f452843b544b082c88403d74ad1ca07f6820 Size (tosha-0.05.tar.gz) = 17859 bytes -SHA1 (patch-aa) = b549c7ae682ce14cae981d2311ed32e9b0ca6d48 +SHA1 (patch-aa) = 6f0a7ed4f4e5cc314d2aa52793c00ede0ba00707 SHA1 (patch-ab) = 9b4b43d6cb0fe2871cfd0e7e76ffdbd19123573a SHA1 (patch-ac) = 26feb1151d4fb02c5831762447c7bb264517f4d6 -SHA1 (patch-af) = f68e8d1ff3d0372fe642259bd30e820a0a2daae2 +SHA1 (patch-af) = 4a1debd7dec8eaa6e2cae2dc33c8ec1aecbfc736 diff --git a/audio/tosha/patches/patch-aa b/audio/tosha/patches/patch-aa index 9d4803509b9..4a76cace02b 100644 --- a/audio/tosha/patches/patch-aa +++ b/audio/tosha/patches/patch-aa @@ -1,6 +1,6 @@ -$NetBSD: patch-aa,v 1.8 2000/09/10 22:50:34 wiz Exp $ +$NetBSD: patch-aa,v 1.9 2004/05/31 17:35:14 minskim Exp $ ---- Makefile.orig Wed May 21 01:57:17 1997 +--- Makefile.orig 1997-05-20 18:57:17.000000000 -0500 +++ Makefile @@ -5,7 +5,6 @@ # Wed May 21 01:51:37 MET DST 1997 @@ -10,7 +10,7 @@ $NetBSD: patch-aa,v 1.8 2000/09/10 22:50:34 wiz Exp $ BINDIR=$(PREFIX)/bin MANDIR=$(PREFIX)/man SECTION=1 -@@ -16,9 +15,11 @@ +@@ -16,7 +15,7 @@ SECTION=1 ###### ###### ################################################### @@ -18,25 +18,23 @@ $NetBSD: patch-aa,v 1.8 2000/09/10 22:50:34 wiz Exp $ +# CFLAGS=-O2 -Wall -ansi # CFLAGS=-g -Wall -ansi -pedantic -+CFLAGS = -I${PREFIX}/include -L${PREFIX}/lib -Wl,-R${PREFIX}/lib -+ all: tosha pcmplay pcmfade - - utils.o: utils.c utils.h -@@ -28,10 +29,10 @@ +@@ -28,21 +27,18 @@ pcmplay.o: pcmplay.c utils.h getlopt.h pcmfade.o: pcmfade.c utils.h tosha: tosha.o utils.o getlopt.o - $(CC) $(CFLAGS) -o tosha -lscsi tosha.o utils.o getlopt.o -+ $(CC) $(CFLAGS) -o tosha tosha.o utils.o getlopt.o -lscsi -lutil ++ $(CC) $(CFLAGS) -o tosha tosha.o utils.o getlopt.o ${LDFLAGS} -lscsi -lutil pcmplay: pcmplay.o utils.o getlopt.o - $(CC) $(CFLAGS) -o pcmplay pcmplay.o utils.o getlopt.o -+ $(CC) $(CFLAGS) -o pcmplay pcmplay.o utils.o getlopt.o -lossaudio ++ $(CC) $(CFLAGS) -o pcmplay pcmplay.o utils.o getlopt.o ${LDFLAGS} ${LIBOSSAUDIO} pcmfade: pcmfade.o utils.o - $(CC) $(CFLAGS) -o pcmfade pcmfade.o utils.o -@@ -40,9 +41,6 @@ +- $(CC) $(CFLAGS) -o pcmfade pcmfade.o utils.o ++ $(CC) $(CFLAGS) -o pcmfade pcmfade.o utils.o ${LDFLAGS} + + install: tosha pcmplay pcmfade install -s -g bin -o bin -m 755 tosha pcmplay pcmfade $(BINDIR) install -c -g bin -o bin -m 644 tosha.1 pcmplay.1 pcmfade.1 \ $(MANDIR)/man$(SECTION) diff --git a/audio/tosha/patches/patch-af b/audio/tosha/patches/patch-af index d046ca04481..914c442b620 100644 --- a/audio/tosha/patches/patch-af +++ b/audio/tosha/patches/patch-af @@ -1,23 +1,13 @@ -$NetBSD: patch-af,v 1.2 1999/12/25 23:45:23 wiz Exp $ ---- ../../work/tosha-0.05/pcmplay.c Wed May 21 02:11:13 1997 -+++ pcmplay.c Fri Oct 31 01:58:37 1997 -@@ -41,12 +41,18 @@ - #include <sys/types.h> - #include <sys/uio.h> - #include <unistd.h> -+#ifdef __NetBSD__ -+#include <soundcard.h> -+#define DEV "/dev/audio" -+#else - #include <machine/soundcard.h> -+#define DEV "/dev/dsp" -+#endif - +$NetBSD: patch-af,v 1.3 2004/05/31 17:35:15 minskim Exp $ + +--- pcmplay.c.orig 1997-05-20 19:11:13.000000000 -0500 ++++ pcmplay.c +@@ -46,7 +46,7 @@ #include "utils.h" #include "getlopt.h" -char *audevice = "/dev/dsp"; -+char *audevice = DEV; ++char *audevice = DEVOSSAUDIO; int buffersize = 32; int dsp_samplesize = 16; int dsp_channels = 2; |