Use buildlink2 and make this work with audio/oss installed.

4 files changed, 32 insertions, 25 deletions

diff --git a/audio/xmmix/Makefile b/audio/xmmix/Makefile
index 5de1f46378c..f740e08a5ef 100644
--- a/audio/xmmix/Makefile
+++ b/audio/xmmix/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2001/09/09 03:08:49 jlam Exp $
+# $NetBSD: Makefile,v 1.18 2002/10/08 12:30:57 jlam Exp $
 # FreeBSD ID: Makefile,v 1.5 1997/09/08 13:37:47 tg Exp
 #
 
@@ -10,14 +10,17 @@ MAINTAINER=	augustss@cs.chalmers.se
 HOMEPAGE=	http://sunsite.unc.edu/~cddb/xmmix/index.html
 COMMENT=	X interface to the audio mixer device
 
+USE_BUILDLINK2=	yes
 USE_IMAKE=	yes
 
-post-patch:
-	for file in ${WRKSRC}/XMmix.ad ${WRKSRC}/resource.h; do		\
-		${MV} -f $$file $$file.orig;				\
-		${SED} -e "s|/usr/lib/X11/xmmix.hlp|${PREFIX}/lib/X11/xmmix.hlp|g" \
-			$$file.orig > $$file;				\
+pre-configure:
+	cd ${WRKSRC}; for file in XMmix.ad resource.h; do		\
+		${SED} -e "s|/usr/lib/X11/|${PREFIX}/lib/X11/|g"	\
+			$$file > $$file.fixed;				\
+		${MV} -f $$file.fixed $$file;				\
 	done
 
-.include "../../mk/motif.buildlink.mk"
+.include "../../mk/motif.buildlink2.mk"
+.include "../../mk/ossaudio.buildlink2.mk"
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/xmmix/distinfo b/audio/xmmix/distinfo
index 9fcab74e7ce..1412a580100 100644
--- a/audio/xmmix/distinfo
+++ b/audio/xmmix/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.3 2001/07/14 12:55:09 agc Exp $
+$NetBSD: distinfo,v 1.4 2002/10/08 12:30:57 jlam Exp $
 
 SHA1 (xmmix-1.2.tar.gz) = 9ec44500dccba63ef7a9d50f66acfb6e45d08714
 Size (xmmix-1.2.tar.gz) = 33496 bytes
-SHA1 (patch-aa) = 8f11873f916380f0370f2a219e73fcc1b530db74
-SHA1 (patch-ab) = 2aa573d26cc60b066eec73345a87a861368ce9ba
+SHA1 (patch-aa) = 68a33a91de0e373da4818a26e339d3c87e895b33
+SHA1 (patch-ab) = cbdc30e17aa2a857d756b403c0873436e9480129
 SHA1 (patch-ac) = 8d68a2de3ee8a094a7f84ecb1d387bc22ca82bbb
 SHA1 (patch-ba) = 8092fcec3c39060da476f2ad2d018e8e0a8aa028
 SHA1 (patch-bb) = ce6a804c52dac8c65661d3a17c5cccbb4b2957d0
diff --git a/audio/xmmix/patches/patch-aa b/audio/xmmix/patches/patch-aa
index 41122f3b04a..57561876dff 100644
--- a/audio/xmmix/patches/patch-aa
+++ b/audio/xmmix/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.7 2001/07/14 12:55:09 agc Exp $
+$NetBSD: patch-aa,v 1.8 2002/10/08 12:30:57 jlam Exp $
 
 --- Imakefile.orig	Sun Jul 14 19:48:56 1996
 +++ Imakefile	Fri Oct 24 23:34:17 1997
@@ -7,7 +7,7 @@ $NetBSD: patch-aa,v 1.7 2001/07/14 12:55:09 agc Exp $
   * #include "Motif.rules"
   */
 -LOCAL_LIBRARIES= XmClientLibs
-+LOCAL_LIBRARIES= ${MOTIFLIB} XawClientLibs -lossaudio
++LOCAL_LIBRARIES= ${MOTIFLIB} XawClientLibs ${LIBOSSAUDIO}
  
  
  /*
diff --git a/audio/xmmix/patches/patch-ab b/audio/xmmix/patches/patch-ab
index d3d2a86074e..0b8222ab0db 100644
--- a/audio/xmmix/patches/patch-ab
+++ b/audio/xmmix/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.1 2000/09/19 11:09:21 fredb Exp $
+$NetBSD: patch-ab,v 1.2 2002/10/08 12:30:57 jlam Exp $
 
---- mixer.c.orig	Thu Nov  7 10:00:26 1996
-+++ mixer.c	Wed Sep 13 22:46:35 2000
-@@ -104,6 +104,14 @@
+--- mixer.c.orig	Thu Nov  7 08:00:26 1996
++++ mixer.c
+@@ -104,6 +104,14 @@ STATIC ctlinfo_t	ctlsav;		/* Saved state
   ***********************/
  
  
