Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 11 Oct 2016 00:59:36 +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: r423739 - in head/games/pink-pony: . files
Message-ID:  <201610110059.u9B0xaL9059796@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: amdmi3
Date: Tue Oct 11 00:59:36 2016
New Revision: 423739
URL: https://svnweb.freebsd.org/changeset/ports/423739

Log:
  - Update to 1.4.1
  - Fix fetch
  - Fix LICENSE

Deleted:
  head/games/pink-pony/files/patch-lib-GL-GLee.h
Modified:
  head/games/pink-pony/Makefile
  head/games/pink-pony/distinfo
  head/games/pink-pony/files/patch-SConstruct
  head/games/pink-pony/pkg-descr

Modified: head/games/pink-pony/Makefile
==============================================================================
--- head/games/pink-pony/Makefile	Tue Oct 11 00:57:39 2016	(r423738)
+++ head/games/pink-pony/Makefile	Tue Oct 11 00:59:36 2016	(r423739)
@@ -2,18 +2,13 @@
 # $FreeBSD$
 
 PORTNAME=	pink-pony
-PORTVERSION=	1.3.1
-PORTREVISION=	7
+PORTVERSION=	1.4.1
 CATEGORIES=	games
-MASTER_SITES=	GOOGLE_CODE \
-		http://mirror.amdmi3.ru/distfiles/
 
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	Tron-like multiplayer racing game
 
-LICENSE=	GPLv3
-
-BROKEN=		Unfetchable (google code has gone away)
+LICENSE=	GPLv3+
 
 LIB_DEPENDS=	libIL.so:graphics/devil \
 		libprotobuf.so:devel/protobuf \
@@ -22,18 +17,22 @@ LIB_DEPENDS=	libIL.so:graphics/devil \
 		libftgl.so:graphics/ftgl \
 		libsigc-2.0.so:devel/libsigc++20
 
-USES=		dos2unix pkgconfig scons tar:bzip2
+USE_GITHUB=	yes
+GH_ACCOUNT=	ginkgo
+
+USES=		pkgconfig scons tar:bzip2
 USE_GL=		gl glu
 USE_SDL=	mixer
 SUB_FILES=	pink-pony.sh
-DOS2UNIX_FILES=	lib/GL/GLee.h
 
 PORTDOCS=	*
 PORTDATA=	*
 
+OPTIONS_DEFINE=	DOCS
+
 post-patch:
 	@${REINPLACE_CMD} -Ee 's,resources/,${DATADIR}/,' \
-		${WRKSRC}/pony.options ${WRKSRC}/lib/Config.cc
+		${WRKSRC}/pony.options ${WRKSRC}/src/Config.cc
 	@${REINPLACE_CMD} -e 's|/usr|${PREFIX}|' ${WRKSRC}/install/pink-pony.desktop
 
 do-install:
@@ -43,7 +42,9 @@ do-install:
 	${INSTALL_SCRIPT} ${WRKDIR}/pink-pony.sh ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
 	${INSTALL_DATA} ${WRKSRC}/install/pink-pony.png ${STAGEDIR}${PREFIX}/share/pixmaps/
 	${INSTALL_DATA} ${WRKSRC}/install/pink-pony.desktop ${STAGEDIR}${PREFIX}/share/applications/
-	${MKDIR} ${STAGEDIR}${DOCSDIR}
+
+do-install-DOCS-on:
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}/
 
 .include <bsd.port.mk>

Modified: head/games/pink-pony/distinfo
==============================================================================
--- head/games/pink-pony/distinfo	Tue Oct 11 00:57:39 2016	(r423738)
+++ head/games/pink-pony/distinfo	Tue Oct 11 00:59:36 2016	(r423739)
@@ -1,2 +1,3 @@
-SHA256 (pink-pony-1.3.1.tar.bz2) = c6d78f56dc76c97ff9bee392fd00e5302050e02f2549a977f76659fd7f04d5a6
-SIZE (pink-pony-1.3.1.tar.bz2) = 11104054
+TIMESTAMP = 1476143571
+SHA256 (ginkgo-pink-pony-1.4.1_GH0.tar.gz) = 20f0da9498bcb75421f0dc9d7b9e5d92aea99510a0c632be3278bd83c4fb9395
+SIZE (ginkgo-pink-pony-1.4.1_GH0.tar.gz) = 11292590

Modified: head/games/pink-pony/files/patch-SConstruct
==============================================================================
--- head/games/pink-pony/files/patch-SConstruct	Tue Oct 11 00:57:39 2016	(r423738)
+++ head/games/pink-pony/files/patch-SConstruct	Tue Oct 11 00:59:36 2016	(r423739)
@@ -1,13 +1,17 @@
---- SConstruct.orig	2013-09-12 00:21:39.000000000 +0400
-+++ SConstruct	2013-09-18 21:30:59.110518891 +0400
-@@ -1,8 +1,7 @@
- import os
+--- SConstruct.orig	2014-01-01 01:39:36 UTC
++++ SConstruct
+@@ -3,11 +3,10 @@ import os
+ optimization_flags = ['-O3']
+ #optimization_flags = ['-O0', '-ggdb']
  
 -env = Environment()
--env['CC'] = 'g++'
--env['CCFLAGS'] = '-Wall -Wextra -Wno-reorder -Wno-unused-parameter -O3 -I/usr/include/OpenEXR -I./lib -I./external/tinyXML'
 +env = Environment(ENV=os.environ, **dict((k, v.split()) for k, v in ARGUMENTS.iteritems()))
-+env.Append(CCFLAGS = '-Wall -Wextra -Wno-reorder -Wno-unused-parameter -I./lib -I./external/tinyXML'.split())
+-env['CC'] = 'g++'
+-env['CCFLAGS'] = ['-Wall', '-Wextra', '-Wno-reorder', '-Wno-unused-parameter'] + optimization_flags
++env.Append(CCFLAGS = ['-Wall', '-Wextra', '-Wno-reorder', '-Wno-unused-parameter'])
  env['LIBS'] = ['GLU', 'GL', 'protobuf', 'IL']
+-env['CPPPATH'] = ['#', '#/src', '#/external/tinyXML', '#/external/flextGL/', '/usr/include/OpenEXR']
++env['CPPPATH'] = ['#', '#/src', '#/external/tinyXML', '#/external/flextGL/']
+ 
  env.ParseConfig("pkg-config IlmBase --cflags --libs")
  env.ParseConfig("pkg-config libglfw --cflags --libs")

Modified: head/games/pink-pony/pkg-descr
==============================================================================
--- head/games/pink-pony/pkg-descr	Tue Oct 11 00:57:39 2016	(r423738)
+++ head/games/pink-pony/pkg-descr	Tue Oct 11 00:59:36 2016	(r423739)
@@ -3,4 +3,4 @@ little ponies that leave a trail of flow
 You have to evade these trails and force other ponies into them.
 The last pony standing wins the game.
 
-WWW: http://code.google.com/p/pink-pony/
+WWW: https://github.com/ginkgo/pink-pony



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