pkgsrc-Users archive

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

Re: Re: Request to commit wip/RE-flex



On Thu, Mar 21, 2024 at 09:45:47PM +0100, Thomas Klausner wrote:
> The PLIST was wrong for doxygen, but I see lots of patches for
> doxygen, so I assume you tried it. Were you using an older version
> (than the latest pkgsrc one) or is there a different problem here?

Yes, tested with Doxygen 1.10 which is the version in -current.  The
patches only fix things that are broken because of changes between
Doxygen 1.9 and 1.10.  I'll submit more complete documentation changes
upstream soon.

I think the PLIST was correct and the real issue is that doc/Doxyfile
contains

DOT_PATH = /opt/local/bin

which should be changed to

DOT_PATH = ${PREFIX}/bin

Sorry, I missed that because ${PREFIX}/bin is in my path.

I've attached a patch that should fix the issue.  Note that it also
fixes a mistake in one of the optimization flags.

Cheers,
--
Malte Dehling
? patches/patch-doc_Doxyfile.in
Index: PLIST
===================================================================
RCS file: /cvsroot/pkgsrc/devel/RE-flex/PLIST,v
retrieving revision 1.4
diff -u -r1.4 PLIST
--- PLIST	21 Mar 2024 20:44:40 -0000	1.4
+++ PLIST	21 Mar 2024 23:57:22 -0000
@@ -59,19 +59,22 @@
 ${PLIST.doxygen}share/doc/RE-flex/html/boostmatcher_8h__incl.png
 ${PLIST.doxygen}share/doc/RE-flex/html/class_reflex-members.html
 ${PLIST.doxygen}share/doc/RE-flex/html/class_reflex.html
-${PLIST.doxygen}share/doc/RE-flex/html/class_reflex__coll__graph.dot
+${PLIST.doxygen}share/doc/RE-flex/html/class_reflex__coll__graph.map
+${PLIST.doxygen}share/doc/RE-flex/html/class_reflex__coll__graph.md5
 ${PLIST.doxygen}share/doc/RE-flex/html/class_reflex__coll__graph.png
 ${PLIST.doxygen}share/doc/RE-flex/html/classes.html
 ${PLIST.doxygen}share/doc/RE-flex/html/classreflex_1_1_abstract_lexer-members.html
 ${PLIST.doxygen}share/doc/RE-flex/html/classreflex_1_1_abstract_lexer.html
 ${PLIST.doxygen}share/doc/RE-flex/html/classreflex_1_1_abstract_lexer_1_1_matcher-members.html
 ${PLIST.doxygen}share/doc/RE-flex/html/classreflex_1_1_abstract_lexer_1_1_matcher.html
-${PLIST.doxygen}share/doc/RE-flex/html/classreflex_1_1_abstract_lexer_1_1_matcher__coll__graph.dot
+${PLIST.doxygen}share/doc/RE-flex/html/classreflex_1_1_abstract_lexer_1_1_matcher__coll__graph.map
+${PLIST.doxygen}share/doc/RE-flex/html/classreflex_1_1_abstract_lexer_1_1_matcher__coll__graph.md5
 ${PLIST.doxygen}share/doc/RE-flex/html/classreflex_1_1_abstract_lexer_1_1_matcher__coll__graph.png
 ${PLIST.doxygen}share/doc/RE-flex/html/classreflex_1_1_abstract_lexer_1_1_matcher__inherit__graph.map
 ${PLIST.doxygen}share/doc/RE-flex/html/classreflex_1_1_abstract_lexer_1_1_matcher__inherit__graph.md5
 ${PLIST.doxygen}share/doc/RE-flex/html/classreflex_1_1_abstract_lexer_1_1_matcher__inherit__graph.png
