games-arcade/snake: Clean-up Makefile in order to use portage env variables

svn path=/sunrise/; revision=9101

4 files changed, 17 insertions, 17 deletions

diff --git a/games-arcade/snake/ChangeLog b/games-arcade/snake/ChangeLog
index a96176edb..d36a4d8b2 100644
--- a/games-arcade/snake/ChangeLog
+++ b/games-arcade/snake/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  24 Aug 2009; Romain Perier (mrpouet) <mrpouet@gentoo.org>
+  snake-0.5.1.ebuild, files/snake-0.5.1-clean-up-Makefile.patch:
+  Clean-up Makefile in order to use portage env variables
+
   23 Aug 2009; Romain Perier (mrpouet) <mrpouet@gentoo.org>
   snake-0.5.1.ebuild, +files/snake-0.5.1-clean-up-Makefile.patch,
   +files/snake-0.5.1-qa-warnings.patch:
diff --git a/games-arcade/snake/Manifest b/games-arcade/snake/Manifest
index dad06af3d..0626e26cb 100644
--- a/games-arcade/snake/Manifest
+++ b/games-arcade/snake/Manifest
@@ -1,6 +1,6 @@
-AUX snake-0.5.1-clean-up-Makefile.patch 2288 RMD160 291ced7dd967291a73ea524c53e4e969803f01a2 SHA1 531dfb86197b2c7d8c26611a62d55f6c782afb67 SHA256 ed4878f2c0e6dcdcc285ed8f9a7966d7658787257a98c827c79b8b204fc27ed8
+AUX snake-0.5.1-clean-up-Makefile.patch 2253 RMD160 0b1b7b5d3fcf383ea66e402542f5c49b227444fd SHA1 14488275945576f45e67b9ad96c710b56f5a855d SHA256 1371230a5d3f0d26ff97cc82983351ee1bec4ab6f482515ff7182b62a91305be
 AUX snake-0.5.1-qa-warnings.patch 2738 RMD160 43567ac54cbbe1604783d9a754525aba7d0f9c51 SHA1 5a4a087a0a9df78e4c98f5686506f947a1664977 SHA256 cfcf64d842a98de40a32e662332960c54ee610cbc82abe5ae8e123fd04cf4047
 DIST snake-0.5.1.tar.bz2 173330 RMD160 2da378f1875fa1739be12da5b8680ccac0737268 SHA1 e2386cd9ae9e651f63f6fc63233f66a0c1f63e83 SHA256 0a8427a5dd6017e40b7098ff71b99a5d25104fbaa7371456a36c5a415c27fa87
-EBUILD snake-0.5.1.ebuild 816 RMD160 ed45f43350568373a189b5bd6c0f67a69e960c0b SHA1 3dbed60434e7c376a4837e89c3fb5b460cf3a242 SHA256 49597f3526bff79ecfcba1d2cb480582fd14feb3f39338ac39ad030984fef8d9
-MISC ChangeLog 1049 RMD160 c7cd3c94965b561ada5252974cd50c1be980b5ec SHA1 5ec2a316d3877be456b33d32c3faed86dc41b997 SHA256 47ecf689b96a251bec8f56f0dc6ac926f4342c784286349ba33086cb0733806a
+EBUILD snake-0.5.1.ebuild 753 RMD160 d8e462eaab898cce28c50e88d8906137ea3767ac SHA1 a3dba14225e4de3d0dd17de7a5301172373cf25e SHA256 5fc2f524b4ea835448da6dc8aafa867099f8099538bd4eb8d2bc4e051f0d22ad
+MISC ChangeLog 1233 RMD160 6581304739b3e7647e48073e94e49bf72c4e615d SHA1 9ac9e661cba1a847f7e2d227cbd39ba2a73ee718 SHA256 f0cf35926e474d9c77b84d962f79d8157615e9dea6264cc8ec6d6bd06341e49e
 MISC metadata.xml 174 RMD160 4baef080089dfad6ee65bcfb4ec1179e00e696b2 SHA1 83b132ab88e399a7699d991cb9ebb1276101d7bc SHA256 7694ba94603327277230fc9afacee8773445604a8e55a6a6d9a4724fe0625d91
