21877624 Remove w3m dependency from asciidoc
authorRich Burridge <rich.burridge@oracle.com>
Tue, 22 Sep 2015 13:44:52 -0700
changeset 4888 45b8c07e70cd
parent 4887 4db7e64f5de8
child 4889 28ca829107b4
21877624 Remove w3m dependency from asciidoc
components/asciidoc/Makefile
components/asciidoc/asciidoc.p5m
components/asciidoc/patches/use-lynx-in-a2x.patch
--- a/components/asciidoc/Makefile	Tue Sep 22 13:34:04 2015 -0700
+++ b/components/asciidoc/Makefile	Tue Sep 22 13:44:52 2015 -0700
@@ -125,4 +125,3 @@
 REQUIRED_PACKAGES += library/libxslt
 REQUIRED_PACKAGES += runtime/python-26
 REQUIRED_PACKAGES += web/browser/lynx
-REQUIRED_PACKAGES += web/browser/w3m
--- a/components/asciidoc/asciidoc.p5m	Tue Sep 22 13:34:04 2015 -0700
+++ b/components/asciidoc/asciidoc.p5m	Tue Sep 22 13:44:52 2015 -0700
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
 #
 
 <transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
@@ -124,6 +124,5 @@
 
 # Add dependencies for the applications that can be potentially exec'ed by a2x.
 depend type=require fmri=__TBD pkg.debug.depend.file=usr/bin/lynx
-depend type=require fmri=__TBD pkg.debug.depend.file=usr/bin/w3m
 depend type=require fmri=__TBD pkg.debug.depend.file=usr/bin/xmllint
 depend type=require fmri=__TBD pkg.debug.depend.file=usr/bin/xsltproc
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/asciidoc/patches/use-lynx-in-a2x.patch	Tue Sep 22 13:44:52 2015 -0700
@@ -0,0 +1,61 @@
+Adjusted the a2x script to always use lynx to convert to text (rather
+than w3m). Note that this patch just does the minimal change required
+to achieve this rather than purge all the Python w3m code in a2x.py
+The a2x manual page has been updated to match.
+
+This patch will not be sent upstream.
+
+--- a2x.py.orig	2015-09-21 17:43:51.919082319 -0700
++++ a2x.py	2015-09-21 17:54:58.379239030 -0700
[email protected]@ -883,7 +883,7 @@
+         action='store_true', dest='keep_artifacts', default=False,
+         help='do not delete temporary build files')
+     parser.add_option('--lynx',
+-        action='store_true', dest='lynx', default=False,
++        action='store_true', dest='lynx', default=True,
+         help='use lynx to generate text files')
+     parser.add_option('-L', '--no-xmllint',
+         action='store_true', dest='no_xmllint', default=False,
+--- doc/a2x.1.orig	2015-09-21 18:03:27.062349415 -0700
++++ doc/a2x.1	2015-09-21 18:08:23.216968250 -0700
[email protected]@ -145,8 +145,7 @@
+ .RS 4
+ Use
+ \fIlynx(1)\fR
+-to generate text formatted output\&. The default behavior is to use
+-\fIw3m(1)\fR\&.
++to generate text formatted output\&. Note that this is the default behavior on Solaris\&.
+ .RE
+ .PP
+ \fB\-L, \-\-no\-xmllint\fR
[email protected]@ -603,20 +602,6 @@
+ .IP \(bu 2.3
+ .\}
+ 
+-\fBw3m\fR
+-(text format):
+-http://w3m\&.sourceforge\&.net/index\&.en\&.html
+-.RE
+-.sp
+-.RS 4
+-.ie n \{\
+-\h'-04'\(bu\h'+03'\c
+-.\}
+-.el \{\
+-.sp -1
+-.IP \(bu 2.3
+-.\}
+-
+ \fBLynx\fR
+ (text format \(em alternative text file generator):
+ http://lynx\&.isc\&.org/
[email protected]@ -715,8 +700,7 @@
+ XSLTPROC = \*(Aqxsltproc\*(Aq
+ DBLATEX = \*(Aqdblatex\*(Aq         # pdf generation\&.
+ FOP = \*(Aqfop\*(Aq                 # pdf generation (\-\-fop option)\&.
+-W3M = \*(Aqw3m\*(Aq                 # text generation\&.
+-LYNX = \*(Aqlynx\*(Aq               # text generation (if no w3m)\&.
++LYNX = \*(Aqlynx\*(Aq               # text generation (\-\-lynx option)\&.
+ XMLLINT = \*(Aqxmllint\*(Aq         # Set to \*(Aq\*(Aq to disable\&.
+ EPUBCHECK = \*(Aqepubcheck\*(Aq     # Set to \*(Aq\*(Aq to disable\&.
+ # External executable default options\&.