CVS commit: pkgsrc/devel/ccache

["Greg Troxel" <gdt%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   gdt
Date:           Fri Dec  9 12:08:57 UTC 2022

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

Log Message:
devel/ccache: Find asciidoctor where pkgsrc puts it

Upstream doesn't look for versioned asciidoctor, and unless
pkg_alternatives helpfully hide this, the manpage build fails.


To generate a diff of this commit:
cvs rdiff -u -r1.52 -r1.53 pkgsrc/devel/ccache/distinfo
cvs rdiff -u -r0 -r1.1 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/distinfo
diff -u pkgsrc/devel/ccache/distinfo:1.52 pkgsrc/devel/ccache/distinfo:1.53
--- pkgsrc/devel/ccache/distinfo:1.52   Mon Dec  5 08:29:44 2022
+++ pkgsrc/devel/ccache/distinfo        Fri Dec  9 12:08:56 2022
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.52 2022/12/05 08:29:44 adam Exp $
+$NetBSD: distinfo,v 1.53 2022/12/09 12:08:56 gdt 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

Added files:

Index: pkgsrc/devel/ccache/patches/patch-doc_CMakeLists.txt
diff -u /dev/null pkgsrc/devel/ccache/patches/patch-doc_CMakeLists.txt:1.1
--- /dev/null   Fri Dec  9 12:08:57 2022
+++ pkgsrc/devel/ccache/patches/patch-doc_CMakeLists.txt        Fri Dec  9 12:08:56 2022
@@ -0,0 +1,16 @@
+$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)