Update to version 1.9.

Changes since last packaged version:
   * --no-doc option added to cancel the --doc option even if
     it is implied (e.g., when css is given) (as suggested by Keith Lea
     and Grant McLean)
   * deal with \r correctly (reported by barrett@9hells.org)
   * added scanner for language LUA (thanks to Marc Côté)
   * added scanner for CAML and SML (with the help of Jean-Baptiste Rouquier
     and James Riely)
   * fixed a bug in C++ scanner concerning tabs after # (reported by
     Don Stauffer).
   * If not specified, the source language will be guessed from the
     input file extension.
   * Added src-hilite-lesspipe.sh a script that can be used with less
     in order to higlight the files processed with less
     (suggested by Konstantine Serebriany)
   * fixed a bug in perl scanning when \" is used in regular expressions
     (reported by Geir Nilsen)
   * html attribute values are generated in quotes (bug fixed by
     Patrick Wagstrom)
   * can generate anchors for line numbers (thanks to Oliver Fischer)

5 files changed, 29 insertions, 34 deletions

diff --git a/textproc/source-highlight/Makefile b/textproc/source-highlight/Makefile
index 500f5b5c102..04dc8723d34 100644
--- a/textproc/source-highlight/Makefile
+++ b/textproc/source-highlight/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.11 2004/05/07 14:08:13 seb Exp $
+# $NetBSD: Makefile,v 1.12 2004/05/15 14:55:38 seb Exp $
 #
 
-DISTNAME=	source-highlight-1.8
+DISTNAME=	source-highlight-1.9
 SVR4_PKGNAME=	srchl
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_GNU:=src-highlite/}
diff --git a/textproc/source-highlight/PLIST b/textproc/source-highlight/PLIST
index 916fbec3cc9..d5c5bd5a4fe 100644
--- a/textproc/source-highlight/PLIST
+++ b/textproc/source-highlight/PLIST
@@ -1,10 +1,10 @@
-@comment $NetBSD: PLIST,v 1.5 2003/10/03 14:42:38 seb Exp $
+@comment $NetBSD: PLIST,v 1.6 2004/05/15 14:55:38 seb Exp $
 bin/cpp2html
 bin/java2html
 bin/source-highlight
 bin/source-highlight-cgi
+bin/src-hilite-lesspipe.sh
 man/man1/source-highlight.1
-share/doc/html/source-highlight/ChangeLog.html
 share/doc/html/source-highlight/Hello.css
 share/doc/html/source-highlight/Hello.java
 share/doc/html/source-highlight/Hello.java.html
@@ -28,11 +28,14 @@ share/doc/html/source-highlight/mono.css
 share/doc/html/source-highlight/source-highlight.html
 share/doc/html/source-highlight/startapp.cc.html
 share/doc/html/source-highlight/test.js.html
+share/doc/html/source-highlight/test.lua.html
+share/doc/html/source-highlight/test.ml.html
 share/doc/html/source-highlight/test.php3.html
 share/doc/html/source-highlight/test.pl.html
 share/doc/html/source-highlight/test.pm.html
 share/doc/html/source-highlight/test.py.html
 share/doc/html/source-highlight/test.rb.html
+share/doc/html/source-highlight/test.sml.html
 share/doc/html/source-highlight/xhtml.css
 share/doc/source-highlight/COPYING
 share/doc/source-highlight/CREDITS
diff --git a/textproc/source-highlight/distinfo b/textproc/source-highlight/distinfo
index 881de3990db..eeadcbc8227 100644
--- a/textproc/source-highlight/distinfo
+++ b/textproc/source-highlight/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.6 2003/10/03 14:42:38 seb Exp $
+$NetBSD: distinfo,v 1.7 2004/05/15 14:55:38 seb Exp $
 
-SHA1 (source-highlight-1.8.tar.gz) = 4116ac69a69486c87443de12f32ba3e78b3d371e
-Size (source-highlight-1.8.tar.gz) = 611213 bytes
+SHA1 (source-highlight-1.9.tar.gz) = b7acc3e354a3043c517f7efa4ddb5e0924464a68
+Size (source-highlight-1.9.tar.gz) = 682343 bytes
 SHA1 (patch-aa) = 3f124bcdc738222dedd0f961e26da3f374700680
 SHA1 (patch-ab) = ecb8ce16381bd68b55f309a0ae43912319138575
 SHA1 (patch-ac) = 62475d945664b84eb4a6e43e5cd4c75f9049eefe
 SHA1 (patch-ad) = 7be6c33e8dbcc61f09ede32b25f6c912bb41b4de
-SHA1 (patch-ag) = 9ee8c56adb295e417f9213e45aa4159b617d28f7
-SHA1 (patch-ah) = 451cb39ccc0b955773490292ac1311e242c82201
+SHA1 (patch-ag) = 77d3668ad1573fee7423aa3651c77ae64fd7cbb7
+SHA1 (patch-ah) = a0df2fb54d9093834d2a017efc3ff512bbd517bf
diff --git a/textproc/source-highlight/patches/patch-ag b/textproc/source-highlight/patches/patch-ag
index d5b918a9ce5..858b42f23b9 100644
--- a/textproc/source-highlight/patches/patch-ag
+++ b/textproc/source-highlight/patches/patch-ag
@@ -1,13 +1,13 @@
-$NetBSD: patch-ag,v 1.3 2003/10/03 14:42:39 seb Exp $
+$NetBSD: patch-ag,v 1.4 2004/05/15 14:55:38 seb Exp $
 
