pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/devel/ccache devel/ccache: Find asciidoctor where pkgs...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/81902c05cfa5
branches:  trunk
changeset: 389768:81902c05cfa5
user:      gdt <gdt%pkgsrc.org@localhost>
date:      Fri Dec 09 12:08:56 2022 +0000

description:
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.

diffstat:

 devel/ccache/distinfo                         |   3 ++-
 devel/ccache/patches/patch-doc_CMakeLists.txt |  16 ++++++++++++++++
 2 files changed, 18 insertions(+), 1 deletions(-)

diffs (31 lines):

diff -r 3c60ae31a237 -r 81902c05cfa5 devel/ccache/distinfo
--- a/devel/ccache/distinfo     Fri Dec 09 11:56:47 2022 +0000
+++ b/devel/ccache/distinfo     Fri Dec 09 12:08:56 2022 +0000
@@ -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
diff -r 3c60ae31a237 -r 81902c05cfa5 devel/ccache/patches/patch-doc_CMakeLists.txt
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/ccache/patches/patch-doc_CMakeLists.txt     Fri Dec 09 12:08:56 2022 +0000
@@ -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)



Home | Main Index | Thread Index | Old Index