Received: by mail.netbsd.org (Postfix, from userid 605) id 47D6E84D32; Sat, 13 Apr 2019 12:08:06 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id C2EC084CFC for ; Sat, 13 Apr 2019 12:08:05 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id jEP8sXXxhWvp for ; Sat, 13 Apr 2019 12:08:04 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 9B0AE84CD4 for ; Sat, 13 Apr 2019 12:08:04 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 95712FB16; Sat, 13 Apr 2019 12:08:04 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1555157284271880" MIME-Version: 1.0 Date: Sat, 13 Apr 2019 12:08:04 +0000 From: "Nia Alarie" Subject: CVS commit: pkgsrc/games To: pkgsrc-changes@NetBSD.org Reply-To: nia@netbsd.org X-Mailer: log_accum Message-Id: <20190413120804.95712FB16@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1555157284271880 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: nia Date: Sat Apr 13 12:08:04 UTC 2019 Modified Files: pkgsrc/games: Makefile Added Files: pkgsrc/games/powder-toy: DESCR Makefile PLIST distinfo options.mk pkgsrc/games/powder-toy/patches: patch-SConscript patch-resources_powder.appdata.xml patch-resources_powder.desktop patch-src_Config.h Log Message: games/powder-toy: Add version 74.1 The Powder Toy is a free physics sandbox game, which simulates air pressure and velocity, heat, gravity and a countless number of interactions between different substances! The game provides you with various building materials, liquids, gases and electronic components. To generate a diff of this commit: cvs rdiff -u -r1.424 -r1.425 pkgsrc/games/Makefile cvs rdiff -u -r0 -r1.1 pkgsrc/games/powder-toy/DESCR \ pkgsrc/games/powder-toy/Makefile pkgsrc/games/powder-toy/PLIST \ pkgsrc/games/powder-toy/distinfo pkgsrc/games/powder-toy/options.mk cvs rdiff -u -r0 -r1.1 pkgsrc/games/powder-toy/patches/patch-SConscript \ pkgsrc/games/powder-toy/patches/patch-resources_powder.appdata.xml \ pkgsrc/games/powder-toy/patches/patch-resources_powder.desktop \ pkgsrc/games/powder-toy/patches/patch-src_Config.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1555157284271880 Content-Disposition: inline Content-Length: 12012 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/games/Makefile diff -u pkgsrc/games/Makefile:1.424 pkgsrc/games/Makefile:1.425 --- pkgsrc/games/Makefile:1.424 Thu Apr 11 20:56:34 2019 +++ pkgsrc/games/Makefile Sat Apr 13 12:08:04 2019 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.424 2019/04/11 20:56:34 nia Exp $ +# $NetBSD: Makefile,v 1.425 2019/04/13 12:08:04 nia Exp $ # COMMENT= Games @@ -283,6 +283,7 @@ SUBDIR+= plib SUBDIR+= pmars SUBDIR+= polyglot SUBDIR+= powder +SUBDIR+= powder-toy SUBDIR+= powermanga SUBDIR+= powwow SUBDIR+= prboom Added files: Index: pkgsrc/games/powder-toy/DESCR diff -u /dev/null pkgsrc/games/powder-toy/DESCR:1.1 --- /dev/null Sat Apr 13 12:08:04 2019 +++ pkgsrc/games/powder-toy/DESCR Sat Apr 13 12:08:04 2019 @@ -0,0 +1,5 @@ +The Powder Toy is a free physics sandbox game, which simulates air +pressure and velocity, heat, gravity and a countless number of +interactions between different substances! The game provides you +with various building materials, liquids, gases and electronic +components. Index: pkgsrc/games/powder-toy/Makefile diff -u /dev/null pkgsrc/games/powder-toy/Makefile:1.1 --- /dev/null Sat Apr 13 12:08:04 2019 +++ pkgsrc/games/powder-toy/Makefile Sat Apr 13 12:08:04 2019 @@ -0,0 +1,63 @@ +# $NetBSD: Makefile,v 1.1 2019/04/13 12:08:04 nia Exp $ + +DISTNAME= powder-toy-94.1 +CATEGORIES= games +MASTER_SITES= ${MASTER_SITE_GITHUB:=ThePowderToy/} +GITHUB_PROJECT= The-Powder-Toy +GITHUB_TAG= v${PKGVERSION_NOREV} + +MAINTAINER= nia@NetBSD.org +HOMEPAGE= https://powdertoy.co.uk/ +COMMENT= Desktop version of the 'falling sand' physics sandbox +LICENSE= gnu-gpl-v3 + +USE_TOOLS+= pkg-config +USE_LANGUAGES= c c++11 + +SCONS_ARGS+= ${_MAKE_JOBS} +SCONS_ARGS+= --output=powder-toy + +CXXFLAGS+= -DNO_INSTALL_CHECK + +INSTALLATION_DIRS+= bin +INSTALLATION_DIRS+= libexec +INSTALLATION_DIRS+= share/appdata +INSTALLATION_DIRS+= share/applications +INSTALLATION_DIRS+= share/doc/powder-toy +.for size in 16 24 32 48 128 256 +INSTALLATION_DIRS+= share/icons/hicolor/${size}x${size}/apps +.endfor + +.include "options.mk" + +do-build: + cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${SCONSBIN} ${SCONS_ARGS} \ + CC=${CC:Q} CXX=${CXX:Q} CFLAGS=${CFLAGS:Q} CXXFLAGS=${CXXFLAGS:Q} \ + LINKFLAGS=${LDFLAGS:Q} CPPPATH=${INCL_PATH:Q} + ${SED} -e 's,@PREFIX@,${PREFIX},g' < ${FILESDIR}/powder-toy.sh.in > \ + ${WRKDIR}/powder-toy.sh + +do-install: + ${INSTALL_DATA} ${WRKSRC}/README.md \ + ${DESTDIR}${PREFIX}/share/doc/powder-toy + ${INSTALL_DATA} ${WRKSRC}/resources/powder.desktop \ + ${DESTDIR}${PREFIX}/share/applications/powder-toy.desktop + ${INSTALL_DATA} ${WRKSRC}/resources/powder.appdata.xml \ + ${DESTDIR}${PREFIX}/share/appdata/powder-toy.appdata.xml + ${INSTALL_SCRIPT} ${WRKDIR}/powder-toy.sh \ + ${DESTDIR}${PREFIX}/bin/powder-toy + ${INSTALL_PROGRAM} ${WRKSRC}/build/powder-toy \ + ${DESTDIR}${PREFIX}/libexec +.for size in 16 24 32 48 128 256 + ${INSTALL_DATA} ${WRKSRC}/resources/icon/powder-${size}.png \ + ${DESTDIR}${PREFIX}/share/icons/hicolor/${size}x${size}/apps/powder-toy.png +.endfor + +.include "../../archivers/bzip2/buildlink3.mk" +.include "../../devel/SDL2/buildlink3.mk" +.include "../../devel/scons/buildlink3.mk" +.include "../../devel/zlib/buildlink3.mk" +.include "../../graphics/hicolor-icon-theme/buildlink3.mk" +.include "../../x11/libX11/buildlink3.mk" +.include "../../mk/pthread.buildlink3.mk" +.include "../../mk/bsd.pkg.mk" Index: pkgsrc/games/powder-toy/PLIST diff -u /dev/null pkgsrc/games/powder-toy/PLIST:1.1 --- /dev/null Sat Apr 13 12:08:04 2019 +++ pkgsrc/games/powder-toy/PLIST Sat Apr 13 12:08:04 2019 @@ -0,0 +1,12 @@ +@comment $NetBSD: PLIST,v 1.1 2019/04/13 12:08:04 nia Exp $ +bin/powder-toy +libexec/powder-toy +share/appdata/powder-toy.appdata.xml +share/applications/powder-toy.desktop +share/doc/powder-toy/README.md +share/icons/hicolor/128x128/apps/powder-toy.png +share/icons/hicolor/16x16/apps/powder-toy.png +share/icons/hicolor/24x24/apps/powder-toy.png +share/icons/hicolor/256x256/apps/powder-toy.png +share/icons/hicolor/32x32/apps/powder-toy.png +share/icons/hicolor/48x48/apps/powder-toy.png Index: pkgsrc/games/powder-toy/distinfo diff -u /dev/null pkgsrc/games/powder-toy/distinfo:1.1 --- /dev/null Sat Apr 13 12:08:04 2019 +++ pkgsrc/games/powder-toy/distinfo Sat Apr 13 12:08:04 2019 @@ -0,0 +1,10 @@ +$NetBSD: distinfo,v 1.1 2019/04/13 12:08:04 nia Exp $ + +SHA1 (powder-toy-94.1.tar.gz) = 14249c100e38971444bb96fd31ff26fd24cc2190 +RMD160 (powder-toy-94.1.tar.gz) = 88671b2007f2f1a2ecc3a079cc961d3475742f56 +SHA512 (powder-toy-94.1.tar.gz) = ecda20d206298ff605a3a361255a0766caceece4d268355e4dbf1d56ef78bd7c43e54560d1ad71f29a8c3572d66eca875d5539e1006b260e029561ab91bf34d4 +Size (powder-toy-94.1.tar.gz) = 1254309 bytes +SHA1 (patch-SConscript) = e1b11abaf9100b2a509cefbfa713baf3c11a2c5a +SHA1 (patch-resources_powder.appdata.xml) = e687b33b50c286ec2858bdf2024e201df4b8be8e +SHA1 (patch-resources_powder.desktop) = 9c77feb557afbd2e5ad4fb0b5f15be1809214555 +SHA1 (patch-src_Config.h) = 01d9cced7a87b6f33b1974bf51dd9d93949d41a2 Index: pkgsrc/games/powder-toy/options.mk diff -u /dev/null pkgsrc/games/powder-toy/options.mk:1.1 --- /dev/null Sat Apr 13 12:08:04 2019 +++ pkgsrc/games/powder-toy/options.mk Sat Apr 13 12:08:04 2019 @@ -0,0 +1,42 @@ +# $NetBSD: options.mk,v 1.1 2019/04/13 12:08:04 nia Exp $ + +PKG_OPTIONS_VAR= PKG_OPTIONS.powder-toy +PKG_SUPPORTED_OPTIONS= debug fftw lua +PKG_SUGGESTED_OPTIONS= fftw lua + +.include "../../mk/bsd.fast.prefs.mk" + +.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64" +PKG_SUPPORTED_OPTIONS+= simd +.endif + +.if ${MACHINE_ARCH} == "x86_64" +PKG_SUGGESTED_OPTIONS+= simd +.endif + +.include "../../mk/bsd.options.mk" + +.if !empty(PKG_OPTIONS:Mdebug) +SCONS_ARGS+= --debugging +.else +SCONS_ARGS+= --release +.endif + +.if !empty(PKG_OPTIONS:Mfftw) +.include "../../math/fftwf/buildlink3.mk" +.else +SCONS_ARGS+= --nofft +.endif + +.if !empty(PKG_OPTIONS:Mlua) +.include "../../lang/lua51/buildlink3.mk" +.else +SCONS_ARGS+= --nolua +.endif + +.if !empty(PKG_OPTIONS:Msimd) +SCONS_ARGS+= --sse +SCONS_ARGS+= --sse2 +.else +SCONS_ARGS+= --no-sse +.endif Index: pkgsrc/games/powder-toy/patches/patch-SConscript diff -u /dev/null pkgsrc/games/powder-toy/patches/patch-SConscript:1.1 --- /dev/null Sat Apr 13 12:08:04 2019 +++ pkgsrc/games/powder-toy/patches/patch-SConscript Sat Apr 13 12:08:04 2019 @@ -0,0 +1,78 @@ +$NetBSD: patch-SConscript,v 1.1 2019/04/13 12:08:04 nia Exp $ + +Support NetBSD. + +--- SConscript.orig 2019-02-21 05:23:45.000000000 +0000 ++++ SConscript +@@ -88,7 +88,7 @@ elif GetOption('lin'): + platform = "Linux" + elif GetOption('mac'): + platform = "Darwin" +-elif compilePlatform not in ["Linux", "Windows", "Darwin", "FreeBSD"]: ++elif compilePlatform not in ["Linux", "Windows", "Darwin", "FreeBSD", "NetBSD"]: + FatalError("Unknown platform: {0}".format(platform)) + + msvc = GetOption('msvc') +@@ -243,11 +243,11 @@ def findLibs(env, conf): + FatalError("libSDL2main not found or not installed") + + #Look for SDL +- runSdlConfig = platform == "Linux" or compilePlatform == "Linux" or platform == "FreeBSD" ++ runSdlConfig = platform == "Linux" or compilePlatform == "Linux" or platform == "FreeBSD" or platform == "NetBSD" + #if platform == "Darwin" and conf.CheckFramework("SDL"): + # runSdlConfig = False +- if not conf.CheckLib("SDL2"): +- FatalError("SDL2 development library not found or not installed") ++ #if not conf.CheckLib("SDL2"): ++ # FatalError("SDL2 development library not found or not installed") + + if runSdlConfig: + try: +@@ -267,10 +267,7 @@ def findLibs(env, conf): + + if not GetOption('nolua') and not GetOption('renderer') and not GetOption('font'): + #Look for Lua +- if platform == "FreeBSD": +- luaver = "lua-5.1" +- else: +- luaver = "lua5.1" ++ luaver = "lua-5.1" + if GetOption('luajit'): + if not conf.CheckLib(['luajit-5.1', 'luajit5.1', 'luajit2.0', 'luajit', 'libluajit']): + FatalError("luajit development library not found or not installed") +@@ -289,7 +286,7 @@ def findLibs(env, conf): + if platform != "Darwin" or not conf.CheckFramework("Lua"): + FatalError("lua5.1 development library not found or not installed") + foundpkg = False +- if platform == "Linux" or platform == "FreeBSD": ++ if platform == "Linux" or platform == "FreeBSD" or platform == "NetBSD": + try: + env.ParseConfig("pkg-config --cflags {0}".format(luaver)) + env.ParseConfig("pkg-config --libs {0}".format(luaver)) +@@ -346,7 +343,7 @@ def findLibs(env, conf): + + #Look for OpenGL libraries + if GetOption('opengl'): +- if platform == "Linux" or platform == "FreeBSD": ++ if platform == "Linux" or platform == "FreeBSD" or platform == "NetBSD": + if not conf.CheckLib('GL'): + FatalError("libGL not found or not installed") + try: +@@ -363,7 +360,7 @@ def findLibs(env, conf): + if not conf.CheckFramework("OpenGL"): + FatalError("OpenGL framework not found or not installed") + +- if platform == "Linux" or platform == "FreeBSD": ++ if platform == "Linux" or platform == "FreeBSD" or platform == "NetBSD": + if not conf.CheckLib('X11'): + FatalError("X11 development library not found or not installed") + +@@ -418,7 +415,7 @@ if platform == "Windows": + env.Append(LINKFLAGS=['/NODEFAULTLIB:msvcrtd.lib']) + else: + env.Append(LINKFLAGS=['-mwindows']) +-elif platform == "Linux" or platform == "FreeBSD": ++elif platform == "Linux" or platform == "FreeBSD" or platform == "NetBSD": + env.Append(CPPDEFINES=['LIN']) + elif platform == "Darwin": + env.Append(CPPDEFINES=['MACOSX']) Index: pkgsrc/games/powder-toy/patches/patch-resources_powder.appdata.xml diff -u /dev/null pkgsrc/games/powder-toy/patches/patch-resources_powder.appdata.xml:1.1 --- /dev/null Sat Apr 13 12:08:04 2019 +++ pkgsrc/games/powder-toy/patches/patch-resources_powder.appdata.xml Sat Apr 13 12:08:04 2019 @@ -0,0 +1,14 @@ +$NetBSD: patch-resources_powder.appdata.xml,v 1.1 2019/04/13 12:08:04 nia Exp $ + +Rename application to powder-toy. + +--- resources/powder.appdata.xml.orig 2019-02-21 05:23:45.000000000 +0000 ++++ resources/powder.appdata.xml +@@ -1,6 +1,6 @@ + + +- powder.desktop ++ powder-toy.desktop + CC0-1.0 + GPL-3.0 + Powder Toy Index: pkgsrc/games/powder-toy/patches/patch-resources_powder.desktop diff -u /dev/null pkgsrc/games/powder-toy/patches/patch-resources_powder.desktop:1.1 --- /dev/null Sat Apr 13 12:08:04 2019 +++ pkgsrc/games/powder-toy/patches/patch-resources_powder.desktop Sat Apr 13 12:08:04 2019 @@ -0,0 +1,16 @@ +$NetBSD: patch-resources_powder.desktop,v 1.1 2019/04/13 12:08:04 nia Exp $ + +Rename application to powder-toy. + +--- resources/powder.desktop.orig 2019-02-21 05:23:45.000000000 +0000 ++++ resources/powder.desktop +@@ -3,7 +3,7 @@ Version=1.0 + Encoding=UTF-8 + Name=Powder Toy + Comment=Physics sandbox game +-Exec=powder +-Icon=powder ++Exec=powder-toy ++Icon=powder-toy + Type=Application + Categories=Game;Simulation; Index: pkgsrc/games/powder-toy/patches/patch-src_Config.h diff -u /dev/null pkgsrc/games/powder-toy/patches/patch-src_Config.h:1.1 --- /dev/null Sat Apr 13 12:08:04 2019 +++ pkgsrc/games/powder-toy/patches/patch-src_Config.h Sat Apr 13 12:08:04 2019 @@ -0,0 +1,15 @@ +$NetBSD: patch-src_Config.h,v 1.1 2019/04/13 12:08:04 nia Exp $ + +Disable auto-updater. + +--- src/Config.h.orig 2019-02-21 05:23:45.000000000 +0000 ++++ src/Config.h +@@ -40,7 +40,7 @@ + #endif + //VersionInfoEnd + +-//#define IGNORE_UPDATES //uncomment this for mods, to not get any update notifications ++#define IGNORE_UPDATES //uncomment this for mods, to not get any update notifications + + #if !(defined(MACOSX) && defined(DEBUG)) + #define HIGH_QUALITY_RESAMPLE //High quality image resampling, slower but much higher quality than my terribad linear interpolation --_----------=_1555157284271880--