fix some compile warnings; tidy

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

4 files changed, 94 insertions, 17 deletions

diff --git a/games-puzzle/galaxis/ChangeLog b/games-puzzle/galaxis/ChangeLog
index 45caa36adb7d..a0fd525af8db 100644
--- a/games-puzzle/galaxis/ChangeLog
+++ b/games-puzzle/galaxis/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-puzzle/galaxis
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-puzzle/galaxis/ChangeLog,v 1.11 2010/10/16 19:55:52 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/galaxis/ChangeLog,v 1.12 2010/10/18 17:14:37 mr_bones_ Exp $
+
+  18 Oct 2010; Michael Sterrett <mr_bones_@gentoo.org> galaxis-1.7.ebuild,
+  +files/galaxis-1.7-gentoo.patch:
+  fix some compile warnings; tidy
 
   16 Oct 2010; Tupone Alfredo <tupone@gentoo.org> galaxis-1.7.ebuild:
   Respect LDFLAGS. Bug #334635 by flameeyes@gentoo.org
diff --git a/games-puzzle/galaxis/Manifest b/games-puzzle/galaxis/Manifest
index 83bf9f14f84d..3f8eefff1718 100644
--- a/games-puzzle/galaxis/Manifest
+++ b/games-puzzle/galaxis/Manifest
@@ -1,4 +1,5 @@
+AUX galaxis-1.7-gentoo.patch 1880 RMD160 345a5e5cf34b4ac2ac438f8d05c8c0defd59d0b8 SHA1 7f2e813a90353d845d104dc159b11117e9961e6c SHA256 563e84f008d0d37d9f3f886ea13d9b184e595fa4d81231c3a52b49be9adfc8c7
 DIST galaxis-1.7.tar.gz 14560 RMD160 eafa96f6a6372631cdfc9d13e7a1afbeaddd6c54 SHA1 644b1bca994047801d9cd5c1444a5493dc77898b SHA256 6ce202547d486ef5eb0300e201116046fab0218012c2b39ae2baf2338c6d0faa