-${PLIST.doxygen}share/doc/RE-flex/html/classreflex_1_1_abstract_lexer__coll__graph.dot
+${PLIST.doxygen}share/doc/RE-flex/html/classreflex_1_1_abstract_lexer__coll__graph.map
+${PLIST.doxygen}share/doc/RE-flex/html/classreflex_1_1_abstract_lexer__coll__graph.md5
 ${PLIST.doxygen}share/doc/RE-flex/html/classreflex_1_1_abstract_lexer__coll__graph.png
 ${PLIST.doxygen}share/doc/RE-flex/html/classreflex_1_1_abstract_lexer__inherit__graph.map
 ${PLIST.doxygen}share/doc/RE-flex/html/classreflex_1_1_abstract_lexer__inherit__graph.md5
@@ -85,29 +88,34 @@
 ${PLIST.doxygen}share/doc/RE-flex/html/classreflex_1_1_abstract_matcher_1_1_operation__coll__graph.map
 ${PLIST.doxygen}share/doc/RE-flex/html/classreflex_1_1_abstract_matcher_1_1_operation__coll__graph.md5
 ${PLIST.doxygen}share/doc/RE-flex/html/classreflex_1_1_abstract_matcher_1_1_operation__coll__graph.png
-${PLIST.doxygen}share/doc/RE-flex/html/classreflex_1_1_abstract_matcher__coll__graph.dot
+${PLIST.doxygen}share/doc/RE-flex/html/classreflex_1_1_abstract_matcher__coll__graph.map
+${PLIST.doxygen}share/doc/RE-flex/html/classreflex_1_1_abstract_matcher__coll__graph.md5
 ${PLIST.doxygen}share/doc/RE-flex/html/classreflex_1_1_abstract_matcher__coll__graph.png
-${PLIST.doxygen}share/doc/RE-flex/html/classreflex_1_1_abstract_matcher__inherit__graph.dot
+${PLIST.doxygen}share/doc/RE-flex/html/classreflex_1_1_abstract_matcher__inherit__graph.map
+${PLIST.doxygen}share/doc/RE-flex/html/classreflex_1_1_abstract_matcher__inherit__graph.md5
 ${PLIST.doxygen}share/doc/RE-flex/html/classreflex_1_1_abstract_matcher__inherit__graph.png
 ${PLIST.doxygen}share/doc/RE-flex/html/classreflex_1_1_bits-members.html
 ${PLIST.doxygen}share/doc/RE-flex/html/classreflex_1_1_bits.html
 ${PLIST.doxygen}share/doc/RE-flex/html/classreflex_1_1_boost_matcher-members.html
 ${PLIST.doxygen}share/doc/RE-flex/html/classreflex_1_1_boost_matcher.html
-${PLIST.doxygen}share/doc/RE-flex/html/classreflex_1_1_boost_matcher__coll__graph.dot
+${PLIST.doxygen}share/doc/RE-flex/html/classreflex_1_1_boost_matcher__coll__graph.map
+${PLIST.doxygen}share/doc/RE-flex/html/classreflex_1_1_boost_matcher__coll__graph.md5
 ${PLIST.doxygen}share/doc/RE-flex/html/classreflex_1_1_boost_matcher__coll__graph.png
 ${PLIST.doxygen}share/doc/RE-flex/html/classreflex_1_1_boost_matcher__inherit__graph.map
 ${PLIST.doxygen}share/doc/RE-flex/html/classreflex_1_1_boost_matcher__inherit__graph.md5
 ${PLIST.doxygen}share/doc/RE-flex/html/classreflex_1_1_boost_matcher__inherit__graph.png
 ${PLIST.doxygen}share/doc/RE-flex/html/classreflex_1_1_boost_perl_matcher-members.html
 ${PLIST.doxygen}share/doc/RE-flex/html/classreflex_1_1_boost_perl_matcher.html
