- Update to 1.2.1

5 files changed, 57 insertions, 17 deletions

diff --git a/games/pink-pony/Makefile b/games/pink-pony/Makefile
index d56397e4fb42..ac991287814f 100644
--- a/games/pink-pony/Makefile
+++ b/games/pink-pony/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	pink-pony
-PORTVERSION=	1.1
+PORTVERSION=	1.2.1
 CATEGORIES=	games
 MASTER_SITES=	GOOGLE_CODE \
 		http://mirror.amdmi3.ru/distfiles/
@@ -17,7 +17,9 @@ COMMENT=	Tron-like multiplayer racing game
 LIB_DEPENDS=	IL.2:${PORTSDIR}/graphics/devil \
 		protobuf.4:${PORTSDIR}/devel/protobuf \
 		glfw.0:${PORTSDIR}/graphics/glfw \
-		Half.6:${PORTSDIR}/graphics/ilmbase
+		Half.6:${PORTSDIR}/graphics/ilmbase \
+		ftgl.2:${PORTSDIR}/graphics/ftgl \
+		sigc-2.0.0:${PORTSDIR}/devel/libsigc++20
 BUILD_DEPENDS=	${LOCALBASE}/lib/libaudiere.so:${PORTSDIR}/audio/audiere
 RUN_DEPENDS=	${LOCALBASE}/lib/libaudiere.so:${PORTSDIR}/audio/audiere
 
@@ -25,22 +27,27 @@ USE_BZIP2=	yes
 USE_SCONS=	yes
 USE_GL=		gl glu
 MAKE_JOBS_SAFE=	yes
+SUB_FILES=	pink-pony.sh
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
 PORTDOCS=	README
 
 post-patch:
