gcc-4 compile fix

Package-Manager: portage-2.0.51.22-r1

6 files changed, 94 insertions, 21 deletions

diff --git a/net-wireless/wavemon/ChangeLog b/net-wireless/wavemon/ChangeLog
index fcbb8e057204..c02c99ed36f8 100644
--- a/net-wireless/wavemon/ChangeLog
+++ b/net-wireless/wavemon/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-wireless/wavemon
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/wavemon/ChangeLog,v 1.14 2004/09/10 07:08:19 brix Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/wavemon/ChangeLog,v 1.15 2005/07/09 03:55:39 halcy0n Exp $
+
+  09 Jul 2005; Mark Loeser <halcy0n@gentoo.org>
+  +files/wavemon-gcc-fixes.patch, -files/wavemon_gcc33_fix,
+  -files/wavemon_gcc34_fix.gz, wavemon-0.4.0b.ebuild:
+  Consolidate gcc fixes into one patch.  Fix compilation with gcc-4.
 
   10 Sep 2004; Henrik Brix Andersen <brix@gentoo.org> wavemon-0.3.3.ebuild:
   Added missing IUSE="".
diff --git a/net-wireless/wavemon/Manifest b/net-wireless/wavemon/Manifest
index dbc6189cdeff..2fee1266afdd 100644
--- a/net-wireless/wavemon/Manifest
+++ b/net-wireless/wavemon/Manifest
@@ -1,8 +1,17 @@
-MD5 39d34a2be4a374f7fdaf090e0db99edd wavemon-0.4.0b.ebuild 871
-MD5 e9e77dba83ba2f7fd1a853b060d366d6 wavemon-0.3.3.ebuild 706
-MD5 cb06d3d0fb5ac928eda053d291973874 ChangeLog 1634
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 6359862abf12ea8e8b110091d52b2ea4 ChangeLog 1869
 MD5 32831d719499c83f7942f6432ef58278 metadata.xml 252
+MD5 e9e77dba83ba2f7fd1a853b060d366d6 wavemon-0.3.3.ebuild 706
+MD5 d7e5341e43c05cf578ad0ef1aa075ef4 wavemon-0.4.0b.ebuild 878
 MD5 74ff273e243d9bfc9a4e80c8a7e6eeaa files/digest-wavemon-0.3.3 66
 MD5 651f4112ea3085a94cd49e49abb1e851 files/digest-wavemon-0.4.0b 65