-${PLIST.doxygen}share/doc/RE-flex/html/classreflex_1_1_boost_perl_matcher__coll__graph.dot
+${PLIST.doxygen}share/doc/RE-flex/html/classreflex_1_1_boost_perl_matcher__coll__graph.map
+${PLIST.doxygen}share/doc/RE-flex/html/classreflex_1_1_boost_perl_matcher__coll__graph.md5
 ${PLIST.doxygen}share/doc/RE-flex/html/classreflex_1_1_boost_perl_matcher__coll__graph.png
 ${PLIST.doxygen}share/doc/RE-flex/html/classreflex_1_1_boost_perl_matcher__inherit__graph.map
 ${PLIST.doxygen}share/doc/RE-flex/html/classreflex_1_1_boost_perl_matcher__inherit__graph.md5
 ${PLIST.doxygen}share/doc/RE-flex/html/classreflex_1_1_boost_perl_matcher__inherit__graph.png
 ${PLIST.doxygen}share/doc/RE-flex/html/classreflex_1_1_boost_posix_matcher-members.html
 ${PLIST.doxygen}share/doc/RE-flex/html/classreflex_1_1_boost_posix_matcher.html
-${PLIST.doxygen}share/doc/RE-flex/html/classreflex_1_1_boost_posix_matcher__coll__graph.dot
+${PLIST.doxygen}share/doc/RE-flex/html/classreflex_1_1_boost_posix_matcher__coll__graph.map
+${PLIST.doxygen}share/doc/RE-flex/html/classreflex_1_1_boost_posix_matcher__coll__graph.md5
 ${PLIST.doxygen}share/doc/RE-flex/html/classreflex_1_1_boost_posix_matcher__coll__graph.png
 ${PLIST.doxygen}share/doc/RE-flex/html/classreflex_1_1_boost_posix_matcher__inherit__graph.map
 ${PLIST.doxygen}share/doc/RE-flex/html/classreflex_1_1_boost_posix_matcher__inherit__graph.md5
@@ -140,12 +148,14 @@
 ${PLIST.doxygen}share/doc/RE-flex/html/classreflex_1_1_flex_lexer.html
 ${PLIST.doxygen}share/doc/RE-flex/html/classreflex_1_1_flex_lexer_1_1_matcher-members.html
 ${PLIST.doxygen}share/doc/RE-flex/html/classreflex_1_1_flex_lexer_1_1_matcher.html
-${PLIST.doxygen}share/doc/RE-flex/html/classreflex_1_1_flex_lexer_1_1_matcher__coll__graph.dot
+${PLIST.doxygen}share/doc/RE-flex/html/classreflex_1_1_flex_lexer_1_1_matcher__coll__graph.map
+${PLIST.doxygen}share/doc/RE-flex/html/classreflex_1_1_flex_lexer_1_1_matcher__coll__graph.md5
 ${PLIST.doxygen}share/doc/RE-flex/html/classreflex_1_1_flex_lexer_1_1_matcher__coll__graph.png
 ${PLIST.doxygen}share/doc/RE-flex/html/classreflex_1_1_flex_lexer_1_1_matcher__inherit__graph.map
 ${PLIST.doxygen}share/doc/RE-flex/html/classreflex_1_1_flex_lexer_1_1_matcher__inherit__graph.md5
 ${PLIST.doxygen}share/doc/RE-flex/html/classreflex_1_1_flex_lexer_1_1_matcher__inherit__graph.png
-${PLIST.doxygen}share/doc/RE-flex/html/classreflex_1_1_flex_lexer__coll__graph.dot
+${PLIST.doxygen}share/doc/RE-flex/html/classreflex_1_1_flex_lexer__coll__graph.map
+${PLIST.doxygen}share/doc/RE-flex/html/classreflex_1_1_flex_lexer__coll__graph.md5
 ${PLIST.doxygen}share/doc/RE-flex/html/classreflex_1_1_flex_lexer__coll__graph.png
 ${PLIST.doxygen}share/doc/RE-flex/html/classreflex_1_1_flex_lexer__inherit__graph.map
 ${PLIST.doxygen}share/doc/RE-flex/html/classreflex_1_1_flex_lexer__inherit__graph.md5
@@ -176,14 +186,16 @@
 ${PLIST.doxygen}share/doc/RE-flex/html/classreflex_1_1_input__inherit__graph.png
 ${PLIST.doxygen}share/doc/RE-flex/html/classreflex_1_1_line_matcher-members.html
 ${PLIST.doxygen}share/doc/RE-flex/html/classreflex_1_1_line_matcher.html
