- Update to 1.1

4 files changed, 11 insertions, 23 deletions

diff --git a/games/pink-pony/Makefile b/games/pink-pony/Makefile
index 39419c68a301..d56397e4fb42 100644
--- a/games/pink-pony/Makefile
+++ b/games/pink-pony/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	pink-pony
-PORTVERSION=	1.0
+PORTVERSION=	1.1
 CATEGORIES=	games
 MASTER_SITES=	GOOGLE_CODE \
 		http://mirror.amdmi3.ru/distfiles/
@@ -31,19 +31,16 @@ WRKSRC=		${WRKDIR}/${PORTNAME}
 PORTDOCS=	README
 
 post-patch:
-	@${REINPLACE_CMD} -Ee 's,(GLSL|levels|models|music|sounds|textures)/,${DATADIR}/&,' \
+	@${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
 
-post-configure:
-	cd ${WRKSRC}/lib && ${LOCALBASE}/bin/protoc --cpp_out=. mesh.proto
-
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/Pony ${PREFIX}/bin
 	${INSTALL_DATA} ${WRKSRC}/pony.options ${PREFIX}/etc/pink-pony.conf
 	cd ${WRKSRC} && ${COPYTREE_SHARE} \
-		"GLSL levels models music sounds textures" ${DATADIR}
+		"GLSL levels models music textures" ${DATADIR}
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}/
diff --git a/games/pink-pony/distinfo b/games/pink-pony/distinfo
index cae8e9fbd513..46088ca66604 100644
--- a/games/pink-pony/distinfo
+++ b/games/pink-pony/distinfo
@@ -1,3 +1,3 @@
-MD5 (pink-pony-1.0.tar.bz2) = af082a8e424b980353b47107a21c8864
-SHA256 (pink-pony-1.0.tar.bz2) = f771caf2887d9553ff24cad2ec3a45fb114fae58ca3757bdca4f620ffbbc9300
-SIZE (pink-pony-1.0.tar.bz2) = 10077835
+MD5 (pink-pony-1.1.tar.bz2) = d99db1120b81234b2a94a948040aea81
+SHA256 (pink-pony-1.1.tar.bz2) = 1ba1c9ceada6947873c1b2e6f4fe270e00c71cf78486c2a7a31e39c12de1247c
+SIZE (pink-pony-1.1.tar.bz2) = 8648912
diff --git a/games/pink-pony/files/patch-SConstruct b/games/pink-pony/files/patch-SConstruct
index d6e3372fded1..5c09671ee9e2 100644
--- a/games/pink-pony/files/patch-SConstruct
+++ b/games/pink-pony/files/patch-SConstruct
@@ -1,11 +1,11 @@
---- SConstruct.orig	2009-06-22 12:58:28.000000000 +0400
-+++ SConstruct	2009-07-09 23:42:45.000000000 +0400
+--- SConstruct.orig	2009-07-11 02:22:02.000000000 +0400
++++ SConstruct	2009-07-20 20:57:58.000000000 +0400
 @@ -1,8 +1,7 @@
  import os
  
 -env = Environment()
 -env['CC'] = 'g++'
--env['CCFLAGS'] = '-Wall -Wextra -Wno-unused-parameter -O0 -ggdb -msse3 -I/usr/include/OpenEXR -I./lib -I./external/tinyXML'
+-env['CCFLAGS'] = '-Wall -Wextra -Wno-unused-parameter -O0 -ggdb -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/pkg-plist b/games/pink-pony/pkg-plist
index 3f6619e4ea67..e05195aec373 100644
--- a/games/pink-pony/pkg-plist
+++ b/games/pink-pony/pkg-plist
@@ -3,6 +3,8 @@ etc/pink-pony.conf
 %%DATADIR%%/GLSL/draw_particles.frag
 %%DATADIR%%/GLSL/draw_particles.geom
 %%DATADIR%%/GLSL/draw_particles.vert
+%%DATADIR%%/GLSL/draw_particles_cpu.frag
+%%DATADIR%%/GLSL/draw_particles_cpu.vert
 %%DATADIR%%/GLSL/heart.frag
 %%DATADIR%%/GLSL/heart.vert
 %%DATADIR%%/GLSL/heightmap.frag
@@ -17,32 +19,21 @@ etc/pink-pony.conf
 %%DATADIR%%/levels/heart.png
 %%DATADIR%%/levels/ring.png
 %%DATADIR%%/levels/skull.png
-%%DATADIR%%/models/Heart.mesh.xml
 %%DATADIR%%/models/Heart.pmesh
-%%DATADIR%%/models/Pony-animated.mesh.xml
 %%DATADIR%%/models/Pony-animated.pmesh
 %%DATADIR%%/models/Pony-animated.pskeleton
-%%DATADIR%%/models/Pony-animated.skeleton.xml
-%%DATADIR%%/models/candy.blend
-%%DATADIR%%/models/heart.blend
-%%DATADIR%%/models/pony-animated.blend
-%%DATADIR%%/models/pony.blend
 %%DATADIR%%/music/To be happy.mp3
-%%DATADIR%%/sounds/explosion.wav
-%%DATADIR%%/sounds/heart.wav
 %%DATADIR%%/textures/four.png
 %%DATADIR%%/textures/grass.png
 %%DATADIR%%/textures/heart-particle.png
 %%DATADIR%%/textures/noise.png
 %%DATADIR%%/textures/one.png
-%%DATADIR%%/textures/pony-blue.png
 %%DATADIR%%/textures/pony.png
 %%DATADIR%%/textures/sand.png
 %%DATADIR%%/textures/sky.png
 %%DATADIR%%/textures/three.png
 %%DATADIR%%/textures/two.png
 @dirrm %%DATADIR%%/textures
-@dirrm %%DATADIR%%/sounds
 @dirrm %%DATADIR%%/music
 @dirrm %%DATADIR%%/models
 @dirrm %%DATADIR%%/levels