Split patches for different files into separate patch files.

Use imake's XmClientLibs instead of handcoded libs.

6 files changed, 64 insertions, 52 deletions

diff --git a/audio/xmmix/files/patch-sum b/audio/xmmix/files/patch-sum
index ac6c106f4e4..abbdde4cd58 100644
--- a/audio/xmmix/files/patch-sum
+++ b/audio/xmmix/files/patch-sum
@@ -1,5 +1,9 @@
-$NetBSD: patch-sum,v 1.2 2000/09/19 11:09:21 fredb Exp $
+$NetBSD: patch-sum,v 1.3 2000/11/02 14:24:32 mjl Exp $
 
-MD5 (patch-aa) = 5db8966c021a2e944d29539a73af9982
+MD5 (patch-aa) = 0f13811a774afc214004e39d93e0a14a
 MD5 (patch-ab) = 6dbb6c7e3d6148d877cafce408b306c6
 MD5 (patch-ac) = 4f9004146c749b2b3352d027c9f6208f
+MD5 (patch-ba) = 7b30bb1789ee68beb7202aa40c9d4d9a
+MD5 (patch-bb) = 04f12c5fd44a2d56f923fbf003117f38
+MD5 (patch-bc) = ed8eae3961edd04b4dae5074070b68eb
+MD5 (patch-bd) = f7d72a6d3221fc88a1735c99f0cb3859
diff --git a/audio/xmmix/patches/patch-aa b/audio/xmmix/patches/patch-aa
index 7bf78d21605..1613a029cb7 100644
--- a/audio/xmmix/patches/patch-aa
+++ b/audio/xmmix/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.5 2000/09/19 11:09:21 fredb Exp $
+$NetBSD: patch-aa,v 1.6 2000/11/02 14:24:32 mjl Exp $
 
 --- ../xmmix-1.2/Imakefile	Sun Jul 14 19:48:56 1996
 +++ ./Imakefile	Fri Oct 24 23:34:17 1997
@@ -7,55 +7,7 @@ $NetBSD: patch-aa,v 1.5 2000/09/19 11:09:21 fredb Exp $
   * #include "Motif.rules"
   */
 -LOCAL_LIBRARIES= XmClientLibs
-+LOCAL_LIBRARIES= -lXm -lXt -lX11 -lossaudio
++LOCAL_LIBRARIES= XmClientLibs -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,13 @@
- #include <sys/types.h>
- #include <sys/stat.h>
- #include <sys/ioctl.h>
-+#ifdef __NetBSD__
-+#include <soundcard.h>
-+/* Ensure we SIGIO */
-+#undef _POSIX_SOURCE
-+#else
- #include <sys/soundcard.h>
-+#endif
- #include <stdlib.h>
- #include <stdio.h>
- #include <errno.h>
---- ../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.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.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/patches/patch-ba b/audio/xmmix/patches/patch-ba
new file mode 100644
index 00000000000..0a97706e5e4
--- /dev/null
+++ b/audio/xmmix/patches/patch-ba
@@ -0,0 +1,18 @@
+$NetBSD: patch-ba,v 1.1 2000/11/02 14:24:32 mjl Exp $
+
+--- ../xmmix-1.2/appenv.h	Sun Jul 14 19:48:59 1996
++++ ./appenv.h	Fri Oct 24 23:33:47 1997
+@@ -59,7 +59,13 @@
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <sys/ioctl.h>
++#ifdef __NetBSD__
++#include <soundcard.h>
++/* Ensure we SIGIO */
++#undef _POSIX_SOURCE
++#else
+ #include <sys/soundcard.h>
++#endif
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <errno.h>
diff --git a/audio/xmmix/patches/patch-bb b/audio/xmmix/patches/patch-bb
new file mode 100644
index 00000000000..698341a3c13
--- /dev/null
+++ b/audio/xmmix/patches/patch-bb
@@ -0,0 +1,13 @@
+$NetBSD: patch-bb,v 1.1 2000/11/02 14:24:32 mjl Exp $
+
+--- ../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);
diff --git a/audio/xmmix/patches/patch-bc b/audio/xmmix/patches/patch-bc
new file mode 100644
index 00000000000..86fd297ae84
--- /dev/null
+++ b/audio/xmmix/patches/patch-bc
@@ -0,0 +1,12 @@
+$NetBSD: patch-bc,v 1.1 2000/11/02 14:24:32 mjl Exp $
+
+--- ../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__ */
+ 
diff --git a/audio/xmmix/patches/patch-bd b/audio/xmmix/patches/patch-bd
new file mode 100644
index 00000000000..144785e584d
--- /dev/null
+++ b/audio/xmmix/patches/patch-bd
@@ -0,0 +1,13 @@
+$NetBSD: patch-bd,v 1.1 2000/11/02 14:24:32 mjl Exp $
+
+--- ../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__ */
+