-${PLIST.doxygen}share/doc/RE-flex/html/classreflex_1_1_line_matcher__coll__graph.dot
+${PLIST.doxygen}share/doc/RE-flex/html/classreflex_1_1_line_matcher__coll__graph.map
+${PLIST.doxygen}share/doc/RE-flex/html/classreflex_1_1_line_matcher__coll__graph.md5
 ${PLIST.doxygen}share/doc/RE-flex/html/classreflex_1_1_line_matcher__coll__graph.png
 ${PLIST.doxygen}share/doc/RE-flex/html/classreflex_1_1_line_matcher__inherit__graph.map
 ${PLIST.doxygen}share/doc/RE-flex/html/classreflex_1_1_line_matcher__inherit__graph.md5
 ${PLIST.doxygen}share/doc/RE-flex/html/classreflex_1_1_line_matcher__inherit__graph.png
 ${PLIST.doxygen}share/doc/RE-flex/html/classreflex_1_1_matcher-members.html
 ${PLIST.doxygen}share/doc/RE-flex/html/classreflex_1_1_matcher.html
-${PLIST.doxygen}share/doc/RE-flex/html/classreflex_1_1_matcher__coll__graph.dot
+${PLIST.doxygen}share/doc/RE-flex/html/classreflex_1_1_matcher__coll__graph.map
+${PLIST.doxygen}share/doc/RE-flex/html/classreflex_1_1_matcher__coll__graph.md5
 ${PLIST.doxygen}share/doc/RE-flex/html/classreflex_1_1_matcher__coll__graph.png
 ${PLIST.doxygen}share/doc/RE-flex/html/classreflex_1_1_matcher__inherit__graph.map
 ${PLIST.doxygen}share/doc/RE-flex/html/classreflex_1_1_matcher__inherit__graph.md5
@@ -198,32 +210,37 @@
 ${PLIST.doxygen}share/doc/RE-flex/html/classreflex_1_1_o_ranges__inherit__graph.png
 ${PLIST.doxygen}share/doc/RE-flex/html/classreflex_1_1_p_c_r_e2_matcher-members.html
 ${PLIST.doxygen}share/doc/RE-flex/html/classreflex_1_1_p_c_r_e2_matcher.html
-${PLIST.doxygen}share/doc/RE-flex/html/classreflex_1_1_p_c_r_e2_matcher__coll__graph.dot
+${PLIST.doxygen}share/doc/RE-flex/html/classreflex_1_1_p_c_r_e2_matcher__coll__graph.map
+${PLIST.doxygen}share/doc/RE-flex/html/classreflex_1_1_p_c_r_e2_matcher__coll__graph.md5
 ${PLIST.doxygen}share/doc/RE-flex/html/classreflex_1_1_p_c_r_e2_matcher__coll__graph.png
 ${PLIST.doxygen}share/doc/RE-flex/html/classreflex_1_1_p_c_r_e2_matcher__inherit__graph.map
 ${PLIST.doxygen}share/doc/RE-flex/html/classreflex_1_1_p_c_r_e2_matcher__inherit__graph.md5
 ${PLIST.doxygen}share/doc/RE-flex/html/classreflex_1_1_p_c_r_e2_matcher__inherit__graph.png
 ${PLIST.doxygen}share/doc/RE-flex/html/classreflex_1_1_p_c_r_e2_u_t_f_matcher-members.html
 ${PLIST.doxygen}share/doc/RE-flex/html/classreflex_1_1_p_c_r_e2_u_t_f_matcher.html
