CVS commit: pkgsrc

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

Module Name:    pkgsrc
Committed By:   wiz
Date:           Sun Feb  8 22:36:16 UTC 2026

Modified Files:
        pkgsrc/devel/boost-libs: Makefile
        pkgsrc/meta-pkgs/boost: distinfo
Added Files:
        pkgsrc/meta-pkgs/boost/patches:
            patch-tools_boost__install_boost-install-dirs.jam
            patch-tools_boost__install_boost-install.jam

Log Message:
boost-libs: fix cmake files

Avoid path to workdir references, and reported fix path to include files.

>From Anthony Mallet on tech-pkg

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.123 -r1.124 pkgsrc/devel/boost-libs/Makefile
cvs rdiff -u -r1.160 -r1.161 pkgsrc/meta-pkgs/boost/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/meta-pkgs/boost/patches/patch-tools_boost__install_boost-install-dirs.jam \
    pkgsrc/meta-pkgs/boost/patches/patch-tools_boost__install_boost-install.jam

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

Modified files:

Index: pkgsrc/devel/boost-libs/Makefile
diff -u pkgsrc/devel/boost-libs/Makefile:1.123 pkgsrc/devel/boost-libs/Makefile:1.124
--- pkgsrc/devel/boost-libs/Makefile:1.123      Wed Jan  7 08:46:26 2026
+++ pkgsrc/devel/boost-libs/Makefile    Sun Feb  8 22:36:16 2026
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.123 2026/01/07 08:46:26 wiz Exp $
+# $NetBSD: Makefile,v 1.124 2026/02/08 22:36:16 wiz Exp $
 
 BOOST_PACKAGE=         libs
 BOOST_COMMENT=         (binary libraries)
 BOOST_CONFIG=          installed
 BOOST_INSTALL_LIBS=    yes
 
-PKGREVISION= 1
+PKGREVISION= 2
 .include "../../meta-pkgs/boost/Makefile.common"
 
 INSTALLATION_DIRS+=    lib

Index: pkgsrc/meta-pkgs/boost/distinfo
diff -u pkgsrc/meta-pkgs/boost/distinfo:1.160 pkgsrc/meta-pkgs/boost/distinfo:1.161
--- pkgsrc/meta-pkgs/boost/distinfo:1.160       Thu Dec 25 22:45:28 2025
+++ pkgsrc/meta-pkgs/boost/distinfo     Sun Feb  8 22:36:16 2026
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.160 2025/12/25 22:45:28 adam Exp $
+$NetBSD: distinfo,v 1.161 2026/02/08 22:36:16 wiz Exp $
 
 BLAKE2s (boost_1_90_0.tar.bz2) = 9fb979657f9c196fa279e8bb05aa5b9bc1dc05f6d856679934abcb250d764758
 SHA512 (boost_1_90_0.tar.bz2) = 1c81b60f63367d7249f277f0a569c181926dcf5a725e30433dd336205f1782880489dd00df6a1a74fd107765d3ca2cd49f806788cabb7d5700a8a55927a9a199
@@ -27,5 +27,7 @@ SHA1 (patch-libs_config_test_boost__no__
 SHA1 (patch-libs_context_src_asm_jump_arm_aapcs_elf_gas.S) = f442dfcad2f6e4caba29f75017dc826c5417b335
 SHA1 (patch-libs_context_src_asm_ontop_arm_aapcs_elf_gas.S) = d4450d2a96520283d0e79b80d86d780cd04274ee
 SHA1 (patch-libs_fiber_build_Jamfile.v2) = 4b4a6698111042a3e54dc181b555516e0685796d
+SHA1 (patch-tools_boost__install_boost-install-dirs.jam) = 560db410080cbb8f8d98ef84c05a2c75e171936d
+SHA1 (patch-tools_boost__install_boost-install.jam) = e404dd58cf9a287a4187d06158ee349f24af5ba5
 SHA1 (patch-tools_build_src_engine_build.sh) = 7a756f04a2f11fd06bfa69c5d8ad160926f7da95
 SHA1 (patch-tools_build_src_tools_gcc.jam) = 4d895f14965ee29e328dda15e9975ccc1c14673f

Added files:

Index: pkgsrc/meta-pkgs/boost/patches/patch-tools_boost__install_boost-install-dirs.jam
diff -u /dev/null pkgsrc/meta-pkgs/boost/patches/patch-tools_boost__install_boost-install-dirs.jam:1.1
--- /dev/null   Sun Feb  8 22:36:16 2026
+++ pkgsrc/meta-pkgs/boost/patches/patch-tools_boost__install_boost-install-dirs.jam    Sun Feb  8 22:36:16 2026
@@ -0,0 +1,20 @@
+$NetBSD: patch-tools_boost__install_boost-install-dirs.jam,v 1.1 2026/02/08 22:36:16 wiz Exp $
+
+For some reason, without this patch, "stage-includedir" is set the BOOST_ROOT
+variable corresponding to the staging directory (WRKSRC/stage) without the
+"include" subdir. This messes up the cmake *-config.cmake files generated
+during the staged build.
+
+--- tools/boost_install/boost-install-dirs.jam.orig    2025-12-03 13:46:48.000000000 +0000
++++ tools/boost_install/boost-install-dirs.jam
+@@ -69,10 +69,6 @@ rule stage-includedir
+         ld = [ path.root [ path.make $(ld) ] [ path.pwd ] ] ;
+         return $(ld) ;
+     }
+-    else if [ modules.peek boostcpp : BOOST_ROOT ]
+-    {
+-        return [ path.make [ modules.peek boostcpp : BOOST_ROOT ] ] ;
+-    }
+     else
+     {
+         local stagedir = [ stagedir ] ;
Index: pkgsrc/meta-pkgs/boost/patches/patch-tools_boost__install_boost-install.jam
diff -u /dev/null pkgsrc/meta-pkgs/boost/patches/patch-tools_boost__install_boost-install.jam:1.1
--- /dev/null   Sun Feb  8 22:36:16 2026
+++ pkgsrc/meta-pkgs/boost/patches/patch-tools_boost__install_boost-install.jam Sun Feb  8 22:36:16 2026
@@ -0,0 +1,16 @@
+$NetBSD: patch-tools_boost__install_boost-install.jam,v 1.1 2026/02/08 22:36:16 wiz Exp $
+
+path.is-rooted $(cmakedir) is always true in pkgsrc but generates references to
+the working directory. This is useless anyway so it seems fine to drop this.
+
+--- tools/boost_install/boost-install.jam.orig 2025-12-03 13:46:48.000000000 +0000
++++ tools/boost_install/boost-install.jam
+@@ -797,7 +797,7 @@ rule make-cmake-config ( target : sources * : properti
+         "get_filename_component(_BOOST_CMAKEDIR \"${CMAKE_CURRENT_LIST_DIR}/../\" REALPATH)"
+         : true ;
+ 
+-    if [ path.is-rooted $(cmakedir) ]
++    if ""
+     {
+         local cmakedir-native = [ path-native-fwd $(cmakedir) ] ;
+