* devel/viewvc

- Add new port viewvc and update to 1.0.0

* Makefile

- Add viewvc

PR:		96099
Submitted by:	Jean-Baptiste Quenot <jbq___caraldi.com>
Repocopy by:	marcus

4 files changed, 32 insertions, 158 deletions

diff --git a/devel/viewvc/files/patch-lib::viewcvs.py b/devel/viewvc/files/patch-lib::viewcvs.py
deleted file mode 100644
index e9d2e4ad4cf..00000000000
--- a/devel/viewvc/files/patch-lib::viewcvs.py
+++ /dev/null
@@ -1,109 +0,0 @@
---- 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()
-     for name, values in cgi.parse().items():
-+      # validate the parameter
-+      _validate_param(name, values[0])
-+
-+      # if we're here, then the parameter is okay
-       query_dict[name] = values[0]
- 
-     # set up query strings, prefixed by question marks and ampersands
-@@ -229,6 +233,77 @@
-     self.taginfo = taginfo
- 
- 
-+def _validate_param(name, value):
-+  """Validate whether the given value is acceptable for the param name.
-+
-+  If the value is not allowed, then an error response is generated, and
-+  this function throws an exception. Otherwise, it simply returns None.
-+  """
-+
-+  try:
-+    validator = _legal_params[name]
-+  except KeyError:
-+    error('An illegal parameter name ("%s") was passed.' % cgi.escape(name))
-+
-+  # is the validator a regex?
-+  if hasattr(validator, 'match'):
-+    if not validator.match(value):
-+      error('An illegal value ("%s") was passed as a parameter.' %
-+            cgi.escape(value))
-+    return
-+
-+  # the validator must be a function
-+  validator(value)
-+
-+def _validate_cvsroot(value):
-+  if not cfg.general.cvs_roots.has_key(value):
-+    error('The CVS root "%s" is unknown.' % cgi.escape(value))
-+
-+def _validate_regex(value):
-+  # hmm. there isn't anything that we can do here.
-+
-+  ### we need to watch the flow of these parameters through the system
-+  ### to ensure they don't hit the page unescaped. otherwise, these
-+  ### parameters could constitute a CSS attack.
-+  pass
-+
-+# obvious things here. note that we don't need uppercase for alpha.
-+_re_validate_alpha = re.compile('^[a-z]+$')
-+_re_validate_number = re.compile('^[0-9]+$')
-+
-+# when comparing two revs, we sometimes construct REV:SYMBOL, so ':' is needed
-+_re_validate_revnum = re.compile('^[-_.a-zA-Z0-9:]+$')
-+
-+# it appears that RFC 2045 also says these chars are legal: !#$%&'*+^{|}~`
-+# but woah... I'll just leave them out for now
-+_re_validate_mimetype = re.compile('^[-_.a-zA-Z0-9/]+$')
-+
-+# the legal query parameters and their validation functions
-+_legal_params = {
-+  'cvsroot'       : _validate_cvsroot,
-+  'search'        : _validate_regex,
-+
-+  'hideattic'     : _re_validate_number,
-+  'sortby'        : _re_validate_alpha,
-+  'sortdir'       : _re_validate_alpha,
-+  'logsort'       : _re_validate_alpha,
-+  'diff_format'   : _re_validate_alpha,
-+  'only_with_tag' : _re_validate_revnum,
-+  'dir_pagestart' : _re_validate_number,
-+  'log_pagestart' : _re_validate_number,
-+  'hidecvsroot'   : _re_validate_number,
-+  'annotate'      : _re_validate_revnum,
-+  'graph'         : _re_validate_revnum,
-+  'makeimage'     : _re_validate_number,
-+  'tarball'       : _re_validate_number,
-+  'r1'            : _re_validate_revnum,
-+  'tr1'           : _re_validate_revnum,
-+  'r2'            : _re_validate_revnum,
-+  'tr2'           : _re_validate_revnum,
-+  '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
- 
diff --git a/devel/viewvc/files/patch-viewcvs-install b/devel/viewvc/files/patch-viewcvs-install
deleted file mode 100644
index aeab05b698f..00000000000
--- a/devel/viewvc/files/patch-viewcvs-install
+++ /dev/null
@@ -1,49 +0,0 @@
---- viewcvs-install.orig	Fri Dec 21 03:59:45 2001
-+++ viewcvs-install	Sun Aug 24 05:38:29 2003
-@@ -51,7 +51,7 @@
- """ % version
- 
- ## installer defaults
--ROOT_DIR = "/usr/local/viewcvs-" + version
-+ROOT_DIR = os.environ['INSTDIR']
- 
- 
- ## list of files for installation
-@@ -65,11 +65,11 @@
-     ("cgi/query.cgi", "cgi/query.cgi", 0755, 1, 0, 0),
-     ("standalone.py", "standalone.py", 0755, 1, 0, 0),
- 
--    ("cgi/viewcvs.conf.dist", "viewcvs.conf", 0644, 1,
-+    ("cgi/viewcvs.conf.dist", "viewcvs.conf.dist", 0644, 1,
- 	     """Note: If you are upgrading from viewcvs-0.7 or earlier: 
- The section [text] has been removed from viewcvs.conf.  The functionality
- went into the new files in subdirectory templates.""", 0),
--    ("cgi/cvsgraph.conf.dist", "cvsgraph.conf", 0644, 0, 1, 0),
-+    ("cgi/cvsgraph.conf.dist", "cvsgraph.conf.dist", 0644, 0, 1, 0),
- 
-     ("lib/PyFontify.py", "lib/PyFontify.py", 0644, 0, 0, 1),
-     ("lib/blame.py", "lib/blame.py", 0644, 0, 0, 1),
-@@ -192,7 +192,7 @@
-     if type(prompt_replace) == type(""):
-       print prompt_replace
-     while 1:
--      temp = raw_input("\n    File %s\n    exists and is different from source file.\n      DO YOU WANT TO,\n        overwrite [o]\n        do not overwrite [d]\n        view differences [v]: " % (dest_path))
-+      temp = 'o'
-       print
- 
-       temp = string.lower(temp[0])
-@@ -245,10 +245,10 @@
-     print INFO_TEXT
-     
-     ## get the install path
--    temp = raw_input("Installation Path [%s]: " % ROOT_DIR)
--    temp = string.strip(temp)
--    if len(temp):
--        ROOT_DIR = temp
-+    #temp = raw_input("Installation Path [%s]: " % ROOT_DIR)
-+    #temp = string.strip(temp)
-+    #if len(temp):
-+    #    ROOT_DIR = temp
-         
-     ## install the files
-     print
diff --git a/devel/viewvc/files/patch-viewvc-install b/devel/viewvc/files/patch-viewvc-install
new file mode 100644
index 00000000000..8c9171bb729
--- /dev/null
+++ b/devel/viewvc/files/patch-viewvc-install
@@ -0,0 +1,16 @@
+--- viewvc-install.orig	Thu Apr 20 15:14:37 2006
++++ viewvc-install	Thu Apr 20 15:15:46 2006
+@@ -67,11 +67,11 @@
+     ("bin/mod_python/handler.py", "bin/mod_python/handler.py", 0755, 1, 0, 0),
+     ("bin/mod_python/.htaccess", "bin/mod_python/.htaccess", 0755, 0, 0, 0),
+     ("bin/standalone.py", "bin/standalone.py", 0755, 1, 0, 0),
+-    ("viewvc.conf.dist", "viewvc.conf", 0644, 0,
++    ("viewvc.conf.dist", "viewvc.conf.dist", 0644, 0,
+ 	     """Note: If you are upgrading from viewcvs-0.7 or earlier: 
+ The section [text] has been removed from viewcvs.conf.  The functionality
+ went into the new files in subdirectory templates.""", 0),
+-    ("cvsgraph.conf.dist", "cvsgraph.conf", 0644, 0, 1, 0),
++    ("cvsgraph.conf.dist", "cvsgraph.conf.dist", 0644, 0, 1, 0),
+ 
+     ("bin/loginfo-handler", "bin/loginfo-handler", 0755, 1, 0, 0),
+     ("bin/cvsdbadmin", "bin/cvsdbadmin", 0755, 1, 0, 0),
diff --git a/devel/viewvc/files/pkg-message.in b/devel/viewvc/files/pkg-message.in
new file mode 100644
index 00000000000..3a39d805e2c
--- /dev/null
+++ b/devel/viewvc/files/pkg-message.in
@@ -0,0 +1,16 @@
+*****************************************************************
+
+If you would like to set up ViewVC in a usable manner, all
+you need to do is modify the configuration file, located at
+%%INSTDIR%%/viewvc.conf, to note where your
+CVSROOT is, and then copy the actual CGI (located at
+%%INSTDIR%%/bin/cgi/viewvc.cgi) to your cgi-bin.
+Please notice that  configuration files are installed as
+".dist" and must be copied to their actual names prior to
+be edited, e.g.:
+$ cd %%INSTDIR%%
+$ cp viewvc.conf.dist viewvc.conf
+$ cp cvsgraph.conf.dist cvsgraph.conf
+It's up to yo to check the ".dist" files after upgrades.
+
+*****************************************************************