- Bump PORTREVISION

- Change master sites, icon
- Remove dependency for graphics/netpbm
- USES gmake instead of USE_GMAKE
- Use pkg-plist instead of PLIST_FILES and PORTDATA
- Add DOCS Option
- Support STAGEDIR
- Change REINPLACE_CMD, fix for STAGEDIR
- Break lines around 80 characters
- Fix Desktop usage, add files/icebreaker.desktop instead of supplied desktop
- Change patches and recreate with make makepatch
- Add patch patch-transition.c, fix warning with Clang

Approved by:	pawel / wg (mentors, implicit)

11 files changed, 116 insertions, 61 deletions

diff --git a/games/icebreaker/Makefile b/games/icebreaker/Makefile
index 725d76fc1fef..07b63cafbadd 100644
--- a/games/icebreaker/Makefile
+++ b/games/icebreaker/Makefile
@@ -3,62 +3,51 @@
 
 PORTNAME=	icebreaker
 PORTVERSION=	1.9.8
+PORTREVISION=	1 
 CATEGORIES=	games
-MASTER_SITES=	http://mattdm.org/icebreaker/1.9.x/
+MASTER_SITES=	http://mattdm.org/icebreaker/1.9.x/ \
+		SF/nemysisfreebsdp/games/${PORTNAME}/:icons
 EXTRACT_SUFX=	.tgz
+DISTFILES=	${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX} \
+		${PORTNAME}.png:icons
+EXTRACT_ONLY=	${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX}
 
 MAINTAINER=	nemysis@FreeBSD.org
 COMMENT=	Game similar to Jezzball or Barrack
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	pnmtopng:${PORTSDIR}/graphics/netpbm
-
+USES=		gmake
 USE_SDL=	mixer sdl
-USE_GMAKE=	yes
-
-PLIST_FILES=	bin/${PORTNAME} \
-		share/pixmaps/${PORTNAME}.png \
-		share/applications/${PORTNAME}.desktop
-
-PORTDATA=	*
-PORTDOCS=	ChangeLog README README.SDL README.ifyoumakechanges README.themes TODO
 
-MAN6=		${PORTNAME}.6
+PORTDOCS=	ChangeLog README README.SDL README.ifyoumakechanges \
+		README.themes TODO
 
-NO_STAGE=	yes
-.include <bsd.port.options.mk>
+OPTIONS_DEFINE=	DOCS
 
 post-patch:
 	@${REINPLACE_CMD} \
-	-e 's|CC=gcc|CC?=g++|' \
-	-e 's|sdl-config|$(SDL_CONFIG)|' \
-	-e 's|prefix=/usr/local|prefix=${PREFIX}|' \
-	-e 's|mandir=$$(prefix)/share/man|mandir=$$(prefix)/man|' \
-	-e 's|highscoredir=/var/local/lib/games|highscoredir=/var/games|' \
-	-e 's|CFLAGS=|CFLAGS+=|' \
-	-e 's|OPTIMIZE=-O3|OPTIMIZE=|' \
-	-e 's|$$(CC) $$(CFLAGS) $$^ -o icebreaker $$(SDL_LIB)|$$(CC) $$(LDFLAGS) $$(CFLAGS) $$^ -o icebreaker $$(SDL_LIB)|' \
-	-e 's|install -s -g games -m 2755 icebreaker $(bindir)|install -g games -m 2755 icebreaker $(bindir)|' \
-	-e 's|install -s -m 755 icebreaker $(bindir)|install -m 755 icebreaker $(bindir)|' \
-	-e 's|chown -f games:games|chown -f root:games|' \
+	-e 's|CC=gcc|CC?=gcc| ; \
+	s|sdl-config|$(SDL_CONFIG)| ; \
+	s|prefix=/usr/local|prefix=${STAGEDIR}${PREFIX}| ; \
+	s|datadir=$$(prefix)/share|datadir=${STAGEDIR}${PREFIX}/share| ; \
+	s|mandir=$$(prefix)/share/man|mandir=${STAGEDIR}${PREFIX}/man| ; \
+	s|highscoredir=/var/local/lib/games|highscoredir=/var/games| ; \
+	s|CFLAGS=|CFLAGS+=| ; \
+	s|OPTIMIZE=-O3|OPTIMIZE=| ; \
+	s|$$(CC) $$(CFLAGS)|$$(CC) $$(LDFLAGS) $$(CFLAGS)| ; \
+	s|install -s -g games|install -g games| ; \
+	s|install -s -m 755|install -m 755| ; \
+	s|chown -f games:games|chown -f root:games| ; \
+	s|$$(SRC:.c=.d)|$$(SRC:.c)|' \
 		${WRKSRC}/Makefile
