Ticket #26539: patch-no_tidy

File patch-no_tidy, 4.6 KB (added by reg-macports.org@…, 14 years ago)
Line 
1diff -Nur wml-2.0.11.orig/configure wml-2.0.11/configure
2--- wml-2.0.11.orig/configure   2010-09-19 22:33:41.000000000 +0200
3+++ wml-2.0.11/configure        2010-09-19 22:35:37.000000000 +0200
4@@ -2989,7 +2989,7 @@
5 fi;
6 
7 
8-ac_configure_args="$ac_configure_args --with-tidy=`pwd`/wml_aux/tidy/tidy"
9+# ac_configure_args="$ac_configure_args --with-tidy=`pwd`/wml_aux/tidy/tidy"
10 
11 
12 
13@@ -3001,7 +3001,7 @@
14 echo "$as_me:$LINENO: result: ${TERM_BOLD}RESULT: Substituting Files${TERM_NORM}" >&5
15 echo "${ECHO_T}${TERM_BOLD}RESULT: Substituting Files${TERM_NORM}" >&6
16 
17-                                                                                                                                                                                                                                      ac_config_files="$ac_config_files Makefile wml_frontend/Makefile wml_backend/Makefile wml_backend/p1_ipp/Makefile wml_backend/p5_divert/Makefile wml_backend/p6_asubst/Makefile wml_backend/p7_htmlfix/Makefile wml_backend/p8_htmlstrip/Makefile wml_backend/p9_slice/Makefile wml_common/Makefile wml_docs/Makefile wml_aux/Makefile wml_aux/htmlinfo/Makefile wml_aux/htmlclean/Makefile wml_aux/linklint/Makefile wml_aux/map2html/Makefile wml_aux/txt2html/Makefile wml_aux/tidy/Makefile wml_aux/weblint/Makefile wml_aux/freetable/Makefile wml_misc/Makefile wml_include/Makefile wml_test/Makefile"
18+                                                                                                                                                                                                                                      ac_config_files="$ac_config_files Makefile wml_frontend/Makefile wml_backend/Makefile wml_backend/p1_ipp/Makefile wml_backend/p5_divert/Makefile wml_backend/p6_asubst/Makefile wml_backend/p7_htmlfix/Makefile wml_backend/p8_htmlstrip/Makefile wml_backend/p9_slice/Makefile wml_common/Makefile wml_docs/Makefile wml_aux/Makefile wml_aux/htmlinfo/Makefile wml_aux/htmlclean/Makefile wml_aux/linklint/Makefile wml_aux/map2html/Makefile wml_aux/txt2html/Makefile wml_aux/weblint/Makefile wml_aux/freetable/Makefile wml_misc/Makefile wml_include/Makefile wml_test/Makefile"
19 cat >confcache <<\_ACEOF
20 # This file is a shell script that caches the results of configure
21 # tests run on this system so they can be shared between configure
22@@ -3569,7 +3569,6 @@
23   "wml_aux/linklint/Makefile" ) CONFIG_FILES="$CONFIG_FILES wml_aux/linklint/Makefile" ;;
24   "wml_aux/map2html/Makefile" ) CONFIG_FILES="$CONFIG_FILES wml_aux/map2html/Makefile" ;;
25   "wml_aux/txt2html/Makefile" ) CONFIG_FILES="$CONFIG_FILES wml_aux/txt2html/Makefile" ;;
26-  "wml_aux/tidy/Makefile" ) CONFIG_FILES="$CONFIG_FILES wml_aux/tidy/Makefile" ;;
27   "wml_aux/weblint/Makefile" ) CONFIG_FILES="$CONFIG_FILES wml_aux/weblint/Makefile" ;;
28   "wml_aux/freetable/Makefile" ) CONFIG_FILES="$CONFIG_FILES wml_aux/freetable/Makefile" ;;
29   "wml_misc/Makefile" ) CONFIG_FILES="$CONFIG_FILES wml_misc/Makefile" ;;
30diff -Nur wml-2.0.11.orig/wml_frontend/wml.src wml-2.0.11/wml_frontend/wml.src
31--- wml-2.0.11.orig/wml_frontend/wml.src        2010-09-19 22:33:41.000000000 +0200
32+++ wml-2.0.11/wml_frontend/wml.src     2010-09-19 22:36:12.000000000 +0200
33@@ -1374,7 +1374,7 @@
34                 $e = "@libdir@/exec/wml_aux_weblint$1";
35             }
36             elsif ($e =~ m|^tidy(.*)|) {
37-                $e = "@libdir@/exec/wml_aux_tidy$1";
38+                $e = "@bindir@/tidy$1";
39                 $e .= " -m" if ($1 eq '');
40             }
41             &verbose(2, "EPILOG: $e $o\n");
42diff -Nur wml-2.0.11.orig/Makefile.in wml-2.0.11/Makefile.in
43--- wml-2.0.11.orig/Makefile.in 2010-09-19 22:41:24.000000000 +0200
44+++ wml-2.0.11/Makefile.in      2010-09-19 22:42:03.000000000 +0200
45@@ -178,8 +178,6 @@
46        $(INSTALL_SCRIPT) wml_aux/txt2html/txt2html.pl $(libdir)/exec/wml_aux_txt2html
47        $(INSTALL_DATA) wml_aux/txt2html/txt2html.txt $(mandir)/$(catdir)1/wml_aux_txt2html.1
48        $(INSTALL_DATA) wml_aux/txt2html/txt2html.dict $(libdir)/data/txt2html.dict
49-       $(INSTALL_PROGRAM) wml_aux/tidy/tidy@EXEEXT@ $(libdir)/exec/wml_aux_tidy@EXEEXT@
50-       $(INSTALL_DATA) wml_aux/tidy/tidy.txt $(mandir)/$(catdir)1/wml_aux_tidy.1
51        $(INSTALL_SCRIPT) wml_aux/htmlinfo/htmlinfo.pl $(libdir)/exec/wml_aux_htmlinfo
52        $(INSTALL_DATA) wml_aux/htmlinfo/htmlinfo.1 $(mandir)/man1/wml_aux_htmlinfo.1
53        $(INSTALL_SCRIPT) wml_aux/linklint/linklint.pl $(libdir)/exec/wml_aux_linklint
54diff -Nur wml-2.0.11.orig/wml_aux/Makefile.in wml-2.0.11/wml_aux/Makefile.in
55--- wml-2.0.11.orig/wml_aux/Makefile.in 2005-12-01 18:50:13.000000000 +0100
56+++ wml-2.0.11/wml_aux/Makefile.in      2010-09-19 22:57:18.000000000 +0200
57@@ -20,7 +20,6 @@
58    htmlinfo  \
59    linklint  \
60    map2html  \
61-   tidy      \
62    txt2html  \
63    weblint   \
64    freetable