- Update to 1.3.1

- Support staging
- Use new LIB_DEPENDS syntax
- Add LICENSE
- Add pkg-message with description of config file problems

PR:		182956 (bits used)
Submitted by:	nemysis <nemysis@FreeBSD.org>

7 files changed, 43 insertions, 103 deletions

diff --git a/games/pink-pony/Makefile b/games/pink-pony/Makefile
index e9a795abb8fd..91d8e786df77 100644
--- a/games/pink-pony/Makefile
+++ b/games/pink-pony/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	pink-pony
-PORTVERSION=	1.2.1
-PORTREVISION=	9
+PORTVERSION=	1.3.1
 CATEGORIES=	games
 MASTER_SITES=	GOOGLE_CODE \
 		http://mirror.amdmi3.ru/distfiles/
@@ -11,46 +10,40 @@ MASTER_SITES=	GOOGLE_CODE \
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	Tron-like multiplayer racing game
 
-LIB_DEPENDS=	IL:${PORTSDIR}/graphics/devil \
-		protobuf:${PORTSDIR}/devel/protobuf \
-		glfw:${PORTSDIR}/graphics/glfw \
-		Half:${PORTSDIR}/graphics/ilmbase \
-		ftgl:${PORTSDIR}/graphics/ftgl \
-		sigc-2.0:${PORTSDIR}/devel/libsigc++20
-BUILD_DEPENDS=	${LOCALBASE}/lib/libaudiere.so:${PORTSDIR}/audio/audiere
-RUN_DEPENDS=	${LOCALBASE}/lib/libaudiere.so:${PORTSDIR}/audio/audiere
+LICENSE=	GPLv3
+
+LIB_DEPENDS=	libIL.so:${PORTSDIR}/graphics/devil \
+		libprotobuf.so:${PORTSDIR}/devel/protobuf \
+		libglfw.so:${PORTSDIR}/graphics/glfw \
+		libHalf.so:${PORTSDIR}/graphics/ilmbase \
+		libftgl.so:${PORTSDIR}/graphics/ftgl \
+		libsigc-2.0.so:${PORTSDIR}/devel/libsigc++20
 
 USES=		pkgconfig
 USE_BZIP2=	yes
 USE_SCONS=	yes
+USES=		pkgconfig
 USE_GL=		gl glu
+USE_SDL=	mixer
 SUB_FILES=	pink-pony.sh
 USE_DOS2UNIX=	lib/GL/GLee.h
 
-WRKSRC=		${WRKDIR}/${PORTNAME}
-
-PORTDOCS=	README
-
-NO_STAGE=	yes
-.include <bsd.port.options.mk>
+PORTDOCS=	*
+PORTDATA=	*
 
 post-patch:
-	@${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} -Ee 's,resources/,${DATADIR}/,' \
+		${WRKSRC}/pony.options ${WRKSRC}/lib/Config.cc
 	@${REINPLACE_CMD} -e 's|/usr|${PREFIX}|' ${WRKSRC}/install/pink-pony.desktop
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/Pony ${PREFIX}/libexec/
-	cd ${WRKSRC} && ${COPYTREE_SHARE} \
-		"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/
-	${INSTALL_DATA} ${WRKSRC}/install/pink-pony.desktop ${PREFIX}/share/applications/
-.if ${PORT_OPTIONS:MDOCS}
-	${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}/
-.endif
+	${INSTALL_PROGRAM} ${WRKSRC}/Pony ${STAGEDIR}${PREFIX}/libexec/
+	cd ${WRKSRC}/resources && ${COPYTREE_SHARE} '*' ${STAGEDIR}${DATADIR}/
+	${INSTALL_DATA} ${WRKSRC}/pony.options ${STAGEDIR}${DATADIR}/
+	${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}
+	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}/
 
 .include <bsd.port.mk>