-EBUILD galaxis-1.7.ebuild 894 RMD160 0334628c4e1feb22d54d3e3550cdfa299be037d9 SHA1 6c3d69ce5c9996b793f4265185d9fccaa2574227 SHA256 6ad972fb3e58356433b556f30c7f69857657743dc07d69446e46b881ba588b39
-MISC ChangeLog 1294 RMD160 071e1c14b12b7d09885dabcb84bd4b048528772e SHA1 1a05570536131f95b5350af5ab7a7a585f88db59 SHA256 4dd4e7490ea1a4f3c5bcf01f2346c64acbf0286b1b21c36099a91dba3d8042cd
+EBUILD galaxis-1.7.ebuild 703 RMD160 116a0528d294ca21bc953914683cfc681df4f6ad SHA1 bd0aa6e553a796f7d6743fcbeadd18f82fb98ea8 SHA256 80925ecfcb2167ad91906b5d391f8a92cd5c487833e4fd9e39b1656a7279a270
+MISC ChangeLog 1442 RMD160 3a0c02b695357fbcc258de840f246c918f662c27 SHA1 bafb2a9c84d93f1e83134d4bccf0c0b3d6407297 SHA256 bd89b0ccb9d03246be7e8accb3413286f894a66276e5fbb245fdd09b7e04d382
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
diff --git a/games-puzzle/galaxis/files/galaxis-1.7-gentoo.patch b/games-puzzle/galaxis/files/galaxis-1.7-gentoo.patch
new file mode 100644
index 000000000000..3153291d3f4f
--- /dev/null
+++ b/games-puzzle/galaxis/files/galaxis-1.7-gentoo.patch
@@ -0,0 +1,83 @@
+diff -ru galaxis-1.7.orig/Makefile galaxis-1.7/Makefile
+--- galaxis-1.7.orig/Makefile	2003-12-29 04:09:53.000000000 -0500
++++ galaxis-1.7/Makefile	2010-10-18 13:08:43.929375025 -0400
+@@ -3,9 +3,8 @@
+ VERS=$(shell sed <galaxis.spec -n -e '/Version: \(.*\)/s//\1/p')
+ 
+ # Flags for use with the Linux ncurses package (recommended)
+-CFLAGS = -g -DNDEBUG  # -I/usr/local/include -L/usr/local/lib
++CFLAGS += -DNDEBUG  # -I/usr/local/include -L/usr/local/lib
+ TERMLIB = -lncurses
+-CC = gcc
+ 
+ # Flags for use with stock curses
+ #CFLAGS = -DNDEBUG
+@@ -13,7 +12,7 @@
+ #CC = gcc
+ 
+ galaxis: galaxis.c
+-	$(CC) $(CFLAGS) -o galaxis galaxis.c $(TERMLIB)
++	$(CC) $(LDFLAGS) $(CFLAGS) -o galaxis galaxis.c $(TERMLIB)
+ 
+ galaxis.6: galaxis.xml
+ 	xmlto man galaxis.xml
+diff -ru galaxis-1.7.orig/galaxis.c galaxis-1.7/galaxis.c
+--- galaxis-1.7.orig/galaxis.c	2003-12-26 23:19:20.000000000 -0500
++++ galaxis-1.7/galaxis.c	2010-10-18 13:10:03.575307583 -0400
+@@ -8,6 +8,10 @@
+ #define _POSIX_SOURCE
+ 
+ #include <stdio.h>
++#include <stdlib.h>
++#include <unistd.h>
++#include <time.h>
++#include <string.h>
+ #include <termios.h>
+ #include <curses.h>
+ #include <signal.h>
+@@ -29,7 +33,6 @@
+ extern long lrand48();
+ extern void srand48();
+ #define bzero(s, n)	(void)memset((char *)(s), '\0', n)
+-extern char *memset();
+ /*
+  * Try this if ungetch() fails to resolve.
+  *
+@@ -167,16 +170,17 @@
+ }		    
+ 
+ /* VARARGS1 */
+-static void prompt(f, s)
++static void prompt(s)
+ /* print a message at the prompt line */
+-char *f, *s;
++char *s;
+ {
+     (void) move(PROMPTLINE, 0);
+     (void) clrtoeol();
+-    (void) printw(f, s);
++    (void) printw("%s", s);
+     (void) refresh();
+ }
+ 
++#if 0
+ static void error(s)
+ char *s;
+ {
+@@ -188,6 +192,7 @@
+ 	(void) beep();
+     }
+ }
++#endif
+ 
+ static int rnd(n)
+ int n;
+@@ -647,7 +652,7 @@
+     }
+ }
+ 
+-main(argc, argv)
++int main(argc, argv)
+ int argc;
+ char *argv[];
+ {
diff --git a/games-puzzle/galaxis/galaxis-1.7.ebuild b/games-puzzle/galaxis/galaxis-1.7.ebuild
index 4139635843ad..0076010768c5 100644
--- a/games-puzzle/galaxis/galaxis-1.7.ebuild
+++ b/games-puzzle/galaxis/galaxis-1.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-puzzle/galaxis/galaxis-1.7.ebuild,v 1.11 2010/10/16 19:55:52 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/galaxis/galaxis-1.7.ebuild,v 1.12 2010/10/18 17:14:37 mr_bones_ Exp $
 
 EAPI=2
 inherit games
@@ -14,20 +14,9 @@ SLOT="0"
 KEYWORDS="amd64 ppc ppc64 x86"
 IUSE=""
 
-RDEPEND=">=sys-libs/ncurses-5.3"
-DEPEND="${RDEPEND}"
+DEPEND=">=sys-libs/ncurses-5.3"
 
-src_prepare() {
-	# Modify CFLAGS
-	sed -i \
-		-e '/^CC/d' \
-		-e '/^CFLAGS/s:-g:$(E_CFLAGS):' \
-		Makefile || die "sed Makefile failed"
-}
-
-src_compile() {
-	emake E_CFLAGS="${LDFLAGS} ${CFLAGS}" || die "emake failed"
-}
+PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
 
 src_install() {
 	dogamesbin galaxis || die "dogamesbin failed"