CVS commit: pkgsrc/games/powder-toy

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Mon Jul 24 16:41:19 UTC 2023

Modified Files:
        pkgsrc/games/powder-toy: Makefile options.mk

Log Message:
powder-toy: convert to scons4

Bump PKGREVISION to be on the safe side


To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 pkgsrc/games/powder-toy/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/games/powder-toy/options.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/games/powder-toy/Makefile
diff -u pkgsrc/games/powder-toy/Makefile:1.19 pkgsrc/games/powder-toy/Makefile:1.20
--- pkgsrc/games/powder-toy/Makefile:1.19       Tue Jul 18 18:13:44 2023
+++ pkgsrc/games/powder-toy/Makefile    Mon Jul 24 16:41:19 2023
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.19 2023/07/18 18:13:44 nia Exp $
+# $NetBSD: Makefile,v 1.20 2023/07/24 16:41:19 wiz Exp $
 
 DISTNAME=      powder-toy-95.0
-PKGREVISION=   11
+PKGREVISION=   12
 CATEGORIES=    games
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=ThePowderToy/}
 GITHUB_PROJECT=        The-Powder-Toy
@@ -17,8 +17,9 @@ USE_LANGUAGES=        c c++
 
 USE_CXX_FEATURES+=     c++11
 
-SCONS_ARGS+=   ${_MAKE_JOBS}
-SCONS_ARGS+=   --output=powder-toy
+SCONS_BUILD_ARGS+=     ${_MAKE_JOBS}
+SCONS_BUILD_ARGS+=     --output=powder-toy
+SCONS_DO_INSTALL=      no
 
 CXXFLAGS+=     -DNO_INSTALL_CHECK
 
@@ -33,10 +34,7 @@ INSTALLATION_DIRS+=  share/icons/hicolor/
 
 .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}
+post-build:
        ${SED} -e 's,@PREFIX@,${PREFIX},g' < ${FILESDIR}/powder-toy.sh.in > \
            ${WRKDIR}/powder-toy.sh
 
@@ -58,7 +56,7 @@ do-install:
 
 .include "../../archivers/bzip2/buildlink3.mk"
 .include "../../devel/SDL2/buildlink3.mk"
-.include "../../devel/scons/buildlink3.mk"
+.include "../../devel/scons4/build.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"

Index: pkgsrc/games/powder-toy/options.mk
diff -u pkgsrc/games/powder-toy/options.mk:1.2 pkgsrc/games/powder-toy/options.mk:1.3
--- pkgsrc/games/powder-toy/options.mk:1.2      Thu Apr 29 23:30:13 2021
+++ pkgsrc/games/powder-toy/options.mk  Mon Jul 24 16:41:19 2023
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.2 2021/04/29 23:30:13 thor Exp $
+# $NetBSD: options.mk,v 1.3 2023/07/24 16:41:19 wiz Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.powder-toy
 PKG_SUPPORTED_OPTIONS= debug fftw lua
@@ -17,26 +17,26 @@ PKG_SUGGESTED_OPTIONS+=     simd
 .include "../../mk/bsd.options.mk"
 
 .if !empty(PKG_OPTIONS:Mdebug)
-SCONS_ARGS+=   --debugging
+SCONS_BUILD_ARGS+=     --debugging
 .else
-SCONS_ARGS+=   --release
+SCONS_BUILD_ARGS+=     --release
 .endif
 
 .if !empty(PKG_OPTIONS:Mfftw)
 .include "../../math/fftw/buildlink3.mk"
 .else
-SCONS_ARGS+=   --nofft
+SCONS_BUILD_ARGS+=     --nofft
 .endif
 
 .if !empty(PKG_OPTIONS:Mlua)
 .include "../../lang/lua51/buildlink3.mk"
 .else
-SCONS_ARGS+=   --nolua
+SCONS_BUILD_ARGS+=     --nolua
 .endif
 
 .if !empty(PKG_OPTIONS:Msimd)
-SCONS_ARGS+=   --sse
-SCONS_ARGS+=   --sse2
+SCONS_BUILD_ARGS+=     --sse
+SCONS_BUILD_ARGS+=     --sse2
 .else
-SCONS_ARGS+=   --no-sse
+SCONS_BUILD_ARGS+=     --no-sse
 .endif