-	@${REINPLACE_CMD} \
-	-e 's|%{Summary}|Game similar to Jezzball or Barrack|' \
-	-e 's|/usr/share/icebreaker/icebreaker_48.bmp|icebreaker|' \
-		${WRKSRC}/icebreaker.desktop
-
-post-build:
-	@(cd ${WRKSRC} && ${LOCALBASE}/bin/winicontoppm -bestqual icebreaker_32.ico | \
-		${LOCALBASE}/bin/pnmtopng > icebreaker.png)
 
 post-install:
-	${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.png ${PREFIX}/share/pixmaps
-	${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.desktop ${PREFIX}/share/applications
+	${INSTALL_DATA} ${_DISTDIR}/${PORTNAME}.png \
+		${STAGEDIR}${PREFIX}/share/pixmaps/
+	${INSTALL_DATA} ${FILESDIR}/${PORTNAME}.desktop ${STAGEDIR}${DESKTOPDIR}
 
-.if ${PORT_OPTIONS:MDOCS}
-	${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR}
-.endif
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/games/icebreaker/distinfo b/games/icebreaker/distinfo
index 5693dd9f75ff..c979aca51922 100644
--- a/games/icebreaker/distinfo
+++ b/games/icebreaker/distinfo
@@ -1,2 +1,4 @@
 SHA256 (icebreaker-1.9.8.tgz) = 2e9b1e898c50562c503cb109172c422544d2e5de09e642bb8eb3401a9180adc4
 SIZE (icebreaker-1.9.8.tgz) = 177355
+SHA256 (icebreaker.png) = bee29260a7e3fcd858b4286246d82df8747b73f2e5e31bc59b732b4df84efcd5
+SIZE (icebreaker.png) = 838
diff --git a/games/icebreaker/files/icebreaker.desktop b/games/icebreaker/files/icebreaker.desktop
new file mode 100644
index 000000000000..8993fc9b1957
--- /dev/null
+++ b/games/icebreaker/files/icebreaker.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Type=Application
+Version=1.0
+Name=IceBreaker
+GenericName=IceBreaker game
+Comment=Addictive action-puzzle game involving bouncing penguins
+Exec=icebreaker
+Icon=icebreaker
+Categories=Game;ArcadeGame;
+Terminal=0
diff --git a/games/icebreaker/files/patch-dialog.c b/games/icebreaker/files/patch-dialog.c
index a020ace4d954..1e72f133d50e 100644
--- a/games/icebreaker/files/patch-dialog.c
+++ b/games/icebreaker/files/patch-dialog.c
@@ -1,5 +1,5 @@
---- dialog.c.orig	2002-06-02 16:25:51.000000000 +0200
-+++ dialog.c	2013-01-13 19:29:58.000000000 +0100
+--- ./dialog.c.orig	2002-06-02 16:25:51.000000000 +0200
++++ ./dialog.c	2013-12-24 13:42:35.000000000 +0100
 @@ -287,10 +287,10 @@
  
  	for (i=0;i<HISCORENUM;i++)
diff --git a/games/icebreaker/files/patch-hiscore.c b/games/icebreaker/files/patch-hiscore.c
index 64512d02b27f..fcf570a47e82 100644
--- a/games/icebreaker/files/patch-hiscore.c
+++ b/games/icebreaker/files/patch-hiscore.c
@@ -1,5 +1,5 @@
---- hiscore.c.orig	2002-06-02 16:28:35.000000000 +0200
-+++ hiscore.c	2013-01-13 20:24:43.000000000 +0100
+--- ./hiscore.c.orig	2002-06-02 16:28:35.000000000 +0200
++++ ./hiscore.c	2013-12-24 13:42:35.000000000 +0100
 @@ -72,7 +72,7 @@
  	// make sure all entries are zeroed out to start.
  	for (i=0;i<HISCORENUM;i++)
diff --git a/games/icebreaker/files/patch-line.c b/games/icebreaker/files/patch-line.c
index 7b62544ee805..1749fd85f459 100644
--- a/games/icebreaker/files/patch-line.c
+++ b/games/icebreaker/files/patch-line.c
@@ -1,5 +1,5 @@
---- line.c.orig	2002-05-31 05:15:45.000000000 +0200
-+++ line.c	2013-01-13 19:49:19.000000000 +0100
+--- ./line.c.orig	2002-05-31 05:15:45.000000000 +0200
++++ ./line.c	2013-12-24 13:42:35.000000000 +0100
 @@ -30,8 +30,9 @@
  
  Line createline(int linenum)
diff --git a/games/icebreaker/files/patch-options.c b/games/icebreaker/files/patch-options.c
index 47c91bab57e8..8270a350297d 100644
--- a/games/icebreaker/files/patch-options.c
+++ b/games/icebreaker/files/patch-options.c
@@ -1,6 +1,6 @@
---- options.c.orig	2002-05-31 05:15:46.000000000 +0200
-+++ options.c	2013-01-13 19:54:42.000000000 +0100
-@@ -66,7 +66,7 @@
+--- ./options.c.orig	2002-06-16 22:35:13.000000000 +0200
++++ ./options.c	2013-12-24 13:42:35.000000000 +0100
+@@ -87,7 +87,7 @@
  	options.autopause=AUTOPAUSEOFF;	
  	options.difficulty=NORMAL;
  	options.fullscreen=FULLSCREENOFF;
@@ -9,16 +9,16 @@
  }
  
  int readoptions(void)
-@@ -81,7 +81,7 @@
+@@ -102,7 +102,7 @@
  
  	setdefaultoptions();
  	
 -	snprintf(filename,255,"%s/%s",homedir,OPTIONFILE);
 +	snprintf(filename,sizeof(filename),"%s/%s",homedir,OPTIONFILE);
  	
- 	optionfile=fopen(filename,"r");
+ 	optionfile=openoptionfile(filename,"r");
  	if (optionfile==NULL)
-@@ -99,7 +99,7 @@
+@@ -120,7 +120,7 @@
  		}
  		
  		sprintf(scanformat,"%%20s %%%ds",10+MAXTHEMENAMELENGTH);	
