- Makefile tweaks

- Add Desktop entries, removed all Notes
- Add pkg-plist
- Shorten header

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

4 files changed, 91 insertions, 28 deletions

diff --git a/games/nelly/Makefile b/games/nelly/Makefile
index 0864d9cbbd3a..2dbbb0bf0dcf 100644
--- a/games/nelly/Makefile
+++ b/games/nelly/Makefile
@@ -1,16 +1,17 @@
-# New Ports collection makefile for:	nelly
-# Date created:		16 July 2012
-# Whom:			nemysis@gmx.ch
-#
+# Created by: nemysis <nemysis@gmx.ch>
 # $FreeBSD$
-#
 
 PORTNAME=	nelly
 PORTVERSION=	1.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games python
 MASTER_SITES=	http://www.partiallydisassembled.net/nelly/ \
-		http://media.pyweek.org/dl/2/rushed/
+		http://media.pyweek.org/dl/2/rushed/ \
+		SF/nemysisfreebsdp/:icons
+DISTFILES=	${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX} \
+		${PORTNAME}.png:icons
+DIST_SUBDIR=	${PORTNAME}
+EXTRACT_ONLY=	${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX}
 
 MAINTAINER=	nemysis@gmx.ch
 COMMENT=	Nelly's Rooftop Garden, physics-based puzzle game
@@ -21,41 +22,35 @@ RUN_DEPENDS=	${PYGAME} \
 USE_PYTHON_RUN=	yes
 NO_BUILD=	yes
 
-PLIST_FILES=	bin/${PORTNAME} \
-		share/pixmaps/${PORTNAME}.png
-
-PORTDATA=	*
 PORTDOCS=	README
 
 SUB_FILES=	${PORTNAME}
 
+DESKTOP_ENTRIES="Nelly's Rooftop Garden" "${COMMENT}" \
+		"${PREFIX}/share/pixmaps/${PORTNAME}.png" \
+		"${PORTNAME}" "Game;ArcadeGame;" false
+
 .include <bsd.port.options.mk>
 
 post-patch:
