Change from the FreeBSD port to my port.

5 files changed, 189 insertions, 45 deletions

diff --git a/audio/xmmix/Makefile b/audio/xmmix/Makefile
index 95b87567da3..a06546fb8b5 100644
--- a/audio/xmmix/Makefile
+++ b/audio/xmmix/Makefile
@@ -1,19 +1,19 @@
+# $NetBSD: Makefile,v 1.2 1997/10/29 00:40:28 augustss Exp $
 # New ports collection makefile for:	xmmix
-# Version required:	1.2
-# Date created:		Mon Aug  5 10:54:25 CDT 1996
-# Whom:			erich@FreeBSD.org
-#
-# $Id: Makefile,v 1.1.1.1 1997/10/28 23:19:29 augustss Exp $
+# Version required:     1.2-pl2
+# Date created:		97-10-24
+# Whom:			augustss@cs.chalmers.se
 #
 
-DISTNAME=	xmmix-1.2
+DISTNAME=       xmmix-1.2
 CATEGORIES=	audio
-MASTER_SITES=	${MASTER_SITE_XCONTRIB}
-MASTER_SITE_SUBDIR=	applications/
+MASTER_SITES=   ftp://ftp.netcom.com/pub/tk/tkan/xmmix-1.2/src/
 
-MAINTAINER=	erich@FreeBSD.org
+MAINTAINER=	augustss@cs.chalmers.se
 
 USE_IMAKE=	yes
 REQUIRES_MOTIF=	yes
 
+MAN1=		xmmix.1
+
 .include <bsd.port.mk>