-MD5 2be127b4e6fce78b81f708845c7c46b3 files/wavemon_gcc34_fix.gz 604
-MD5 ff2398ce07fafd5ac9ff8a7b964378d1 files/wavemon_gcc33_fix 281
+MD5 c818e93801166a1257810f1ccd56001d files/wavemon-gcc-fixes.patch 2147
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD4DBQFCz0rrCRZPokWLroQRAmP/AKCv+Y+s3SqsHESB7IBr5kHYPxs+MwCY8HV0
+MgIXtvTY7UEfslWJtnbIvg==
+=evh7
+-----END PGP SIGNATURE-----
diff --git a/net-wireless/wavemon/files/wavemon-gcc-fixes.patch b/net-wireless/wavemon/files/wavemon-gcc-fixes.patch
new file mode 100644
index 000000000000..f89728aced1d
--- /dev/null
+++ b/net-wireless/wavemon/files/wavemon-gcc-fixes.patch
@@ -0,0 +1,70 @@
+diff -ur wavemon-0.4.0b-orig/conf.c wavemon-0.4.0b/conf.c
+--- wavemon-0.4.0b-orig/conf.c	2005-07-08 23:49:09.000000000 -0400
++++ wavemon-0.4.0b/conf.c	2005-07-08 23:48:05.000000000 -0400
+@@ -409,8 +409,8 @@
+ 										fatal_error("parse error in %s, line %d: '%s' is not a valid argument here", cfname, lnum, rv);
+ 									}
+ 									break;
+-					case t_sep: 	/* gcc -Wall sucks */
+-					case t_func:
++					case t_sep: ; 	/* gcc -Wall sucks */
++					case t_func: ;
+ 				}
+ 			}
+ 		}
+@@ -481,7 +481,7 @@
+ 							break;
+ 				case t_listval: sprintf(rv, "%s", (char *)ci->v);
+ 				case t_sep: break;
+-				case t_func:
++				case t_func: ;
+ 			}
+ 			
+ 			add = 1;
+diff -ur wavemon-0.4.0b-orig/conf_scr.c wavemon-0.4.0b/conf_scr.c
+--- wavemon-0.4.0b-orig/conf_scr.c	2005-07-08 23:49:09.000000000 -0400
++++ wavemon-0.4.0b/conf_scr.c	2005-07-08 23:48:05.000000000 -0400
+@@ -63,7 +63,7 @@
+ 			case t_listval:	strncpy(s, (char *)item->v, 32);
+ 							break;
+ 			case t_sep:		/* gcc -Wall sucks */
+-			case t_func:
++			case t_func: ;
+ 		}
+ 
+ 		if (!item->unit) {
+@@ -135,8 +135,8 @@
+ 						}
+ 						strncpy((char *)item->v, ll_get(item->list, tmp), 32);
+ 						break;
+-		case t_sep:		/* gcc -Wall sucks */
+-		case t_func:
++		case t_sep: ;		/* gcc -Wall sucks */
++		case t_func: ;
+ 	}
+ }	
+ 
+diff -ur wavemon-0.4.0b-orig/llist.c wavemon-0.4.0b/llist.c
+--- wavemon-0.4.0b-orig/llist.c	2005-07-08 23:46:09.000000000 -0400
++++ wavemon-0.4.0b/llist.c	2005-07-08 23:47:28.000000000 -0400
+@@ -352,7 +352,7 @@
+ 					*((int *)l->e) = va_arg(*ap, int);
+ 					break;
+ 		case 's':	l->e = (void *)malloc(sizeof(char *));
+-					(char *)l->e = strdup(va_arg(*ap, char *));
++					l->e = strdup(va_arg(*ap, char *));
+ 					break;
+ 		case 'f':	l->e = (void *)malloc(sizeof(double));
+ 					*((double *)l->e) = va_arg(*ap, double);
+diff -ur wavemon-0.4.0b-orig/wavemon.c wavemon-0.4.0b/wavemon.c
+--- wavemon-0.4.0b-orig/wavemon.c	2005-07-08 23:49:09.000000000 -0400
++++ wavemon-0.4.0b/wavemon.c	2005-07-08 23:48:05.000000000 -0400
+@@ -170,7 +170,7 @@
+ 
+ 	if (conf.dump == 1) {
+ 	  dump_parameters(&conf);
+-	  exit();
++	  exit(0);
+ 	}
+ 
+ 	/* initialize the ncurses interface */
diff --git a/net-wireless/wavemon/files/wavemon_gcc33_fix b/net-wireless/wavemon/files/wavemon_gcc33_fix
deleted file mode 100644
index 9bab10028bf4..000000000000
--- a/net-wireless/wavemon/files/wavemon_gcc33_fix
+++ /dev/null
@@ -1,11 +0,0 @@
---- wavemon-0.4.0b-orig/wavemon.c	2002-12-21 13:18:30.000000000 +0100
-+++ wavemon-0.4.0b/wavemon.c	2003-07-02 12:24:29.000000000 +0200
-@@ -170,7 +170,7 @@
- 
- 	if (conf.dump == 1) {
- 	  dump_parameters(&conf);
--	  exit();
-+	  exit(0);
- 	}
- 
- 	/* initialize the ncurses interface */
diff --git a/net-wireless/wavemon/files/wavemon_gcc34_fix.gz b/net-wireless/wavemon/files/wavemon_gcc34_fix.gz
deleted file mode 100644
index 9ec6b54bf20c..000000000000
--- a/net-wireless/wavemon/files/wavemon_gcc34_fix.gz
+++ /dev/null
diff --git a/net-wireless/wavemon/wavemon-0.4.0b.ebuild b/net-wireless/wavemon/wavemon-0.4.0b.ebuild
index 0bb786ab484a..09b5eef77973 100644
--- a/net-wireless/wavemon/wavemon-0.4.0b.ebuild
+++ b/net-wireless/wavemon/wavemon-0.4.0b.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/wavemon/wavemon-0.4.0b.ebuild,v 1.9 2004/09/10 07:06:45 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/wavemon/wavemon-0.4.0b.ebuild,v 1.10 2005/07/09 03:55:40 halcy0n Exp $
 
 inherit eutils
 
@@ -16,7 +16,7 @@ DEPEND="sys-libs/ncurses"
 
 src_unpack() {
 	unpack ${A}
-	epatch ${FILESDIR}/wavemon_gcc34_fix.gz
+	epatch ${FILESDIR}/wavemon-gcc-fixes.patch
 	cd ${S}
 
 	mv configure configure.orig