diff --git a/games/pink-pony/distinfo b/games/pink-pony/distinfo
index 2793865c76c2..5b1320bce712 100644
--- a/games/pink-pony/distinfo
+++ b/games/pink-pony/distinfo
@@ -1,2 +1,2 @@
-SHA256 (pink-pony-1.2.1.tar.bz2) = ca29a59f6768712a15adce429f6a9447c1295d5b1247d1a4a2d5875a491342cf
-SIZE (pink-pony-1.2.1.tar.bz2) = 10194361
+SHA256 (pink-pony-1.3.1.tar.bz2) = c6d78f56dc76c97ff9bee392fd00e5302050e02f2549a977f76659fd7f04d5a6
+SIZE (pink-pony-1.3.1.tar.bz2) = 11104054
diff --git a/games/pink-pony/files/patch-SConstruct b/games/pink-pony/files/patch-SConstruct
index dece15f0173c..eb2643efbcbb 100644
--- a/games/pink-pony/files/patch-SConstruct
+++ b/games/pink-pony/files/patch-SConstruct
@@ -1,13 +1,13 @@
---- SConstruct.orig	2009-08-19 17:38:38.000000000 +0400
-+++ SConstruct	2009-08-25 18:18:24.000000000 +0400
+--- 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
  
 -env = Environment()
 -env['CC'] = 'g++'
--env['CCFLAGS'] = '-Wall -Wextra -Wno-unused-parameter -O2 -I/usr/include/OpenEXR -I./lib -I./external/tinyXML'
+-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-unused-parameter -I./lib -I./external/tinyXML'.split())
- env['LIBS'] = ['GLU', 'GL', 'protobuf', 'IL', 'ILUT', 'audiere']
++env.Append(CCFLAGS = '-Wall -Wextra -Wno-reorder -Wno-unused-parameter -I./lib -I./external/tinyXML'.split())
+ env['LIBS'] = ['GLU', 'GL', 'protobuf', 'IL']
  env.ParseConfig("pkg-config IlmBase --cflags --libs")
  env.ParseConfig("pkg-config libglfw --cflags --libs")
diff --git a/games/pink-pony/files/patch-lib-GL-GLee.h b/games/pink-pony/files/patch-lib-GL-GLee.h
index 5f35464b1eab..1fd7e2ba5e9e 100644
--- a/games/pink-pony/files/patch-lib-GL-GLee.h
+++ b/games/pink-pony/files/patch-lib-GL-GLee.h
@@ -1,5 +1,5 @@
---- lib/GL/GLee.h.orig	2009-04-12 22:06:20.000000000 +0400
-+++ lib/GL/GLee.h	2009-07-09 23:58:05.000000000 +0400
+--- lib/GL/GLee.h.orig	2013-09-12 00:21:39.000000000 +0400
++++ lib/GL/GLee.h	2013-09-18 21:32:09.160519239 +0400
 @@ -747,8 +747,6 @@
  
  	/* GLX */
diff --git a/games/pink-pony/files/pink-pony.sh.in b/games/pink-pony/files/pink-pony.sh.in
index 06a00570a4e4..1840277b573c 100644
--- a/games/pink-pony/files/pink-pony.sh.in
+++ b/games/pink-pony/files/pink-pony.sh.in
@@ -1,12 +1,12 @@
 #!/bin/sh
 
 if [ "$#" -ge 1 ]; then
-    exec %%PREFIX%%/libexec/Pony "$*"
+	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
+	if [ ! -f ~/.config/pony.options ]; then
+		mkdir -p ~/.config/
+		cp -af %%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-message b/games/pink-pony/pkg-message
new file mode 100644
index 000000000000..146c73484e19
--- /dev/null
+++ b/games/pink-pony/pkg-message
@@ -0,0 +1,4 @@
+After updating, game may fail to start unable to find some data
+files. In this case, please remove ~/.config/pony.options left
+from the previous install and retry. Unfortunately, the game
+currently doesn't properly handle config file updating.
diff --git a/games/pink-pony/pkg-plist b/games/pink-pony/pkg-plist
index 970d22152aeb..9eed21256b68 100644
--- a/games/pink-pony/pkg-plist
+++ b/games/pink-pony/pkg-plist
@@ -1,61 +1,4 @@
 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
-%%DATADIR%%/GLSL/draw_particles_cpu.frag
-%%DATADIR%%/GLSL/draw_particles_cpu.vert
-%%DATADIR%%/GLSL/heart.frag
-%%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
-%%DATADIR%%/GLSL/step_particles.geom
-%%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%%