-	@${REINPLACE_CMD} -Ee 's,(GLSL|levels|models|music|textures)/,${DATADIR}/&,' \
-		${WRKSRC}/pony.options ${WRKSRC}/PinkPony.cc ${WRKSRC}/lib/*.cc
-	@${REINPLACE_CMD} -e 's|pony.options|${PREFIX}/etc/pink-pony.conf|' \
-		${WRKSRC}/PinkPony.cc
+	@${REINPLACE_CMD} -Ee 's,(GLSL|levels|models|music|textures|fonts)/,${DATADIR}/&,' \
+		${WRKSRC}/pony.options ${WRKSRC}/Pony.cc ${WRKSRC}/lib/*.cc ${WRKSRC}/levels.xml
+	@${REINPLACE_CMD} -e 's|levels.xml|${DATADIR}/&|' \
+		${WRKSRC}/lib/Config.cc ${WRKSRC}/pony.options
+	@${REINPLACE_CMD} -e 's|/usr|${PREFIX}|' ${WRKSRC}/install/pink-pony.desktop
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/Pony ${PREFIX}/bin
-	${INSTALL_DATA} ${WRKSRC}/pony.options ${PREFIX}/etc/pink-pony.conf
+	${INSTALL_PROGRAM} ${WRKSRC}/Pony ${PREFIX}/libexec/
 	cd ${WRKSRC} && ${COPYTREE_SHARE} \
-		"GLSL levels models music textures" ${DATADIR}
+		"GLSL levels* models music textures fonts pony.options" ${DATADIR}/
+	${INSTALL_SCRIPT} ${WRKDIR}/pink-pony.sh ${PREFIX}/bin/pink-pony
+	${INSTALL_DATA} ${WRKSRC}/install/pink-pony.png ${PREFIX}/share/pixmaps/
+	${MKDIR} ${PREFIX}/share/applications
+	${INSTALL_DATA} ${WRKSRC}/install/pink-pony.desktop ${PREFIX}/share/applications/
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}/
diff --git a/games/pink-pony/distinfo b/games/pink-pony/distinfo
index 46088ca66604..0d186d68f4d2 100644
--- a/games/pink-pony/distinfo
+++ b/games/pink-pony/distinfo
@@ -1,3 +1,3 @@
-MD5 (pink-pony-1.1.tar.bz2) = d99db1120b81234b2a94a948040aea81
-SHA256 (pink-pony-1.1.tar.bz2) = 1ba1c9ceada6947873c1b2e6f4fe270e00c71cf78486c2a7a31e39c12de1247c
-SIZE (pink-pony-1.1.tar.bz2) = 8648912
+MD5 (pink-pony-1.2.1.tar.bz2) = 3acdab21d3368e0f0e931abcecb916d5
+SHA256 (pink-pony-1.2.1.tar.bz2) = ca29a59f6768712a15adce429f6a9447c1295d5b1247d1a4a2d5875a491342cf
+SIZE (pink-pony-1.2.1.tar.bz2) = 10194361
diff --git a/games/pink-pony/files/patch-SConstruct b/games/pink-pony/files/patch-SConstruct
index 5c09671ee9e2..dece15f0173c 100644
--- a/games/pink-pony/files/patch-SConstruct
+++ b/games/pink-pony/files/patch-SConstruct
@@ -1,11 +1,11 @@
---- SConstruct.orig	2009-07-11 02:22:02.000000000 +0400
-+++ SConstruct	2009-07-20 20:57:58.000000000 +0400
+--- SConstruct.orig	2009-08-19 17:38:38.000000000 +0400
++++ SConstruct	2009-08-25 18:18:24.000000000 +0400
 @@ -1,8 +1,7 @@
  import os
  
 -env = Environment()
 -env['CC'] = 'g++'
--env['CCFLAGS'] = '-Wall -Wextra -Wno-unused-parameter -O0 -ggdb -I/usr/include/OpenEXR -I./lib -I./external/tinyXML'
+-env['CCFLAGS'] = '-Wall -Wextra -Wno-unused-parameter -O2 -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-unused-parameter -I./lib -I./external/tinyXML'.split())
  env['LIBS'] = ['GLU', 'GL', 'protobuf', 'IL', 'ILUT', 'audiere']
diff --git a/games/pink-pony/files/pink-pony.sh.in b/games/pink-pony/files/pink-pony.sh.in
new file mode 100644
index 000000000000..06a00570a4e4
--- /dev/null
+++ b/games/pink-pony/files/pink-pony.sh.in
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+if [ "$#" -ge 1 ]; then
+    exec %%PREFIX%%/libexec/Pony "$*"
+else
+    if [ ! -f ~/.config/pony.options ]; then
+	mkdir -p ~/.config/
+	cp %%DATADIR%%/pony.options ~/.config/pony.options
+	chmod u+w ~/.config/pony.options
+    fi
+    exec %%PREFIX%%/libexec/Pony ~/.config/pony.options
+fi
diff --git a/games/pink-pony/pkg-plist b/games/pink-pony/pkg-plist
index e05195aec373..6cd9804b1d75 100644
--- a/games/pink-pony/pkg-plist
+++ b/games/pink-pony/pkg-plist
@@ -1,5 +1,6 @@
-bin/Pony
-etc/pink-pony.conf
+bin/pink-pony
+libexec/Pony
+share/applications/pink-pony.desktop
 %%DATADIR%%/GLSL/draw_particles.frag
 %%DATADIR%%/GLSL/draw_particles.geom
 %%DATADIR%%/GLSL/draw_particles.vert
@@ -9,6 +10,7 @@ etc/pink-pony.conf
 %%DATADIR%%/GLSL/heart.vert
 %%DATADIR%%/GLSL/heightmap.frag
 %%DATADIR%%/GLSL/heightmap.vert
+%%DATADIR%%/GLSL/nop.frag
 %%DATADIR%%/GLSL/pony.frag
 %%DATADIR%%/GLSL/pony.vert
 %%DATADIR%%/GLSL/step_particles.frag
@@ -16,26 +18,45 @@ etc/pink-pony.conf
 %%DATADIR%%/GLSL/step_particles.vert
 %%DATADIR%%/GLSL/water.frag
 %%DATADIR%%/GLSL/water.vert
+%%DATADIR%%/fonts/DaveDS_-_Sketchy.ttf
+%%DATADIR%%/levels.xml
+%%DATADIR%%/levels.xml.bak
 %%DATADIR%%/levels/heart.png
+%%DATADIR%%/levels/long.png
 %%DATADIR%%/levels/ring.png
 %%DATADIR%%/levels/skull.png
+%%DATADIR%%/levels/strange.png
 %%DATADIR%%/models/Heart.pmesh
 %%DATADIR%%/models/Pony-animated.pmesh
 %%DATADIR%%/models/Pony-animated.pskeleton
 %%DATADIR%%/music/To be happy.mp3
+%%DATADIR%%/pony.options
+%%DATADIR%%/textures/back.png
+%%DATADIR%%/textures/computer.png
+%%DATADIR%%/textures/down.png
 %%DATADIR%%/textures/four.png
 %%DATADIR%%/textures/grass.png
 %%DATADIR%%/textures/heart-particle.png
+%%DATADIR%%/textures/human.png
+%%DATADIR%%/textures/left.png
+%%DATADIR%%/textures/logo.png
 %%DATADIR%%/textures/noise.png
 %%DATADIR%%/textures/one.png
 %%DATADIR%%/textures/pony.png
+%%DATADIR%%/textures/quit.png
+%%DATADIR%%/textures/right.png
 %%DATADIR%%/textures/sand.png
+%%DATADIR%%/textures/settings.png
 %%DATADIR%%/textures/sky.png
 %%DATADIR%%/textures/three.png
 %%DATADIR%%/textures/two.png
+%%DATADIR%%/textures/up.png
+share/pixmaps/pink-pony.png
 @dirrm %%DATADIR%%/textures
 @dirrm %%DATADIR%%/music
 @dirrm %%DATADIR%%/models
 @dirrm %%DATADIR%%/levels
+@dirrm %%DATADIR%%/fonts
 @dirrm %%DATADIR%%/GLSL
 @dirrm %%DATADIR%%
+@dirrmtry share/applications