- Add Desktop entries

- Add icons
- Add pkg-plist
- Bump portrevision

PR:		ports/173356
Submitted by:	nemysis <nemysis@gmx.ch> (maintainer)

5 files changed, 99 insertions, 39 deletions

diff --git a/games/blockrage/Makefile b/games/blockrage/Makefile
index d5cdea3e68f4..530dd99c092f 100644
--- a/games/blockrage/Makefile
+++ b/games/blockrage/Makefile
@@ -1,15 +1,14 @@
-# New Ports collection makefile for:	blockrage
-# Date created:		2012-04-28
-# Whom:			nemysis@gmx.ch
-#
+# Created by: nemysis <nemysis@gmx.ch>
 # $FreeBSD$
-#
 
 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${EXTRACT_SUFX}:icons
 
 MAINTAINER=	nemysis@gmx.ch
 COMMENT=	Falling blocks game with 2-player hotseat mode
@@ -21,39 +20,55 @@ ALL_TARGET=	${PORTNAME}
 USE_SDL=	sdl image mixer
 MAKE_JOBS_SAFE=	yes
 
-PLIST_FILES=	bin/${PORTNAME}
-
 MAN6=		${PORTNAME}.6
 
-PORTDATA=	*
 PORTDOCS=	ChangeLog KNOWN_BUGS README TODO
 
+OPTIONS_DEFINE=	DOCS
+
+INSTALLS_ICONS=	yes
+ICON_SIZES=	32x32 48x48 64x64 72x72 96x96
+
 SUB_FILES=	${PORTNAME}
 
+DESKTOP_ENTRIES="Block Rage" "${COMMENT}" \
+		"share/pixmaps/${PORTNAME}.png" \
+		"${PORTNAME}" "Game;ArcadeGame;" false
+
 .include <bsd.port.options.mk>
 
-do-install:
-# Scripts
-	${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME} ${PREFIX}/bin
+.if ${PORT_OPTIONS:MDOCS}
+PLIST_SUB+=	PORTDOCS=""
+.else
+PLIST_SUB+=	PORTDOCS="@comment "
+.endif
 
-# Executable
+post-patch:
+	@${REINPLACE_CMD} -e 's|MYCC=gcc|MYCC=|' \
+	-e 's| -O2 -Wall||' \
+		${WRKSRC}/configure
+
+do-install:
+	${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME} ${PREFIX}/bin/
 	${MKDIR} ${DATADIR}
 	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${DATADIR}
 
-post-install:
-	${INSTALL_MAN} ${WRKSRC}/${MAN6} ${MAN6PREFIX}/man/man6
-
-# Data
-.  for d in data blockrage-fhs.rc blockrage.cfg blockrage.rc
+.for d in data blockrage-fhs.rc blockrage.cfg blockrage.rc
 	@(cd ${WRKSRC} && ${COPYTREE_SHARE} ${d} ${DATADIR})
