[pkgsrc/trunk]: pkgsrc/devel/ccache ccache: perl is a build dependency

[wiz <wiz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/067db895e98b
branches:  trunk
changeset: 389779:067db895e98b
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Fri Dec 09 16:14:12 2022 +0000

description:
ccache: perl is a build dependency

Fix asciidoctor executable name to work for all ruby versions, not
just the current default.

diffstat:

 devel/ccache/Makefile                         |  10 ++++++++--
 devel/ccache/distinfo                         |   3 +--
 devel/ccache/patches/patch-doc_CMakeLists.txt |  16 ----------------
 3 files changed, 9 insertions(+), 20 deletions(-)

diffs (62 lines):

diff -r f3c497e312f3 -r 067db895e98b devel/ccache/Makefile
--- a/devel/ccache/Makefile     Fri Dec 09 14:13:22 2022 +0000
+++ b/devel/ccache/Makefile     Fri Dec 09 16:14:12 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.66 2022/12/09 11:56:47 gdt Exp $
+# $NetBSD: Makefile,v 1.67 2022/12/09 16:14:12 wiz Exp $
 
 DISTNAME=      ccache-4.7.4
 PKGREVISION=   1
@@ -15,7 +15,7 @@
 
 USE_CMAKE=     yes
 USE_LANGUAGES= c99 c++17
-USE_TOOLS+=    perl:test pkg-config
+USE_TOOLS+=    perl:build pkg-config
 TEST_TARGET=   test
 
 GCC_REQD=      8 # std::filesystem
@@ -23,6 +23,12 @@
 .include "../../lang/ruby/rubyversion.mk"
 TOOL_DEPENDS+= ${RUBY_PKGPREFIX}-asciidoctor>=2.0.0:../../textproc/ruby-asciidoctor
 
+SUBST_CLASSES+=                rubyver
+SUBST_SED.rubyver+=    -e "s/asciidoctor/asciidoctor${RUBY_SUFFIX}/"
+SUBST_FILES.rubyver+=  doc/CMakeLists.txt
+SUBST_STAGE.rubyver=   pre-configure
+SUBST_MESSAGE.rubyver= Fixing asciidoctor executable name.
+
 .include "../../archivers/zstd/buildlink3.mk"
 .include "../../databases/hiredis/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r f3c497e312f3 -r 067db895e98b devel/ccache/distinfo
--- a/devel/ccache/distinfo     Fri Dec 09 14:13:22 2022 +0000
+++ b/devel/ccache/distinfo     Fri Dec 09 16:14:12 2022 +0000
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.53 2022/12/09 12:08:56 gdt Exp $
+$NetBSD: distinfo,v 1.54 2022/12/09 16:14:12 wiz Exp $
 
 BLAKE2s (ccache-4.7.4.tar.gz) = cf2457632a920d400371fc775d62abfc02b2cb0ffc110d412f36c8cbfd8f2ce4
 SHA512 (ccache-4.7.4.tar.gz) = 58faceb3d3b566d53000ac81bf27a52502ff3cb163f29506eccb7831bfcfdde3601102fe8b57530b8900e1d5e050374364c4df3c88ff825f0132e94b90441de9
 Size (ccache-4.7.4.tar.gz) = 743012 bytes
-SHA1 (patch-doc_CMakeLists.txt) = 27e5a8036dbfa4753f6a78c959fa9538bb42c947
diff -r f3c497e312f3 -r 067db895e98b devel/ccache/patches/patch-doc_CMakeLists.txt
--- a/devel/ccache/patches/patch-doc_CMakeLists.txt     Fri Dec 09 14:13:22 2022 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,16 +0,0 @@
-$NetBSD: patch-doc_CMakeLists.txt,v 1.1 2022/12/09 12:08:56 gdt Exp $
-
-Find where pkgsrc installs asciidoctor, rather than the normal place.
-
-Perhaps a patch should be pushed upstream that looks for versioned
-asciidoctor in addition to uadorned asciidoctor, or perhaps our cmake
-should be taught about versioned programs, or perhaps something else.
-
---- doc/CMakeLists.txt.orig    2022-11-21 18:53:32.000000000 +0000
-+++ doc/CMakeLists.txt
-@@ -1,4 +1,4 @@
--find_program(ASCIIDOCTOR_EXE asciidoctor)
-+find_program(ASCIIDOCTOR_EXE asciidoctor31)
- mark_as_advanced(ASCIIDOCTOR_EXE) # Don't show in CMake UIs
- 
- if(NOT ASCIIDOCTOR_EXE)