@@ -27,7 +27,7 @@
  		{
  			if (!strcmp(optbuf,"sound"))
  			{
-@@ -135,7 +135,7 @@
+@@ -156,7 +156,7 @@
  			}
  			else if (!strcmp(optbuf,"theme"))
  			{
@@ -36,16 +36,16 @@
  			}
  			// FIX: add username
  		}
-@@ -150,7 +150,7 @@
+@@ -171,7 +171,7 @@
  {
- 	FILE * optionfile;
+ 	OPTFILEHANDLER * optionfile;
  	char filename[255];
 -	snprintf(filename,255,"%s/%s",homedir,OPTIONFILE);
 +	snprintf(filename,sizeof(filename),"%s/%s",homedir,OPTIONFILE);
  	
- 	optionfile=fopen(filename,"w");
+ 	optionfile=openoptionfile(filename,"w");
  	if (optionfile==NULL)
-@@ -292,7 +292,7 @@
+@@ -313,7 +313,7 @@
  			else
  			{
  				// fix -- we should probably search for malicious characters here.
@@ -54,7 +54,7 @@
  			}	
  		}
  		else if (strncmp(argv[i],FLAGTHEMELONG "=" ,strlen(FLAGTHEMELONG "=")) == 0)
-@@ -312,7 +312,7 @@
+@@ -333,7 +333,7 @@
  			else
  			{
  				// fix -- we should probably search for malicious characters here.
diff --git a/games/icebreaker/files/patch-penguin.c b/games/icebreaker/files/patch-penguin.c
index b8ee0a4dc253..4281dde2d972 100644
--- a/games/icebreaker/files/patch-penguin.c
+++ b/games/icebreaker/files/patch-penguin.c
@@ -1,5 +1,5 @@
---- penguin.c.orig	2002-05-31 05:15:46.000000000 +0200
-+++ penguin.c	2013-01-13 19:57:45.000000000 +0100
+--- ./penguin.c.orig	2002-05-31 05:15:46.000000000 +0200
++++ ./penguin.c	2013-12-24 13:42:35.000000000 +0100
 @@ -40,8 +40,9 @@
  
  Penguin createpenguinxy(int x, int y)
diff --git a/games/icebreaker/files/patch-themes.c b/games/icebreaker/files/patch-themes.c
index 45d82eb9ffac..87f0366c9d56 100644
--- a/games/icebreaker/files/patch-themes.c
+++ b/games/icebreaker/files/patch-themes.c
@@ -1,5 +1,5 @@
---- themes.c.orig	2002-05-31 05:49:53.000000000 +0200
-+++ themes.c	2013-01-13 19:42:26.000000000 +0100
+--- ./themes.c.orig	2002-05-31 05:49:53.000000000 +0200
++++ ./themes.c	2013-12-24 13:42:35.000000000 +0100
 @@ -192,7 +192,7 @@
  
  	foundcolor.spritetransparent = 0;
diff --git a/games/icebreaker/files/patch-transition.c b/games/icebreaker/files/patch-transition.c
new file mode 100644
index 000000000000..6f85e64d64e0
--- /dev/null
+++ b/games/icebreaker/files/patch-transition.c
@@ -0,0 +1,12 @@
+--- ./transition.c.orig	2002-05-31 05:15:46.000000000 +0200
++++ ./transition.c	2013-12-24 13:48:47.000000000 +0100
+@@ -164,7 +164,8 @@
+ 	// wait for click, scroll score (or whatever)
+ 	while (!done) 
+ 	{
+-		while(pollevent(&event));
++		while(pollevent(&event))
++		;
+ 		{
+ 			if (event.type == SDL_QUIT)
+ 			{
diff --git a/games/icebreaker/pkg-plist b/games/icebreaker/pkg-plist
new file mode 100644
index 000000000000..392bd7eedbad
--- /dev/null
+++ b/games/icebreaker/pkg-plist
@@ -0,0 +1,42 @@
+bin/icebreaker
+man/man6/icebreaker.6.gz
+share/applications/icebreaker.desktop
+%%DATADIR%%/atom.bmp
+%%DATADIR%%/bgeveryone.wav
+%%DATADIR%%/bgvvint.wav
+%%DATADIR%%/billg.bmp
+%%DATADIR%%/billg.ibt
+%%DATADIR%%/blocks.ibt
+%%DATADIR%%/bwop.wav
+%%DATADIR%%/cheese.ibt
+%%DATADIR%%/cow.bmp
+%%DATADIR%%/cows.ibt
+%%DATADIR%%/crash.wav
+%%DATADIR%%/drum.wav
+%%DATADIR%%/ewww.wav
+%%DATADIR%%/icebreaker_48.bmp
+%%DATADIR%%/jz-like.ibt
+%%DATADIR%%/kitty.bmp
+%%DATADIR%%/kitty.ibt
+%%DATADIR%%/linux.ibt
+%%DATADIR%%/moo.wav
+%%DATADIR%%/mouse-r.bmp
+%%DATADIR%%/mouse.bmp
+%%DATADIR%%/nbwoanp.wav
+%%DATADIR%%/ouch.wav
+%%DATADIR%%/penguin.bmp
+%%DATADIR%%/penguinicon_32.bmp
+%%DATADIR%%/phase.wav
+%%DATADIR%%/pop.wav
+%%DATADIR%%/scrunch.wav
+%%DATADIR%%/splash.wav
+%%DATADIR%%/splat.wav
+%%DATADIR%%/squeak.wav
+%%DATADIR%%/star.bmp
+%%DATADIR%%/stars.ibt
+%%DATADIR%%/tap.wav
+%%DATADIR%%/turtle.bmp
+%%DATADIR%%/turtles.ibt
+%%DATADIR%%/woodblock.bmp
+share/pixmaps/icebreaker.png
+@dirrm %%DATADIR%%