Update to 1.2.

4 files changed, 32 insertions, 22 deletions

diff --git a/games/icebreaker/Makefile b/games/icebreaker/Makefile
index 87201cde9f96..cca342ec3e03 100644
--- a/games/icebreaker/Makefile
+++ b/games/icebreaker/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	icebreaker
-PORTVERSION=	1.0
+PORTVERSION=	1.2
 CATEGORIES=	games
 MASTER_SITES=	http://www.mattdm.org/icebreaker/
 EXTRACT_SUFX=	.tgz
@@ -21,8 +21,11 @@ USE_GMAKE=	yes
 MAKE_ENV=	SDL_CONFIG="${SDL_CONFIG}" \
 		prefix="${PREFIX}" \
 		highscoredir="${PREFIX}/share/icebreaker/scores" \
+		mandir="${PREFIX}/man" \
 		CHMOD="${CHMOD}" \
 		CHOWN="${CHOWN}" \
 		MKDIR="${MKDIR}"
 
+MAN6=		${PORTNAME}.6
+
 .include <bsd.port.mk>
diff --git a/games/icebreaker/distinfo b/games/icebreaker/distinfo
index 75a2053e4f38..43a656ad40d1 100644
--- a/games/icebreaker/distinfo
+++ b/games/icebreaker/distinfo
@@ -1 +1 @@
-MD5 (icebreaker-1.0.tgz) = 74259ee86ff7bf5eec8471aed89e5388
+MD5 (icebreaker-1.2.tgz) = 5da38e33c1b6814a32fd8bdd0192f43b
diff --git a/games/icebreaker/files/patch-aa b/games/icebreaker/files/patch-aa
index 9e1984c3c4a8..4f011eec8abe 100644
--- a/games/icebreaker/files/patch-aa
+++ b/games/icebreaker/files/patch-aa
@@ -1,46 +1,52 @@
---- Makefile.orig	Thu Oct  5 21:55:31 2000
-+++ Makefile	Thu Oct 19 14:24:35 2000
-@@ -1,4 +1,4 @@
--CC=gcc
+
+$FreeBSD$
+
+--- Makefile.orig	Fri Jul 27 05:45:10 2001
++++ Makefile	Mon Jul 30 14:25:37 2001
+@@ -1,6 +1,7 @@
+ CC=gcc
+ 
+-SDLCONFIG=sdl-config
++SDLCONFIG=$(SDL_CONFIG)
 +CC?=gcc
  
  ifndef prefix
    #prefix=/usr/local
-@@ -10,16 +10,16 @@
-   highscoredir=/var/lib/games
+@@ -17,7 +18,7 @@
  endif
  
--CFLAGS=-Wall -O3 $(SDL_CFLAGS) -DDATAPREFIX=\"$(prefix)/share/icebreaker\" -DHISCOREPREFIX=\"$(highscoredir)\"
-+CFLAGS+=-Wall $(SDL_CFLAGS) -DDATAPREFIX=\"$(prefix)/share/icebreaker\" -DHISCOREPREFIX=\"$(highscoredir)\"
- #CFLAGS=-Wall -pg -g $(SDL_CFLAGS)
+ ifndef OPTIMIZE
+-  OPTIMIZE=-O3
++  OPTIMIZE=
+ endif
  
- SRC=icebreaker.c cursor.c grid.c laundry.c line.c penguin.c sound.c \
-     level.c intro.c text.c status.c transition.c hiscore.c dialog.c
+ CFLAGS=-Wall $(OPTIMIZE) $(SDL_CFLAGS) -DDATAPREFIX=\"$(prefix)/share/icebreaker\" -DHISCOREPREFIX=\"$(highscoredir)\"
+@@ -26,7 +27,7 @@
+     level.c intro.c text.c status.c transition.c hiscore.c dialog.c \
+     options.c fullscreen.c
  
 -SDL_MIXER=-lSDL_mixer
 +SDL_MIXER=-lSDL_mixer -lsmpeg
  SDL_LIB=$(SDL_LDFLAGS) $(SDL_MIXER) 
--SDL_CFLAGS := $(shell sdl-config --cflags)
--SDL_LDFLAGS := $(shell sdl-config --libs)
-+SDL_CFLAGS := $(shell $(SDL_CONFIG) --cflags)
-+SDL_LDFLAGS := $(shell $(SDL_CONFIG) --libs)
- 
- 
- all:	icebreaker
-@@ -38,15 +38,16 @@
- 	$(CC) $(CFLAGS) $^ -o icebreaker $(SDL_LIB)
+ SDL_CFLAGS := $(shell $(SDLCONFIG) --cflags)
+ SDL_LDFLAGS := $(shell $(SDLCONFIG) --libs)
+@@ -100,17 +101,17 @@
+ 	   sed 's/\$$VERDATE/$(VERDATE)/' > $@
  
  install: all
 -	mkdir -p $(prefix)/bin
 -	mkdir -p $(prefix)/share/icebreaker
 -	mkdir -p $(highscoredir)
+-	mkdir -p $(mandir)/man6
 +	$(MKDIR) $(prefix)/share/icebreaker
 +	$(MKDIR) $(highscoredir)
  
 -	install -m 644 *.wav *.bmp $(prefix)/share/icebreaker
 -	install -g games -s -m 2755 icebreaker $(prefix)/bin
+-	install -m 644 icebreaker.6 $(mandir)/man6
 +	$(BSD_INSTALL_DATA) *.wav *.bmp $(prefix)/share/icebreaker
 +	$(BSD_INSTALL_PROGRAM) icebreaker $(prefix)/bin
++	$(BSD_INSTALL_MAN) icebreaker.6 $(mandir)/man6
  	touch $(highscoredir)/icebreaker.scores
 -	chown games:games $(highscoredir)/icebreaker.scores
 -	chmod 664 $(highscoredir)/icebreaker.scores
diff --git a/games/icebreaker/pkg-plist b/games/icebreaker/pkg-plist
index e927d7b6265d..e01925ca8511 100644
--- a/games/icebreaker/pkg-plist
+++ b/games/icebreaker/pkg-plist
@@ -3,6 +3,7 @@ share/icebreaker/crash.wav
 share/icebreaker/icebreaker_48.bmp
 share/icebreaker/ouch.wav
 share/icebreaker/penguin.bmp
+share/icebreaker/penguinicon_32.bmp
 share/icebreaker/scores/icebreaker.scores
 @dirrm share/icebreaker/scores
 @dirrm share/icebreaker