diff --git a/audio/xmmix/patches/patch-aa b/audio/xmmix/patches/patch-aa
index c3f4a3d6091..0b72a5d245d 100644
--- a/audio/xmmix/patches/patch-aa
+++ b/audio/xmmix/patches/patch-aa
@@ -1,22 +1,172 @@
---- ./appenv.h.org	Sun Jul 14 10:48:59 1996
-+++ ./appenv.h	Mon Aug 19 04:05:16 1996
-@@ -59,7 +59,7 @@
+--- ../xmmix-1.2/Imakefile	Sun Jul 14 19:48:56 1996
++++ ./Imakefile	Fri Oct 24 23:34:17 1997
+@@ -43,7 +43,7 @@
+  * #include "Motif.tmpl"
+  * #include "Motif.rules"
+  */
+-LOCAL_LIBRARIES= XmClientLibs
++LOCAL_LIBRARIES= -lXm -lXt -lX11 -lossaudio
+ 
+ 
+ /*
+--- ../xmmix-1.2/appenv.h	Sun Jul 14 19:48:59 1996
++++ ./appenv.h	Fri Oct 24 23:33:47 1997
+@@ -59,7 +59,11 @@
  #include <sys/types.h>
  #include <sys/stat.h>
  #include <sys/ioctl.h>
--#include <sys/soundcard.h>
-+#include <machine/soundcard.h>
++#ifdef __NetBSD__
++#include <soundcard.h>
++#else
+ #include <sys/soundcard.h>
++#endif
  #include <stdlib.h>
  #include <stdio.h>
  #include <errno.h>
---- ./Imakefile.org	Sun Jul 14 10:48:56 1996
-+++ ./Imakefile	Mon Aug 19 04:09:48 1996
-@@ -43,7 +43,7 @@
-  * #include "Motif.tmpl"
-  * #include "Motif.rules"
-  */
--LOCAL_LIBRARIES= XmClientLibs
-+LOCAL_LIBRARIES= ${MOTIFLIB} ${XTOOLLIB} ${XLIB}
+--- ../xmmix-1.2/main.c	Thu Nov  7 17:01:43 1996
++++ ./main.c	Mon Aug 11 23:12:51 1997
+@@ -159,7 +159,7 @@
+ 	post_realize_config(&widgets);
+ 
+ 	/* Register callback routines */
+-	register_callbacks(&widgets);
++	register_callbacks(&widgets, app);
+ 
+ 	/* Initialize screen controls */
+ 	mx_start(&widgets);
+--- ../xmmix-1.2/mixer.c	Thu Nov  7 17:00:26 1996
++++ ./mixer.c	Mon Aug 11 23:20:15 1997
+@@ -104,6 +104,14 @@
+  ***********************/
  
  
++#ifdef __NetBSD__
++void
++mxchg(int sig)
++{
++	deliverSIGIO();
++}
++#endif
++
  /*
+  * do_ioctl
+  *	Perform ioctl command.  If file is not yet open or if we
+@@ -681,11 +689,13 @@
+ 	/* Query sound driver version */
+ 	if ((fp = fopen("/dev/sndstat", "r")) == NULL) {
+ 		if (!app_data.demo) {
++#ifndef __NetBSD__
+ 			fprintf(errfp, "%s: %s: %s\n",
+ 				PROGNAME,
+ 				"Cannot open /dev/sndstat",
+ 				"assuming pre-3.0 sound driver.");
+ 			maxdevs = MAXDEVS_V2;
++#endif
+ 		}
+ 		return;
+ 	}
+@@ -915,6 +925,7 @@
+ mx_start(widgets_t *m)
+ {
+ 	char	msg[256];
++	int one = 1;
+ 
+ 	if (app_data.autoload != NULL && app_data.autoload[0] != '\0' &&
+ 	    strcmp(app_data.autoload, "/dev/null") != 0) {
+@@ -930,6 +941,14 @@
+ 		}
+ 	}
+ 
++#if defined(__NetBSD__)
++	signal(SIGIO, mxchg);
++	ioctl(dev_fd, FIOASYNC, &one);
++#endif
++
++	/* Query hardware mixer settings */
++	mx_queryhw(&widgets);
++
+ 	/* Update screen controls to match current status */
+ 	mx_updctl(m);
+ }
+@@ -1531,6 +1550,22 @@
+ 	if (p->reason != XmCR_FOCUS || form == (Widget) NULL)
+ 		return;
+ 
++	/* Query hardware mixer settings */
++	mx_queryhw(&widgets);
++
++	/* Update screen controls */
++	mx_updctl(&widgets);
++}
++
++
++/*
++ * mx_change
++ *	Mixer device has changed
++ */
++/*ARGSUSED*/
++void
++mx_change(XtPointer client_data)
++{
+ 	/* Query hardware mixer settings */
+ 	mx_queryhw(&widgets);
+ 
+--- ../xmmix-1.2/mixer.h	Sun Jul 14 19:49:04 1996
++++ ./mixer.h	Mon Aug 11 23:19:17 1997
+@@ -78,6 +78,7 @@
+ extern void	mx_fsok_btn(Widget, XtPointer, XtPointer);
+ extern void	mx_fscancel_btn(Widget, XtPointer, XtPointer);
+ extern void	mx_focuschg(Widget, XtPointer, XtPointer);
++extern void	mx_change(XtPointer);
+ 
+ #endif	/* __MIXER_H__ */
+ 
+--- ../xmmix-1.2/widget.c	Sun Jul 14 19:49:09 1996
++++ ./widget.c	Sat Oct 25 00:24:43 1997
+@@ -973,6 +973,10 @@
+ 	delw = XmInternAtom(display, "WM_DELETE_WINDOW", False);
+ }
+ 
++static XtSignalId sigid;
++void deliverSIGIO() {
++	XtNoticeSignal(sigid);
++}
+ 
+ /*
+  * register_callbacks
+@@ -985,7 +989,7 @@
+  *	Nothing
+  */
+ void
+-register_callbacks(widgets_t *m)
++register_callbacks(widgets_t *m, XtAppContext app)
+ {
+ 	int	i;
+ 
+@@ -1126,6 +1130,15 @@
+ 		XmNfocusCallback,
+ 		(XtCallbackProc) mx_focuschg, (XtPointer) m->form
+ 	);
++
++#ifdef __NetBSD__
++	/*
++	 * Mixer SIGIO change callback
++	 */
++	sigid = XtAppAddSignal(app,
++		(XtSignalCallbackProc) mx_change, (XtPointer) 0
++	);
++#endif
+ 
+ 	/*
+ 	 * Install WM_DELETE_WINDOW handler
+--- ../xmmix-1.2/widget.h	Sun Jul 14 19:49:10 1996
++++ ./widget.h	Mon Aug 11 23:13:43 1997
+@@ -119,7 +119,7 @@
+ extern void	widget_init(widgets_t *);
+ extern void	create_widgets(widgets_t *);
+ extern void	post_realize_config(widgets_t *);
+-extern void	register_callbacks(widgets_t *);
++extern void	register_callbacks(widgets_t *, XtAppContext);
+ 
+ #endif /* __WIDGET_H__ */
+ 
diff --git a/audio/xmmix/pkg/COMMENT b/audio/xmmix/pkg/COMMENT
index 8f237039785..f02781d0306 100644
--- a/audio/xmmix/pkg/COMMENT
+++ b/audio/xmmix/pkg/COMMENT
@@ -1 +1 @@
-a Motif based audio mixer
+A X interface to the audio mixer device.
diff --git a/audio/xmmix/pkg/DESCR b/audio/xmmix/pkg/DESCR
index 6a1b9c19c9c..e1768d8d8ed 100644
--- a/audio/xmmix/pkg/DESCR
+++ b/audio/xmmix/pkg/DESCR
@@ -1,20 +1,14 @@
-From the README:
-
-  Xmmix is a sound mixer utility for the X Window System using the
-  OSF/Motif interface.  It requires the Unix Sound System (formerly
-  "VoxWare") sound driver by Hannu Savolainen (hannu@voxware.pp.fi).
-
-  For those of you with access to the WWW (via Netscape, NCSA Mosaic
-  or other WWW browser), The URL for the xmmix home page is as
-  follows:
-
-      http://sunsite.unc.edu/~cddb/xmmix/
-
-  This home page provides up-to-date information about the
-  current release version, online README file, FTP service to get
-  the software, an interactive form to send comments and
-  suggestions, and late breaking announcement, if any.
-
-I don't have hardware to test all the features, but it looks ok.
-eric.
-erich@FreeBSD.org
+			----------------------
+			X M M I X  version 1.2
+			     patchlevel 2
+			----------------------
+			      by Ti Kan
+
+Xmmix is a sound mixer utility for the X Window System using the
+OSF/Motif interface.  It requires the Unix Sound System (formerly
+"VoxWare") sound driver by Hannu Savolainen (hannu@voxware.pp.fi)
+and from 4front Technologies.  This driver is also known as the Linux
+sound driver.
+
+The NetBSD ports adds automatic updating of the mixer controls
+on screen when other programs manipulate them.
diff --git a/audio/xmmix/pkg/PLIST b/audio/xmmix/pkg/PLIST
index 6f5532e5441..fa0d478ae1f 100644
--- a/audio/xmmix/pkg/PLIST
+++ b/audio/xmmix/pkg/PLIST
@@ -1,4 +1,4 @@
 bin/xmmix
 lib/X11/app-defaults/XMmix
-lib/X11/xmmix.hlp
-man/man1/xmmix.1.gz
+lib/X11/xmmix.hlp 
+man/cat1/xmmix.0