# HG changeset patch # User Rich Burridge # Date 1442954044 25200 # Node ID 4db7e64f5de8c0014877951fead4f339b9300b72 # Parent 5489d408f67af5486b11507b56e94ed8c52395ef 21881935 xmlto shouldn't use w3m and should depend on lynx diff -r 5489d408f67a -r 4db7e64f5de8 components/xmlto/Makefile --- a/components/xmlto/Makefile Fri Sep 18 15:29:23 2015 -0700 +++ b/components/xmlto/Makefile Tue Sep 22 13:34:04 2015 -0700 @@ -86,3 +86,4 @@ REQUIRED_PACKAGES += shell/gnu-getopt REQUIRED_PACKAGES += system/library REQUIRED_PACKAGES += text/gnu-grep +REQUIRED_PACKAGES += web/browser/lynx diff -r 5489d408f67a -r 4db7e64f5de8 components/xmlto/patches/use-lynx-in-txt.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/components/xmlto/patches/use-lynx-in-txt.patch Tue Sep 22 13:34:04 2015 -0700 @@ -0,0 +1,33 @@ +Adjusted two files in the xmlto package to always use lynx to convert to +text (rather than w3m). + +This patch will not be sent upstream. + +--- xmlto-0.0.26/format/docbook/txt.orig 2015-09-22 07:24:15.113641794 -0700 ++++ xmlto-0.0.26/format/docbook/txt 2015-09-22 07:24:47.569354480 -0700 +@@ -1,10 +1,6 @@ + case "$USE_BACKEND" in + DEFAULT|DBLATEX) +- if [ -n "`type -t $W3M_PATH`" ] +- then +- CONVERT="$W3M_PATH" +- ARGS="-T text/html -dump" +- elif [ -n "`type -t $LYNX_PATH`" ] ++ if [ -n "`type -t $LYNX_PATH`" ] + then + CONVERT="$LYNX_PATH" + ARGS="-force_html -dump -nolist -width=72" +--- xmlto-0.0.26/format/xhtml1/txt.orig 2015-09-22 07:29:23.866130037 -0700 ++++ xmlto-0.0.26/format/xhtml1/txt 2015-09-22 07:29:42.989011718 -0700 +@@ -1,10 +1,6 @@ + case "$USE_BACKEND" in + DEFAULT|DBLATEX) +- if [ -n "`type -t $W3M_PATH`" ] +- then +- CONVERT="$W3M_PATH" +- ARGS="-T text/html -dump" +- elif [ -n "`type -t $LYNX_PATH`" ] ++ if [ -n "`type -t $LYNX_PATH`" ] + then + CONVERT="$LYNX_PATH" + ARGS="-force_html -dump -nolist -width=72" diff -r 5489d408f67a -r 4db7e64f5de8 components/xmlto/xmlto.p5m --- a/components/xmlto/xmlto.p5m Fri Sep 18 15:29:23 2015 -0700 +++ b/components/xmlto/xmlto.p5m Tue Sep 22 13:34:04 2015 -0700 @@ -18,7 +18,7 @@ # # CDDL HEADER END # -# Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. # default mangler.man.stability uncommitted> set name=pkg.fmri \ @@ -77,6 +77,7 @@ license COPYING license=GPLv2 # xmlto script dependencies that aren't automatically found: +depend type=require fmri=__TBD pkg.debug.depend.file=usr/bin/lynx depend type=require fmri=__TBD pkg.debug.depend.file=usr/bin/xmllint depend type=require fmri=__TBD pkg.debug.depend.file=usr/bin/xsltproc depend type=require fmri=__TBD pkg.debug.depend.file=usr/gnu/bin/find