CVS commit: pkgsrc/games/openttd

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Mon Jul 17 21:07:58 UTC 2023

Modified Files:
        pkgsrc/games/openttd: Makefile PLIST distinfo
        pkgsrc/games/openttd/patches: patch-cmake_InstallAndPackage.cmake

Log Message:
openttd: package correctly on Darwin


To generate a diff of this commit:
cvs rdiff -u -r1.112 -r1.113 pkgsrc/games/openttd/Makefile
cvs rdiff -u -r1.30 -r1.31 pkgsrc/games/openttd/PLIST
cvs rdiff -u -r1.43 -r1.44 pkgsrc/games/openttd/distinfo
cvs rdiff -u -r1.2 -r1.3 \
    pkgsrc/games/openttd/patches/patch-cmake_InstallAndPackage.cmake

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

Modified files:

Index: pkgsrc/games/openttd/Makefile
diff -u pkgsrc/games/openttd/Makefile:1.112 pkgsrc/games/openttd/Makefile:1.113
--- pkgsrc/games/openttd/Makefile:1.112 Mon Jul 17 20:26:08 2023
+++ pkgsrc/games/openttd/Makefile       Mon Jul 17 21:07:58 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.112 2023/07/17 20:26:08 triaxx Exp $
+# $NetBSD: Makefile,v 1.113 2023/07/17 21:07:58 adam Exp $
 
 DISTNAME=      openttd-13.3-source
 PKGNAME=       ${DISTNAME:S/-source//}
@@ -13,11 +13,8 @@ COMMENT=     Open source clone of Transport 
 LICENSE=       gnu-gpl-v2
 
 WRKSRC=                ${WRKDIR}/${PKGNAME_NOREV}
-USE_CMAKE=     yes
 USE_LANGUAGES= c c++
 USE_TOOLS+=    pkg-config
-CONFIGURE_DIRS=        build
-CMAKE_ARG_PATH=        ..
 
 # C++17
 GCC_REQD+=     8 # std::charconv
@@ -35,24 +32,28 @@ CMAKE_ARGS+=        -DCMAKE_INSTALL_DATADIR=sha
 CMAKE_ARGS+=   -DCMAKE_DISABLE_FIND_PACKAGE_Allegro=ON
 CMAKE_ARGS+=   -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=ON
 CMAKE_ARGS+=   -DCMAKE_DISABLE_FIND_PACKAGE_Grfcodec=ON
+CMAKE_ARGS+=   -DOPTION_INSTALL_FHS=ON
 
 BUILDLINK_TRANSFORM+=  opt:-std=c++17:-std=gnu++17 # alloca
 BUILDLINK_TRANSFORM+=  opt:-std=c++1z:-std=gnu++1z # alloca
 
-pre-configure:
-       ${MKDIR} ${WRKSRC}/build
+PLIST_VARS=    unix
+.if ${OPSYS} != "Darwin"
+PLIST.unix=    yes
+.include "../../devel/SDL2/buildlink3.mk"
+.include "../../fonts/fontconfig/buildlink3.mk"
+.include "../../graphics/freetype2/buildlink3.mk"
+.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
+.include "../../sysutils/desktop-file-utils/desktopdb.mk"
+.include "../../textproc/icu/buildlink3.mk"
+.endif
 
 .include "../../archivers/lzo/buildlink3.mk"
 .include "../../archivers/xz/buildlink3.mk"
 .include "../../audio/fluidsynth/buildlink3.mk"
 .include "../../converters/libiconv/buildlink3.mk"
-.include "../../devel/SDL2/buildlink3.mk"
+.include "../../devel/cmake/build.mk"
 .include "../../devel/zlib/buildlink3.mk"
-.include "../../fonts/fontconfig/buildlink3.mk"
-.include "../../graphics/freetype2/buildlink3.mk"
-.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
-.include "../../sysutils/desktop-file-utils/desktopdb.mk"
-.include "../../textproc/icu/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/games/openttd/PLIST
diff -u pkgsrc/games/openttd/PLIST:1.30 pkgsrc/games/openttd/PLIST:1.31
--- pkgsrc/games/openttd/PLIST:1.30     Mon Jul 17 20:26:08 2023
+++ pkgsrc/games/openttd/PLIST  Mon Jul 17 21:07:58 2023
@@ -1,18 +1,18 @@
-@comment $NetBSD: PLIST,v 1.30 2023/07/17 20:26:08 triaxx Exp $
+@comment $NetBSD: PLIST,v 1.31 2023/07/17 21:07:58 adam Exp $
 bin/openttd
 man/man6/openttd.6
-share/applications/openttd.desktop
+${PLIST.unix}share/applications/openttd.desktop
 share/doc/openttd/COPYING.md
 share/doc/openttd/README.md
 share/doc/openttd/changelog.txt
 share/doc/openttd/known-bugs.txt
 share/doc/openttd/multiplayer.md
-share/icons/hicolor/128x128/apps/openttd.png
-share/icons/hicolor/16x16/apps/openttd.png
-share/icons/hicolor/256x256/apps/openttd.png
-share/icons/hicolor/32x32/apps/openttd.png
-share/icons/hicolor/48x48/apps/openttd.png
-share/icons/hicolor/64x64/apps/openttd.png
+${PLIST.unix}share/icons/hicolor/128x128/apps/openttd.png
+${PLIST.unix}share/icons/hicolor/16x16/apps/openttd.png
+${PLIST.unix}share/icons/hicolor/256x256/apps/openttd.png
+${PLIST.unix}share/icons/hicolor/32x32/apps/openttd.png
+${PLIST.unix}share/icons/hicolor/48x48/apps/openttd.png
+${PLIST.unix}share/icons/hicolor/64x64/apps/openttd.png
 share/openttd/ai/compat_0.7.nut
 share/openttd/ai/compat_1.0.nut
 share/openttd/ai/compat_1.1.nut
@@ -128,5 +128,5 @@ share/openttd/scripts/on_server_connect.
 share/openttd/scripts/pre_dedicated.scr.example
 share/openttd/scripts/pre_server.scr.example
 share/openttd/scripts/readme.txt
-share/pixmaps/openttd.32.xpm
-share/pixmaps/openttd.64.xpm
+${PLIST.unix}share/pixmaps/openttd.32.xpm
+${PLIST.unix}share/pixmaps/openttd.64.xpm

Index: pkgsrc/games/openttd/distinfo
diff -u pkgsrc/games/openttd/distinfo:1.43 pkgsrc/games/openttd/distinfo:1.44
--- pkgsrc/games/openttd/distinfo:1.43  Mon Jul 17 20:26:08 2023
+++ pkgsrc/games/openttd/distinfo       Mon Jul 17 21:07:58 2023
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.43 2023/07/17 20:26:08 triaxx Exp $
+$NetBSD: distinfo,v 1.44 2023/07/17 21:07:58 adam Exp $
 
 BLAKE2s (openttd-13.3-source.tar.xz) = 7fbba0842b627c67a76b911c9cfe810d3ecf2a47240a0838dcbebd95baf94186
 SHA512 (openttd-13.3-source.tar.xz) = bb91755f65bd3c3f4716b6722f29bc63633e04557d427cb224f4c3aecdbd3744df4921aba3872966fc587541fe2cdaa2fd80891236a9c87826cea0a6865e2318
 Size (openttd-13.3-source.tar.xz) = 7417568 bytes
-SHA1 (patch-cmake_InstallAndPackage.cmake) = ccac4a306d243b57cf6dcc36636d65f2dab434aa
+SHA1 (patch-cmake_InstallAndPackage.cmake) = 47cf19bf6b77dc5bcf954ee5ffdb4967f2af19ea
 SHA1 (patch-src_core_alloc__func.hpp) = 9c5a855316e3262c51c1b4c836de760d53abb759

Index: pkgsrc/games/openttd/patches/patch-cmake_InstallAndPackage.cmake
diff -u pkgsrc/games/openttd/patches/patch-cmake_InstallAndPackage.cmake:1.2 pkgsrc/games/openttd/patches/patch-cmake_InstallAndPackage.cmake:1.3
--- pkgsrc/games/openttd/patches/patch-cmake_InstallAndPackage.cmake:1.2        Mon Jul 17 20:26:08 2023
+++ pkgsrc/games/openttd/patches/patch-cmake_InstallAndPackage.cmake    Mon Jul 17 21:07:58 2023
@@ -1,59 +1,29 @@
-$NetBSD: patch-cmake_InstallAndPackage.cmake,v 1.2 2023/07/17 20:26:08 triaxx Exp $
+$NetBSD: patch-cmake_InstallAndPackage.cmake,v 1.3 2023/07/17 21:07:58 adam Exp $
 
 Do not try to generate Linux distribution packages.
 
 --- cmake/InstallAndPackage.cmake.orig 2023-06-11 16:42:59.000000000 +0000
 +++ cmake/InstallAndPackage.cmake
-@@ -154,51 +154,9 @@ elseif(UNIX)
+@@ -121,7 +121,7 @@ set(CPACK_PACKAGE_EXECUTABLES "openttd;O
+ set(CPACK_STRIP_FILES YES)
+ set(CPACK_OUTPUT_FILE_PREFIX "bundles")
+ 
+-if(APPLE)
++if(FALSE)
+     # Stripping would produce unreadable stacktraces.
+     set(CPACK_STRIP_FILES NO)
+     set(CPACK_GENERATOR "Bundle")
+@@ -154,10 +154,11 @@ elseif(UNIX)
      if(OPTION_PACKAGE_DEPENDENCIES)
          set(CPACK_GENERATOR "TXZ")
          set(PLATFORM "generic")
 -    elseif(NOT OPTION_INSTALL_FHS)
-+    else(NOT OPTION_INSTALL_FHS)
++    else()
          set(CPACK_GENERATOR "TXZ")
          set(PLATFORM "unknown")
 -    else()
--        find_program(LSB_RELEASE_EXEC lsb_release)
--        execute_process(COMMAND ${LSB_RELEASE_EXEC} -is
--            OUTPUT_VARIABLE LSB_RELEASE_ID
--            OUTPUT_STRIP_TRAILING_WHITESPACE
--        )
--        if(LSB_RELEASE_ID)
--            if(LSB_RELEASE_ID STREQUAL "Ubuntu" OR LSB_RELEASE_ID STREQUAL "Debian")
--                execute_process(COMMAND ${LSB_RELEASE_EXEC} -cs
--                    OUTPUT_VARIABLE LSB_RELEASE_CODENAME
--                    OUTPUT_STRIP_TRAILING_WHITESPACE
--                )
--                string(TOLOWER "${LSB_RELEASE_ID}-${LSB_RELEASE_CODENAME}" PLATFORM)
--
--                set(CPACK_GENERATOR "DEB")
--                include(PackageDeb)
--            else()
--                set(UNSUPPORTED_PLATFORM_NAME "LSB-based Linux distribution '${LSB_RELEASE_ID}'")
--            endif()
--        elseif(EXISTS "/etc/os-release")
--            file(STRINGS "/etc/os-release" OS_RELEASE_CONTENTS REGEX "^ID=")
--            string(REGEX MATCH "ID=(.*)" _ ${OS_RELEASE_CONTENTS})
--            set(DISTRO_ID ${CMAKE_MATCH_1})
--            if(DISTRO_ID STREQUAL "arch")
--                set(PLATFORM "arch")
--                set(CPACK_GENERATOR "TXZ")
--            elseif(DISTRO_ID STREQUAL "fedora" OR DISTRO_ID STREQUAL "rhel")
--                set(PLATFORM "fedora")
--                set(CPACK_GENERATOR "RPM")
--                include(PackageRPM)
--            else()
--                set(UNSUPPORTED_PLATFORM_NAME "Linux distribution '${DISTRO_ID}' from /etc/os-release")
--            endif()
--        else()
--            set(UNSUPPORTED_PLATFORM_NAME "Linux distribution")
--        endif()
--
--        if(NOT PLATFORM)
--            set(PLATFORM "generic")
--            set(CPACK_GENERATOR "TXZ")
--            message(WARNING "Unknown ${UNSUPPORTED_PLATFORM_NAME} found for packaging; can only pack to a txz. Please consider creating a Pull Request to add support for this distribution.")
--        endif()
-     endif()
- 
-     set(CPACK_PACKAGE_FILE_NAME "openttd-#CPACK_PACKAGE_VERSION#-linux-${PLATFORM}-${CPACK_SYSTEM_NAME}")
++    endif()
++    if(FALSE)
+         find_program(LSB_RELEASE_EXEC lsb_release)
+         execute_process(COMMAND ${LSB_RELEASE_EXEC} -is
+             OUTPUT_VARIABLE LSB_RELEASE_ID