--- ./Makefile	2012-08-21 07:18:53.000000000 +0200
+++ ./Makefile	2012-11-04 08:20:28.000000000 +0100
@@ -7,53 +7,76 @@ 
 
 PORTNAME=	blockrage
 PORTVERSION=	0.2.3
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	games
-MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTVERSION} \
+		SF/nemysisfreebsdp/:icons
+DISTFILES=	${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX} \
+		${PORTNAME}_icons.tar.gz:icons
+DIST_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	nemysis@gmx.ch
 COMMENT=	Falling blocks game with 2-player hotseat mode
 
 LICENSE=	GPLv2
 
+BUILD_DEPENDS=	pngtopnm:${PORTSDIR}/graphics/netpbm
+
 GNU_CONFIGURE=	yes
 ALL_TARGET=	${PORTNAME}
 USE_SDL=	sdl image mixer
 MAKE_JOBS_SAFE=	yes
 
-PLIST_FILES=	bin/${PORTNAME}
+PLIST_FILES=	bin/${PORTNAME} \
+		share/pixmaps/${PORTNAME}.png \
+		share/icons/hicolor/32x32/apps/${PORTNAME}.png \
+		share/icons/hicolor/48x48/apps/${PORTNAME}.png \
+		share/icons/hicolor/64x64/apps/${PORTNAME}.png \
+		share/icons/hicolor/72x72/apps/${PORTNAME}.png \
+		share/icons/hicolor/96x96/apps/${PORTNAME}.png
 
 MAN6=		${PORTNAME}.6
 
 PORTDATA=	*
 PORTDOCS=	ChangeLog KNOWN_BUGS README TODO
 
+INSTALLS_ICONS=	yes
+ICON_SIZES=	32x32 48x48 64x64 72x72 96x96
+
 SUB_FILES=	${PORTNAME}
 
+DESKTOP_ENTRIES="Block Rage" "${COMMENT}" "${PORTNAME}" \
+		"${PORTNAME}" "Game;ArcadeGame;" ${FALSE}
+
 .include <bsd.port.options.mk>
 
+post-patch:
+	@${REINPLACE_CMD} -e 's|MYCC=gcc|MYCC=|' \
+	-e 's| -O2 -Wall||' \
+		${WRKSRC}/configure
+
 do-install:
-# Scripts
 	${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME} ${PREFIX}/bin
-
-# Executable
 	${MKDIR} ${DATADIR}
 	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${DATADIR}
 
+.for d in data blockrage-fhs.rc blockrage.cfg blockrage.rc
+	@(cd ${WRKSRC} && ${COPYTREE_SHARE} ${d} ${DATADIR})
+.endfor
+
 post-install:
-	${INSTALL_MAN} ${WRKSRC}/${MAN6} ${MAN6PREFIX}/man/man6
+.for s in ${ICON_SIZES}
+	${MKDIR} ${PREFIX}/share/icons/hicolor/${s}/apps
+	${INSTALL_DATA} ${WRKDIR}/${PORTNAME}_${s}.png \
+		${PREFIX}/share/icons/hicolor/${s}/apps/${PORTNAME}.png
+.endfor
+	${LN} -sf ${PREFIX}/share/icons/hicolor/48x48/apps/${PORTNAME}.png ${PREFIX}/share/pixmaps
 
-# Data
-.  for d in data blockrage-fhs.rc blockrage.cfg blockrage.rc
-	@(cd ${WRKSRC} && ${COPYTREE_SHARE} ${d} ${DATADIR})
-.  endfor
+	${INSTALL_MAN} ${WRKSRC}/${MAN6} ${MAN6PREFIX}/man/man6
 
-# Documentation
 .if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${DOCSDIR}
-.  for f in ${PORTDOCS}
-	${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}
-.  endfor
+	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>
--- ./distinfo	2012-05-11 17:47:42.000000000 +0200
+++ ./distinfo	2012-11-04 08:20:35.000000000 +0100
@@ -1,2 +1,4 @@ 
-SHA256 (blockrage-0.2.3.tar.gz) = f9722e519fb74be2ecb9377fd2470c94382088a67df33acea215fd0a5a0b4cb6
-SIZE (blockrage-0.2.3.tar.gz) = 75620
+SHA256 (blockrage/blockrage-0.2.3.tar.gz) = f9722e519fb74be2ecb9377fd2470c94382088a67df33acea215fd0a5a0b4cb6
+SIZE (blockrage/blockrage-0.2.3.tar.gz) = 75620
+SHA256 (blockrage/blockrage_icons.tar.gz) = 8a634d710d3e5c251a9a5facc9b7911d125520524918dc6b681d4df255784438
+SIZE (blockrage/blockrage_icons.tar.gz) = 11264
--- ./files/blockrage.in	2012-08-09 14:01:19.000000000 +0200
+++ ./files/blockrage.in	2012-10-07 22:51:29.000000000 +0200
@@ -1,7 +1,7 @@ 
 #!/bin/sh
 #
 # $FreeBSD: ports/games/blockrage/files/blockrage.in,v 1.1 2012/08/09 12:01:19 scheidell Exp $
+#
 
-echo "Block Rage: Starting up..."
 cd "%%DATADIR%%"
-./blockrage
+exec ./blockrage
--- ./files/patch-configure	2012-05-11 17:47:42.000000000 +0200
+++ ./files/patch-configure	1970-01-01 01:00:00.000000000 +0100
@@ -1,13 +0,0 @@ 
---- configure.orig	2005-10-24 21:47:16.000000000 +0200
-+++ configure	2012-05-03 01:41:10.000000000 +0200
-@@ -39,8 +39,8 @@
- #SOUND_OPT=-DNOSOUND
- SOUND_OPT=
- 
--MYCC=gcc
--MYCFLAGS='-s -O2 -Wall `sdl-config --cflags`'" $SOUND_OPT -DSYSCONFDIR=\\\"\${sysconfdir}/\${progname}\\\""
-+MYCC=
-+MYCFLAGS='-s `sdl-config --cflags`'" $SOUND_OPT -DSYSCONFDIR=\\\"\${sysconfdir}/\${progname}\\\""
- 
- if test -z "$CC" ; then
-   CC="$MYCC";