Sun Sep 4 22:25:36 2011 UTC ()
void main


(dholland)
diff -r1.6 -r1.7 pkgsrc/audio/xmmix/distinfo
diff -r1.2 -r1.3 pkgsrc/audio/xmmix/patches/patch-bb
cvs diff -r1.6 -r1.7 pkgsrc/audio/xmmix/distinfo (expand / switch to unified diff)

--- pkgsrc/audio/xmmix/distinfo 2005/12/11 20:35:40 1.6
+++ pkgsrc/audio/xmmix/distinfo 2011/09/04 22:25:36 1.7
@@ -1,12 +1,12 @@ @@ -1,12 +1,12 @@
1$NetBSD: distinfo,v 1.6 2005/12/11 20:35:40 joerg Exp $ 1$NetBSD: distinfo,v 1.7 2011/09/04 22:25:36 dholland Exp $
2 2
3SHA1 (xmmix-1.2.tar.gz) = 9ec44500dccba63ef7a9d50f66acfb6e45d08714 3SHA1 (xmmix-1.2.tar.gz) = 9ec44500dccba63ef7a9d50f66acfb6e45d08714
4RMD160 (xmmix-1.2.tar.gz) = 05f5ca6811848f0b86a9dc94e6d943a07cda0ba8 4RMD160 (xmmix-1.2.tar.gz) = 05f5ca6811848f0b86a9dc94e6d943a07cda0ba8
5Size (xmmix-1.2.tar.gz) = 33496 bytes 5Size (xmmix-1.2.tar.gz) = 33496 bytes
6SHA1 (patch-aa) = 68a33a91de0e373da4818a26e339d3c87e895b33 6SHA1 (patch-aa) = 68a33a91de0e373da4818a26e339d3c87e895b33
7SHA1 (patch-ab) = cbdc30e17aa2a857d756b403c0873436e9480129 7SHA1 (patch-ab) = cbdc30e17aa2a857d756b403c0873436e9480129
8SHA1 (patch-ac) = 8d68a2de3ee8a094a7f84ecb1d387bc22ca82bbb 8SHA1 (patch-ac) = 8d68a2de3ee8a094a7f84ecb1d387bc22ca82bbb
9SHA1 (patch-ba) = 8092fcec3c39060da476f2ad2d018e8e0a8aa028 9SHA1 (patch-ba) = 8092fcec3c39060da476f2ad2d018e8e0a8aa028
10SHA1 (patch-bb) = 4c468f8b42150b2dc9d21176863be168428b8885 10SHA1 (patch-bb) = 1c01aa80d4c24ba7caecb1a4ef97ac36d8e242ba
11SHA1 (patch-bc) = 1c77a45c31ee023a3b0e7c9a720c1d9d2d2fb75e 11SHA1 (patch-bc) = 1c77a45c31ee023a3b0e7c9a720c1d9d2d2fb75e
12SHA1 (patch-bd) = d4209f5de96ef45d47aec2c28ccfe099c0c13fdf 12SHA1 (patch-bd) = d4209f5de96ef45d47aec2c28ccfe099c0c13fdf
cvs diff -r1.2 -r1.3 pkgsrc/audio/xmmix/patches/patch-bb (expand / switch to unified diff)

--- pkgsrc/audio/xmmix/patches/patch-bb 2005/12/11 20:35:41 1.2
+++ pkgsrc/audio/xmmix/patches/patch-bb 2011/09/04 22:25:36 1.3
@@ -1,26 +1,39 @@ @@ -1,26 +1,39 @@
1$NetBSD: patch-bb,v 1.2 2005/12/11 20:35:41 joerg Exp $ 1$NetBSD: patch-bb,v 1.3 2011/09/04 22:25:36 dholland Exp $
 2
 3- initialize errfp (but why twice?)
 4- fix void main
 5- pass the XtAppContext to widget.c, which now needs it
2 6
3--- main.c.orig 1996-11-07 16:01:43.000000000 +0000 7--- main.c.orig 1996-11-07 16:01:43.000000000 +0000
4+++ main.c 8+++ main.c
5@@ -33,7 +33,7 @@ static char *_main_c_ident_ = "@(#)main. 9@@ -33,7 +33,7 @@ static char *_main_c_ident_ = "@(#)main.
6 bool_t exit_flag; /* Flag indicating end of application */ 10 bool_t exit_flag; /* Flag indicating end of application */
7 appdata_t app_data; /* Options data */ 11 appdata_t app_data; /* Options data */
8 widgets_t widgets; /* Holder of all widgets */ 12 widgets_t widgets; /* Holder of all widgets */
9-FILE *errfp = stderr;/* Error message stream */ 13-FILE *errfp = stderr;/* Error message stream */
10+FILE *errfp;/* Error message stream */ 14+FILE *errfp;/* Error message stream */
11  15
12  16
13 /*********************** 17 /***********************
 18@@ -95,7 +95,7 @@ usage(int argc, char **argv)
 19 * main
 20 * The main function
 21 */
 22-void
 23+int
 24 main(int argc, char **argv)
 25 {
 26 XtAppContext app;
14@@ -103,6 +103,7 @@ main(int argc, char **argv) 27@@ -103,6 +103,7 @@ main(int argc, char **argv)
15  28
16 /* Initialize variables */ 29 /* Initialize variables */
17 exit_flag = FALSE; 30 exit_flag = FALSE;
18+ errfp = stderr; 31+ errfp = stderr;
19  32
20 /* Handle some signals */ 33 /* Handle some signals */
21 signal(SIGINT, onsig); 34 signal(SIGINT, onsig);
22@@ -159,7 +160,7 @@ main(int argc, char **argv) 35@@ -159,7 +160,7 @@ main(int argc, char **argv)
23 post_realize_config(&widgets); 36 post_realize_config(&widgets);
24  37
25 /* Register callback routines */ 38 /* Register callback routines */
26- register_callbacks(&widgets); 39- register_callbacks(&widgets);