void main

4 files changed, 36 insertions, 11 deletions

diff --git a/audio/xmix/distinfo b/audio/xmix/distinfo
index 751670f5dff..73cca2385df 100644
--- a/audio/xmix/distinfo
+++ b/audio/xmix/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2005/11/06 23:49:03 joerg Exp $
+$NetBSD: distinfo,v 1.6 2011/09/04 22:17:41 dholland Exp $
 
 SHA1 (xmix-2.1.tar.gz) = 390096a541a41ffb47c9b57ee6029211d31393d3
 RMD160 (xmix-2.1.tar.gz) = 0f1bc15b89bfc657ade9b12cb9decb248d780925
@@ -7,4 +7,4 @@ SHA1 (xmix-2.1.mixers.patch) = 86b423774a6afcd56a8f8931108823d702db1ea5
 RMD160 (xmix-2.1.mixers.patch) = bbbc4b44ed603e54044fc1c71fa20f4373cae81a
 Size (xmix-2.1.mixers.patch) = 1684 bytes
 SHA1 (patch-aa) = a60baf409d6f9182f185fbd41676d85c31971363
-SHA1 (patch-ab) = a6201bea678a64b41d71dd52830a79250e72a461
+SHA1 (patch-ab) = df27582fbac4a3e0068c8ca475c840decf1839c0
diff --git a/audio/xmix/patches/patch-ab b/audio/xmix/patches/patch-ab
index 9549fe031f5..801288fbc7f 100644
--- a/audio/xmix/patches/patch-ab
+++ b/audio/xmix/patches/patch-ab
@@ -1,9 +1,12 @@
-$NetBSD: patch-ab,v 1.4 1999/02/10 14:55:33 frueauf Exp $
+$NetBSD: patch-ab,v 1.5 2011/09/04 22:17:41 dholland Exp $
 
-diff -r -u ../../src/xmix-2.1/xmix.c ./xmix.c
---- ../../src/xmix-2.1/xmix.c	Sun Jan 17 13:13:12 1999
-+++ ./xmix.c	Sun Jan 17 13:16:12 1999
-@@ -77,7 +77,12 @@
+- support more OSes (is the first hunk actually correct?)
+- fix void main
+- remove debug printout
+
+--- xmix.c.orig	2011-09-04 22:12:45.000000000 +0000
++++ xmix.c
+@@ -77,7 +77,12 @@ to Rick! I'll call this version V2.1
  #include "square_empty.bit"
  #include "square_with_x.bit"
  
@@ -17,7 +20,16 @@ diff -r -u ../../src/xmix-2.1/xmix.c ./xmix.c
  
  #define SOUND_FULL_SCALE 100.0
  #define MAX_SOUND_VOL 95
-@@ -742,7 +747,7 @@
+@@ -450,7 +455,7 @@ static void set_supported(VolumeControl 
+ }
+ 
+ 
+-void main (int argc, char **argv)
++int main (int argc, char **argv)
+ {
+   XtAppContext app_context;
+   int scroll_sep, longway;
+@@ -742,7 +747,7 @@ void main (int argc, char **argv)
    mic.locked = 0;
    reclvl.locked = 0;
  
diff --git a/audio/xmmix/distinfo b/audio/xmmix/distinfo
index eae6e92abc9..381412a40e4 100644
--- a/audio/xmmix/distinfo
+++ b/audio/xmmix/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.6 2005/12/11 20:35:40 joerg Exp $
+$NetBSD: distinfo,v 1.7 2011/09/04 22:25:36 dholland Exp $
 
 SHA1 (xmmix-1.2.tar.gz) = 9ec44500dccba63ef7a9d50f66acfb6e45d08714
 RMD160 (xmmix-1.2.tar.gz) = 05f5ca6811848f0b86a9dc94e6d943a07cda0ba8
@@ -7,6 +7,6 @@ SHA1 (patch-aa) = 68a33a91de0e373da4818a26e339d3c87e895b33
 SHA1 (patch-ab) = cbdc30e17aa2a857d756b403c0873436e9480129
 SHA1 (patch-ac) = 8d68a2de3ee8a094a7f84ecb1d387bc22ca82bbb
 SHA1 (patch-ba) = 8092fcec3c39060da476f2ad2d018e8e0a8aa028
-SHA1 (patch-bb) = 4c468f8b42150b2dc9d21176863be168428b8885
+SHA1 (patch-bb) = 1c01aa80d4c24ba7caecb1a4ef97ac36d8e242ba
 SHA1 (patch-bc) = 1c77a45c31ee023a3b0e7c9a720c1d9d2d2fb75e
 SHA1 (patch-bd) = d4209f5de96ef45d47aec2c28ccfe099c0c13fdf
diff --git a/audio/xmmix/patches/patch-bb b/audio/xmmix/patches/patch-bb
index 596d391ae6b..666187795a7 100644
--- a/audio/xmmix/patches/patch-bb
+++ b/audio/xmmix/patches/patch-bb
@@ -1,4 +1,8 @@
-$NetBSD: patch-bb,v 1.2 2005/12/11 20:35:41 joerg Exp $
+$NetBSD: patch-bb,v 1.3 2011/09/04 22:25:36 dholland Exp $
+
+- initialize errfp (but why twice?)
+- fix void main
+- pass the XtAppContext to widget.c, which now needs it
 
 --- main.c.orig	1996-11-07 16:01:43.000000000 +0000
 +++ main.c
@@ -11,6 +15,15 @@ $NetBSD: patch-bb,v 1.2 2005/12/11 20:35:41 joerg Exp $
  
  
  /***********************
+@@ -95,7 +95,7 @@ usage(int argc, char **argv)
+  * main
+  *	The main function
+  */
+-void
++int
+ main(int argc, char **argv)
+ {
+ 	XtAppContext	app;
 @@ -103,6 +103,7 @@ main(int argc, char **argv)
  
  	/* Initialize variables */