CVS commit: pkgsrc/textproc/FlightCrew

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

Module Name:    pkgsrc
Committed By:   wiz
Date:           Mon Aug 18 07:02:06 UTC 2025

Modified Files:
        pkgsrc/textproc/FlightCrew: Makefile distinfo
        pkgsrc/textproc/FlightCrew/patches:
            patch-src_FlightCrew_tests_CMakeLists.txt

Log Message:
FlightCrew: fix build with cmake 4


To generate a diff of this commit:
cvs rdiff -u -r1.77 -r1.78 pkgsrc/textproc/FlightCrew/Makefile
cvs rdiff -u -r1.10 -r1.11 pkgsrc/textproc/FlightCrew/distinfo
cvs rdiff -u -r1.2 -r1.3 \
    pkgsrc/textproc/FlightCrew/patches/patch-src_FlightCrew_tests_CMakeLists.txt

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

Modified files:

Index: pkgsrc/textproc/FlightCrew/Makefile
diff -u pkgsrc/textproc/FlightCrew/Makefile:1.77 pkgsrc/textproc/FlightCrew/Makefile:1.78
--- pkgsrc/textproc/FlightCrew/Makefile:1.77    Wed Jun 18 07:27:55 2025
+++ pkgsrc/textproc/FlightCrew/Makefile Mon Aug 18 07:02:05 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.77 2025/06/18 07:27:55 wiz Exp $
+# $NetBSD: Makefile,v 1.78 2025/08/18 07:02:05 wiz Exp $
 
 DISTNAME=      FlightCrew-0.7.2-Code
 PKGNAME=       ${DISTNAME:S/-Code//}
@@ -18,6 +18,8 @@ USE_LANGUAGES=                c c++
 USE_CXX_FEATURES=      c++17
 FORCE_CXX_STD=         c++17
 
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_POLICY_VERSION_MINIMUM=3.5
+
 # Work around NetBSD unzip vs others for patched files.
 SUBST_CLASSES+=                cr
 SUBST_STAGE.cr=                post-extract

Index: pkgsrc/textproc/FlightCrew/distinfo
diff -u pkgsrc/textproc/FlightCrew/distinfo:1.10 pkgsrc/textproc/FlightCrew/distinfo:1.11
--- pkgsrc/textproc/FlightCrew/distinfo:1.10    Mon Jan 30 11:46:03 2023
+++ pkgsrc/textproc/FlightCrew/distinfo Mon Aug 18 07:02:05 2025
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.10 2023/01/30 11:46:03 wiz Exp $
+$NetBSD: distinfo,v 1.11 2025/08/18 07:02:05 wiz Exp $
 
 BLAKE2s (FlightCrew-0.7.2-Code.zip) = 50b593a716ff0d33052b3fe7b70b85e42a3c404c5fe2beebb3b71d8405575992
 SHA512 (FlightCrew-0.7.2-Code.zip) = 6933cd85bab0300ee2258106225cbf23474516c4993bc1bcad6736676169eabcaf4a5b31a6cdfc2bf4ff3be8fee9432a8048615112f330d1ac55a04874d094aa
@@ -7,6 +7,6 @@ SHA1 (patch-CMakeLists.txt) = 8423ab7b53
 SHA1 (patch-src_FlightCrew_CMakeLists.txt) = 2c60cb722bb7613f007f2e3a644f1d9f8509f8ba
 SHA1 (patch-src_FlightCrew_Validators_Opf_ReachabilityAnalysis.cpp) = 53fbd6e1b1b9a11739f16383406f10ddaa253293
 SHA1 (patch-src_FlightCrew_Validators_SaxSchemaValidator.cpp) = 65b6fe9e04d4567449dd36039999d14bee1e7e61
-SHA1 (patch-src_FlightCrew_tests_CMakeLists.txt) = 79b165b1b6c4801a92868d4ad1b6496f3bf0d34a
+SHA1 (patch-src_FlightCrew_tests_CMakeLists.txt) = 934296b4cd2425d30d5e4926dfd8f835a5284953
 SHA1 (patch-src_XercesExtensions_LocationAwareDOMParser.cpp) = 5c49d264d7257ea988ef1a8f335ec59799ff3fce
 SHA1 (patch-src_utf8-cpp_utf8_core.h) = 1ff6b89132f1ff671e48735ca11153d17d38fd17

Index: pkgsrc/textproc/FlightCrew/patches/patch-src_FlightCrew_tests_CMakeLists.txt
diff -u pkgsrc/textproc/FlightCrew/patches/patch-src_FlightCrew_tests_CMakeLists.txt:1.2 pkgsrc/textproc/FlightCrew/patches/patch-src_FlightCrew_tests_CMakeLists.txt:1.3
--- pkgsrc/textproc/FlightCrew/patches/patch-src_FlightCrew_tests_CMakeLists.txt:1.2    Sat Jul  2 14:43:12 2016
+++ pkgsrc/textproc/FlightCrew/patches/patch-src_FlightCrew_tests_CMakeLists.txt        Mon Aug 18 07:02:06 2025
@@ -1,12 +1,14 @@
-$NetBSD: patch-src_FlightCrew_tests_CMakeLists.txt,v 1.2 2016/07/02 14:43:12 joerg Exp $
+$NetBSD: patch-src_FlightCrew_tests_CMakeLists.txt,v 1.3 2025/08/18 07:02:06 wiz Exp $
 
 * libgtest is needed.
 
---- src/FlightCrew/tests/CMakeLists.txt.orig   2011-08-11 21:03:56.000000000 +0000
+--- src/FlightCrew/tests/CMakeLists.txt.orig   2011-08-11 19:03:56.000000000 +0000
 +++ src/FlightCrew/tests/CMakeLists.txt
-@@ -59,13 +59,13 @@ set( ALL_INCLUDES ${gtest_SOURCE_DIR}/in
+@@ -57,15 +57,14 @@ link_directories ( ${PROJECT_BINARY_DIR}
+ include( ${CMAKE_SOURCE_DIR}/cmake_extras/CustomPCH.cmake )
+ set( ALL_INCLUDES ${gtest_SOURCE_DIR}/include ${BoostParts_SOURCE_DIR} )
  
- set( GCC_PCH_TARGET gccPCH_tests )
+-set( GCC_PCH_TARGET gccPCH_tests )
  
 -precompiled_header( TEST_SOURCES ALL_INCLUDES ${GCC_PCH_TARGET} ${PCH_NAME} )
 +# precompiled_header( TEST_SOURCES ALL_INCLUDES ${GCC_PCH_TARGET} ${PCH_NAME} )
@@ -20,3 +22,12 @@ $NetBSD: patch-src_FlightCrew_tests_CMak
  
  #############################################################################
  
+@@ -97,7 +96,7 @@ if( MSVC )
+     
+ elseif( CMAKE_COMPILER_IS_GNUCXX )
+     # Make sure the PCH is built for GCC
+-    add_dependencies( ${PROJECT_NAME} ${GCC_PCH_TARGET} )
++    add_dependencies( ${PROJECT_NAME} )
+ endif()
+ 
+ # needed for correct Xerces header inclusion