CVS commit: pkgsrc/devel/ccache

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

Module Name:    pkgsrc
Committed By:   wiz
Date:           Fri Dec  9 16:14:12 UTC 2022

Modified Files:
        pkgsrc/devel/ccache: Makefile distinfo
Removed Files:
        pkgsrc/devel/ccache/patches: patch-doc_CMakeLists.txt

Log Message:
ccache: perl is a build dependency

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


To generate a diff of this commit:
cvs rdiff -u -r1.66 -r1.67 pkgsrc/devel/ccache/Makefile
cvs rdiff -u -r1.53 -r1.54 pkgsrc/devel/ccache/distinfo
cvs rdiff -u -r1.1 -r0 pkgsrc/devel/ccache/patches/patch-doc_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/devel/ccache/Makefile
diff -u pkgsrc/devel/ccache/Makefile:1.66 pkgsrc/devel/ccache/Makefile:1.67
--- pkgsrc/devel/ccache/Makefile:1.66   Fri Dec  9 11:56:47 2022
+++ pkgsrc/devel/ccache/Makefile        Fri Dec  9 16:14:12 2022
@@ -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 @@ LICENSE=      gnu-gpl-v3 AND modified-bsd AND
 
 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 @@ GCC_REQD=    8 # std::filesystem
 .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"

Index: pkgsrc/devel/ccache/distinfo
diff -u pkgsrc/devel/ccache/distinfo:1.53 pkgsrc/devel/ccache/distinfo:1.54
--- pkgsrc/devel/ccache/distinfo:1.53   Fri Dec  9 12:08:56 2022
+++ pkgsrc/devel/ccache/distinfo        Fri Dec  9 16:14:12 2022
@@ -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