honor LDFLAGS; quiet some warnings; move sed into a patch

Package-Manager: portage-2.1.8.3/cvs/Linux i686

4 files changed, 102 insertions, 22 deletions

diff --git a/games-puzzle/tetrinet/ChangeLog b/games-puzzle/tetrinet/ChangeLog
index 8013cf18dc53..9ba042119ef9 100644
--- a/games-puzzle/tetrinet/ChangeLog
+++ b/games-puzzle/tetrinet/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-puzzle/tetrinet
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-puzzle/tetrinet/ChangeLog,v 1.10 2009/05/31 02:28:23 nyhm Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/tetrinet/ChangeLog,v 1.11 2010/07/14 17:38:21 mr_bones_ Exp $
+
+  14 Jul 2010; Michael Sterrett <mr_bones_@gentoo.org> tetrinet-0.11.ebuild,
+  +files/tetrinet-0.11-build.patch:
+  honor LDFLAGS; quiet some warnings; move sed into a patch
 
   31 May 2009; Tristan Heaven <nyhm@gentoo.org> tetrinet-0.11.ebuild:
   Fix LICENSE: as-is -> public-domain
diff --git a/games-puzzle/tetrinet/Manifest b/games-puzzle/tetrinet/Manifest
index 9f3643b6c210..23cdcdd5491c 100644
--- a/games-puzzle/tetrinet/Manifest
+++ b/games-puzzle/tetrinet/Manifest
@@ -1,15 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX tetrinet-0.11-build.patch 2957 RMD160 97138364a69769bdf35b332103ca287fa19ea73d SHA1 93f4413f2468d33a0415ca347d51df45d7f955ba SHA256 c433279501c9a06ee8e885c728de51fe47b10dcdd5c8506a61b49e1910a66f03
 AUX tetrinet-0.11-no-ipv6.patch 181 RMD160 3180df978a28cc0628852fb98fec86752b82efb6 SHA1 0a9b665d146a7381c8a7a3b70bbd24cd134e1914 SHA256 fd28bf5b2b58e1274afa4258076ce765b055d535220ac2fdb23eec8625a773b6
 DIST tetrinet-0.11.tar.bz2 38607 RMD160 709376da9f0a06dacd3f11b572bdce11dd159ebd SHA1 2fb2bfcfe1fc2af82b01b66e2b28a77ad1262c17 SHA256 a7a32da072d0a7bb9f1a61ced5641336924c314692ed8ac3394147f3716b972c
