Attachment 136131 Details for Bug 181224 – qnetwalk.diff

[patch] qnetwalk.diff

qnetwalk.diff (text/x-diff; charset=us-ascii), 5.38 KB, created by Rusmir Dusko on 2013-08-15 18:01:22 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Rusmir Dusko

Created: 2013-08-15 18:01:22 UTC

Size: 5.38 KB

patch

obsolete

>===> Generating patch
>===> Viewing diff with more
>diff -ruN /usr/ports/games/qnetwalk/Makefile ./Makefile
>--- /usr/ports/games/qnetwalk/Makefile	2013-06-02 18:54:52.000000000 +0200
>+++ ./Makefile	2013-08-15 18:20:52.000000000 +0200
>@@ -2,8 +2,7 @@
> # $FreeBSD: head/games/qnetwalk/Makefile 318736 2013-05-21 23:54:31Z amdmi3 $
> 
> PORTNAME=	qnetwalk
>-PORTVERSION=	1.3
>-PORTREVISION=	6
>+PORTVERSION=	1.4
> CATEGORIES=	games
> MASTER_SITES=	http://qt.osdn.org.ua/ \
> 		http://mirror.amdmi3.ru/distfiles/
>@@ -11,23 +10,35 @@
> MAINTAINER=	amdmi3@FreeBSD.org
> COMMENT=	Qt-version of the NetWalk game
> 
>+LICENSE=	GPLv2
>+
>+USES=		desktop-file-utils
> USE_QT4=	corelib gui qmake_build moc_build rcc_build
>-MAKE_JOBS_SAFE=	yes
>+USE_SDL=	mixer
> 
> MAN6=		qnetwalk.6
> 
>+PORTDOCS=	ChangeLog README
>+
>+OPTIONS_DEFINE=	DOCS
>+
>+.include <bsd.port.options.mk>
>+
> do-configure:
>-	@cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${QMAKE} ${QMAKEFLAGS}
>+	@cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} \
>+		${QMAKE} ${QMAKEFLAGS} PREFIX=${PREFIX}
> 
> do-install:
>-	${INSTALL_PROGRAM} ${WRKSRC}/qnetwalk ${PREFIX}/bin
>-	${INSTALL_MAN} ${WRKSRC}/qnetwalk.6 ${MAN6PREFIX}/man/man6
>-	${MKDIR} ${DATADIR}/sounds
>-	${INSTALL_DATA} ${WRKSRC}/sounds/*.wav ${DATADIR}/sounds
>-	${MKDIR} ${DATADIR}/translations
>-	${INSTALL_DATA} ${WRKSRC}/translations/*.qm ${DATADIR}/translations
>-	${MKDIR} ${PREFIX}/share/applications
>+	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin
>+	@(cd ${WRKSRC} && ${COPYTREE_SHARE} "pics sounds translations" ${DATADIR})
>+	@${LN} -sf ${DATADIR}/pics/computer2.png ${PREFIX}/share/pixmaps/${PORTNAME}.png
>+	@${MKDIR} ${PREFIX}/share/applications
> 	${INSTALL_DATA} ${WRKSRC}/menu/qnetwalk.desktop ${PREFIX}/share/applications
>-	${INSTALL_DATA} ${WRKSRC}/menu/qnetwalk.xpm ${PREFIX}/share/pixmaps
>+
>+	${INSTALL_MAN} ${MAN6:S|^|${WRKSRC}/|} ${MAN6PREFIX}/man/man6
>+.if ${PORT_OPTIONS:MDOCS}
>+	@${MKDIR} ${DOCSDIR}
>+	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR}
>+.endif
> 
> .include <bsd.port.mk>
>diff -ruN /usr/ports/games/qnetwalk/distinfo ./distinfo
>--- /usr/ports/games/qnetwalk/distinfo	2013-06-02 18:54:52.000000000 +0200
>+++ ./distinfo	2013-08-01 03:14:14.000000000 +0200
>@@ -1,2 +1,2 @@
>-SHA256 (qnetwalk-1.3.tar.gz) = 583b11513cca87caf0c3615291f2df3e06e580aaa1ff09c88d19504da2274c66
>-SIZE (qnetwalk-1.3.tar.gz) = 148686
>+SHA256 (qnetwalk-1.4.tar.gz) = 35e23e18e2b2b565d07bdb93abf9100debfc8e4be5bb34d5992c4d3f14d3279c
>+SIZE (qnetwalk-1.4.tar.gz) = 153863
>diff -ruN /usr/ports/games/qnetwalk/files/patch-cell.cpp ./files/patch-cell.cpp
>--- /usr/ports/games/qnetwalk/files/patch-cell.cpp	2013-08-13 13:12:03.000000000 +0200
>+++ ./files/patch-cell.cpp	1970-01-01 01:00:00.000000000 +0100
>@@ -1,20 +0,0 @@
>---- cell.cpp.orig	2008-03-30 13:29:12.000000000 +0400
>-+++ cell.cpp	2013-08-07 21:24:52.637031376 +0400
>-@@ -19,7 +19,7 @@
>- Cell::PixmapMap Cell::shadowpixmap;
>- Cell::PixmapMap Cell::connectedpixmap;
>- Cell::PixmapMap Cell::disconnectedpixmap;
>--Cell::Cell * Cell::focusedCell = 0;
>-+Cell * Cell::focusedCell = 0;
>- 
>- 
>- void Cell::setGameOver(bool b)
>-@@ -28,7 +28,7 @@
>- }
>- 
>- 
>--Cell::Cell * Cell::focused()
>-+Cell * Cell::focused()
>- {
>-     return focusedCell;
>- }
>diff -ruN /usr/ports/games/qnetwalk/pkg-plist ./pkg-plist
>--- /usr/ports/games/qnetwalk/pkg-plist	2013-06-02 18:54:52.000000000 +0200
>+++ ./pkg-plist	2013-08-01 03:15:39.000000000 +0200
>@@ -1,22 +1,61 @@
> bin/qnetwalk
> share/applications/qnetwalk.desktop
>-share/pixmaps/qnetwalk.xpm
>+share/pixmaps/qnetwalk.png
>+%%DATADIR%%/pics/background.png
>+%%DATADIR%%/pics/cable0001.png
>+%%DATADIR%%/pics/cable0010.png
>+%%DATADIR%%/pics/cable0011.png
>+%%DATADIR%%/pics/cable0100.png
>+%%DATADIR%%/pics/cable0101.png
>+%%DATADIR%%/pics/cable0110.png
>+%%DATADIR%%/pics/cable0111.png
>+%%DATADIR%%/pics/cable1000.png
>+%%DATADIR%%/pics/cable1001.png
>+%%DATADIR%%/pics/cable1010.png
>+%%DATADIR%%/pics/cable1011.png
>+%%DATADIR%%/pics/cable1100.png
>+%%DATADIR%%/pics/cable1101.png
>+%%DATADIR%%/pics/cable1110.png
>+%%DATADIR%%/pics/computer1.png
>+%%DATADIR%%/pics/computer2.png
>+%%DATADIR%%/pics/focus.png
>+%%DATADIR%%/pics/highscores.png
>+%%DATADIR%%/pics/homepage.png
>+%%DATADIR%%/pics/locked.png
>+%%DATADIR%%/pics/newgame.png
>+%%DATADIR%%/pics/qnetwalk.png
>+%%DATADIR%%/pics/quit.png
>+%%DATADIR%%/pics/server.png
>+%%DATADIR%%/pics/shadow.png
> %%DATADIR%%/sounds/click.wav
> %%DATADIR%%/sounds/connect.wav
> %%DATADIR%%/sounds/start.wav
> %%DATADIR%%/sounds/turn.wav
> %%DATADIR%%/sounds/win.wav
> %%DATADIR%%/translations/qnetwalk_de.qm
>+%%DATADIR%%/translations/qnetwalk_de.ts
> %%DATADIR%%/translations/qnetwalk_es.qm
>+%%DATADIR%%/translations/qnetwalk_es.ts
> %%DATADIR%%/translations/qnetwalk_fr.qm
>+%%DATADIR%%/translations/qnetwalk_fr.ts
> %%DATADIR%%/translations/qnetwalk_it.qm
>+%%DATADIR%%/translations/qnetwalk_it.ts
> %%DATADIR%%/translations/qnetwalk_nl.qm
>+%%DATADIR%%/translations/qnetwalk_nl.ts
> %%DATADIR%%/translations/qnetwalk_pl.qm
>+%%DATADIR%%/translations/qnetwalk_pl.ts
> %%DATADIR%%/translations/qnetwalk_pt_BR.qm
>+%%DATADIR%%/translations/qnetwalk_pt_BR.ts
> %%DATADIR%%/translations/qnetwalk_ru.qm
>+%%DATADIR%%/translations/qnetwalk_ru.ts
> %%DATADIR%%/translations/qnetwalk_tr.qm
>+%%DATADIR%%/translations/qnetwalk_tr.ts
> %%DATADIR%%/translations/qnetwalk_ua.qm
>+%%DATADIR%%/translations/qnetwalk_ua.ts
>+%%DATADIR%%/translations/qnetwalk_zh_CN.qm
>+%%DATADIR%%/translations/qnetwalk_zh_CN.ts
> @dirrm %%DATADIR%%/translations
> @dirrm %%DATADIR%%/sounds
>+@dirrm %%DATADIR%%/pics
> @dirrm %%DATADIR%%
> @dirrmtry share/applications
>===> Done

Actions: View | Diff

Attachments on bug 181224: 136130 | 136131