Attachment 166398 Details for Bug 206324 – Patch with additional changes

[patch] Patch with additional changes

openclonk.patch (text/plain), 2.86 KB, created by Dmitry Marakasov on 2016-02-01 14:35:09 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dmitry Marakasov

Created: 2016-02-01 14:35:09 UTC

Size: 2.86 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 407363)
>+++ Makefile	(working copy)
>@@ -2,9 +2,8 @@
> # $FreeBSD$
> 
> PORTNAME=	openclonk
>-PORTVERSION=	6.1
>+PORTVERSION=	7.0
> DISTVERSIONSUFFIX=	-src
>-PORTREVISION=	1
> CATEGORIES=	games
> MASTER_SITES=	http://www.openclonk.org/builds/release/${DISTVERSION}/
> 
>@@ -12,8 +11,8 @@
> COMMENT=	Multiplayer action game involving small and nimble humanoids
> 
> LICENSE=	ISCL CC0-1.0
>-LICENSE_COMB=	dual
>-LICENSE_FILE=	${WRKSRC}/COPYING
>+LICENSE_COMB=	multi
>+LICENSE_FILE_ISCL=	${WRKSRC}/COPYING
> 
> LIB_DEPENDS=	libboost_thread.so:${PORTSDIR}/devel/boost-libs \
> 		libfreetype.so:${PORTSDIR}/print/freetype2 \
>@@ -23,9 +22,9 @@
> 
> BROKEN_FreeBSD_9=	does not build (lack of proper c++11 support)
> 
>-USES=		compiler:c++11-lib cmake desktop-file-utils jpeg pkgconfig tar:bzip2
>+USES=		compiler:c++14-lang cmake desktop-file-utils jpeg pkgconfig tar:bzip2
> USE_GL=		glew
>-USE_GNOME=	gtk20
>+USE_GNOME=	gtk30
> USE_SDL=	sdl mixer
> USE_XORG=	x11 xpm
> INSTALLS_ICONS=	yes
>@@ -32,6 +31,6 @@
> 
> post-patch:
> 	@${REINPLACE_CMD} -e 's|DESTINATION games|DESTINATION bin|' \
>-		${WRKSRC}/CMakeLists.txt
>+		-e 's|share/games|share|' ${WRKSRC}/CMakeLists.txt
> 
> .include <bsd.port.mk>
>Index: distinfo
>===================================================================
>--- distinfo	(revision 407363)
>+++ distinfo	(working copy)
>@@ -1,2 +1,2 @@
>-SHA256 (openclonk-6.1-src.tar.bz2) = 5c3903f82c9d7e8c466ab1ff594d553911a6e5fa0be2a326684d823ef1c24905
>-SIZE (openclonk-6.1-src.tar.bz2) = 68861317
>+SHA256 (openclonk-7.0-src.tar.bz2) = bc1a231d72774a7aa8819e54e1f79be27a21b579fb057609398f2aa5700b0732
>+SIZE (openclonk-7.0-src.tar.bz2) = 102143348
>Index: pkg-plist
>===================================================================
>--- pkg-plist	(revision 407363)
>+++ pkg-plist	(working copy)
>@@ -1,20 +1,21 @@
> bin/c4group
> bin/openclonk
> share/applications/openclonk.desktop
>-share/games/openclonk/Arena.ocf
>-share/games/openclonk/Decoration.ocd
>-share/games/openclonk/Graphics.ocg
>-share/games/openclonk/Material.ocg
>-share/games/openclonk/Missions.ocf
>-share/games/openclonk/Music.ocg
>-share/games/openclonk/Objects.ocd
>-share/games/openclonk/Parkour.ocf
>-share/games/openclonk/Sound.ocg
>-share/games/openclonk/System.ocg
>-share/games/openclonk/Tutorial.ocf
>-share/games/openclonk/Worlds.ocf
> share/icons/hicolor/128x128/apps/openclonk.png
> share/icons/hicolor/256x256/apps/openclonk.png
> share/icons/hicolor/32x32/apps/openclonk.png
> share/icons/hicolor/512x512/apps/openclonk.png
> share/icons/hicolor/64x64/apps/openclonk.png
>+%%DATADIR%%/Arena.ocf
>+%%DATADIR%%/Decoration.ocd
>+%%DATADIR%%/Defense.ocf
>+%%DATADIR%%/Graphics.ocg
>+%%DATADIR%%/Material.ocg
>+%%DATADIR%%/Missions.ocf
>+%%DATADIR%%/Music.ocg
>+%%DATADIR%%/Objects.ocd
>+%%DATADIR%%/Parkour.ocf
>+%%DATADIR%%/Sound.ocg
>+%%DATADIR%%/System.ocg
>+%%DATADIR%%/Tutorials.ocf
>+%%DATADIR%%/Worlds.ocf

Flags:

amdmi3: maintainer-approval?

Actions: View | Diff

Attachments on bug 206324: 165692 | 166398