-.  endfor
+.endfor
+
+post-install:
+.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/
+	${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>
diff --git a/games/blockrage/distinfo b/games/blockrage/distinfo
index f8295934609e..954e14b34b05 100644
--- a/games/blockrage/distinfo
+++ b/games/blockrage/distinfo
@@ -1,2 +1,4 @@
 SHA256 (blockrage-0.2.3.tar.gz) = f9722e519fb74be2ecb9377fd2470c94382088a67df33acea215fd0a5a0b4cb6
 SIZE (blockrage-0.2.3.tar.gz) = 75620
+SHA256 (blockrage_icons.tar.gz) = 8a634d710d3e5c251a9a5facc9b7911d125520524918dc6b681d4df255784438
+SIZE (blockrage_icons.tar.gz) = 11264
diff --git a/games/blockrage/files/blockrage.in b/games/blockrage/files/blockrage.in
index 2a4eaa9eca7a..8362f8d15a78 100644
--- a/games/blockrage/files/blockrage.in
+++ b/games/blockrage/files/blockrage.in
@@ -1,7 +1,7 @@
 #!/bin/sh
 #
 # $FreeBSD$
+#
 
-echo "Block Rage: Starting up..."
 cd "%%DATADIR%%"
-./blockrage
+exec ./blockrage
diff --git a/games/blockrage/files/patch-configure b/games/blockrage/files/patch-configure
index a7ff15a0c120..e69de29bb2d1 100644
--- a/games/blockrage/files/patch-configure
+++ b/games/blockrage/files/patch-configure
@@ -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";
diff --git a/games/blockrage/pkg-plist b/games/blockrage/pkg-plist
new file mode 100644
index 000000000000..ec6b85bc06fd
--- /dev/null
+++ b/games/blockrage/pkg-plist
@@ -0,0 +1,56 @@
+bin/blockrage
+%%DATADIR%%/blockrage
+%%DATADIR%%/blockrage-fhs.rc
+%%DATADIR%%/blockrage.cfg
+%%DATADIR%%/blockrage.rc
+%%DATADIR%%/data/test/dataset.cfg
+%%DATADIR%%/data/test/fonth.pcx
+%%DATADIR%%/data/test/fonth.txt
+%%DATADIR%%/data/test/fontn.pcx
+%%DATADIR%%/data/test/fontn.txt
+%%DATADIR%%/data/test/g1p.pcx
+%%DATADIR%%/data/test/g2p.pcx
+%%DATADIR%%/data/test/game.col
+%%DATADIR%%/data/test/logo.pcx
+%%DATADIR%%/data/test/menu.pcx
+%%DATADIR%%/data/test/pa0.pcx
+%%DATADIR%%/data/test/pa1.pcx
+%%DATADIR%%/data/test/pa2.pcx
+%%DATADIR%%/data/test/pa3.pcx
+%%DATADIR%%/data/test/pmenu.pcx
+%%DATADIR%%/data/test/s00p1.pcx
+%%DATADIR%%/data/test/s00p1.txt
+%%DATADIR%%/data/test/s00p2.pcx
+%%DATADIR%%/data/test/s00p2.txt
+%%DATADIR%%/data/test/s00p3.pcx
+%%DATADIR%%/data/test/s00p3.txt
+%%DATADIR%%/data/test/s00p4.pcx
+%%DATADIR%%/data/test/s00p4.txt
+%%DATADIR%%/data/test/s00p5.pcx
+%%DATADIR%%/data/test/s00p5.txt
+%%DATADIR%%/data/test/s00p6.pcx
+%%DATADIR%%/data/test/s00p6.txt
+%%DATADIR%%/data/test/sfx0.snd
+%%DATADIR%%/data/test/sfx1.snd
+%%DATADIR%%/data/test/sfx2.snd
+share/icons/hicolor/32x32/apps/blockrage.png
+share/icons/hicolor/48x48/apps/blockrage.png
+share/icons/hicolor/64x64/apps/blockrage.png
+share/icons/hicolor/72x72/apps/blockrage.png
+share/icons/hicolor/96x96/apps/blockrage.png
+share/pixmaps/blockrage.png
+@dirrmtry share/icons/hicolor/96x96/apps
+@dirrmtry share/icons/hicolor/96x96
+@dirrmtry share/icons/hicolor/72x72/apps
+@dirrmtry share/icons/hicolor/72x72
+@dirrmtry share/icons/hicolor/64x64/apps
+@dirrmtry share/icons/hicolor/64x64
+@dirrmtry share/icons/hicolor/48x48/apps
+@dirrmtry share/icons/hicolor/48x48
+@dirrmtry share/icons/hicolor/32x32/apps
+@dirrmtry share/icons/hicolor/32x32
+@dirrmtry share/icons/hicolor
+@dirrmtry share/icons
+@dirrm %%DATADIR%%/data/test
+@dirrm %%DATADIR%%/data
+@dirrm %%DATADIR%%