-EBUILD tetrinet-0.11.ebuild 863 RMD160 ff5f48f29316c0733c00d3b76773b6ca865a8036 SHA1 f95f27aa9e208ffe8a69ea21e2b5214c512087c4 SHA256 f62e1218130c2af69502d8e711b6fe8b2ca9e875cbc0756950d587227e5e9f0a
-MISC ChangeLog 1278 RMD160 4b319db026501f3e395fcc3745fac12973bda0d5 SHA1 3ea7deb29543306f1642bd3a387bc85aa75b7773 SHA256 b1bbb0e35d23dd2acc2d6eb539a3665e930c816dd9b9899f3e44892549540797
+EBUILD tetrinet-0.11.ebuild 790 RMD160 b5ed425bfdf14f8d4b46e993a02969cf003b74d2 SHA1 89f1f18241c94fbf7515a66eb1b77a6a8bd898f1 SHA256 078386b384d5aa8ca339c3dd73a6bc7b9359838cc5e0f20073216714ac17feb6
+MISC ChangeLog 1457 RMD160 6b643b39fb34b40905de7ff0e566be20820f00bc SHA1 2b1b140fab5a0b643cb546dea80c934f9e3cc0aa SHA256 2c72f0bd849bdb9ed36f3f8c4e847f800b1aa9dc8f3e5c99f4172273ea1aff35
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAkoh604ACgkQdz7hIScOURFvBACfQZEE5NN0kiQY4BfxgZFJDfBx
-iBsAn0qAAuGWwFTKbqTSqtIA5OjwugVH
-=WWaG
------END PGP SIGNATURE-----
diff --git a/games-puzzle/tetrinet/files/tetrinet-0.11-build.patch b/games-puzzle/tetrinet/files/tetrinet-0.11-build.patch
new file mode 100644
index 000000000000..719691cad4e9
--- /dev/null
+++ b/games-puzzle/tetrinet/files/tetrinet-0.11-build.patch
@@ -0,0 +1,88 @@
+diff -ru tetrinet-0.11.orig/Makefile tetrinet-0.11/Makefile
+--- tetrinet-0.11.orig/Makefile	2003-09-07 12:29:29.000000000 -0400
++++ tetrinet-0.11/Makefile	2010-07-14 13:23:52.526003482 -0400
+@@ -1,6 +1,4 @@
+-CC = cc
+-
+-CFLAGS = -O2 -I/usr/include/ncurses -DHAVE_IPV6 -g -Wall
++CFLAGS += -I/usr/include/ncurses -g -Wall
+ OBJS = sockets.o tetrinet.o tetris.o tty.o xwin.o
+ 
+ ### If you want to have -server tetrinet client option, comment the two lines
+@@ -24,10 +22,10 @@
+ ########
+ 
+ tetrinet: $(OBJS)
+-	$(CC) -o $@ $(OBJS) -lncurses
++	$(CC) $(LDFLAGS) -o $@ $(OBJS) -lncurses
+ 
+ tetrinet-server: server.c sockets.c tetrinet.c tetris.c server.h sockets.h tetrinet.h tetris.h
+-	$(CC) $(CFLAGS) -o $@ -DSERVER_ONLY server.c sockets.c tetrinet.c tetris.c
++	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ -DSERVER_ONLY server.c sockets.c tetrinet.c tetris.c
+ 
+ .c.o:
+ 	$(CC) $(CFLAGS) -c $<
+diff -ru tetrinet-0.11.orig/sockets.c tetrinet-0.11/sockets.c
+--- tetrinet-0.11.orig/sockets.c	2003-09-09 15:15:04.000000000 -0400
++++ tetrinet-0.11/sockets.c	2010-07-14 13:18:28.999213319 -0400
+@@ -66,7 +66,7 @@
+     if (c == 0xFF)
+ 	ptr--;
+     *ptr = 0;
+-    if (log) {
++    if (logging) {
+ 	if (!logfile)
+ 	    logfile = fopen(logname, "a");
+ 	if (logfile) {
+@@ -89,7 +89,7 @@
+     unsigned char c = 0xFF;
+     int n = 0;
+ 
+-    if (log) {
++    if (logging) {
+ 	if (!logfile)
+ 	    logfile = fopen(logname, "a");
+ 	if (logfile) {
+diff -ru tetrinet-0.11.orig/tetrinet.c tetrinet-0.11/tetrinet.c
+--- tetrinet-0.11.orig/tetrinet.c	2003-09-07 12:29:29.000000000 -0400
++++ tetrinet-0.11/tetrinet.c	2010-07-14 13:22:33.529265565 -0400
+@@ -21,7 +21,7 @@
+ /*************************************************************************/
+ 
+ int fancy = 0;		/* Fancy TTY graphics? */
+-int log = 0;		/* Log network traffic to file? */
++int logging = 0;		/* Log network traffic to file? */
+ char *logname;		/* Log filename */
+ int windows_mode = 0;	/* Try to be just like the Windows version? */
+ int noslide = 0;	/* Disallow piece sliding? */
+@@ -82,8 +82,7 @@
+ 	    else
+ 		winlist[i].team = 0;
+ 	    s++;
+-	    strncpy(winlist[i].name, s, sizeof(winlist[i].name)-1);
+-	    winlist[i].name[sizeof(winlist[i].name)] = 0;
++	    snprintf(winlist[i].name, sizeof(winlist[i].name), "%s", s);
+ 	    winlist[i].points = atoi(t);
+ 	    if ((t = strchr(t, ';')) != NULL)
+ 		winlist[i].games = atoi(t+1);
+@@ -590,7 +589,7 @@
+ 	    if (strcmp(av[i], "-fancy") == 0) {
+ 		fancy = 1;
+ 	    } else if (strcmp(av[i], "-log") == 0) {
+-		log = 1;
++		logging = 1;
+ 		i++;
+ 		if (i >= ac) {
+ 		    fprintf(stderr, "Option -log requires an argument\n");
+diff -ru tetrinet-0.11.orig/tetrinet.h tetrinet-0.11/tetrinet.h
+--- tetrinet-0.11.orig/tetrinet.h	2003-09-07 12:12:51.000000000 -0400
++++ tetrinet-0.11/tetrinet.h	2010-07-14 13:18:20.061828023 -0400
+@@ -74,7 +74,7 @@
+ /* Externs */
+ 
+ extern int fancy;
+-extern int log;
++extern int logging;
+ extern char *logname;
+ extern int windows_mode;
+ extern int noslide;
diff --git a/games-puzzle/tetrinet/tetrinet-0.11.ebuild b/games-puzzle/tetrinet/tetrinet-0.11.ebuild
index bbd8ba2005ff..9232850d4fa3 100644
--- a/games-puzzle/tetrinet/tetrinet-0.11.ebuild
+++ b/games-puzzle/tetrinet/tetrinet-0.11.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-puzzle/tetrinet/tetrinet-0.11.ebuild,v 1.13 2009/05/31 02:28:23 nyhm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/tetrinet/tetrinet-0.11.ebuild,v 1.14 2010/07/14 17:38:21 mr_bones_ Exp $
 
 EAPI=2
 inherit eutils flag-o-matic games
@@ -17,14 +17,11 @@ IUSE="ipv6"
 DEPEND=">=sys-libs/ncurses-5"
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-no-ipv6.patch
+	epatch \
+		"${FILESDIR}"/${P}-no-ipv6.patch \
+		"${FILESDIR}"/${P}-build.patch
 
 	use ipv6 && append-flags -DHAVE_IPV6
-	sed -i \
-		-e '/^CC/d' \
-		-e 's/-DHAVE_IPV6//' \
-		-e "s:-O2:${CFLAGS}:" Makefile \
-		|| die "sed Makefile failed"
 }
 
 src_install() {