Fix GCC 3.3.1 related build problem.

5 files changed, 31 insertions, 5 deletions

diff --git a/audio/wmmixer/distinfo b/audio/wmmixer/distinfo
index ee84fb3cb8e..ae4f45d55dc 100644
--- a/audio/wmmixer/distinfo
+++ b/audio/wmmixer/distinfo
@@ -1,4 +1,6 @@
-$NetBSD: distinfo,v 1.3 2002/05/22 18:29:17 wiz Exp $
+$NetBSD: distinfo,v 1.4 2003/09/28 14:52:55 tron Exp $
 
 SHA1 (wmmixer-1.0-beta1.tgz) = b8695455e1a7364aa337feb924f059db9a5856fe
 Size (wmmixer-1.0-beta1.tgz) = 18801 bytes
+SHA1 (patch-aa) = 4ee2ac096da6ee07a5e917242a6066c842dfa4d4
+SHA1 (patch-ab) = 7fd4f67cd2bf121fd33d6cbefc1067172644da14
diff --git a/audio/wmmixer/patches/patch-aa b/audio/wmmixer/patches/patch-aa
new file mode 100644
index 00000000000..921c05e1705
--- /dev/null
+++ b/audio/wmmixer/patches/patch-aa
@@ -0,0 +1,13 @@
+$NetBSD: patch-aa,v 1.1 2003/09/28 14:52:55 tron Exp $
+
+--- wmmixer.cc.orig	1998-09-05 17:11:33.000000000 +0200
++++ wmmixer.cc	2003-09-28 16:45:37.000000000 +0200
+@@ -503,7 +503,7 @@
+    }
+ }
+ 
+-void checkVol(bool forced=true){
++void checkVol(bool forced){
+    mixctl->readVol(channel[curchannel], true);
+    int nl=mixctl->readLeft(channel[curchannel]);
+    int nr=mixctl->readRight(channel[curchannel]);
diff --git a/audio/wmmixer/patches/patch-ab b/audio/wmmixer/patches/patch-ab
new file mode 100644
index 00000000000..68e5d0f5dfe
--- /dev/null
+++ b/audio/wmmixer/patches/patch-ab
@@ -0,0 +1,11 @@
+--- Imakefile.orig	1998-09-05 17:11:33.000000000 +0200
++++ Imakefile	2003-09-28 16:50:51.000000000 +0200
+@@ -7,7 +7,4 @@
+ DEPLIBS = $(DEPXLIB) 
+ LOCAL_LIBRARIES = $(XPMLIB) $(XLIB) $(OSSAUDIO)
+ 
+-SRCS = wmmixer.cc
+-OBJS = wmmixer.o
+-
+-ComplexProgramTarget(wmmixer)
++SimpleCplusplusProgramTarget(wmmixer)
diff --git a/editors/uemacs/distinfo b/editors/uemacs/distinfo
index 48c8fa40f9f..6c0c4d1a1f4 100644
--- a/editors/uemacs/distinfo
+++ b/editors/uemacs/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.2 2001/04/19 11:01:05 agc Exp $
+$NetBSD: distinfo,v 1.3 2003/09/28 14:56:03 tron Exp $
 
 SHA1 (ue400dev.zip) = edbb0261cdaa1803d9f7dc7debfd4a9df3a668eb
 Size (ue400dev.zip) = 1179949 bytes
 SHA1 (patch-aa) = bc503d998c68d59aa297744e0b4ca9778814ec33
-SHA1 (patch-ab) = f3054f487f3f0f38c8f45391a0f425a19f66e213
+SHA1 (patch-ab) = e2e929a63a1746379322191728c0c19b7a7c5f9a
 SHA1 (patch-ac) = f7aaa2514f74987a68da726a397d58089fc2d82e
 SHA1 (patch-ad) = 977e0ca09cc53ba4bb90936dd5e34a460d0ea4e8
 SHA1 (patch-ae) = 40998fe8f82a65cbfdabc849ee68a04aac9ef821
diff --git a/editors/uemacs/patches/patch-ab b/editors/uemacs/patches/patch-ab
index 322d425c298..e9503399b35 100644
--- a/editors/uemacs/patches/patch-ab
+++ b/editors/uemacs/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.2 2000/03/23 22:08:52 tron Exp $
+$NetBSD: patch-ab,v 1.3 2003/09/28 14:56:03 tron Exp $
 
 --- netbsd/estruct.h.orig	Wed Mar 25 14:21:05 1998
 +++ netbsd/estruct.h	Wed Mar 25 14:25:34 1998
@@ -169,7 +169,7 @@ $NetBSD: patch-ab,v 1.2 2000/03/23 22:08:52 tron Exp $
 +#define NOISY	1	/* Use a fancy BELL if it exists		*/
 +#define CTAGS	1	/* include vi-like tagging?			*/
 +#define SPEECH	0	/* spoken EMACS, for the sight impared [not ready] */
-+#define VARARG	1	/* use varargs.h for mlwrite()			*/
++#define VARARG	0	/* use varargs.h for mlwrite()			*/
 +
 +#if	XVT
 +#undef	COLOR