@@ -17,13 +17,14 @@ $NetBSD: patch-ab,v 1.1 2000/09/19 11:09:21 fredb Exp $
  /*
   * do_ioctl
   *	Perform ioctl command.  If file is not yet open or if we
-@@ -201,12 +209,17 @@
+@@ -201,12 +209,18 @@ mx_queryhw(widgets_t *m)
  			ctlinfo.slinfo[i].right = ((level >> 8) & 0xff);
  
  			/* Sanity check */
 -			if (ctlinfo.slinfo[i].left > 100)
 -				ctlinfo.slinfo[i].left = 100;
-+#ifdef __NetBSD__
++#if defined(__NetBSD__) && \
++    !defined(OPEN_SOUND_SYSTEM) && !defined(UNIX_SOUND_SYSTEM)
 +#  define SLIDER_MAX 255
 +#else
 +#  define SLIDER_MAX 100
@@ -39,11 +40,12 @@ $NetBSD: patch-ab,v 1.1 2000/09/19 11:09:21 fredb Exp $
  			else if (ctlinfo.slinfo[i].right < 0)
  				ctlinfo.slinfo[i].right = 0;
  
-@@ -674,18 +687,24 @@
+@@ -674,18 +688,25 @@ mx_init_drv(void)
  	}
  
  	/* Set maximum number of devices supported */
-+#ifdef __NetBSD__
++#if defined(__NetBSD__) && \
++    !defined(OPEN_SOUND_SYSTEM) && !defined(UNIX_SOUND_SYSTEM)
 +	maxdevs = SOUND_MIXER_NRDEVICES;
 +#else
  	maxdevs = MAXDEVS_V3;
@@ -54,7 +56,7 @@ $NetBSD: patch-ab,v 1.1 2000/09/19 11:09:21 fredb Exp $
  	/* Query sound driver version */
  	if ((fp = fopen("/dev/sndstat", "r")) == NULL) {
  		if (!app_data.demo) {
-+#ifndef __NetBSD__
++#if defined(OPEN_SOUND_SYSTEM) || defined(UNIX_SOUND_SYSTEM)
  			fprintf(errfp, "%s: %s: %s\n",
  				PROGNAME,
  				"Cannot open /dev/sndstat",
@@ -64,7 +66,7 @@ $NetBSD: patch-ab,v 1.1 2000/09/19 11:09:21 fredb Exp $
  		}
  		return;
  	}
-@@ -915,6 +934,7 @@
+@@ -915,6 +936,7 @@ void
  mx_start(widgets_t *m)
  {
  	char	msg[256];
@@ -72,13 +74,15 @@ $NetBSD: patch-ab,v 1.1 2000/09/19 11:09:21 fredb Exp $
  
  	if (app_data.autoload != NULL && app_data.autoload[0] != '\0' &&
  	    strcmp(app_data.autoload, "/dev/null") != 0) {
-@@ -930,6 +950,14 @@
+@@ -930,6 +952,16 @@ mx_start(widgets_t *m)
  		}
  	}
  
 +#if defined(__NetBSD__)
 +	signal(SIGIO, mxchg);
-+	ioctl(dev_fd, FIOASYNC, &one);
++#if !defined(OPEN_SOUND_SYSTEM) && !defined(UNIX_SOUND_SYSTEM)
++	do_ioctl(FIOASYNC, &one, "FIOASYNC", IOC_DATA_NONE);
++#endif
 +#endif
 +
 +	/* Query hardware mixer settings */
@@ -87,7 +91,7 @@ $NetBSD: patch-ab,v 1.1 2000/09/19 11:09:21 fredb Exp $
  	/* Update screen controls to match current status */
  	mx_updctl(m);
  }
-@@ -1531,6 +1559,22 @@
+@@ -1531,6 +1563,22 @@ mx_focuschg(Widget w, XtPointer client_d
  	if (p->reason != XmCR_FOCUS || form == (Widget) NULL)
  		return;