Attachment 129349 Details for Bug 173345 – nelly.diff

[patch] nelly.diff

nelly.diff (text/x-patch), 4.59 KB, created by nemysis on 2012-11-04 11:26:31 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: nemysis

Created: 2012-11-04 11:26:31 UTC

Size: 4.59 KB

patch

obsolete

>===> Generating patch
>===> Viewing diff with more
>diff -ruN --exclude=CVS /usr/ports/games/nelly/Makefile ./Makefile
>--- /usr/ports/games/nelly/Makefile	2012-09-15 01:39:13.000000000 +0200
>+++ ./Makefile	2012-11-04 12:19:52.000000000 +0100
>@@ -7,7 +7,7 @@
> 
> 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/
>@@ -17,45 +17,44 @@
> 
> RUN_DEPENDS=	${PYGAME} \
> 		${PYTHON_PKGNAMEPREFIX}opengl>=0:${PORTSDIR}/graphics/py-opengl
>+EXTRACT_DEPENDS=	pamscale:${PORTSDIR}/graphics/netpbm
> 
> 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}" "${PORTNAME}" \
>+		"${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
>+
>+post-extract:
>+	 @(cd ${WRKSRC} && \
>+		${LOCALBASE}/bin/pngtopnm ./textures/flower.png | \
>+		${LOCALBASE}/bin/pamscale 1.548 | ${LOCALBASE}/bin/pnmtopng > ${PORTNAME}.png)
> 
> do-install:
>-# Scripts
> 	${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME} ${PREFIX}/bin
>-
>-# Executable
> 	${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} ${WRKSRC}/${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 -ruN --exclude=CVS /usr/ports/games/nelly/files/nelly.in ./files/nelly.in
>--- /usr/ports/games/nelly/files/nelly.in	2012-08-10 05:20:10.000000000 +0200
>+++ ./files/nelly.in	2012-11-04 03:21:33.000000000 +0100
>@@ -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 -ruN --exclude=CVS /usr/ports/games/nelly/pkg-plist ./pkg-plist
>--- /usr/ports/games/nelly/pkg-plist	1970-01-01 01:00:00.000000000 +0100
>+++ ./pkg-plist	2012-11-04 11:40:41.000000000 +0100
>@@ -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%%
>===> Done

Actions: View | Diff

Attachments on bug 173345: 129347 | 129348 | 129349 | 129350 | 129351