Fix last commit

(broken due to old work-dir lying around; pointed out by tron)

7 files changed, 24 insertions, 124 deletions

diff --git a/audio/sox/Makefile b/audio/sox/Makefile
index 7e12cd859d2..18e7ecc21bb 100644
--- a/audio/sox/Makefile
+++ b/audio/sox/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 1999/09/29 23:31:18 tron Exp $
+# $NetBSD: Makefile,v 1.11 1999/09/29 23:48:14 hubertf Exp $
 # FreeBSD Id: Makefile,v 1.9 1997/02/04 10:32:34 max Exp 
 #
 
@@ -9,10 +9,9 @@ MASTER_SITES=	http://metalab.unc.edu/pub/Linux/apps/sound/convert/
 MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://home.sprynet.com/~cbagwell/sox.html
 
-MAKEFILE=	Makefile.unx
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/sox ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/sox.man ${PREFIX}/man/man1/sox.1
+GNU_CONFIGURE=	yes
+CONFIGURE_ARGS+=--enable-fast-ulaw \
+		--enable-fast-alaw \
+		--with-sun-audio
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/sox/files/patch-sum b/audio/sox/files/patch-sum
index 091aa94f6cc..85434a2703b 100644
--- a/audio/sox/files/patch-sum
+++ b/audio/sox/files/patch-sum
@@ -1,6 +1,3 @@
-$NetBSD: patch-sum,v 1.1 1999/07/09 13:50:15 agc Exp $
+$NetBSD: patch-sum,v 1.2 1999/09/29 23:48:15 hubertf Exp $
 
-MD5 (patch-aa) = fdb868add610b379000437fb239c2bab
-MD5 (patch-ab) = fafd012107c48b156b41057b489c30f6
-MD5 (patch-ac) = e0fdc5ef075afa19df049cf1e5392ea4
-MD5 (patch-ae) = fc8f1c726af7881ba96dd182c5c39661
+MD5 (patch-aa) = e2aa8254aa54ecb572e2e25b2e5d061b
diff --git a/audio/sox/patches/patch-aa b/audio/sox/patches/patch-aa
index fa4d416c2cc..2cc1e1b3ea6 100644
--- a/audio/sox/patches/patch-aa
+++ b/audio/sox/patches/patch-aa
@@ -1,59 +1,14 @@
-$NetBSD: patch-aa,v 1.3 1998/08/07 10:36:11 agc Exp $
-
---- sbdsp.c.orig	Wed Aug 17 23:11:01 1994
-+++ sbdsp.c	Fri Jun 19 19:01:35 1998
-@@ -21,7 +21,12 @@
- #include <i386/isa/sblast.h>
- #else
- #ifdef LINUXSOUND
--#include <linux/soundcard.h>
-+#ifdef __NetBSD__
-+#include <sys/ioctl.h>
-+#include <soundcard.h>
-+#else
-+#include <machine/soundcard.h>
-+#endif
- #else
- #include <sys/sb.h>
- #endif
-@@ -77,8 +82,18 @@
- 	ioctl(fileno(ft->fp), DSP_IOCTL_VOICE, &off);
- 	ioctl(fileno(ft->fp), DSP_IOCTL_SPEED, &ft->info.rate);
- #else
-+#ifdef __NetBSD__
-+	{
-+		int fmt = AFMT_U8;
-+		ioctl(fileno(ft->fp), SNDCTL_DSP_SETFMT, &fmt);
-+	}
-+#endif
- #if defined(LINUXSOUND)
--	ioctl(fileno(ft->fp), SNDCTL_DSP_SPEED, ft->info.rate);
-+  #if SOUND_VERSION >= 200
-+	ioctl(fileno(ft->fp), SOUND_PCM_WRITE_RATE, &ft->info.rate);
-+  #else
-+	ioctl(fileno(ft->fp), SOUND_PCM_WRITE_RATE, ft->info.rate);
-+  #endif
- #else
- 	ioctl(fileno(ft->fp), DSP_IOCTL_VOICE, 0);
- 	ioctl(fileno(ft->fp), DSP_IOCTL_SPEED, ft->info.rate);
-@@ -146,9 +161,19 @@
- 	ioctl(fileno(ft->fp), DSP_IOCTL_VOICE, &on);
- 	ioctl(fileno(ft->fp), DSP_IOCTL_SPEED, &ft->info.rate);
- #else
+--- sunaudio.c.orig	Sun Jul 18 20:57:36 1999
++++ sunaudio.c	Thu Sep 30 01:43:33 1999
+@@ -17,7 +17,10 @@
+  */
+ 
+ #include <sys/ioctl.h>
+-#ifdef __SVR4
++#if defined(__SVR4) || defined(__NetBSD__)
 +#ifdef __NetBSD__
