Attachment 129371 Details for Bug 173356 – blockrage.diff

[patch] blockrage.diff

blockrage.diff (text/x-patch), 6.14 KB, created by nemysis on 2012-11-04 13:19:05 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: nemysis

Created: 2012-11-04 13:19:05 UTC

Size: 6.14 KB

patch

obsolete

>===> Generating patch
>===> Viewing diff with more
>diff -ruN --exclude=CVS /usr/ports/games/blockrage/Makefile ./Makefile
>--- /usr/ports/games/blockrage/Makefile	2012-08-21 07:18:53.000000000 +0200
>+++ ./Makefile	2012-11-04 14:15:38.000000000 +0100
>@@ -7,9 +7,13 @@
> 
> 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.tar.gz:icons
>+DIST_SUBDIR=	${PORTNAME}
> 
> MAINTAINER=	nemysis@gmx.ch
> COMMENT=	Falling blocks game with 2-player hotseat mode
>@@ -21,39 +25,47 @@
> USE_SDL=	sdl image mixer
> MAKE_JOBS_SAFE=	yes
> 
>-PLIST_FILES=	bin/${PORTNAME}
>-
> MAN6=		${PORTNAME}.6
> 
>-PORTDATA=	*
> PORTDOCS=	ChangeLog KNOWN_BUGS README TODO
> 
>+INSTALLS_ICONS=	yes
>+ICON_SIZES=	32x32 48x48 64x64 72x72 96x96
>+
> SUB_FILES=	${PORTNAME}
> 
>+DESKTOP_ENTRIES="Block Rage" "${COMMENT}" "${PORTNAME}" \
>+		"${PORTNAME}" "Game;ArcadeGame;" ${FALSE}
>+
> .include <bsd.port.options.mk>
> 
>+post-patch:
>+	@${REINPLACE_CMD} -e 's|MYCC=gcc|MYCC=|' \
>+	-e 's| -O2 -Wall||' \
>+		${WRKSRC}/configure
>+
> do-install:
>-# Scripts
> 	${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME} ${PREFIX}/bin
>-
>-# Executable
> 	${MKDIR} ${DATADIR}
> 	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${DATADIR}
> 
>+.for d in data blockrage-fhs.rc blockrage.cfg blockrage.rc
>+	@(cd ${WRKSRC} && ${COPYTREE_SHARE} ${d} ${DATADIR})
>+.endfor
>+
> post-install:
>-	${INSTALL_MAN} ${WRKSRC}/${MAN6} ${MAN6PREFIX}/man/man6
>+.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
> 
>-# Data
>-.  for d in data blockrage-fhs.rc blockrage.cfg blockrage.rc
>-	@(cd ${WRKSRC} && ${COPYTREE_SHARE} ${d} ${DATADIR})
>-.  endfor
>+	${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 -ruN --exclude=CVS /usr/ports/games/blockrage/distinfo ./distinfo
>--- /usr/ports/games/blockrage/distinfo	2012-05-11 17:47:42.000000000 +0200
>+++ ./distinfo	2012-11-04 14:11:15.000000000 +0100
>@@ -1,2 +1,4 @@
>-SHA256 (blockrage-0.2.3.tar.gz) = f9722e519fb74be2ecb9377fd2470c94382088a67df33acea215fd0a5a0b4cb6
>-SIZE (blockrage-0.2.3.tar.gz) = 75620
>+SHA256 (blockrage/blockrage-0.2.3.tar.gz) = f9722e519fb74be2ecb9377fd2470c94382088a67df33acea215fd0a5a0b4cb6
>+SIZE (blockrage/blockrage-0.2.3.tar.gz) = 75620
>+SHA256 (blockrage/blockrage_icons.tar.gz) = 8a634d710d3e5c251a9a5facc9b7911d125520524918dc6b681d4df255784438
>+SIZE (blockrage/blockrage_icons.tar.gz) = 11264
>diff -ruN --exclude=CVS /usr/ports/games/blockrage/files/blockrage.in ./files/blockrage.in
>--- /usr/ports/games/blockrage/files/blockrage.in	2012-08-09 14:01:19.000000000 +0200
>+++ ./files/blockrage.in	2012-11-04 14:16:50.000000000 +0100
>@@ -1,7 +1,7 @@
> #!/bin/sh
> #
> # $FreeBSD: ports/games/blockrage/files/blockrage.in,v 1.1 2012/08/09 12:01:19 scheidell Exp $
>+#
> 
>-echo "Block Rage: Starting up..."
> cd "%%DATADIR%%"
>-./blockrage
>\ No newline at end of file
>+exec ./blockrage
>diff -ruN --exclude=CVS /usr/ports/games/blockrage/files/patch-configure ./files/patch-configure
>--- /usr/ports/games/blockrage/files/patch-configure	2012-05-11 17:47:42.000000000 +0200
>+++ ./files/patch-configure	1970-01-01 01:00:00.000000000 +0100
>@@ -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 -ruN --exclude=CVS /usr/ports/games/blockrage/pkg-plist ./pkg-plist
>--- /usr/ports/games/blockrage/pkg-plist	1970-01-01 01:00:00.000000000 +0100
>+++ ./pkg-plist	2012-11-04 14:12:49.000000000 +0100
>@@ -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%%
>===> Done

Actions: View | Diff

Attachments on bug 173356: 129370 | 129371 | 129372