diff --git a/games-arcade/snake/files/snake-0.5.1-clean-up-Makefile.patch b/games-arcade/snake/files/snake-0.5.1-clean-up-Makefile.patch
index a1f90c9c3..20fb0c551 100644
--- a/games-arcade/snake/files/snake-0.5.1-clean-up-Makefile.patch
+++ b/games-arcade/snake/files/snake-0.5.1-clean-up-Makefile.patch
@@ -1,28 +1,26 @@
- Makefile |   54 +++++++++++++++++-------------------------------------
- 1 files changed, 17 insertions(+), 37 deletions(-)
+ Makefile |   52 +++++++++++++++-------------------------------------
+ 1 files changed, 15 insertions(+), 37 deletions(-)
 
 diff --git a/Makefile b/Makefile
-index 69e39ea..d1ac825 100644
+index 69e39ea..660e12a 100644
 --- a/Makefile
 +++ b/Makefile
-@@ -1,8 +1,11 @@
+@@ -1,8 +1,9 @@
 -OBJS = main.o snake.o config.o playground.o queue_key.o config-player.o
 -CC = g++
 -DEBUG = -g
 -CFLAGS = -Wall -c -I/usr/include/SDL $(DEBUG)
 -LFLAGS = -Wall -L/usr/lib -lSDL -lpthread -lSDL_image -lSDL_gfx -lSDL_ttf -lSDL_mixer  $(DEBUG)
 +CC=g++
-+my_CXXFLAGS=
-+CXXFLAGS=-W -Wall `pkg-config sdl --cflags` $(my_CXXFLAGS)
++CPPFLAGS=`pkg-config sdl --cflags`
 +LIBS=`pkg-config sdl --libs` -lSDL_image -lSDL_gfx -lSDL_ttf -lSDL_mixer
-+LDFLAGS=
 +
 +SRC=$(wildcard src/*.cpp)
 +OBJ=$(SRC:.cpp=.o)
  
  ifndef GAMES_BINDIR
  GAMES_BINDIR=/usr/games/bin
-@@ -12,44 +15,21 @@ ifndef GAMES_DATADIR
+@@ -12,44 +13,21 @@ ifndef GAMES_DATADIR
  GAMES_DATADIR=/usr/share/games
  endif
  
@@ -43,8 +41,8 @@ index 69e39ea..d1ac825 100644
 -
 -config.o : src/config.cpp src/config.h src/config-player.h
 -	$(CC) $(CFLAGS) src/config.cpp
-+CXXFLAGS+=-DBINDIR="\"$(GAMES_BINDIR)\""
-+CXXFLAGS+=-DDATADIR="\"$(GAMES_DATADIR)\""
++CPPFLAGS += -DBINDIR="\"$(GAMES_BINDIR)\""
++CPPFLAGS += -DDATADIR="\"$(GAMES_DATADIR)\""
  
 -playground.o : src/playground.cpp src/playground.h src/definitions.h src/config.h
 -	$(CC) $(CFLAGS) src/playground.cpp
@@ -57,7 +55,7 @@ index 69e39ea..d1ac825 100644
 +all: snake
  
 +snake: $(OBJ)
-+	$(CC) $(CXXFLAGS) $^ -o $@ $(LDFLAGS) $(LIBS)
++	$(CC) $(CPPFLAGS) $(CXXFLAGS) $^ -o $@ $(LDFLAGS) $(LIBS)
 +%.o: src/%.cpp src/%.h
  clean:
 -	rm *.o *~ snake
diff --git a/games-arcade/snake/snake-0.5.1.ebuild b/games-arcade/snake/snake-0.5.1.ebuild
index db27f85de..9ab0b8a5b 100644
--- a/games-arcade/snake/snake-0.5.1.ebuild
+++ b/games-arcade/snake/snake-0.5.1.ebuild
@@ -27,9 +27,7 @@ src_prepare() {
 	epatch "${FILESDIR}"/${P}-{clean-up-Makefile,qa-warnings}.patch
 }
 src_compile() {
-	emake CC=$(tc-getCXX)         \
-		my_CXXFLAGS="${CXXFLAGS}" \
-		LDFLAGS="${LDFLAGS}" || die "emake failed"
+	emake CC=$(tc-getCXX) || die "emake failed"
 }
 src_install() {
 	emake DESTDIR="${D}" install || die "install failed"