-+	{
-+		int fmt = AFMT_U8;
-+		ioctl(fileno(ft->fp), SNDCTL_DSP_SETFMT, &fmt);
-+	}
++#include <sys/types.h>
 +#endif
- #if defined(LINUXSOUND)
- 	ioctl(fileno(ft->fp), SNDCTL_DSP_SYNC, 0);
--	ioctl(fileno(ft->fp), SNDCTL_DSP_SPEED, ft->info.rate);
-+  #if SOUND_VERSION >= 200
-+	ioctl(fileno(ft->fp), SOUND_PCM_WRITE_RATE, &ft->info.rate);
-+  #else
-+	ioctl(fileno(ft->fp), SOUND_PCM_WRITE_RATE, ft->info.rate);
-+  #endif
+ #include <sys/audioio.h>
  #else
- 	ioctl(fileno(ft->fp), DSP_IOCTL_VOICE, 1);
- 	ioctl(fileno(ft->fp), DSP_IOCTL_SPEED, ft->info.rate);
+ #include <sun/audioio.h>
diff --git a/audio/sox/patches/patch-ab b/audio/sox/patches/patch-ab
deleted file mode 100644
index ccb7953d147..00000000000
--- a/audio/sox/patches/patch-ab
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-ab,v 1.3 1998/08/07 10:36:12 agc Exp $
-
---- Makefile.unx.orig	Sat Oct  8 01:14:48 1994
-+++ Makefile.unx	Fri Jun 19 19:05:49 1998
-@@ -153,10 +153,17 @@
- # RM  = del /q
- 
- 
-+
-+# NetBSD 1.3
-+CFLAGS		= -O -DLINUXSOUND -D_HAVE_PARAM_H -Dunix
-+CC		= cc
-+AR		= ar r
-+RANLIB		= ranlib
-+
- all: sox
- 
- sox: sox.o $(SOUNDLIB)
--	$(CC) $(CFLAGS) -o sox sox.o $(SOUNDLIB) -lm
-+	$(CC) $(CFLAGS) -o sox sox.o $(SOUNDLIB) -lm -lossaudio
- 
- $(SOUNDLIB): $(LIBOBJS)
- 	$(RM) $(SOUNDLIB)
diff --git a/audio/sox/patches/patch-ac b/audio/sox/patches/patch-ac
deleted file mode 100644
index d357910cedb..00000000000
--- a/audio/sox/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.2 1998/08/07 10:36:12 agc Exp $
-
---- au.c.orig	Wed Aug  3 22:13:29 1994
-+++ au.c	Thu Apr 24 13:37:59 1997
-@@ -299,6 +299,8 @@
- 	wblong(ft, magic);
- 
- 	/* hdr_size = SUN_HDRSIZE;		/* + strlen(ft->comment); */
-+	if (ft->comment == NULL)
-+		ft->comment = "";
- 	hdr_size = SUN_HDRSIZE + strlen(ft->comment);
- 	wblong(ft, hdr_size);
- 
diff --git a/audio/sox/patches/patch-ae b/audio/sox/patches/patch-ae
deleted file mode 100644
index 4a9c11fd013..00000000000
--- a/audio/sox/patches/patch-ae
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-ae,v 1.2 1998/08/07 10:36:12 agc Exp $
-
---- sox.c.old	Fri Oct  7 23:10:11 1994
-+++ sox.c	Wed Dec 17 15:12:54 1997
-@@ -444,12 +444,10 @@
- 	for(e = 1; e < neffects; e++)
- 		efftab[e].odone = efftab[e].olen = 0;
- 
--#ifdef later
- 	/* Do volume before effects or after?  idunno */
- 	if (dovolume && informat.info.size != FLOAT) 
--		for (i = 0; i < isamp; i++)
--			ibuffer[i] = volumechange(ibuffer[i]);
--#endif
-+		for (i = 0; i < efftab[0].olen; i++)
-+			efftab[0].obuf[i] = volumechange(efftab[0].obuf[i]);
- 		
- 	do {
- 
diff --git a/audio/sox/pkg/PLIST b/audio/sox/pkg/PLIST
index 310565df98c..c6b8dbf50a5 100644
--- a/audio/sox/pkg/PLIST
+++ b/audio/sox/pkg/PLIST
@@ -1,3 +1,7 @@
-@comment $NetBSD: PLIST,v 1.2 1997/11/06 09:58:20 agc Exp $
+@comment $NetBSD: PLIST,v 1.3 1999/09/29 23:48:20 hubertf Exp $
+bin/play
+bin/rec
 bin/sox
-man/man1/sox.1.gz
+man/man1/sox.1
+man/man1/play.1
+man/man1/rec.1