Update tuxpuck 0.7.116 -> 0.8.1 and make build respect ${CC}

PR:		44760
Submitted by:	Jan Stocker <Jan.Stocker@t-online.de> (maintainer)
Approved by:	pat

4 files changed, 33 insertions, 31 deletions

diff --git a/games/tuxpuck/Makefile b/games/tuxpuck/Makefile
index d4b27bb..f8e3906 100644
--- a/games/tuxpuck/Makefile
+++ b/games/tuxpuck/Makefile
@@ -7,8 +7,7 @@
 #
 
 PORTNAME=	tuxpuck
-PORTVERSION=	0.7.116
-PORTREVISION=	1
+PORTVERSION=	0.8.1
 CATEGORIES=	games
 MASTER_SITES=	http://www.efd.lth.se/~d00jkr/tuxpuck/
 
@@ -22,6 +21,7 @@ LIB_DEPENDS=	SDL-1.1.4:${PORTSDIR}/devel/sdl12 \
 SDL_CONFIG=	${LOCALBASE}/bin/sdl11-config
 USE_GMAKE=	yes
 MAKE_ENV=	SDL_CONFIG="${SDL_CONFIG}"
+ALL_TARGET=	tuxpuck
 
 MANCOMPRESSED=	yes
 MAN6=	tuxpuck.6
diff --git a/games/tuxpuck/distinfo b/games/tuxpuck/distinfo
index d06766c..5af5324 100644
--- a/games/tuxpuck/distinfo
+++ b/games/tuxpuck/distinfo
@@ -1 +1 @@
-MD5 (tuxpuck-0.7.116.tar.gz) = 6533daf46c4630840c8173e02b43b9f7
+MD5 (tuxpuck-0.8.1.tar.gz) = f9343dd08d10e90c81815f3037a13489
diff --git a/games/tuxpuck/files/patch-Makefile b/games/tuxpuck/files/patch-Makefile
index 816dbfe..ee98b86 100644
--- a/games/tuxpuck/files/patch-Makefile
+++ b/games/tuxpuck/files/patch-Makefile
@@ -1,36 +1,23 @@
---- Makefile.orig	Thu Apr 25 23:14:27 2002
-+++ Makefile	Thu Apr 25 23:25:55 2002
-@@ -1,7 +1,7 @@
+--- Makefile.orig	Tue Oct 15 13:48:06 2002
++++ Makefile	Wed Oct 30 13:01:37 2002
+@@ -1,8 +1,8 @@
  # Makefile for TuxPuck , Copyright Jacob Kroon 2001-2002
- VERSION		= 0.7.109
- CC		= gcc
+ VERSION		= 0.8.1
+-CC		= gcc
 -CFLAGS		+= `sdl-config --cflags` -D_VERSION=\"$(VERSION)\" \
+-		   -g -Wall
++CC		?= gcc
 +CFLAGS		+= `$(SDL_CONFIG) --cflags` -D_VERSION=\"$(VERSION)\" \
- 		   -g -Wall -Werror
- CSOURCES	= tuxpuck.c video.c audio.c sprite.c font.c timer.c board.c \
- 	   	  entity.c glass.c scoreboard.c player.c zoom.c png.c jpg.c \
-@@ -11,6 +11,7 @@
- 
- #############################################################
- 
-+
- OBJS=$(CSOURCES:.c=.o)
- 
- %.o	: %.c
-@@ -18,7 +19,7 @@
++		   -Wall
+ CSOURCES	= tuxpuck.c video.c audio.c menu.c sprite.c font.c timer.c \
+ 		  board.c entity.c glass.c scoreboard.c player.c zoom.c png.c \
+ 		  jpg.c intro.c tux.c arcana.c 
+@@ -18,7 +18,7 @@
  
  tuxpuck : $(OBJS)
  	cd data; $(MAKE)
--	$(CC) $(OBJS) data/libdata.a `sdl-config --libs` -lm -lpng -ljpeg \
-+	$(CC) $(OBJS) data/libdata.a `$(SDL_CONFIG) --libs` -lm -lpng -ljpeg \
- 	-lz -lvorbisfile -lvorbis -o tuxpuck
+-	$(CC) $(CFLAGS) $(OBJS) data/libdata.a `sdl-config --libs` -lm -lpng \
++	$(CC) $(CFLAGS) $(OBJS) data/libdata.a `$(SDL_CONFIG) --libs` -lm -lpng \
+ 	-ljpeg -lz -lvorbisfile -lvorbis -logg -o tuxpuck
  
  clean :
-@@ -55,3 +56,7 @@
- 	install -d $(DESTDIR)/usr/man/man6
- 	install -m755 tuxpuck $(DESTDIR)/usr/bin
- 	install -m644 man/tuxpuck.6.gz $(DESTDIR)/usr/man/man6
-+
-+all : tuxpuck
-+
-+
diff --git a/games/tuxpuck/files/patch-utils::Makefile b/games/tuxpuck/files/patch-utils::Makefile
new file mode 100644
index 0000000..dbda89c
--- /dev/null
+++ b/games/tuxpuck/files/patch-utils::Makefile
@@ -0,0 +1,15 @@
+--- utils/Makefile.orig	Tue Oct 15 13:48:06 2002
++++ utils/Makefile	Wed Oct 30 13:06:42 2002
+@@ -9,10 +9,10 @@
+ 	$(CC) $(CFLAGS) ttf2font.c `freetype-config --cflags --libs` -o ttf2font
+ 
+ data2c : data2c.c
+-	$(CC) $(CFLAGS) data2c.c `sdl-config --cflags` -o data2c
++	$(CC) $(CFLAGS) data2c.c `$(SDL_CONFIG) --cflags` -o data2c
+ 
+ anim : anim.c
+-	$(CC) $(CFLAGS) anim.c `sdl-config --cflags` -o anim
++	$(CC) $(CFLAGS) anim.c `$(SDL_CONFIG) --cflags` -o anim
+ 
+ clean :
+ 	rm -f *~ data2c ttf2font anim