Attachment 150062 Details for Bug 195514 – Proposed patch (with fixed license description)

[patch] Proposed patch (with fixed license description)

pioneer_0.0.20141029-0.0.20141128.diff (text/plain), 3.86 KB, created by lightside on 2014-12-01 07:50:59 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: lightside

Created: 2014-12-01 07:50:59 UTC

Size: 3.86 KB

patch

obsolete

>diff -ruN pioneer.orig/Makefile pioneer/Makefile
>--- pioneer.orig/Makefile	2014-10-30 15:35:57.000000000 +0400
>+++ pioneer/Makefile	2014-12-01 10:38:52.000000000 +0400
>@@ -9,21 +9,24 @@
> MAINTAINER=	lightside@gmx.com
> COMMENT=	Space adventure game set in the Milky Way galaxy
> 
>-LICENSE=	APACHE20 GPLv3 MIT ZLIB CCBYSAv3 DejaVu GLEW SIL
>+LICENSE=	APACHE20 GPLv3 MIT ZLIB CCBYSAv3 DejaVu GLEW IUP SIL
> LICENSE_COMB=	multi
> LICENSE_NAME_CCBYSAv3=	Creative Commons Attribution-ShareAlike 3.0 Unported license
> LICENSE_NAME_DejaVu=	Bitstream Vera and Arev fonts license
> LICENSE_NAME_GLEW=	The OpenGL Extension Wrangler Library license
>+LICENSE_NAME_IUP=	Galaxy colour image use policy
> LICENSE_NAME_SIL=	SIL open font license version 1.1
> LICENSE_FILE_APACHE20=	${WRKSRC}/licenses/Apache-2.0.txt
> LICENSE_FILE_CCBYSAv3=	${WRKSRC}/licenses/CC-BY-SA-3.0.txt
> LICENSE_FILE_DejaVu=	${WRKSRC}/licenses/DejaVu-license.txt
> LICENSE_FILE_GLEW=	${WRKSRC}/licenses/GLEW.txt
> LICENSE_FILE_GPLv3=	${WRKSRC}/licenses/GPL-3.txt
>+LICENSE_FILE_IUP=	${WRKSRC}/licenses/Image\ Use\ Policy\ -\ NASA\ Spitzer\ Space\ Telescope.html
> LICENSE_FILE_SIL=	${WRKSRC}/licenses/SIL-1.1.txt
> LICENSE_PERMS_CCBYSAv3=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
> LICENSE_PERMS_DejaVu=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
> LICENSE_PERMS_GLEW=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
>+LICENSE_PERMS_IUP=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
> LICENSE_PERMS_SIL=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
> 
> BUILD_DEPENDS=	${LOCALBASE}/include/GL/glu.h:${PORTSDIR}/graphics/libGLU
>@@ -35,7 +38,7 @@
> 
> GH_ACCOUNT=	pioneerspacesim
> GH_PROJECT=	${PORTNAME}
>-GH_TAGNAME=	20141029
>+GH_TAGNAME=	20141128
> 
> WRKSRC=		${WRKDIR}/${GH_PROJECT}-${GH_TAGNAME}
> 
>@@ -70,7 +73,7 @@
> 
> .include <bsd.port.options.mk>
> 
>-.if ${OSVERSION} < 1000054
>+.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000054
> USE_GCC=	yes
> .else
> USES+=		compiler:c++11-lang
>@@ -99,7 +102,7 @@
> 	@${MV} ${STAGEDIR}${PREFIX}/bin/modelcompiler \
> 		${STAGEDIR}${PREFIX}/bin/${PORTNAME}-modelcompiler
> .endif
>-	cd ${WRKSRC} && ${COPYTREE_SHARE} "${PORTDOCS}" ${STAGEDIR}${DOCSDIR}
>+	(cd ${WRKSRC} && ${COPYTREE_SHARE} "${PORTDOCS}" ${STAGEDIR}${DOCSDIR})
> 	${INSTALL_DATA} ${WRKSRC}/application-icon/pngs/pioneer-256x256.png \
> 		${STAGEDIR}${PREFIX}/share/pixmaps/${PORTNAME}.png
> 
>diff -ruN pioneer.orig/distinfo pioneer/distinfo
>--- pioneer.orig/distinfo	2014-10-30 15:35:57.000000000 +0400
>+++ pioneer/distinfo	2014-11-29 18:03:07.000000000 +0400
>@@ -1,2 +1,2 @@
>-SHA256 (pioneer-0.0.20141029.tar.gz) = 918ca629a2f24e18826fb8394137447317778b105fd3d6e8e625d49654724b02
>-SIZE (pioneer-0.0.20141029.tar.gz) = 174101452
>+SHA256 (pioneer-0.0.20141128.tar.gz) = b6d4e42194dd18407609ca297cc3038219b36031581aa94abb3d02b3f32c94c9
>+SIZE (pioneer-0.0.20141128.tar.gz) = 174122579
>diff -ruN pioneer.orig/files/patch-src_posix_OSPosix.cpp pioneer/files/patch-src_posix_OSPosix.cpp
>--- pioneer.orig/files/patch-src_posix_OSPosix.cpp	2014-10-29 08:40:29.000000000 +0400
>+++ pioneer/files/patch-src_posix_OSPosix.cpp	2014-11-29 18:13:20.000000000 +0400
>@@ -5,7 +5,7 @@
>  
>  	char infoString[2048];
> -#if defined(__APPLE__)
>-+#if defined(__APPLE__) || defined(__FREEBSD__)
>++#if !defined(__linux__)
>  	snprintf(infoString, 2048, "System Name: %s\nHost Name: %s\nRelease(Kernel) Version: %s\nKernel Build Timestamp: %s\nMachine Arch: %s\n",
>  		uts.sysname, uts.nodename, uts.release, uts.version, uts.machine);
>  #else
>diff -ruN pioneer.orig/pkg-descr pioneer/pkg-descr
>--- pioneer.orig/pkg-descr	2014-10-29 08:40:29.000000000 +0400
>+++ pioneer/pkg-descr	2014-11-29 17:45:06.000000000 +0400
>@@ -9,5 +9,5 @@
> hand at piracy, make your fortune trading between systems, or do missions for
> the various factions fighting for power, freedom or self-determination.
> 
>-WWW: http://pioneerspacesim.net
> WWW: http://github.com/pioneerspacesim/pioneer
>+WWW: http://pioneerspacesim.net

Actions: View | Diff

Attachments on bug 195514: 150010 | 150011 | 150012 | 150013 | 150062 | 150082