CVS commit: pkgsrc/games/devilutionx

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

Module Name:    pkgsrc
Committed By:   wiz
Date:           Fri Aug 22 10:10:46 UTC 2025

Modified Files:
        pkgsrc/games/devilutionx: Makefile PLIST.bundle

Log Message:
devilutionx: fix non-macOS build after switch to cmake/build.mk


To generate a diff of this commit:
cvs rdiff -u -r1.35 -r1.36 pkgsrc/games/devilutionx/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/games/devilutionx/PLIST.bundle

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

Modified files:

Index: pkgsrc/games/devilutionx/Makefile
diff -u pkgsrc/games/devilutionx/Makefile:1.35 pkgsrc/games/devilutionx/Makefile:1.36
--- pkgsrc/games/devilutionx/Makefile:1.35      Thu Aug 21 20:13:19 2025
+++ pkgsrc/games/devilutionx/Makefile   Fri Aug 22 10:10:46 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2025/08/21 20:13:19 triaxx Exp $
+# $NetBSD: Makefile,v 1.36 2025/08/22 10:10:46 wiz Exp $
 
 DISTNAME=      devilutionx-1.2.1
 PKGREVISION=   14
@@ -19,9 +19,6 @@ USE_LANGUAGES=        c c++
 
 USE_CXX_FEATURES+=     unique_ptr
 
-CONFIGURE_DIRS=        build
-CMAKE_ARG_PATH=        ..
-
 CMAKE_CONFIGURE_ARGS+= -DCMAKE_BUILD_TYPE="Release"
 CMAKE_CONFIGURE_ARGS+= -DASAN=OFF -DUBSAN=OFF
 CMAKE_CONFIGURE_ARGS+= -DDEBUG=OFF
@@ -31,10 +28,6 @@ CMAKE_CONFIGURE_ARGS+=       -DDEVILUTIONX_STA
 
 LDFLAGS.SunOS+=        -lsocket
 
-INSTALLATION_DIRS+=    bin
-INSTALLATION_DIRS+=    share/applications
-INSTALLATION_DIRS+=    share/icons/hicolor/512x512/apps
-
 pre-patch:
        dos2unix ${WRKSRC}/CMakeLists.txt
 
@@ -57,11 +50,12 @@ do-install:
        ${INSTALL_DATA} ${WRKSRC}/${CMAKE_BUILD_DIR}/devilutionx.app/Contents/Resources/CharisSILB.ttf \
                ${DESTDIR}${MACOS_BUNDLE_PREFIX}/devilutionx.app/Contents/Resources/CharisSILB.ttf
 .else
-pre-configure:
-       ${MKDIR} -p ${WRKSRC}/build
+INSTALLATION_DIRS+=    bin
+INSTALLATION_DIRS+=    share/applications
+INSTALLATION_DIRS+=    share/icons/hicolor/512x512/apps
 
 do-install:
-       ${INSTALL_PROGRAM} ${WRKSRC}/build/devilutionx ${DESTDIR}${PREFIX}/bin
+       ${INSTALL_PROGRAM} ${WRKSRC}/${CMAKE_BUILD_DIR}/devilutionx ${DESTDIR}${PREFIX}/bin
        ${INSTALL_DATA} ${FILESDIR}/devilutionx.desktop \
            ${DESTDIR}${PREFIX}/share/applications
        ${INSTALL_DATA} ${WRKSRC}/Packaging/resources/icon.png \

Index: pkgsrc/games/devilutionx/PLIST.bundle
diff -u pkgsrc/games/devilutionx/PLIST.bundle:1.1 pkgsrc/games/devilutionx/PLIST.bundle:1.2
--- pkgsrc/games/devilutionx/PLIST.bundle:1.1   Thu Aug 21 20:13:19 2025
+++ pkgsrc/games/devilutionx/PLIST.bundle       Fri Aug 22 10:10:46 2025
@@ -1,5 +1,5 @@
-@comment $NetBSD: PLIST.bundle,v 1.1 2025/08/21 20:13:19 triaxx Exp $
+@comment $NetBSD: PLIST.bundle,v 1.2 2025/08/22 10:10:46 wiz Exp $
+Applications/devilutionx.app/Contents/Info.plist
 Applications/devilutionx.app/Contents/MacOS/devilutionx
 Applications/devilutionx.app/Contents/Resources/AppIcon.icns
 Applications/devilutionx.app/Contents/Resources/CharisSILB.ttf
-Applications/devilutionx.app/Contents/Info.plist