Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 2 Dec 2014 03:15:34 +0000 (UTC)
From:      Dmitry Marakasov <amdmi3@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r373736 - in head/games/pioneer: . files
Message-ID:  <201412020315.sB23FYX9034391@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: amdmi3
Date: Tue Dec  2 03:15:33 2014
New Revision: 373736
URL: https://svnweb.freebsd.org/changeset/ports/373736
QAT: https://qat.redports.org/buildarchive/r373736/

Log:
  - Update to 20141128 (changes: https://github.com/pioneerspacesim/pioneer/compare/20141029...20141128)
  - Update licenses
  - Added OPSYS in conjunction to OSVERSION
  - Wrapped cd related command to parentheses
  - Corrected patch for src/posix/OSPosix.cpp file
  - Fix multiple WWW in pkg-descr
  
  PR:		195514
  Submitted by:	lightside@gmx.com (maintainer)

Modified:
  head/games/pioneer/Makefile
  head/games/pioneer/distinfo
  head/games/pioneer/files/patch-src_posix_OSPosix.cpp
  head/games/pioneer/pkg-descr

Modified: head/games/pioneer/Makefile
==============================================================================
--- head/games/pioneer/Makefile	Tue Dec  2 02:30:23 2014	(r373735)
+++ head/games/pioneer/Makefile	Tue Dec  2 03:15:33 2014	(r373736)
@@ -9,21 +9,24 @@ MASTER_SITES=	http://github.com/${GH_ACC
 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 @@ LIB_DEPENDS=	libsigc-2.0.so:${PORTSDIR}/
 
 GH_ACCOUNT=	pioneerspacesim
 GH_PROJECT=	${PORTNAME}
-GH_TAGNAME=	20141029
+GH_TAGNAME=	20141128
 
 WRKSRC=		${WRKDIR}/${GH_PROJECT}-${GH_TAGNAME}
 
@@ -70,7 +73,7 @@ MODELCOMPILER_PLIST_FILES=	bin/${PORTNAM
 
 .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 @@ post-install:
 	@${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
 

Modified: head/games/pioneer/distinfo
==============================================================================
--- head/games/pioneer/distinfo	Tue Dec  2 02:30:23 2014	(r373735)
+++ head/games/pioneer/distinfo	Tue Dec  2 03:15:33 2014	(r373736)
@@ -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

Modified: head/games/pioneer/files/patch-src_posix_OSPosix.cpp
==============================================================================
--- head/games/pioneer/files/patch-src_posix_OSPosix.cpp	Tue Dec  2 02:30:23 2014	(r373735)
+++ head/games/pioneer/files/patch-src_posix_OSPosix.cpp	Tue Dec  2 03:15:33 2014	(r373736)
@@ -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

Modified: head/games/pioneer/pkg-descr
==============================================================================
--- head/games/pioneer/pkg-descr	Tue Dec  2 02:30:23 2014	(r373735)
+++ head/games/pioneer/pkg-descr	Tue Dec  2 03:15:33 2014	(r373736)
@@ -10,4 +10,3 @@ hand at piracy, make your fortune tradin
 the various factions fighting for power, freedom or self-determination.
 
 WWW: http://pioneerspacesim.net
-WWW: http://github.com/pioneerspacesim/pioneer



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201412020315.sB23FYX9034391>