---- tests/Makefile.am.orig	2003-08-31 13:56:10.000000000 +0000
+--- tests/Makefile.am.orig	2004-03-08 19:13:31.000000000 +0000
 +++ tests/Makefile.am
-@@ -211,7 +211,7 @@ check_ruby: test.rb.html test_comments.r
- 	diff $(srcdir)/test.rb.html test.rb.out.html
- 	diff $(srcdir)/test_comments.rb.html test_comments.rb.out.html
+@@ -255,7 +255,7 @@ check_sml: test.sml.html
+ 	@echo expect no output from diff
+ 	diff $(srcdir)/test.sml.html test.sml.out.html
  
 -source_highlightdoc_DATA = test.php3.html test.pl.html test.pm.html \
 +source_highlightdochtml_DATA = test.php3.html test.pl.html test.pm.html \
- test.py.html test.rb.html test.js.html
+ test.py.html test.rb.html test.js.html test.lua.html test.ml.html \
+ test.sml.html
  
- CLEANFILES = *.out.html *.out.txt
diff --git a/textproc/source-highlight/patches/patch-ah b/textproc/source-highlight/patches/patch-ah
index 9e1676b81a2..764ceb6dee0 100644
--- a/textproc/source-highlight/patches/patch-ah
+++ b/textproc/source-highlight/patches/patch-ah
@@ -1,6 +1,6 @@
-$NetBSD: patch-ah,v 1.4 2003/10/03 14:42:39 seb Exp $
+$NetBSD: patch-ah,v 1.5 2004/05/15 14:55:38 seb Exp $
 
---- tests/Makefile.in.orig	2003-10-03 14:29:44.000000000 +0000
+--- tests/Makefile.in.orig	2004-04-19 11:19:02.000000000 +0000
 +++ tests/Makefile.in
 @@ -138,6 +138,7 @@ sbindir = @sbindir@
  sharedstatedir = @sharedstatedir@
@@ -10,33 +10,25 @@ $NetBSD: patch-ah,v 1.4 2003/10/03 14:42:39 seb Exp $
  sysconfdir = @sysconfdir@
  target_alias = @target_alias@
  
-@@ -194,7 +195,7 @@ test.java.txt
+@@ -209,7 +210,7 @@ test.sml test.sml.html
  
  CPP2HTML_WHEADERS = $(CPP2HTML) --header=$(srcdir)/header.html --footer=$(srcdir)/footer.html --title="Header and footer test"
  
 -source_highlightdoc_DATA = test.php3.html test.pl.html test.pm.html \
 +source_highlightdochtml_DATA = test.php3.html test.pl.html test.pm.html \
- test.py.html test.rb.html test.js.html
+ test.py.html test.rb.html test.js.html test.lua.html test.ml.html \
+ test.sml.html
  
- 
-@@ -203,8 +204,10 @@ subdir = tests
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+@@ -220,7 +221,7 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/m
  CONFIG_HEADER = $(top_builddir)/config.h
  CONFIG_CLEAN_FILES =
-+depcomp =
-+am__depfiles_maybe =
  DIST_SOURCES =
 -DATA = $(source_highlightdoc_DATA)
 +DATA = $(source_highlightdochtml_DATA)
  
  DIST_COMMON = Makefile.am Makefile.in
  all: all-am
-@@ -212,27 +215,27 @@ all: all-am
- .SUFFIXES:
- $(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
- 	cd $(top_srcdir) && \
--	  $(AUTOMAKE) --gnu  tests/Makefile
-+	  $(AUTOMAKE) --foreign  --ignore-deps tests/Makefile
+@@ -232,23 +233,23 @@ $(srcdir)/Makefile.in:  Makefile.am  $(t
  Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
  	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
  uninstall-info-am:
@@ -70,7 +62,7 @@ $NetBSD: patch-ah,v 1.4 2003/10/03 14:42:39 seb Exp $
  	done
  tags: TAGS
  TAGS:
-@@ -277,7 +280,7 @@ check: check-am
+@@ -293,7 +294,7 @@ check: check-am
  all-am: Makefile $(DATA)
  
  installdirs:
@@ -79,7 +71,7 @@ $NetBSD: patch-ah,v 1.4 2003/10/03 14:42:39 seb Exp $
  
  install: install-am
  install-exec: install-exec-am
-@@ -320,7 +323,7 @@ info: info-am
+@@ -336,7 +337,7 @@ info: info-am
  
  info-am:
  
@@ -88,7 +80,7 @@ $NetBSD: patch-ah,v 1.4 2003/10/03 14:42:39 seb Exp $
  
  install-exec-am:
  
-@@ -346,17 +349,17 @@ ps: ps-am
+@@ -362,17 +363,17 @@ ps: ps-am
  
  ps-am: