New port xwave - a wave record/play/edit utility.

PR:		19200
Submitted by:	Trevor Johnson <trevor@jpj.net>
Obtained from:	NetBSD

11 files changed, 304 insertions, 0 deletions

diff --git a/audio/Makefile b/audio/Makefile
index 4c65bf330163..6772268ca74c 100644
--- a/audio/Makefile
+++ b/audio/Makefile
@@ -127,6 +127,7 @@
     SUBDIR += xmradio
     SUBDIR += xsidplay
     SUBDIR += xtuner
+    SUBDIR += xwave
     SUBDIR += yamt
 
 .include <bsd.port.subdir.mk>
diff --git a/audio/xwave/Makefile b/audio/xwave/Makefile
new file mode 100644
index 000000000000..7dc2b95ab510
--- /dev/null
+++ b/audio/xwave/Makefile
@@ -0,0 +1,35 @@
+# New ports collection makefile for:	xwave
+# Date created:				2000-06-11
+# Whom:					Trevor Johnson <trevor@jpj.net>
+# based on the NetBSD port
+#
+# $NetBSD: Makefile,v 1.8 2000/04/24 14:52:33 hubertf Exp $
+# $FreeBSD$
+#
+
+PORTNAME=	xwave
+PORTVERSION=	2
+CATEGORIES=	audio
+MASTER_SITES=	ftp://ftp.vex.net/pub/software/
+DISTNAME=	xwave2
+
+MAINTAINER=	trevor@jpj.net
+
+LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm
+
+USE_IMAKE=	yes
+
+DOC_FILES=	README README-XWAVE2 README.v06 COPYING INSTALL
+
+do-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/src/xwave ${PREFIX}/bin
+	${INSTALL_DATA} ${WRKSRC}/src/XWave ${PREFIX}/lib/X11/app-defaults/
+
+.if !defined(NOPORTDOCS)
+	${MKDIR} ${PREFIX}/share/doc/xwave2
+.for i in ${DOC_FILES}
+	${INSTALL_MAN} ${WRKSRC}/${i} ${PREFIX}/share/doc/xwave2
+.endfor
+.endif
+
+.include <bsd.port.mk>
diff --git a/audio/xwave/distinfo b/audio/xwave/distinfo
new file mode 100644
index 000000000000..c402725848e0
--- /dev/null
+++ b/audio/xwave/distinfo
@@ -0,0 +1,3 @@
+$NetBSD: md5,v 1.3 1999/02/08 21:27:11 hubertf Exp $
+
+MD5 (xwave2.tar.gz) = fddc9ac33e3c7ec5272212abe8c8e606
diff --git a/audio/xwave/files/patch-ad b/audio/xwave/files/patch-ad
new file mode 100644
index 000000000000..14e682348226
--- /dev/null
+++ b/audio/xwave/files/patch-ad
@@ -0,0 +1,184 @@
+$NetBSD: patch-ad,v 1.2 1998/08/07 10:36:23 agc Exp $
+
+--- xwave/src/audio.c.orig	Wed Aug 12 23:27:09 1998
++++ src/audio.c	Sun Jun 11 13:35:54 2000
+@@ -37,7 +37,7 @@
+ #ifdef linux
+ #include <linux/soundcard.h>
+ 
+-#elif defined(FreeBSD)
++#elif defined(__FreeBSD__)
+ #include <machine/soundcard.h>
+ 
+ #elif defined(sgi)
+@@ -55,7 +55,7 @@
+ #include "sample_settings.h"
+ #include "audio.h"
+ 
+-#if defined(linux) || defined (FreeBSD) || defined(sun) 
++#if defined(linux) || defined (__FreeBSD__) || defined(sun) 
+ static int set_dsp(int o_mode,int res,int channels,int freq,int *buf_size);
+ #endif
+ 
+@@ -67,7 +67,7 @@
+ static Audio_File af;
+ static int stop_record;
+ 
+-#if defined (linux) || defined (FreeBSD)
++#if defined (linux) || defined (__FreeBSD__)
+ int set_dsp(int o_mode,int res, int channels, int freq, int *buf_size)
+ {
+     int check;
+@@ -274,7 +274,7 @@
+ }
+ #endif
+ 
+-#ifdef sun
++#if defined(sun)
+ void check_audio(Main_Bool *mb)
+ /* test if there is a play device, and how fast we can play */
+ {
+@@ -307,7 +307,7 @@
+ 	 case AUDIO_ENCODING_LINEAR:
+ 	    printf("ULAW\n");break;
+ 	 default:
+-	    printf("unknown encoding\n");
++	    printf("unknown encoding: %d\n",au_info.play.encoding);
+ 	}
+ 	close(audio);
+     } else  {
+@@ -370,7 +370,7 @@
+ 
+ void play_file(char *fname,Main_Bool *mb)
+ {
+-#if defined (linux) || defined (FreeBSD) || defined (sun)
++#if defined (linux) || defined (__FreeBSD__) || defined (sun)
+     int audio;
+ #elif defined(sgi)
+     ALport port;
+@@ -384,7 +384,7 @@
+ 	return;
+     }
+     
+-#if defined (linux) || defined (FreeBSD) || defined (sun)
++#if defined (linux) || defined (__FreeBSD__) || defined (sun)
+     if ((audio=set_dsp(O_WRONLY,af.bps,af.channels,af.freq,&buf_size))==-1) {
+ 	fprintf(stderr,"XWave: Error ! Cannot set dsp !\n");
+ 	close(af.fd);
+@@ -404,7 +404,7 @@
+     if ((buffer=malloc(buf_size))==NULL) {
+ 	fprintf(stderr,"XWave: Error ! Cannot alloc mem !\n");
+ 	close(af.fd);
+-#if defined (linux) || defined (FreeBSD) || defined (sun)
++#if defined (linux) || defined (__FreeBSD__) || defined (sun)
+ 	close(audio);
+ #elif defined(sgi)
+ 	ALcloseport(port);
+@@ -413,7 +413,7 @@
+ 	return;
+     }
+     
+-#if defined (linux) || defined (FreeBSD) || defined (sun)
++#if defined (linux) || defined (__FreeBSD__) || defined (sun)
+     while ((length=af_read(af,buffer,buf_size))>0) {
+ 	if (write(audio, buffer, length)==-1) break;
+     }
+@@ -440,7 +440,7 @@
+     int offset=0,playlength,length;
+ #ifdef sgi
+     ALport port;
+-#elif defined(linux) || defined (FreeBSD) || defined (sun)
++#elif defined(linux) || defined (__FreeBSD__) || defined (sun)
+     int audio;
+     
+     if ((audio=set_dsp(O_WRONLY,wd->res,wd->channels,wd->freq,&buf_size))==-1) {
+@@ -473,7 +473,7 @@
+ 	buffer=wd->buffer+offset;
+ 	while (playlength>0) {
+ 	    if (playlength<buf_size) buf_size=playlength;
+-#if defined (linux) || defined (FreeBSD) || defined (sun)
++#if defined (linux) || defined (__FreeBSD__) || defined (sun)
+ 	    if (write(audio, buffer, buf_size)==-1) {
+ 		close(audio);
+ 		kill((pid_t) getppid(),SIGUSR1);
+@@ -497,7 +497,7 @@
+ 	wd2af(wd,&af);
+ 	af_rewind(af);
+ 	if (af_seek(af,offset,SEEK_CUR)==AF_ERROR) {
+-#if defined (linux) || defined (FreeBSD) || defined (sun)
++#if defined (linux) || defined (__FreeBSD__) || defined (sun)
+ 	    close(audio);
+ #elif defined(sgi)
+ 	    ALcloseport(port);
+@@ -510,7 +510,7 @@
+ 	while (playlength>0) {
+ 	    if (playlength<buf_size) buf_size=playlength;
+ 	    if ((length=af_read(af,(char*) md->mg->fbuf,buf_size))==-1) {
+-#if defined (linux) || defined (FreeBSD) || defined (sun)
++#if defined (linux) || defined (__FreeBSD__) || defined (sun)
+ 		close(audio);
+ #elif defined(sgi)
+ 		ALcloseport(port);
+@@ -518,7 +518,7 @@
+ 		kill((pid_t) getppid(),SIGUSR1);
+ 		return;
+ 	    }
+-#if defined (linux) || defined (FreeBSD) || defined (sun)
++#if defined (linux) || defined (__FreeBSD__) || defined (sun)
+ 	    if (write(audio,(char*) md->mg->fbuf,length)==-1) {
+ 		close(audio);
+ 		kill((pid_t) getppid(),SIGUSR1);
+@@ -536,7 +536,7 @@
+ 	}
+     }
+     
+-#if defined (linux) || defined (FreeBSD) || defined (sun)
++#if defined (linux) || defined (__FreeBSD__) || defined (sun)
+     close(audio);
+ #elif defined(sgi)
+     while (ALgetfilled(port)) sginap(2);
+@@ -556,7 +556,7 @@
+     void write_length();
+     byte *data=NULL;
+     int abuf_size,count;
+-#if defined (linux) || defined (FreeBSD) || defined (sun)
++#if defined (linux) || defined (__FreeBSD__) || defined (sun)
+     int audio;
+     
+     if ((audio=set_dsp(O_RDONLY,res,mode,freq,&abuf_size))==-1) {
+@@ -577,7 +577,7 @@
+     
+     if ((data = (byte *) malloc(abuf_size)) == NULL) {
+ 	fprintf(stderr,"XWave: Error while alloc mem for audio_buffer !\n");
+-#if defined (linux) || defined (FreeBSD) || defined (sun)
++#if defined (linux) || defined (__FreeBSD__) || defined (sun)
+ 	close(audio);
+ #elif defined(sgi)
+ 	ALcloseport(port);
+@@ -595,7 +595,7 @@
+     
+     if (af_open(fname,&af,AF_NEW)==AF_ERROR) {
+ 	free(data);
+-#if defined (linux) || defined (FreeBSD) || defined (sun)
++#if defined (linux) || defined (__FreeBSD__) || defined (sun)
+ 	close(audio);
+ #elif defined(sgi)
+ 	ALcloseport(port);
+@@ -608,7 +608,7 @@
+     signal(SIGUSR1,write_length);
+     
+     while(1) {
+-#if defined (linux) || defined (FreeBSD) || defined (sun)
++#if defined (linux) || defined (__FreeBSD__) || defined (sun)
+ 	if ((count=read(audio, data, abuf_size))==-1) {
+ 	    close(audio);
+ 	    af_close(af);
+@@ -632,7 +632,7 @@
+ 	    return;
+ 	}
+ 	if ((count=af_write(af,(char*)data,count))==AF_ERROR) {
+-#if defined (linux) || defined (FreeBSD) || defined (sun)
++#if defined (linux) || defined (__FreeBSD__) || defined (sun)
+ 	    close(audio);
+ #elif defined(sgi)
+ 	    ALcloseport(port);
diff --git a/audio/xwave/files/patch-al b/audio/xwave/files/patch-al
new file mode 100644
index 000000000000..559e249cf7d2
--- /dev/null
+++ b/audio/xwave/files/patch-al
@@ -0,0 +1,11 @@
+$NetBSD: patch-al,v 1.2 1998/08/07 10:36:24 agc Exp $
+
+--- config.site.BAK	Sat Feb 21 19:55:25 1998
++++ config.site	Sat Feb 21 19:55:55 1998
+@@ -1,5 +1,5 @@
+ 
+-EXTRA_INCLUDES=-I../ -I../include
++EXTRA_INCLUDES=-I../ -I../include -I${X11BASE}/include
+ 
+ XCOMM On sgi we need libaudio
+ XCOMM OSLIBS=-laudio
diff --git a/audio/xwave/files/patch-ap b/audio/xwave/files/patch-ap
new file mode 100644
index 000000000000..3e4bbaaee589
--- /dev/null
+++ b/audio/xwave/files/patch-ap
@@ -0,0 +1,26 @@
+--- src/record_dialog.c.orig	Wed Aug 12 23:27:10 1998
++++ src/record_dialog.c	Sun Jun 11 13:36:13 2000
+@@ -33,8 +33,6 @@
+ #include <sys/wait.h>
+ #include <signal.h>
+ 
+-
+-
+ #include <X11/Intrinsic.h>	/* Intrinsics Definitions */
+ #include <X11/StringDefs.h>	/* Standard Name-String definitions */
+ #include <X11/Shell.h>     	/* Shell Definitions */
+@@ -52,12 +50,13 @@
+ #include "button.h"
+ #include "xwave_widget.h"
+ #include "sample_settings.h"
+-#include "audio.h"
++//#include "audio.h"
+ #include "audio_file.h"
+ #include "filebrowse.h"
+ #include "graphics.h"
+ #include "fileop.h"
+ #include "record_dialog.h"
++#include "audio.h"
+ 
+ extern Main_Data *MD;
+ extern AppResources app_resources;
diff --git a/audio/xwave/files/patch-aq b/audio/xwave/files/patch-aq
new file mode 100644
index 000000000000..edc447e10c19
--- /dev/null
+++ b/audio/xwave/files/patch-aq
@@ -0,0 +1,11 @@
+--- src/types.h.orig	Wed Aug 12 23:27:10 1998
++++ src/types.h	Sun Jun 11 13:17:49 2000
+@@ -27,7 +27,7 @@
+ typedef unsigned char byte;
+ typedef byte bool;
+ 
+-#ifdef FreeBSD
++#ifdef __FreeBSD__
+ typedef unsigned long ulong;
+ #endif
+ 
diff --git a/audio/xwave/pkg-comment b/audio/xwave/pkg-comment
new file mode 100644
index 000000000000..dc8236c0fde0
--- /dev/null
+++ b/audio/xwave/pkg-comment
@@ -0,0 +1 @@
+Audio player/recorder/editor for the X Window System
diff --git a/audio/xwave/pkg-descr b/audio/xwave/pkg-descr
new file mode 100644
index 000000000000..d8c186ce239b
--- /dev/null
+++ b/audio/xwave/pkg-descr
@@ -0,0 +1,20 @@
+note from the original author:
+ 
+The user interface of xwave is based on Athena and FWF widgets.
+The application defaults are optimized for Xaw3d, so if you don't
+use Xaw3d you may want to modify the resources.
+
+Features:
+	- multiple files
+	- overview window 
+	- zoom window
+	- mark, cut, copy, paste, merge
+	- echo, reverse, swap, resample, volume (absolute, dynamic
+	  compressor)
+	- stop recording on demand
+	- raw, wav, au, aiff, aifc (PCM, ALAW, ULAW, and some ADPCM
+	  implementations)
+	- files of any length
+
+Trevor Johnson
+trevor@jpj.net
diff --git a/audio/xwave/pkg-message b/audio/xwave/pkg-message
new file mode 100644
index 000000000000..87aa52040267
--- /dev/null
+++ b/audio/xwave/pkg-message
@@ -0,0 +1,3 @@
+If you run out of space for the temporary files, set the X ressource
+XWave*tdir (either in /usr/X11R6/lib/X11/app-defaults/XWave or your
+~/.Xdefaults) to a suitable directory.
diff --git a/audio/xwave/pkg-plist b/audio/xwave/pkg-plist
new file mode 100644
index 000000000000..9734b6011951
--- /dev/null
+++ b/audio/xwave/pkg-plist
@@ -0,0 +1,9 @@
+@comment $NetBSD: PLIST,v 1.2 1999/02/08 21:27:12 hubertf Exp $
+bin/xwave
+lib/X11/app-defaults/XWave
+share/doc/xwave2/README
+share/doc/xwave2/README-XWAVE2
+share/doc/xwave2/README.v06
+share/doc/xwave2/COPYING
+share/doc/xwave2/INSTALL
+@dirrm share/doc/xwave2