-	@${REINPLACE_CMD} -e 's,/usr/bin/python,${PYTHON_CMD},' \
+	@${REINPLACE_CMD} -e 's|/usr/bin/python|${PYTHON_CMD}|' \
 		${WRKSRC}/*.py
-	@(cd ${WRKSRC} && ${RM} *.py.bak)
+	@${FIND} ${WRKSRC} -name "*.bak" -delete
 
 do-install:
-# Scripts
-	${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME} ${PREFIX}/bin
-
-# Executable
+	${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME} ${PREFIX}/bin/
 	${MKDIR} ${DATADIR}
 	${INSTALL_SCRIPT} ${WRKSRC}/*.py ${DATADIR}
 
-# Data
-.  for d in fonts levels textures
+.for d in fonts levels textures
 	@(cd ${WRKSRC} && ${COPYTREE_SHARE} ${d} ${DATADIR})
-.  endfor
+.endfor
 
-# Pixmaps
-	${INSTALL_DATA} ${WRKSRC}/textures/menu.png ${PREFIX}/share/pixmaps/${PORTNAME}.png
+	${INSTALL_DATA} ${_DISTDIR}/${PORTNAME}.png ${PREFIX}/share/pixmaps/
 
-# Documentation
 .if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>
diff --git a/games/nelly/distinfo b/games/nelly/distinfo
index ef8be32096ef..5dfbad7d1882 100644
--- a/games/nelly/distinfo
+++ b/games/nelly/distinfo
@@ -1,2 +1,4 @@
-SHA256 (nelly-1.0.tar.gz) = a62a959259645cf849275498d19e71348f08ec92f490f2f902697dbefff04620
-SIZE (nelly-1.0.tar.gz) = 516647
+SHA256 (nelly/nelly-1.0.tar.gz) = a62a959259645cf849275498d19e71348f08ec92f490f2f902697dbefff04620
+SIZE (nelly/nelly-1.0.tar.gz) = 516647
+SHA256 (nelly/nelly.png) = 39278ddea84ead2580ad5e9747f007fce0822b853ba5e5a94e6a649ecf2a56cb
+SIZE (nelly/nelly.png) = 2599
diff --git a/games/nelly/files/nelly.in b/games/nelly/files/nelly.in
index 70ae64b3dc80..c2f72849b0d7 100644
--- a/games/nelly/files/nelly.in
+++ b/games/nelly/files/nelly.in
@@ -1,5 +1,7 @@
 #!/bin/sh
 #
-echo "Nelly's Rooftop Garden: Starting up..."
+# $FreeBSD$
+#
+
 cd "%%DATADIR%%"
-./nelly.py
+exec /usr/bin/env python ./nelly.py "${@}"
diff --git a/games/nelly/pkg-plist b/games/nelly/pkg-plist
new file mode 100644
index 000000000000..f5c03b1f87cf
--- /dev/null
+++ b/games/nelly/pkg-plist
@@ -0,0 +1,64 @@
+bin/nelly
+%%DATADIR%%/collide.py
+%%DATADIR%%/font.py
+%%DATADIR%%/fonts/babelfish.ttf
+%%DATADIR%%/levels/level01.lvl
+%%DATADIR%%/levels/level02.lvl
+%%DATADIR%%/levels/level03.lvl
+%%DATADIR%%/levels/level04.lvl
+%%DATADIR%%/levels/level05.lvl
+%%DATADIR%%/levels/level06.lvl
+%%DATADIR%%/levels/level07.lvl
+%%DATADIR%%/levels/level08.lvl
+%%DATADIR%%/levels/level09.lvl
+%%DATADIR%%/levels/level10.lvl
+%%DATADIR%%/levels/level11.lvl
+%%DATADIR%%/levels/level12.lvl
+%%DATADIR%%/levels/level13.lvl
+%%DATADIR%%/levels/level14.lvl
+%%DATADIR%%/levels/level15.lvl
+%%DATADIR%%/nelly.py
+%%DATADIR%%/res.py
+%%DATADIR%%/textures/brick.jpg
+%%DATADIR%%/textures/dialog.png
+%%DATADIR%%/textures/dialog_ok.png
+%%DATADIR%%/textures/drip.png
+%%DATADIR%%/textures/flower.png
+%%DATADIR%%/textures/frame.png
+%%DATADIR%%/textures/hotplate.png
+%%DATADIR%%/textures/kettle.png
+%%DATADIR%%/textures/left.png
+%%DATADIR%%/textures/loadback.png
+%%DATADIR%%/textures/loadframe.png
+%%DATADIR%%/textures/loadframeback.png
+%%DATADIR%%/textures/menu.png
+%%DATADIR%%/textures/metal.png
+%%DATADIR%%/textures/move_handle.png
+%%DATADIR%%/textures/new.png
+%%DATADIR%%/textures/plant_seg.png
+%%DATADIR%%/textures/pot.png
+%%DATADIR%%/textures/right.png
+%%DATADIR%%/textures/rot_handle.png
+%%DATADIR%%/textures/save.png
+%%DATADIR%%/textures/spin_down.png
+%%DATADIR%%/textures/spin_up.png
+%%DATADIR%%/textures/steam.png
+%%DATADIR%%/textures/tool_active.png
+%%DATADIR%%/textures/tool_hotplate.png
+%%DATADIR%%/textures/tool_kettle.png
+%%DATADIR%%/textures/tool_lines.png
+%%DATADIR%%/textures/tool_metal.png
+%%DATADIR%%/textures/tool_plant.png
+%%DATADIR%%/textures/tool_wood.png
+%%DATADIR%%/textures/toold_hotplate.png
+%%DATADIR%%/textures/toold_kettle.png
+%%DATADIR%%/textures/toold_lines.png
+%%DATADIR%%/textures/toold_metal.png
+%%DATADIR%%/textures/toold_plant.png
+%%DATADIR%%/textures/toold_wood.png
+%%DATADIR%%/textures/wood.png
+share/pixmaps/nelly.png
+@dirrm %%DATADIR%%/textures
+@dirrm %%DATADIR%%/levels
+@dirrm %%DATADIR%%/fonts
+@dirrm %%DATADIR%%