Date: Mon, 14 Oct 2013 00:44:56 +0200 From: nemysis <nemysis@FreeBSD.org> To: FreeBSD-gnats-submit@freebsd.org Cc: amdmi3@FreeBSD.org Subject: ports/182956: [PATCH] games/pink-pony: update to 1.3.1 Message-ID: <201310132244.r9DMiue8058514@freefall.freebsd.org> Resent-Message-ID: <201310132250.r9DMo09s058621@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 182956 >Category: ports >Synopsis: [PATCH] games/pink-pony: update to 1.3.1 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Sun Oct 13 22:50:00 UTC 2013 >Closed-Date: >Last-Modified: >Originator: nemysis >Release: FreeBSD 9.2-RELEASE-p8 amd64 >Organization: >Environment: System: FreeBSD nemysis4now 9.2-RELEASE-p8 FreeBSD 9.2-RELEASE-p8 #0: Mon Sep 23 16:26:45 UTC 2013 >Description: - Update to 1.3.1 - Use the new format for LIB_DEPENDS - Add license (GPLv3) - Change dependency graphics/glfw to graphics/glfw2 - Add USE_SDL= mixer - Support STAGEDIR - Change REINPLACE_CMD - Correctly use -af flags for cp Port maintainer (amdmi3@FreeBSD.org) is cc'd. Generated and tested manually, tested with stage and with RedPorts, sent with FreeBSD Port Tools 0.99_8 (mode: update, diff: ports) >How-To-Repeat: Build log https://redports.org/buildarchive/20131013204000-2792/ >Fix: --- pink-pony-1.3.1.patch begins here --- diff -ruN /usr/ports/games/pink-pony/Makefile ./Makefile --- /usr/ports/games/pink-pony/Makefile 2013-09-20 20:51:07.000000000 +0200 +++ ./Makefile 2013-10-14 00:37:49.000000000 +0200 @@ -2,8 +2,7 @@ # $FreeBSD: head/games/pink-pony/Makefile 327730 2013-09-20 17:36:33Z bapt $ PORTNAME= pink-pony -PORTVERSION= 1.2.1 -PORTREVISION= 7 +PORTVERSION= 1.3.1 CATEGORIES= games MASTER_SITES= GOOGLE_CODE \ http://mirror.amdmi3.ru/distfiles/ @@ -11,12 +10,14 @@ 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 +LICENSE= GPLv3 + +LIB_DEPENDS= libIL.so:${PORTSDIR}/graphics/devil \ + libprotobuf.so:${PORTSDIR}/devel/protobuf \ + libglfw.so:${PORTSDIR}/graphics/glfw2 \ + libHalf.so:${PORTSDIR}/graphics/ilmbase \ + libftgl.so:${PORTSDIR}/graphics/ftgl \ + libsigc-2.0.so:${PORTSDIR}/devel/libsigc++20 BUILD_DEPENDS= ${LOCALBASE}/lib/libaudiere.so:${PORTSDIR}/audio/audiere RUN_DEPENDS= ${LOCALBASE}/lib/libaudiere.so:${PORTSDIR}/audio/audiere @@ -24,34 +25,32 @@ USE_BZIP2= yes USE_SCONS= yes USE_GL= gl glu +USE_SDL= mixer SUB_FILES= pink-pony.sh -USE_DOS2UNIX= lib/GL/GLee.h - -WRKSRC= ${WRKDIR}/${PORTNAME} +USE_DOS2UNIX= lib/GL/GLee.c lib/GL/GLee.h PORTDOCS= README -NO_STAGE= yes -.include <bsd.port.options.mk> +OPTIONS_DEFINE= DOCS 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 + ${WRKSRC}/lib/Config.cc + @${REINPLACE_CMD} -e 's|resources/|${DATADIR}/|' \ + ${WRKSRC}/pony.options @${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/ - ${MKDIR} ${PREFIX}/share/applications - ${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} \ + "GLSL fonts levels models music sounds textures levels.xml" ${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/ + @${MKDIR} ${STAGEDIR}${DESKTOPDIR} + ${INSTALL_DATA} ${WRKSRC}/install/${PORTNAME}.desktop ${STAGEDIR}${DESKTOPDIR} + + @${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR} .include <bsd.port.mk> diff -ruN /usr/ports/games/pink-pony/distinfo ./distinfo --- /usr/ports/games/pink-pony/distinfo 2013-09-13 02:56:53.000000000 +0200 +++ ./distinfo 2013-10-12 22:37:43.000000000 +0200 @@ -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 -ruN /usr/ports/games/pink-pony/files/patch-SConstruct ./files/patch-SConstruct --- /usr/ports/games/pink-pony/files/patch-SConstruct 2013-09-13 02:56:53.000000000 +0200 +++ ./files/patch-SConstruct 2013-10-13 22:38:34.000000000 +0200 @@ -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-11 22:21:39.000000000 +0200 ++++ ./SConstruct 2013-10-13 22:38:17.000000000 +0200 @@ -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['LIBS'] = ['GLU', 'GL', 'protobuf', 'IL'] env.ParseConfig("pkg-config IlmBase --cflags --libs") env.ParseConfig("pkg-config libglfw --cflags --libs") diff -ruN /usr/ports/games/pink-pony/files/patch-lib-GL-GLee.h ./files/patch-lib-GL-GLee.h --- /usr/ports/games/pink-pony/files/patch-lib-GL-GLee.h 2013-09-13 02:56:53.000000000 +0200 +++ ./files/patch-lib-GL-GLee.h 1970-01-01 01:00:00.000000000 +0100 @@ -1,11 +0,0 @@ ---- 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 -@@ -747,8 +747,6 @@ - - /* GLX */ - -- typedef void (*__GLXextFuncPtr)(void); -- - #ifndef GLX_ARB_get_proc_address - #define GLX_ARB_get_proc_address 1 - extern __GLXextFuncPtr glXGetProcAddressARB (const GLubyte *); diff -ruN /usr/ports/games/pink-pony/files/patch-lib__GL__GLee.h ./files/patch-lib__GL__GLee.h --- /usr/ports/games/pink-pony/files/patch-lib__GL__GLee.h 1970-01-01 01:00:00.000000000 +0100 +++ ./files/patch-lib__GL__GLee.h 2013-10-13 22:38:34.000000000 +0200 @@ -0,0 +1,11 @@ +--- ./lib/GL/GLee.h.orig 2013-10-13 22:36:08.000000000 +0200 ++++ ./lib/GL/GLee.h 2013-10-13 22:36:08.000000000 +0200 +@@ -747,8 +747,6 @@ + + /* GLX */ + +- typedef void (*__GLXextFuncPtr)(void); +- + #ifndef GLX_ARB_get_proc_address + #define GLX_ARB_get_proc_address 1 + extern __GLXextFuncPtr glXGetProcAddressARB (const GLubyte *); diff -ruN /usr/ports/games/pink-pony/files/pink-pony.sh.in ./files/pink-pony.sh.in --- /usr/ports/games/pink-pony/files/pink-pony.sh.in 2013-09-13 02:56:53.000000000 +0200 +++ ./files/pink-pony.sh.in 2013-10-13 03:18:42.000000000 +0200 @@ -5,7 +5,7 @@ else if [ ! -f ~/.config/pony.options ]; then mkdir -p ~/.config/ - cp %%DATADIR%%/pony.options ~/.config/pony.options + cp -af %%DATADIR%%/pony.options ~/.config/pony.options chmod u+w ~/.config/pony.options fi exec %%PREFIX%%/libexec/Pony ~/.config/pony.options diff -ruN /usr/ports/games/pink-pony/pkg-plist ./pkg-plist --- /usr/ports/games/pink-pony/pkg-plist 2013-09-13 02:56:53.000000000 +0200 +++ ./pkg-plist 2013-10-13 00:14:21.000000000 +0200 @@ -10,7 +10,6 @@ %%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 @@ -18,19 +17,27 @@ %%DATADIR%%/GLSL/step_particles.vert %%DATADIR%%/GLSL/water.frag %%DATADIR%%/GLSL/water.vert -%%DATADIR%%/fonts/DaveDS_-_Sketchy.ttf +%%DATADIR%%/fonts/dijkstra.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.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%%/pony.options +%%DATADIR%%/sounds/explosion.wav +%%DATADIR%%/sounds/heart.wav %%DATADIR%%/textures/back.png %%DATADIR%%/textures/computer.png %%DATADIR%%/textures/down.png @@ -42,6 +49,7 @@ %%DATADIR%%/textures/logo.png %%DATADIR%%/textures/noise.png %%DATADIR%%/textures/one.png +%%DATADIR%%/textures/pony-blue.png %%DATADIR%%/textures/pony.png %%DATADIR%%/textures/quit.png %%DATADIR%%/textures/right.png @@ -53,6 +61,7 @@ %%DATADIR%%/textures/up.png share/pixmaps/pink-pony.png @dirrm %%DATADIR%%/textures +@dirrm %%DATADIR%%/sounds @dirrm %%DATADIR%%/music @dirrm %%DATADIR%%/models @dirrm %%DATADIR%%/levels --- pink-pony-1.3.1.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201310132244.r9DMiue8058514>