CVS commit: pkgsrc/textproc

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

Module Name:    pkgsrc
Committed By:   wiz
Date:           Fri Aug 22 17:29:00 UTC 2025

Modified Files:
        pkgsrc/textproc/sentencepiece: Makefile.common distinfo
Added Files:
        pkgsrc/textproc/py-sentencepiece: distinfo
        pkgsrc/textproc/py-sentencepiece/patches: patch-build__bundled.sh
Removed Files:
        pkgsrc/textproc/sentencepiece/patches: patch-build__bundled.sh

Log Message:
*sentencepiece*: fix patch usage

can't share patches because of different WRKSRC


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.3 pkgsrc/textproc/py-sentencepiece/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/textproc/py-sentencepiece/patches/patch-build__bundled.sh
cvs rdiff -u -r1.7 -r1.8 pkgsrc/textproc/sentencepiece/Makefile.common
cvs rdiff -u -r1.3 -r1.4 pkgsrc/textproc/sentencepiece/distinfo
cvs rdiff -u -r1.1 -r0 \
    pkgsrc/textproc/sentencepiece/patches/patch-build__bundled.sh

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

Modified files:

Index: pkgsrc/textproc/sentencepiece/Makefile.common
diff -u pkgsrc/textproc/sentencepiece/Makefile.common:1.7 pkgsrc/textproc/sentencepiece/Makefile.common:1.8
--- pkgsrc/textproc/sentencepiece/Makefile.common:1.7   Fri Jun  6 07:51:53 2025
+++ pkgsrc/textproc/sentencepiece/Makefile.common       Fri Aug 22 17:28:59 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.7 2025/06/06 07:51:53 wiz Exp $
+# $NetBSD: Makefile.common,v 1.8 2025/08/22 17:28:59 wiz Exp $
 #
 # used by textproc/sentencepiece/Makefile
 # used by textproc/py-sentencepiece/Makefile
@@ -15,7 +15,5 @@ LICENSE=      apache-2.0
 
 USE_LANGUAGES=         c c++
 USE_CXX_FEATURES=      c++17
-DISTINFO_FILE=         ${.CURDIR}/../../textproc/sentencepiece/distinfo
-PATCHDIR=              ${.CURDIR}/../../textproc/sentencepiece/patches
 
 .include "../../mk/atomic64.mk"

Index: pkgsrc/textproc/sentencepiece/distinfo
diff -u pkgsrc/textproc/sentencepiece/distinfo:1.3 pkgsrc/textproc/sentencepiece/distinfo:1.4
--- pkgsrc/textproc/sentencepiece/distinfo:1.3  Fri Aug 22 14:31:48 2025
+++ pkgsrc/textproc/sentencepiece/distinfo      Fri Aug 22 17:28:59 2025
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.3 2025/08/22 14:31:48 wiz Exp $
+$NetBSD: distinfo,v 1.4 2025/08/22 17:28:59 wiz Exp $
 
 BLAKE2s (sentencepiece-0.2.0.tar.gz) = 68609347224e87397b98a2602bb88fb15df907d2bfe7e9cbce82020fc0c67169
 SHA512 (sentencepiece-0.2.0.tar.gz) = b4214f5bfbe2a0757794c792e87e7c53fda7e65b2511b37fc757f280bf9287ba59b5d630801e17de6058f8292a3c6433211917324cb3446a212a51735402e614
 Size (sentencepiece-0.2.0.tar.gz) = 11980811 bytes
-SHA1 (patch-build__bundled.sh) = cad43cfcdb7b11acc563c1a3696975805275539c

Added files:

Index: pkgsrc/textproc/py-sentencepiece/distinfo
diff -u /dev/null pkgsrc/textproc/py-sentencepiece/distinfo:1.3
--- /dev/null   Fri Aug 22 17:29:00 2025
+++ pkgsrc/textproc/py-sentencepiece/distinfo   Fri Aug 22 17:28:59 2025
@@ -0,0 +1,6 @@
+$NetBSD: distinfo,v 1.3 2025/08/22 17:28:59 wiz Exp $
+
+BLAKE2s (sentencepiece-0.2.0.tar.gz) = 68609347224e87397b98a2602bb88fb15df907d2bfe7e9cbce82020fc0c67169
+SHA512 (sentencepiece-0.2.0.tar.gz) = b4214f5bfbe2a0757794c792e87e7c53fda7e65b2511b37fc757f280bf9287ba59b5d630801e17de6058f8292a3c6433211917324cb3446a212a51735402e614
+Size (sentencepiece-0.2.0.tar.gz) = 11980811 bytes
+SHA1 (patch-build__bundled.sh) = cad43cfcdb7b11acc563c1a3696975805275539c

Index: pkgsrc/textproc/py-sentencepiece/patches/patch-build__bundled.sh
diff -u /dev/null pkgsrc/textproc/py-sentencepiece/patches/patch-build__bundled.sh:1.1
--- /dev/null   Fri Aug 22 17:29:00 2025
+++ pkgsrc/textproc/py-sentencepiece/patches/patch-build__bundled.sh    Fri Aug 22 17:29:00 2025
@@ -0,0 +1,13 @@
+$NetBSD: patch-build__bundled.sh,v 1.1 2025/08/22 17:29:00 wiz Exp $
+
+Fix build with cmake 4.
+
+--- build_bundled.sh.orig      2024-02-19 08:06:52.000000000 +0000
++++ build_bundled.sh
+@@ -18,5 +18,5 @@ else
+   SRC_DIR=./sentencepiece
+ fi
+ 
+-cmake ${SRC_DIR} -B ${BUILD_DIR} -DSPM_ENABLE_SHARED=OFF -DCMAKE_INSTALL_PREFIX=${INSTALL_DIR}
++cmake ${SRC_DIR} -B ${BUILD_DIR} -DSPM_ENABLE_SHARED=OFF -DCMAKE_INSTALL_PREFIX=${INSTALL_DIR} -DCMAKE_POLICY_VERSION_MINIMUM=3.5
+ cmake --build ${BUILD_DIR} --config Release --target install --parallel $(nproc)