-${PLIST.doxygen}share/doc/RE-flex/html/classreflex_1_1_p_c_r_e2_u_t_f_matcher__coll__graph.dot
+${PLIST.doxygen}share/doc/RE-flex/html/classreflex_1_1_p_c_r_e2_u_t_f_matcher__coll__graph.map
+${PLIST.doxygen}share/doc/RE-flex/html/classreflex_1_1_p_c_r_e2_u_t_f_matcher__coll__graph.md5
 ${PLIST.doxygen}share/doc/RE-flex/html/classreflex_1_1_p_c_r_e2_u_t_f_matcher__coll__graph.png
 ${PLIST.doxygen}share/doc/RE-flex/html/classreflex_1_1_p_c_r_e2_u_t_f_matcher__inherit__graph.map
 ${PLIST.doxygen}share/doc/RE-flex/html/classreflex_1_1_p_c_r_e2_u_t_f_matcher__inherit__graph.md5
 ${PLIST.doxygen}share/doc/RE-flex/html/classreflex_1_1_p_c_r_e2_u_t_f_matcher__inherit__graph.png
 ${PLIST.doxygen}share/doc/RE-flex/html/classreflex_1_1_pattern-members.html
 ${PLIST.doxygen}share/doc/RE-flex/html/classreflex_1_1_pattern.html
-${PLIST.doxygen}share/doc/RE-flex/html/classreflex_1_1_pattern__coll__graph.dot
+${PLIST.doxygen}share/doc/RE-flex/html/classreflex_1_1_pattern__coll__graph.map
+${PLIST.doxygen}share/doc/RE-flex/html/classreflex_1_1_pattern__coll__graph.md5
 ${PLIST.doxygen}share/doc/RE-flex/html/classreflex_1_1_pattern__coll__graph.png
 ${PLIST.doxygen}share/doc/RE-flex/html/classreflex_1_1_pattern_matcher-members.html
 ${PLIST.doxygen}share/doc/RE-flex/html/classreflex_1_1_pattern_matcher.html
 ${PLIST.doxygen}share/doc/RE-flex/html/classreflex_1_1_pattern_matcher_3_01std_1_1string_01_4-members.html
 ${PLIST.doxygen}share/doc/RE-flex/html/classreflex_1_1_pattern_matcher_3_01std_1_1string_01_4.html
-${PLIST.doxygen}share/doc/RE-flex/html/classreflex_1_1_pattern_matcher_3_01std_1_1string_01_4__coll__graph.dot
+${PLIST.doxygen}share/doc/RE-flex/html/classreflex_1_1_pattern_matcher_3_01std_1_1string_01_4__coll__graph.map
+${PLIST.doxygen}share/doc/RE-flex/html/classreflex_1_1_pattern_matcher_3_01std_1_1string_01_4__coll__graph.md5
 ${PLIST.doxygen}share/doc/RE-flex/html/classreflex_1_1_pattern_matcher_3_01std_1_1string_01_4__coll__graph.png
 ${PLIST.doxygen}share/doc/RE-flex/html/classreflex_1_1_pattern_matcher_3_01std_1_1string_01_4__inherit__graph.map
 ${PLIST.doxygen}share/doc/RE-flex/html/classreflex_1_1_pattern_matcher_3_01std_1_1string_01_4__inherit__graph.md5
 ${PLIST.doxygen}share/doc/RE-flex/html/classreflex_1_1_pattern_matcher_3_01std_1_1string_01_4__inherit__graph.png
-${PLIST.doxygen}share/doc/RE-flex/html/classreflex_1_1_pattern_matcher__coll__graph.dot
+${PLIST.doxygen}share/doc/RE-flex/html/classreflex_1_1_pattern_matcher__coll__graph.map
+${PLIST.doxygen}share/doc/RE-flex/html/classreflex_1_1_pattern_matcher__coll__graph.md5
 ${PLIST.doxygen}share/doc/RE-flex/html/classreflex_1_1_pattern_matcher__coll__graph.png
 ${PLIST.doxygen}share/doc/RE-flex/html/classreflex_1_1_pattern_matcher__inherit__graph.map
 ${PLIST.doxygen}share/doc/RE-flex/html/classreflex_1_1_pattern_matcher__inherit__graph.md5
@@ -246,21 +263,24 @@
 ${PLIST.doxygen}share/doc/RE-flex/html/classreflex_1_1_ranges__inherit__graph.png
 ${PLIST.doxygen}share/doc/RE-flex/html/classreflex_1_1_std_ecma_matcher-members.html
 ${PLIST.doxygen}share/doc/RE-flex/html/classreflex_1_1_std_ecma_matcher.html
