ports/75993: [PATCH] devel/viewcvs: Fix enscript args

[Tim Bishop]

>Number:         75993
>Category:       ports
>Synopsis:       [PATCH] devel/viewcvs: Fix enscript args
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sun Jan 09 13:50:26 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator:     Tim Bishop
>Release:        FreeBSD 5.2.1-RELEASE-p9 i386
>Organization:
>Environment:
System: FreeBSD pendennis.ukc.ac.uk 5.2.1-RELEASE-p9 FreeBSD 5.2.1-RELEASE-p9 #1: Sun Jul 18 15:23:54 BST 2004
>Description:
The "-W html" args to enscript no longer seem to work, but the
longer form of "--language=html" does. This patch makes viewcvs use
the longer form.

Solution found here:

http://mailman.lyra.org/pipermail/viewcvs/2003q3/002189.html

Tested and appears to fix my problem.

Generated with FreeBSD Port Tools 0.63
>How-To-Repeat:
>Fix:

--- viewcvs-0.9.2_2.patch begins here ---
Index: files/patch-lib::viewcvs.py
===================================================================
RCS file: /u1/freebsd/cvs/ports/devel/viewcvs/files/patch-lib::viewcvs.py,v
retrieving revision 1.1
diff -u -r1.1 patch-lib::viewcvs.py
--- files/patch-lib::viewcvs.py	24 Aug 2003 12:40:03 -0000	1.1
+++ files/patch-lib::viewcvs.py	9 Jan 2005 13:37:45 -0000
@@ -1,5 +1,5 @@
---- lib/viewcvs.py.orig        Tue Jan 15 10:35:55 2002
-+++ lib/viewcvs.py     Fri Apr 25 19:18:22 2003
+--- lib/viewcvs.py.orig	Tue Jan 15 09:35:55 2002
++++ lib/viewcvs.py	Sun Jan  9 13:35:45 2005
 @@ -174,6 +174,10 @@
      # parse the query params into a dictionary (and use defaults)
      query_dict = default_settings.copy()
@@ -11,11 +11,10 @@
        query_dict[name] = values[0]
  
      # set up query strings, prefixed by question marks and ampersands
-@@ -228,6 +232,77 @@
-     self.branch = branch
+@@ -229,6 +233,77 @@
      self.taginfo = taginfo
  
-+
+ 
 +def _validate_param(name, value):
 +  """Validate whether the given value is acceptable for the param name.
 +
@@ -86,6 +85,25 @@
 +  'rev'           : _re_validate_revnum,
 +  'content-type'  : _re_validate_mimetype,
 +  }
- 
++
  class LogEntry:
    "Hold state for each revision entry in an 'rlog' output."
+   def __init__(self, rev, date, author, state, changed, log):
+@@ -478,7 +553,7 @@
+ def markup_stream_enscript(lang, fp):
+   sys.stdout.flush()
+   enscript = popen.pipe_cmds([(os.path.normpath(os.path.join(cfg.options.enscript_path,'enscript')),
+-                               '--color', '-W', 'html', '-E' + lang, '-o',
++                               '--color', '--language=html', '-E' + lang, '-o',
+                                '-', '-'),
+                               ('sed', '-n', '/^<PRE>$/,/<\\/PRE>$/p')])
+ 
+@@ -494,7 +569,7 @@
+   except IOError, v:
+     print "<h3>Failure during use of an external program:</h3>"
+     print "<pre>"
+-    print os.path.normpath(os.path.join(cfg.options.enscript_path,'enscript')) + " --color -W html -E"+lang+" -o - -"
++    print os.path.normpath(os.path.join(cfg.options.enscript_path,'enscript')) + " --color --language=html -E"+lang+" -o - -"
+     print "</pre>"
+     raise
+ 
--- viewcvs-0.9.2_2.patch ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted: