Bug 173345 - [MAINTAINER] games/nelly: Changed Makefile, nelly.in, Desktop entries, Removed all Notes
Summary: [MAINTAINER] games/nelly: Changed Makefile, nelly.in, Desktop entries, Remove...
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: Beech Rintoul
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2012-11-04 02:40 UTC by nemysis
Modified: 2013-03-13 22:30 UTC (History)
1 user (show)

See Also:


Attachments
nelly-1.0_1.patch (2.02 KB, patch)
2012-11-04 02:40 UTC, nemysis
no flags Details | Diff
nelly.diff (4.59 KB, patch)
2012-11-04 10:44 UTC, nemysis
no flags Details | Diff
nelly.diff (4.59 KB, patch)
2012-11-04 11:26 UTC, nemysis
no flags Details | Diff
nelly.diff (5.19 KB, patch)
2012-11-04 12:39 UTC, nemysis
no flags Details | Diff
nelly.diff (5.27 KB, patch)
2013-02-22 16:43 UTC, nemysis
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description nemysis 2012-11-04 02:40:00 UTC
Makefile changed:
+EXTRACT_DEPENDS=	pamscale:${PORTSDIR}/graphics/netpbm
+DESKTOP_ENTRIES=
+post-extract:

Changed and refined
 post-patch:

Changed
files/nelly.in

Generated with FreeBSD Port Tools 0.99_6 (mode: change, diff: ports)

How-To-Repeat: 
portlint -A
looks fine.

port test: clean
Comment 1 nemysis 2012-11-04 10:44:04 UTC
Removed
-PLIST_FILES=   bin/${PORTNAME} \                                                                                                                              
-               share/pixmaps/${PORTNAME}.png                                                                                                                  
-                                                                                                                                                              
-PORTDATA=      *

Added pkg-plist
Comment 2 Jason E. Hale freebsd_committer freebsd_triage 2012-11-04 11:07:14 UTC
I think the addition of graphics/netpbm to these ports just to scale a little 
icon is a bit excessive.  It brings in a lot of dependencies for little gain.  
There's a nice litte 32x32 icon ${WRKSRC}/textures/flower.png that could work 
just as well for this port.

I didn't look close at the others but if you really need an icon it would be 
nicer for the user to host the already scaled icon somewhere rather than 
having this somewhat heavyweight netpbm dependency.
-- 
Jason E. Hale - jhale@
FreeBSD Ports Committer
KDE/FreeBSD Team
Comment 3 nemysis 2012-11-04 11:26:31 UTC
On Sun, 04 Nov 2012 06:07:14 -0500
"Jason E. Hale" <jhale@freebsd.org> wrote:

> I think the addition of graphics/netpbm to these ports just to scale a little 
> icon is a bit excessive.  It brings in a lot of dependencies for little gain.  
> There's a nice litte 32x32 icon ${WRKSRC}/textures/flower.png that could work 
> just as well for this port.
> 
> I didn't look close at the others but if you really need an icon it would be 
> nicer for the user to host the already scaled icon somewhere rather than 
> having this somewhat heavyweight netpbm dependency.

Thanks i use now textures/flower.png.

I need png icons for PC-BSD PBI, Rox Desktop and Desktop files,
the best size is 48x48, because mostly is today used big Monitors.

graphics/netpbm isn't so big Port.
Comment 4 nemysis 2012-11-04 12:39:56 UTC
Uploaded to mine SF site and added in Makefile

+               SF/nemysisfreebsdp/:icons
+DISTFILES=     ${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX} \
+               ${PORTNAME}.png:icons
+DIST_SUBDIR=   ${PORTNAME}
+EXTRACT_ONLY=  ${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX}
Comment 5 nemysis 2013-02-22 16:43:53 UTC
"${PREFIX}/share/pixmaps/${PORTNAME}.png"
"${PORTNAME}" "Game;ArcadeGame;" false
${INSTALL_DATA} ${_DISTDIR}/${PORTNAME}.png ${PREFIX}/share/pixmaps/
Comment 6 Beech Rintoul freebsd_committer freebsd_triage 2013-03-12 23:36:14 UTC
Responsible Changed
From-To: freebsd-ports-bugs->beech

Mine
Comment 7 dfilter service freebsd_committer freebsd_triage 2013-03-13 22:26:54 UTC
Author: beech
Date: Wed Mar 13 22:26:44 2013
New Revision: 314118
URL: http://svnweb.freebsd.org/changeset/ports/314118

Log:
  - Makefile tweaks
  - Add Desktop entries, removed all Notes
  - Add pkg-plist
  - Shorten header
  
  PR:		ports/173345
  Submitted by:	nemysis <nemysis@gmx.ch> (maintainer)

Added:
  head/games/nelly/pkg-plist   (contents, props changed)
Modified:
  head/games/nelly/Makefile
  head/games/nelly/distinfo   (contents, props changed)
  head/games/nelly/files/nelly.in   (contents, props changed)

Modified: head/games/nelly/Makefile
==============================================================================
--- head/games/nelly/Makefile	Wed Mar 13 21:59:01 2013	(r314117)
+++ head/games/nelly/Makefile	Wed Mar 13 22:26:44 2013	(r314118)
@@ -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>

Modified: head/games/nelly/distinfo
==============================================================================
--- head/games/nelly/distinfo	Wed Mar 13 21:59:01 2013	(r314117)
+++ head/games/nelly/distinfo	Wed Mar 13 22:26:44 2013	(r314118)
@@ -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

Modified: head/games/nelly/files/nelly.in
==============================================================================
--- head/games/nelly/files/nelly.in	Wed Mar 13 21:59:01 2013	(r314117)
+++ head/games/nelly/files/nelly.in	Wed Mar 13 22:26:44 2013	(r314118)
@@ -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 "${@}"

Added: head/games/nelly/pkg-plist
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/games/nelly/pkg-plist	Wed Mar 13 22:26:44 2013	(r314118)
@@ -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%%
_______________________________________________
svn-ports-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-ports-all
To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
Comment 8 Beech Rintoul freebsd_committer freebsd_triage 2013-03-13 22:27:14 UTC
State Changed
From-To: open->closed

Committed, Thanks!