-${PLIST.doxygen}share/doc/RE-flex/html/classreflex_1_1_std_ecma_matcher__coll__graph.dot
+${PLIST.doxygen}share/doc/RE-flex/html/classreflex_1_1_std_ecma_matcher__coll__graph.map
+${PLIST.doxygen}share/doc/RE-flex/html/classreflex_1_1_std_ecma_matcher__coll__graph.md5
 ${PLIST.doxygen}share/doc/RE-flex/html/classreflex_1_1_std_ecma_matcher__coll__graph.png
 ${PLIST.doxygen}share/doc/RE-flex/html/classreflex_1_1_std_ecma_matcher__inherit__graph.map
 ${PLIST.doxygen}share/doc/RE-flex/html/classreflex_1_1_std_ecma_matcher__inherit__graph.md5
 ${PLIST.doxygen}share/doc/RE-flex/html/classreflex_1_1_std_ecma_matcher__inherit__graph.png
 ${PLIST.doxygen}share/doc/RE-flex/html/classreflex_1_1_std_matcher-members.html
 ${PLIST.doxygen}share/doc/RE-flex/html/classreflex_1_1_std_matcher.html
-${PLIST.doxygen}share/doc/RE-flex/html/classreflex_1_1_std_matcher__coll__graph.dot
+${PLIST.doxygen}share/doc/RE-flex/html/classreflex_1_1_std_matcher__coll__graph.map
+${PLIST.doxygen}share/doc/RE-flex/html/classreflex_1_1_std_matcher__coll__graph.md5
 ${PLIST.doxygen}share/doc/RE-flex/html/classreflex_1_1_std_matcher__coll__graph.png
 ${PLIST.doxygen}share/doc/RE-flex/html/classreflex_1_1_std_matcher__inherit__graph.map
 ${PLIST.doxygen}share/doc/RE-flex/html/classreflex_1_1_std_matcher__inherit__graph.md5
 ${PLIST.doxygen}share/doc/RE-flex/html/classreflex_1_1_std_matcher__inherit__graph.png
 ${PLIST.doxygen}share/doc/RE-flex/html/classreflex_1_1_std_posix_matcher-members.html
 ${PLIST.doxygen}share/doc/RE-flex/html/classreflex_1_1_std_posix_matcher.html
-${PLIST.doxygen}share/doc/RE-flex/html/classreflex_1_1_std_posix_matcher__coll__graph.dot
+${PLIST.doxygen}share/doc/RE-flex/html/classreflex_1_1_std_posix_matcher__coll__graph.map
+${PLIST.doxygen}share/doc/RE-flex/html/classreflex_1_1_std_posix_matcher__coll__graph.md5
 ${PLIST.doxygen}share/doc/RE-flex/html/classreflex_1_1_std_posix_matcher__coll__graph.png
 ${PLIST.doxygen}share/doc/RE-flex/html/classreflex_1_1_std_posix_matcher__inherit__graph.map
 ${PLIST.doxygen}share/doc/RE-flex/html/classreflex_1_1_std_posix_matcher__inherit__graph.md5
@@ -492,7 +512,8 @@
 ${PLIST.doxygen}share/doc/RE-flex/html/inherit_graph_29.map
 ${PLIST.doxygen}share/doc/RE-flex/html/inherit_graph_29.md5
 ${PLIST.doxygen}share/doc/RE-flex/html/inherit_graph_29.png
