Attachment 129212 Details for Bug 173176 – lmarbles.diff

[patch] lmarbles.diff

lmarbles.diff (text/x-patch), 4.81 KB, created by nemysis on 2013-02-22 03:09:34 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: nemysis

Created: 2013-02-22 03:09:34 UTC

Size: 4.81 KB

patch

obsolete

>===> Generating patch
>===> Viewing diff with more
>diff -ruN --exclude=CVS /usr/ports/games/lmarbles/Makefile ./Makefile
>--- /usr/ports/games/lmarbles/Makefile	2013-01-14 17:55:27.000000000 +0100
>+++ ./Makefile	2013-02-22 03:42:10.000000000 +0100
>@@ -7,32 +7,54 @@
> 
> PORTNAME=	lmarbles
> PORTVERSION=	1.0.8
>-PORTREVISION=	2
>+PORTREVISION=	3
> CATEGORIES=	games
>-MASTER_SITES=	SF/lgames/${PORTNAME}
>+MASTER_SITES=	SF/lgames/${PORTNAME} \
>+		SF/nemysisfreebsdp/:icons
>+DISTFILES=	${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX} \
>+		${PORTNAME}_icons${EXTRACT_SUFX}:icons
> 
>-MAINTAINER=	ports@FreeBSD.org
>-COMMENT=	A challenging puzzle game similar to Atomix
>+MAINTAINER=	nemysis@gmx.ch
>+COMMENT=	Atomix-like game of moving marbles in puzzles
>+
>+LICENSE=	GPLv2
> 
> USE_SDL=	sdl mixer
> USE_GMAKE=	yes
> GNU_CONFIGURE=	yes
>-CONFIGURE_ARGS=	--localstatedir=${DATADIR}
>+CONFIGURE_ARGS=	--localstatedir=/var/games
> 
> MAN6=		${PORTNAME}.6
> 
>+PORTDOCS=	*
>+
>+DOCSRCDIR1=	${WRKSRC}
>+DOC_FILES1=	AUTHORS ChangeLog README README-SDL.txt
>+
>+DOCSRCDIR2=	${WRKSRC}/src/manual
>+DOCSDIR2=	${DOCSDIR}/manual
>+DOC_FILES2=	*.jpg *.html
>+
>+SUB_FILES=	pkg-install
>+
>+.include <bsd.port.options.mk>
>+
> post-patch:
> 	@${REINPLACE_CMD} -e 's|(datadir)/icons|(datadir)/pixmaps|g' \
>+	-e 's|(datadir)/pixmaps/lmarbles32.gif|(datadir)/pixmaps/lmarbles32.png|g' \
>+	-e 's|(datadir)/pixmaps/lmarbles48.gif|(datadir)/pixmaps/lmarbles48.png|g' \
> 		${WRKSRC}/Makefile.in
> 
> post-install:
>-	@${CHMOD} 2755 ${PREFIX}/bin/${PORTNAME}
>-	@${CHOWN} root:games ${PREFIX}/bin/${PORTNAME}
>-	@${CHMOD} 0664 ${DATADIR}/${PORTNAME}.prfs
>-	@${CHOWN} root:games ${DATADIR}/${PORTNAME}.prfs
>-.if !defined(NOPORTDOCS)
>-	@${MKDIR} ${DOCSDIR}
>-	${INSTALL_DATA} ${WRKSRC}/src/manual/* ${DOCSDIR}
>+	${INSTALL_DATA} ${WRKDIR}/${PORTNAME}*.png ${PREFIX}/share/pixmaps/
>+
>+.if ${PORT_OPTIONS:MDOCS}
>+	${MKDIR} ${DOCSDIR}
>+	${INSTALL_DATA} ${DOC_FILES1:S|^|${DOCSRCDIR1}/|} ${DOCSDIR}
>+	${MKDIR} ${DOCSDIR2}
>+	${INSTALL_DATA} ${DOC_FILES2:S|^|${DOCSRCDIR2}/|} ${DOCSDIR2}
> .endif
> 
>+	@${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
>+
> .include <bsd.port.mk>
>diff -ruN --exclude=CVS /usr/ports/games/lmarbles/distinfo ./distinfo
>--- /usr/ports/games/lmarbles/distinfo	2013-01-14 17:55:27.000000000 +0100
>+++ ./distinfo	2013-02-22 03:22:52.000000000 +0100
>@@ -1,2 +1,4 @@
> SHA256 (lmarbles-1.0.8.tar.gz) = 0e5a16a0116d325589b28f3555ced6a0b486f0fd7632cd3d98bee5cddf213e83
> SIZE (lmarbles-1.0.8.tar.gz) = 914238
>+SHA256 (lmarbles_icons.tar.gz) = 7e33408a4b6a2e39c979654607757d53432f2d1eaa6814f4f2892939faa8a8cb
>+SIZE (lmarbles_icons.tar.gz) = 4096
>diff -ruN --exclude=CVS /usr/ports/games/lmarbles/files/pkg-install.in ./files/pkg-install.in
>--- /usr/ports/games/lmarbles/files/pkg-install.in	1970-01-01 01:00:00.000000000 +0100
>+++ ./files/pkg-install.in	2012-10-28 22:37:16.000000000 +0100
>@@ -0,0 +1,12 @@
>+#!/bin/sh
>+#
>+# $FreeBSD$
>+#
>+
>+FILE="/var/games/lmarbles.prfs"
>+
>+if [ ! -e $FILE ]; then
>+	${INSTALL_DATA} ${WRKSRC}/src/empty.prfs $FILE
>+fi
>+chgrp games $FILE
>+chmod 664 $FILE
>diff -ruN --exclude=CVS /usr/ports/games/lmarbles/pkg-descr ./pkg-descr
>--- /usr/ports/games/lmarbles/pkg-descr	2013-01-14 17:55:27.000000000 +0100
>+++ ./pkg-descr	2012-10-28 22:20:20.000000000 +0100
>@@ -2,4 +2,9 @@
> The goal is to arrange a figure out of single marbles within a time
> limit to reach the next level.
> 
>+You goal in the puzzle game marbles is to create a more or less complex
>+figure out of single marbles within a time limit to reach the next
>+level. Sounds easy? Well, there is a problem: If a marble starts to
>+move, it will not stop until it hits a wall or another marble.
>+
> WWW: http://lgames.sourceforge.net/index.php?project=LMarbles
>diff -ruN --exclude=CVS /usr/ports/games/lmarbles/pkg-plist ./pkg-plist
>--- /usr/ports/games/lmarbles/pkg-plist	2013-01-14 17:55:27.000000000 +0100
>+++ ./pkg-plist	2012-10-28 22:20:59.000000000 +0100
>@@ -1,11 +1,5 @@
> bin/lmarbles
> share/applications/lmarbles.desktop
>-%%PORTDOCS%%%%DOCSDIR%%/arrow.jpg
>-%%PORTDOCS%%%%DOCSDIR%%/arrow2.jpg
>-%%PORTDOCS%%%%DOCSDIR%%/crumble.jpg
>-%%PORTDOCS%%%%DOCSDIR%%/manual.html
>-%%PORTDOCS%%%%DOCSDIR%%/marbles.jpg
>-%%PORTDOCS%%%%DOCSDIR%%/teleport.jpg
> %%DATADIR%%/gfx/board.bmp
> %%DATADIR%%/gfx/f_red.bmp
> %%DATADIR%%/gfx/f_small.bmp
>@@ -63,7 +57,6 @@
> %%DATADIR%%/gfx/wood/wall.bmp
> %%DATADIR%%/gfx/wood/wall_crumble.bmp
> %%DATADIR%%/levels/Original
>-%%DATADIR%%/lmarbles.prfs
> %%DATADIR%%/sounds/alarm.wav
> %%DATADIR%%/sounds/arrow.wav
> %%DATADIR%%/sounds/click.wav
>@@ -72,7 +65,9 @@
> %%DATADIR%%/sounds/select.wav
> %%DATADIR%%/sounds/stop.wav
> %%DATADIR%%/sounds/teleport.wav
>+share/pixmaps/lmarbles32.png
> share/pixmaps/lmarbles48.gif
>+share/pixmaps/lmarbles48.png
> @dirrm %%DATADIR%%/sounds
> @dirrm %%DATADIR%%/levels
> @dirrm %%DATADIR%%/gfx/wood
>@@ -80,5 +75,4 @@
> @dirrm %%DATADIR%%/gfx/metal
> @dirrm %%DATADIR%%/gfx
> @dirrm %%DATADIR%%
>-%%PORTDOCS%%@dirrm %%DOCSDIR%%
> @dirrmtry share/applications
>===> Done

Actions: View | Diff

Attachments on bug 173176: 129211 | 129212