-${PLIST.doxygen}share/doc/RE-flex/html/inherit_graph_3.dot
+${PLIST.doxygen}share/doc/RE-flex/html/inherit_graph_3.map
+${PLIST.doxygen}share/doc/RE-flex/html/inherit_graph_3.md5
 ${PLIST.doxygen}share/doc/RE-flex/html/inherit_graph_3.png
 ${PLIST.doxygen}share/doc/RE-flex/html/inherit_graph_30.map
 ${PLIST.doxygen}share/doc/RE-flex/html/inherit_graph_30.md5
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/devel/RE-flex/distinfo,v
retrieving revision 1.8
diff -u -r1.8 distinfo
--- distinfo	21 Mar 2024 20:44:40 -0000	1.8
+++ distinfo	21 Mar 2024 23:57:22 -0000
@@ -3,6 +3,7 @@
 BLAKE2s (RE-flex-4.1.2.tar.gz) = 1d4cd5a78522ecfdb3deae59e3de1114b4452a8a4b9de41ab99da83194ce5956
 SHA512 (RE-flex-4.1.2.tar.gz) = 964567b865316f00a5f9cb1ca93ca29fd96ff79f02253c960dd5965e750e0fd30a3dbb5d4d51992b5359b0a89637ab98fd215bd41f48a47372f9ae1a8d5fcefa
 Size (RE-flex-4.1.2.tar.gz) = 6600481 bytes
+SHA1 (patch-doc_Doxyfile.in) = 2239c942293a1bd213f1a7f56f0b0dfb90184a4f
 SHA1 (patch-doc_index.md) = 382df877d351eff1df7ccd2b919331db67c4ee21
 SHA1 (patch-examples_Make) = 2e7a07f62cf80ef502cb76b8cdb980c7a2d0773b
 SHA1 (patch-include_reflex_convert.h) = ed9fbae2d615907a0b596ba5ee9080eb3129c9dc
Index: options.mk
===================================================================
RCS file: /cvsroot/pkgsrc/devel/RE-flex/options.mk,v
retrieving revision 1.4
diff -u -r1.4 options.mk
--- options.mk	21 Mar 2024 20:44:40 -0000	1.4
+++ options.mk	21 Mar 2024 23:57:22 -0000
@@ -8,11 +8,17 @@
 
 # don't build with cpu optimizations detected during configure
 .if empty(PKG_OPTIONS:Mcpu-optimization)
-CONFIGURE_ARGS+=	--disable-avx
+CONFIGURE_ARGS+=	--disable-avx2
 CONFIGURE_ARGS+=	--disable-sse2
 CONFIGURE_ARGS+=	--disable-neon
 .endif
 
+SUBST_CLASSES+=		path
+SUBST_FILES.path=	# set below
+SUBST_MESSAGE.path=	Updating paths.
+SUBST_STAGE.path=	pre-configure
+SUBST_VARS.path=	CC CXX PREFIX
+
 # build and install html docs
 PLIST_VARS+=		doxygen
 .if !empty(PKG_OPTIONS:Mdoxygen)
@@ -22,6 +28,8 @@
 
 TOOL_DEPENDS+=		doxygen-[0-9]*:../../devel/doxygen
 
+SUBST_FILES.path+=	doc/Doxyfile.in
+
 post-configure:
 	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} doc/html
 
@@ -45,11 +53,7 @@
 
 DEPENDS+=		bison-[0-9]*:../../devel/bison
 
-SUBST_CLASSES+=		path
-SUBST_FILES.path=	examples/Make
-SUBST_MESSAGE.path=	Updating paths.
-SUBST_STAGE.path=	pre-install
-SUBST_VARS.path=	CC CXX PREFIX
+SUBST_FILES.path+=	examples/Make
 
 .PHONY: post-install-examples
 
$NetBSD$

fix path

--- doc/Doxyfile.in.orig	2024-03-21 22:47:59.122485248 +0000
+++ doc/Doxyfile.in
@@ -2387,7 +2387,7 @@ INTERACTIVE_SVG        = NO
 # found. If left blank, it is assumed the dot tool can be found in the path.
 # This tag requires that the tag HAVE_DOT is set to YES.
 
-DOT_PATH               = /opt/local/bin
+DOT_PATH               = @PREFIX@/bin
 
 # The DOTFILE_DIRS tag can be used to specify one or more directories that
 # contain dot files that are included in the documentation (see the \dotfile

Attachment: signature.asc
Description: PGP signature



Home | Main Index | Thread Index | Old Index