Update to version 2.1.2.

Add build dependencies on GNU make and GNU sed for 'test' target's benefit.

Support for input chroot, via make variable SOURCE_HIGHLIGHT_INPUT_CHROOT,
deactivated otherwise the build is broken.

XXX Is 'TOOLS_PLATFORM.gsed= # empty' the proper way to override a
the platform sed tool ?

Relinquish stewardship.

Changes since last packaged version (1.11):
Version 2.1.2
   * fixed conversion of hexadecimal characters in output language
     definitions
   * fixed compilation error with regex 1.33
   * include man page
   * fixed a bug with LaTeX output of " with some inputencs

Version 2.1.1
   * fixed a bug that sigsegv when more than one input file
     is provided
   * fixed a compilation error with gcc 4.0

Version 2.1
   * Included obsolete man page.
   * output language format specifications are read at run-time
     so that new output languages can be easily added dynamically
     (without recompiling the sources) by using a simple syntax.
   * "fixed" and "notfixed" styles can be specified.
   * fixed the handling of end-of-line (processed only once)
   * LaTeX output
   * TeXinfo output
   * debug of a language definition
   * tags.j2h files are now called style files.
   * renamed --tags-file option in --style-file
   * allows to specify a prefix for the generated line number anchors
   * --header and --footer do not imply --doc
   * language definition for LogTalk and LaTeX

Version 2.0
   * Language specifications are read at run-time, so that
     new languages can be easily added dynamically (without recompiling
     the sources) by using a simple syntax.
   * "nonsensitive" for simple definitions
   * cgi version not built automatically
   * failsafe option to simply output the input file when no
     language definition is found
   * functionalities with less improved.

Version 1.11.1
   * fixed compilations problems on some Unix compilers

11 files changed, 829 insertions, 309 deletions

diff --git a/textproc/source-highlight/Makefile b/textproc/source-highlight/Makefile
index 5a7b95cc87f..7f32f030495 100644
--- a/textproc/source-highlight/Makefile
+++ b/textproc/source-highlight/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.16 2005/04/11 21:47:42 tv Exp $
+# $NetBSD: Makefile,v 1.17 2005/10/10 09:05:59 seb Exp $
 #
 
-DISTNAME=	source-highlight-1.11
+DISTNAME=	source-highlight-2.1.2
 SVR4_PKGNAME=	srchl
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_GNU:=src-highlite/}
@@ -13,13 +13,26 @@ COMMENT=	Highlight syntax of various languages source into HTML document
 GNU_CONFIGURE=	YES
 USE_LANGUAGES=	c c++
 
+INFO_FILES=	source-highlight.info
+
+# this is only really needed for the 'test' target
+USE_TOOLS+=	gmake gsed
 TEST_TARGET=	check
 
+BUILDLINK_TRANSFORM+=	l:boost_regex:boost_regex-mt
+
 .include "../../mk/bsd.prefs.mk"
 
-.ifdef SOURCE_HIGHLIGHT_INPUT_CHROOT
-CONFIGURE_ARGS+=	--enable-input-chroot=${SOURCE_HIGHLIGHT_INPUT_CHROOT}
-BUILD_DEFS+=		SOURCE_HIGHLIGHT_INPUT_CHROOT
+.if "${OPSYS}" == "NetBSD"
+# We really need GNU sed not NetBSD's GNuish sed
+TOOLS_PLATFORM.gsed=	# empty
 .endif
 
+# Build is broken with input chroot
+#.ifdef SOURCE_HIGHLIGHT_INPUT_CHROOT
+#CONFIGURE_ARGS+=	--enable-input-chroot=${SOURCE_HIGHLIGHT_INPUT_CHROOT:Q}
+#BUILD_DEFS+=		SOURCE_HIGHLIGHT_INPUT_CHROOT
+#.endif
+
+.include "../../devel/boost-libs/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/source-highlight/PLIST b/textproc/source-highlight/PLIST
index ef026c22d60..a3b2342ec18 100644
--- a/textproc/source-highlight/PLIST
+++ b/textproc/source-highlight/PLIST
@@ -1,9 +1,9 @@
-@comment $NetBSD: PLIST,v 1.8 2004/10/21 00:15:47 seb Exp $
+@comment $NetBSD: PLIST,v 1.9 2005/10/10 09:05:59 seb Exp $
 bin/cpp2html
 bin/java2html
 bin/source-highlight
-bin/source-highlight-cgi
 bin/src-hilite-lesspipe.sh
+info/source-highlight.info
 man/man1/source-highlight.1
 share/doc/html/source-highlight/Hello.css
 share/doc/html/source-highlight/Hello.java
@@ -26,13 +26,15 @@ share/doc/html/source-highlight/colors.html
 share/doc/html/source-highlight/cpp2html.css
 share/doc/html/source-highlight/error.log.html
 share/doc/html/source-highlight/flex_scanner.ll.html
+share/doc/html/source-highlight/index.html
 share/doc/html/source-highlight/mono-alt.css
 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/syslog.log.html
-share/doc/html/source-highlight/tags.esc
-share/doc/html/source-highlight/tags.syslog
+share/doc/html/source-highlight/syslog.style
+share/doc/html/source-highlight/test.htm.html
+share/doc/html/source-highlight/test.java.tex.html
 share/doc/html/source-highlight/test.js.html
 share/doc/html/source-highlight/test.log.html
 share/doc/html/source-highlight/test.lua.html
@@ -53,8 +55,52 @@ share/doc/source-highlight/README
 share/doc/source-highlight/README.compile_VC6
 share/doc/source-highlight/THANKS
 share/doc/source-highlight/TODO.txt
-share/source-highlight/tags.j2h
-share/source-highlight/tags2.j2h
+share/source-highlight/bison.lang
+share/source-highlight/c_comment.lang
+share/source-highlight/caml.lang
+share/source-highlight/changelog.lang
+share/source-highlight/cpp.lang
+share/source-highlight/css_common.outlang
+share/source-highlight/cssdoc.outlang
+share/source-highlight/default.style
+share/source-highlight/esc.outlang
+share/source-highlight/esc.style
+share/source-highlight/flex.lang
+share/source-highlight/fortran.lang
+share/source-highlight/function.lang
+share/source-highlight/html.lang
+share/source-highlight/html.outlang
+share/source-highlight/html_common.outlang
+share/source-highlight/htmldoc.outlang
+share/source-highlight/java.lang
+share/source-highlight/javascript.lang
+share/source-highlight/lang.map
+share/source-highlight/latex.lang
+share/source-highlight/latex.outlang
+share/source-highlight/latexcolor.outlang
+share/source-highlight/latexcolordoc.outlang
+share/source-highlight/latexdoc.outlang
+share/source-highlight/log.lang
+share/source-highlight/logtalk.lang
+share/source-highlight/lua.lang
+share/source-highlight/number.lang
+share/source-highlight/outlang.map
+share/source-highlight/pascal.lang
+share/source-highlight/perl.lang
+share/source-highlight/php.lang
+share/source-highlight/prolog.lang
+share/source-highlight/python.lang
+share/source-highlight/ruby.lang
+share/source-highlight/sml.lang
+share/source-highlight/style2.style
+share/source-highlight/style3.style
+share/source-highlight/symbols.lang
+share/source-highlight/texinfo.outlang
+share/source-highlight/texinfo.style
+share/source-highlight/url.lang
+share/source-highlight/xhtml.outlang
+share/source-highlight/xhtmlcss.outlang
+share/source-highlight/xhtmldoc.outlang
 @dirrm share/source-highlight
 @dirrm share/doc/source-highlight
 @dirrm share/doc/html/source-highlight
diff --git a/textproc/source-highlight/distinfo b/textproc/source-highlight/distinfo
index 8cd6138e4ea..370b7d3bda2 100644
--- a/textproc/source-highlight/distinfo
+++ b/textproc/source-highlight/distinfo
@@ -1,14 +1,14 @@
-$NetBSD: distinfo,v 1.12 2005/02/24 14:48:49 agc Exp $
+$NetBSD: distinfo,v 1.13 2005/10/10 09:05:59 seb Exp $
 
-SHA1 (source-highlight-1.11.tar.gz) = 67bfdfcfe525dc4e61143e8e5865f8d977fe2b58
-RMD160 (source-highlight-1.11.tar.gz) = c096bcbf0985bfff0c7416acd27b25313761c905
-Size (source-highlight-1.11.tar.gz) = 722472 bytes
-SHA1 (patch-aa) = 3f124bcdc738222dedd0f961e26da3f374700680
-SHA1 (patch-ab) = 8b8d92e8bfe8773b7eeff6d7d794f4b8f47218ac
-SHA1 (patch-ac) = 62475d945664b84eb4a6e43e5cd4c75f9049eefe
-SHA1 (patch-ad) = e9635748cedbc11d7a0c7a68f149e8647a3ddbc0
-SHA1 (patch-ae) = ea3b682e89556a8c32b990585c07c6cd48fb24d9
-SHA1 (patch-af) = 55f91e0f744ca0028db5aa04806084e057191637
-SHA1 (patch-ag) = e56f2f94ae8cc22766d11ee3729ad3e6410f3240
-SHA1 (patch-ah) = ba914d5f459bda5da8a57ad83b53abb4bc474701
+SHA1 (source-highlight-2.1.2.tar.gz) = 378ff93218a29db42f9b56e3c88fb18751686259
+RMD160 (source-highlight-2.1.2.tar.gz) = f4a54515efb7952a0f5105bc97d60929c726fd2f
+Size (source-highlight-2.1.2.tar.gz) = 557143 bytes
+SHA1 (patch-aa) = e4911d6c15c81fd1a24f517c0e5a7d3302c62656
+SHA1 (patch-ab) = 51752354b791007ffbe2ec560d322a0526036951
+SHA1 (patch-ac) = b2c5e51a85660d0e298dbfca6f3a335dde68b3d3
+SHA1 (patch-ad) = 3bdbd5e9ef87eeb0869ebd5a64e3d0e9f934f69a
+SHA1 (patch-ae) = 1695543aaee9a414fe0267c8e4798be7ed507760
+SHA1 (patch-af) = 6131f0c5be4c6c0819abc591fd0f8a7a6ab8a05a
+SHA1 (patch-ag) = 469d098f73ab695a46bf3ac4a69f033f85f676e8
+SHA1 (patch-ah) = 8b001b2fb917e067bfb8a2f45c41b24f3294b05b
 SHA1 (patch-ai) = 8571124ee2190bc0da0d78046aa8bcd542296857
diff --git a/textproc/source-highlight/patches/patch-aa b/textproc/source-highlight/patches/patch-aa
index 5ef07f8bca8..be2b56ec38b 100644
--- a/textproc/source-highlight/patches/patch-aa
+++ b/textproc/source-highlight/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.1 2002/12/23 22:27:50 seb Exp $
+$NetBSD: patch-aa,v 1.2 2005/10/10 09:05:59 seb Exp $
 
---- configure.in.orig	Wed Oct 30 18:21:25 2002
-+++ configure.in
-@@ -17,9 +17,11 @@ AM_INIT_AUTOMAKE(source-highlight,1.6.1)
+--- configure.ac.orig	2005-08-25 14:09:51.000000000 +0000
++++ configure.ac
+@@ -17,9 +17,11 @@ AM_INIT_AUTOMAKE(source-highlight,2.1.2)
  
  AC_SUBST(source_highlightdatadir)
  AC_SUBST(source_highlightdocdir)
@@ -12,5 +12,12 @@ $NetBSD: patch-aa,v 1.1 2002/12/23 22:27:50 seb Exp $
  source_highlightdocdir=$datadir/doc/source-highlight
 +source_highlightdochtmldir=$datadir/doc/html/source-highlight
  
- dnl scanner version
- 
+ dnl Checks for C compiler.
+ AC_PROG_CC
+@@ -216,4 +218,4 @@ if test -z "$ac_cv_path_HELP2MAN"; then
+ help2man is not installed so the man page will not
+ be updated in case command line options are changed.
+ This is important for maintainers only, though.])
+-fi
+\ No newline at end of file
++fi
diff --git a/textproc/source-highlight/patches/patch-ab b/textproc/source-highlight/patches/patch-ab
index e0d0a67bbf7..f751876b845 100644
--- a/textproc/source-highlight/patches/patch-ab
+++ b/textproc/source-highlight/patches/patch-ab
@@ -1,32 +1,20 @@
-$NetBSD: patch-ab,v 1.2 2004/08/16 15:21:45 seb Exp $
+$NetBSD: patch-ab,v 1.3 2005/10/10 09:05:59 seb Exp $
 
---- configure.orig	2004-08-16 14:10:31.000000000 +0000
-+++ configure
-@@ -309,7 +309,7 @@ ac_includes_default="\
- # include <unistd.h>
- #endif"
- 
--ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot source_highlightdatadir source_highlightdocdir JAVA_SCANNER_VERSION CPP_SCANNER_VERSION PROLOG_SCANNER_VERSION PERL_SCANNER_VERSION PHP3_SCANNER_VERSION PYTHON_SCANNER_VERSION CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE ar_to_use CPP EGREP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE RANLIB ac_ct_RANLIB CHROOT_INPUT_DIR TXTC YACC LEX LEXLIB LEX_OUTPUT_ROOT LIBOBJS CXXCPP GENGETOPT NO_GENGETOPT_TRUE NO_GENGETOPT_FALSE YFLAGS TAR LTLIBOBJS'
-+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot source_highlightdatadir source_highlightdocdir source_highlightdochtmldir JAVA_SCANNER_VERSION CPP_SCANNER_VERSION PROLOG_SCANNER_VERSION PERL_SCANNER_VERSION PHP3_SCANNER_VERSION PYTHON_SCANNER_VERSION CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE ar_to_use CPP EGREP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE RANLIB ac_ct_RANLIB CHROOT_INPUT_DIR TXTC YACC LEX LEXLIB LEX_OUTPUT_ROOT LIBOBJS CXXCPP GENGETOPT NO_GENGETOPT_TRUE NO_GENGETOPT_FALSE YFLAGS TAR LTLIBOBJS'
- ac_subst_files=''
- 
- # Initialize some variables set by options.
-@@ -1744,8 +1744,10 @@ INSTALL_STRIP_PROGRAM="\${SHELL} \$(inst
- 
- 
- 
-+
- source_highlightdatadir=$datadir/source-highlight
- source_highlightdocdir=$datadir/doc/source-highlight
-+source_highlightdochtmldir=$datadir/doc/html/source-highlight
- 
- 
- 
-@@ -7341,6 +7343,7 @@ s,@SET_MAKE@,$SET_MAKE,;t t
- s,@am__leading_dot@,$am__leading_dot,;t t
- s,@source_highlightdatadir@,$source_highlightdatadir,;t t
- s,@source_highlightdocdir@,$source_highlightdocdir,;t t
-+s,@source_highlightdochtmldir@,$source_highlightdochtmldir,;t t
- s,@JAVA_SCANNER_VERSION@,$JAVA_SCANNER_VERSION,;t t
- s,@CPP_SCANNER_VERSION@,$CPP_SCANNER_VERSION,;t t
- s,@PROLOG_SCANNER_VERSION@,$PROLOG_SCANNER_VERSION,;t t
+--- doc/Makefile.am.orig	2005-08-25 14:10:51.000000000 +0000
++++ doc/Makefile.am
+@@ -71,7 +71,7 @@ EXTRA_DIST = colors.html source-highligh
+              gpl.texinfo flex_scanner.ll $(GENERATEDINFOS) \
+              source-highlight.1
+ 
+-source_highlightdoc_DATA = colors.html source-highlight.html \
++source_highlightdochtml_DATA = colors.html source-highlight.html \
+     Hello.java Hello1.html Hello2.html Hello3.html Hello4.html Hello5.html \
+     Hello.java.html Hello_h_f.html Hello_lines.html Hello_xhtml.html \
+     Hello_xhtml2.html \
+@@ -167,4 +167,4 @@ flex_scanner.ll.html
+ html-clean:
+ 	rm -f $(HTML_GENERATED_FILES)
+ 
+-DISTCLEANFILES = $(HTML_GENERATED_FILES) source-highlight.1 $(GENERATEDINFOS)
+\ No newline at end of file
++DISTCLEANFILES = $(HTML_GENERATED_FILES) source-highlight.1 $(GENERATEDINFOS)
diff --git a/textproc/source-highlight/patches/patch-ac b/textproc/source-highlight/patches/patch-ac
index 057b1a65069..ab4fddf11e5 100644
--- a/textproc/source-highlight/patches/patch-ac
+++ b/textproc/source-highlight/patches/patch-ac
@@ -1,13 +1,13 @@
-$NetBSD: patch-ac,v 1.2 2003/06/12 01:17:31 seb Exp $
+$NetBSD: patch-ac,v 1.3 2005/10/10 09:05:59 seb Exp $
 
---- doc/Makefile.am.orig	2003-03-17 09:38:40.000000000 +0000
-+++ doc/Makefile.am
-@@ -34,7 +34,7 @@ EXTRA_DIST = colors.html @PACKAGE@.html 
-              header.html footer.html \
-              startapp.cc.html cmdline.c.html cmdline.h.html
+--- tests/Makefile.am.orig	2005-08-25 14:01:56.000000000 +0000
++++ tests/Makefile.am
+@@ -459,7 +459,7 @@ check_debug: debug.debug
+ 	@echo expect no output from diff
+ 	diff $(srcdir)/debug.debug debug.out.debug
  
--source_highlightdoc_DATA = colors.html @PACKAGE@.html \
-+source_highlightdochtml_DATA = colors.html @PACKAGE@.html \
-     Hello.java Hello1.html Hello2.html Hello3.html Hello4.html Hello5.html \
-     Hello.java.html Hello_h_f.html Hello_lines.html Hello_xhtml.html \
-     Hello_xhtml2.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.lua.html test.ml.html \
+ test.sml.html test.log.html access.log.html auth.log.html error.log.html syslog.log.html test.htm.html test.java.tex.html \
+ syslog.style
diff --git a/textproc/source-highlight/patches/patch-ad b/textproc/source-highlight/patches/patch-ad
index 70d3b56d5dd..c9dad593ec0 100644
--- a/textproc/source-highlight/patches/patch-ad
+++ b/textproc/source-highlight/patches/patch-ad
@@ -1,110 +1,436 @@
-$NetBSD: patch-ad,v 1.4 2004/08/16 15:21:45 seb Exp $
+$NetBSD: patch-ad,v 1.5 2005/10/10 09:05:59 seb Exp $
 
---- doc/Makefile.in.orig	2004-08-16 14:10:12.000000000 +0000
-+++ doc/Makefile.in
-@@ -59,11 +59,11 @@ CONFIG_CLEAN_FILES = source-highlight.ht
- SOURCES =
- DIST_SOURCES =
- man1dir = $(mandir)/man1
--am__installdirs = "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(source_highlightdocdir)"
-+am__installdirs = "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(source_highlightdochtmldir)"
- NROFF = nroff
- MANS = $(man_MANS)
--source_highlightdocDATA_INSTALL = $(INSTALL_DATA)
--DATA = $(source_highlightdoc_DATA)
-+source_highlightdochtmlDATA_INSTALL = $(INSTALL_DATA)
-+DATA = $(source_highlightdochtml_DATA)
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- ACLOCAL = @ACLOCAL@
- AMDEP_FALSE = @AMDEP_FALSE@
-@@ -161,6 +161,7 @@ sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
- source_highlightdatadir = @source_highlightdatadir@
- source_highlightdocdir = @source_highlightdocdir@
-+source_highlightdochtmldir = @source_highlightdochtmldir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
- TAGS_J2H_OPTION = --tags-file $(top_srcdir)/src/tags.j2h 
-@@ -182,7 +183,7 @@ EXTRA_DIST = colors.html @PACKAGE@.html 
-              header.html footer.html \
-              startapp.cc.html cmdline.c.html cmdline.h.html
+--- configure.orig	2005-10-09 09:26:55.000000000 +0000
++++ configure
+@@ -309,7 +309,7 @@ ac_includes_default="\
+ # include <unistd.h>
+ #endif"
  
--source_highlightdoc_DATA = colors.html @PACKAGE@.html \
-+source_highlightdochtml_DATA = colors.html @PACKAGE@.html \
-     Hello.java Hello1.html Hello2.html Hello3.html Hello4.html Hello5.html \
-     Hello.java.html Hello_h_f.html Hello_lines.html Hello_xhtml.html \
-     Hello_xhtml2.html \
-@@ -291,22 +292,22 @@ uninstall-man1:
- 	  echo " rm -f '$(DESTDIR)$(man1dir)/$$inst'"; \
- 	  rm -f "$(DESTDIR)$(man1dir)/$$inst"; \
- 	done
--install-source_highlightdocDATA: $(source_highlightdoc_DATA)
-+install-source_highlightdochtmlDATA: $(source_highlightdochtml_DATA)
- 	@$(NORMAL_INSTALL)
--	test -z "$(source_highlightdocdir)" || $(mkdir_p) "$(DESTDIR)$(source_highlightdocdir)"
--	@list='$(source_highlightdoc_DATA)'; for p in $$list; do \
-+	test -z "$(source_highlightdochtmldir)" || $(mkdir_p) "$(DESTDIR)$(source_highlightdochtmldir)"
-+	@list='$(source_highlightdochtml_DATA)'; for p in $$list; do \
- 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- 	  f="`echo $$p | sed -e 's|^.*/||'`"; \
--	  echo " $(source_highlightdocDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(source_highlightdocdir)/$$f'"; \
--	  $(source_highlightdocDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(source_highlightdocdir)/$$f"; \
-+	  echo " $(source_highlightdochtmlDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(source_highlightdochtmldir)/$$f'"; \
-+	  $(source_highlightdochtmlDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(source_highlightdochtmldir)/$$f"; \
- 	done
+-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar source_highlightdatadir source_highlightdocdir CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE ar_to_use CPP EGREP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE RANLIB ac_ct_RANLIB BOOST_REGEX_LIB CXXCPP CHROOT_INPUT_DIR TXTC YACC LEX LEXLIB LEX_OUTPUT_ROOT LIBOBJS GENGETOPT NO_GENGETOPT_TRUE NO_GENGETOPT_FALSE DOUBLECPP NO_DOUBLECPP_TRUE NO_DOUBLECPP_FALSE VALGRIND HELP2MAN NO_HELP2MAN_TRUE NO_HELP2MAN_FALSE YFLAGS TAR TEXI2HTML LTLIBOBJS'
++ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar source_highlightdatadir source_highlightdocdir source_highlightdochtmldir CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE ar_to_use CPP EGREP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE RANLIB ac_ct_RANLIB BOOST_REGEX_LIB CXXCPP CHROOT_INPUT_DIR TXTC YACC LEX LEXLIB LEX_OUTPUT_ROOT LIBOBJS GENGETOPT NO_GENGETOPT_TRUE NO_GENGETOPT_FALSE DOUBLECPP NO_DOUBLECPP_TRUE NO_DOUBLECPP_FALSE VALGRIND HELP2MAN NO_HELP2MAN_TRUE NO_HELP2MAN_FALSE YFLAGS TAR TEXI2HTML LTLIBOBJS'
+ ac_subst_files=''
  
--uninstall-source_highlightdocDATA:
-+uninstall-source_highlightdochtmlDATA:
- 	@$(NORMAL_UNINSTALL)
--	@list='$(source_highlightdoc_DATA)'; for p in $$list; do \
-+	@list='$(source_highlightdochtml_DATA)'; for p in $$list; do \
- 	  f="`echo $$p | sed -e 's|^.*/||'`"; \
--	  echo " rm -f '$(DESTDIR)$(source_highlightdocdir)/$$f'"; \
--	  rm -f "$(DESTDIR)$(source_highlightdocdir)/$$f"; \
-+	  echo " rm -f '$(DESTDIR)$(source_highlightdochtmldir)/$$f'"; \
-+	  rm -f "$(DESTDIR)$(source_highlightdochtmldir)/$$f"; \
- 	done
- tags: TAGS
- TAGS:
-@@ -346,7 +347,7 @@ check-am: all-am
- check: check-am
- all-am: Makefile $(MANS) $(DATA)
- installdirs:
--	for dir in "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(source_highlightdocdir)"; do \
-+	for dir in "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(source_highlightdochtmldir)"; do \
- 	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
- 	done
- install: install-am
-@@ -392,7 +393,7 @@ info: info-am
+ # Initialize some variables set by options.
+@@ -970,7 +970,7 @@ esac
+     else
+       echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
+     fi
+-    cd "$ac_popdir"
++    cd $ac_popdir
+   done
+ fi
  
- info-am:
+@@ -1761,8 +1761,10 @@ am__tar='${AMTAR} chof - "$$tardir"'; am
  
--install-data-am: install-man install-source_highlightdocDATA
-+install-data-am: install-man install-source_highlightdochtmlDATA
  
- install-exec-am:
  
-@@ -419,7 +420,7 @@ ps: ps-am
- ps-am:
++
+ source_highlightdatadir=$datadir/source-highlight
+ source_highlightdocdir=$datadir/doc/source-highlight
++source_highlightdochtmldir=$datadir/doc/html/source-highlight
  
- uninstall-am: uninstall-info-am uninstall-man \
--	uninstall-source_highlightdocDATA
-+	uninstall-source_highlightdochtmlDATA
+ ac_ext=c
+ ac_cpp='$CPP $CPPFLAGS'
+@@ -2332,7 +2334,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -2390,7 +2393,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -2506,7 +2510,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -2560,7 +2565,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -2605,7 +2611,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -2649,7 +2656,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -2978,7 +2986,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -3292,7 +3301,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -3462,7 +3472,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -3527,7 +3538,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -3594,7 +3606,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -3743,7 +3756,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -3928,7 +3942,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -3997,7 +4012,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -4181,7 +4197,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_cxx_werror_flag"
++			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -4239,7 +4256,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_cxx_werror_flag"
++			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -4310,7 +4328,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_cxx_werror_flag"
++			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -4354,7 +4373,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_cxx_werror_flag"
++			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -4773,7 +4793,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_cxx_werror_flag"
++			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -4854,7 +4875,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_cxx_werror_flag"
++			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -4934,7 +4956,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_cxx_werror_flag"
++			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -5014,7 +5037,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_cxx_werror_flag"
++			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -5090,7 +5114,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_cxx_werror_flag"
++			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -5169,7 +5194,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_cxx_werror_flag"
++			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -5467,7 +5493,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_cxx_werror_flag"
++			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -5742,7 +5769,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_cxx_werror_flag"
++			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -5808,7 +5836,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_cxx_werror_flag"
++			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -5897,7 +5926,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_cxx_werror_flag"
++			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -5969,7 +5999,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_cxx_werror_flag"
++			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -6036,7 +6067,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_cxx_werror_flag"
++			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -6136,7 +6168,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_cxx_werror_flag"
++			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -6212,7 +6245,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_cxx_werror_flag"
++			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -6378,7 +6412,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_cxx_werror_flag"
++			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -6563,7 +6598,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_cxx_werror_flag"
++			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -6633,7 +6669,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_cxx_werror_flag"
++			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -6817,7 +6854,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_cxx_werror_flag"
++			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -6886,7 +6924,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
++	 { ac_try='test -z "$ac_cxx_werror_flag"
++			 || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -7974,6 +8013,7 @@ s,@am__tar@,$am__tar,;t t
+ s,@am__untar@,$am__untar,;t t
+ s,@source_highlightdatadir@,$source_highlightdatadir,;t t
+ s,@source_highlightdocdir@,$source_highlightdocdir,;t t
++s,@source_highlightdochtmldir@,$source_highlightdochtmldir,;t t
+ s,@CC@,$CC,;t t
+ s,@CFLAGS@,$CFLAGS,;t t
+ s,@LDFLAGS@,$LDFLAGS,;t t
+@@ -8190,6 +8230,11 @@ esac
+   *) ac_INSTALL=$ac_top_builddir$INSTALL ;;
+   esac
  
- uninstall-man: uninstall-man1
- 
-@@ -427,11 +428,12 @@ uninstall-man: uninstall-man1
- 	distclean-generic distdir dvi dvi-am html html-am info info-am \
- 	install install-am install-data install-data-am install-exec \
- 	install-exec-am install-info install-info-am install-man \
--	install-man1 install-source_highlightdocDATA install-strip \
-+	install-man1 install-source_highlightdochtmlDATA install-strip \
- 	installcheck installcheck-am installdirs maintainer-clean \
- 	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
- 	pdf-am ps ps-am uninstall uninstall-am uninstall-info-am \
--	uninstall-man uninstall-man1 uninstall-source_highlightdocDATA
-+	uninstall-man uninstall-man1 \
-+	uninstall-source_highlightdochtmlDATA
- 
- 
- # note that $(srcdir) actually points to doc dir
++  if test x"$ac_file" != x-; then
++    { echo "$as_me:$LINENO: creating $ac_file" >&5
++echo "$as_me: creating $ac_file" >&6;}
++    rm -f "$ac_file"
++  fi
+   # Let's still pretend it is `configure' which instantiates (i.e., don't
+   # use $as_me), people would be surprised to read:
+   #    /* config.h.  Generated by config.status.  */
+@@ -8228,12 +8273,6 @@ echo "$as_me: error: cannot find input f
+ 	 fi;;
+       esac
+     done` || { (exit 1); exit 1; }
+-
+-  if test x"$ac_file" != x-; then
+-    { echo "$as_me:$LINENO: creating $ac_file" >&5
+-echo "$as_me: creating $ac_file" >&6;}
+-    rm -f "$ac_file"
+-  fi
+ _ACEOF
+ cat >>$CONFIG_STATUS <<_ACEOF
+   sed "$ac_vpsub
diff --git a/textproc/source-highlight/patches/patch-ae b/textproc/source-highlight/patches/patch-ae
index 3871b8a0fae..d6894d9f679 100644
--- a/textproc/source-highlight/patches/patch-ae
+++ b/textproc/source-highlight/patches/patch-ae
@@ -1,8 +1,8 @@
-$NetBSD: patch-ae,v 1.3 2004/05/16 12:22:40 seb Exp $
+$NetBSD: patch-ae,v 1.4 2005/10/10 09:05:59 seb Exp $
 
---- src/lib/fileutil.cc.orig	2004-04-19 10:59:24.000000000 +0000
+--- src/lib/fileutil.cc.orig	2005-08-25 14:01:56.000000000 +0000
 +++ src/lib/fileutil.cc
-@@ -41,7 +41,7 @@ read_file(const string &fileName)
+@@ -43,7 +43,7 @@ read_file(const string &fileName)
    // we open it as binary otherwise we may experience problems under
    // Windows system: when we fread, the number of char read can be
    // less then char_count, and thus we'd get an error...
diff --git a/textproc/source-highlight/patches/patch-af b/textproc/source-highlight/patches/patch-af
index c6245bc1ab6..0369ac7bef0 100644
--- a/textproc/source-highlight/patches/patch-af
+++ b/textproc/source-highlight/patches/patch-af
@@ -1,23 +1,138 @@
-$NetBSD: patch-af,v 1.4 2004/10/21 00:15:47 seb Exp $
+$NetBSD: patch-af,v 1.5 2005/10/10 09:05:59 seb Exp $
 
---- doc/source-highlight.1.in.orig	2004-07-11 12:58:38.000000000 +0000
-+++ doc/source-highlight.1.in
-@@ -19,7 +19,8 @@ output languages are: \fBHTML\fP, \fBXHT
- .PP
- \fBTexinfo documentation will be released soon, but meanwhile
- please refer to README file or to the html documentation that you
--can find in @prefix@/share/doc/source-highlight.\fP 
-+can find respectively in @prefix@/share/doc/source-highlight and
-+@prefix@/share/doc/html/source-highlight.\fP 
- .SH OPTIONS
- \fBsource-highlight\fP accepts some options.
- .sp
-@@ -121,7 +122,7 @@ with \fB--verbose\fP option
- enabled. 
- 
- .SH "SEE ALSO"
--HTML documentation in \fI@prefix@/share/doc/source-highlight\fP.
-+HTML documentation in \fI@prefix@/share/doc/html/source-highlight\fP.
- .SH "VERSION INFORMATION"
- This man page (partially) documents \fBsource-highlight\fP, version @VERSION@.
- TexInfo documentation will be released soon.
+--- doc/Makefile.in.orig	2005-10-09 09:27:17.000000000 +0000
++++ doc/Makefile.in
+@@ -56,6 +56,8 @@ am__configure_deps = $(am__aclocal_m4_de
+ mkinstalldirs = $(install_sh) -d
+ CONFIG_HEADER = $(top_builddir)/config.h
+ CONFIG_CLEAN_FILES = index.html
++depcomp =
++am__depfiles_maybe =
+ SOURCES =
+ DIST_SOURCES =
+ INFO_DEPS = $(srcdir)/source-highlight.info
+@@ -70,7 +72,7 @@ TEXI2PDF = $(TEXI2DVI) --pdf --batch
+ MAKEINFOHTML = $(MAKEINFO) --html
+ DVIPS = dvips
+ am__installdirs = "$(DESTDIR)$(infodir)" "$(DESTDIR)$(man1dir)" \
+-	"$(DESTDIR)$(source_highlightdocdir)"
++	"$(DESTDIR)$(source_highlightdochtmldir)"
+ man1dir = $(mandir)/man1
+ NROFF = nroff
+ MANS = $(man_MANS)
+@@ -80,8 +82,8 @@ am__vpath_adj = case $$p in \
+     *) f=$$p;; \
+   esac;
+ am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+-source_highlightdocDATA_INSTALL = $(INSTALL_DATA)
+-DATA = $(source_highlightdoc_DATA)
++source_highlightdochtmlDATA_INSTALL = $(INSTALL_DATA)
++DATA = $(source_highlightdochtml_DATA)
+ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ ACLOCAL = @ACLOCAL@
+ AMDEP_FALSE = @AMDEP_FALSE@
+@@ -184,6 +186,7 @@ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
+ source_highlightdatadir = @source_highlightdatadir@
+ source_highlightdocdir = @source_highlightdocdir@
++source_highlightdochtmldir = @source_highlightdochtmldir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+ TAGS_J2H_OPTION = --style-file $(top_srcdir)/src/default.style
+@@ -210,7 +213,7 @@ EXTRA_DIST = colors.html source-highligh
+              gpl.texinfo flex_scanner.ll $(GENERATEDINFOS) \
+              source-highlight.1
+ 
+-source_highlightdoc_DATA = colors.html source-highlight.html \
++source_highlightdochtml_DATA = colors.html source-highlight.html \
+     Hello.java Hello1.html Hello2.html Hello3.html Hello4.html Hello5.html \
+     Hello.java.html Hello_h_f.html Hello_lines.html Hello_xhtml.html \
+     Hello_xhtml2.html \
+@@ -250,9 +253,9 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefi
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  doc/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  --ignore-deps doc/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --gnu  doc/Makefile
++	  $(AUTOMAKE) --gnu  --ignore-deps doc/Makefile
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ 	@case '$?' in \
+@@ -444,22 +447,22 @@ uninstall-man1:
+ 	  echo " rm -f '$(DESTDIR)$(man1dir)/$$inst'"; \
+ 	  rm -f "$(DESTDIR)$(man1dir)/$$inst"; \
+ 	done
+-install-source_highlightdocDATA: $(source_highlightdoc_DATA)
++install-source_highlightdochtmlDATA: $(source_highlightdochtml_DATA)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(source_highlightdocdir)" || $(mkdir_p) "$(DESTDIR)$(source_highlightdocdir)"
+-	@list='$(source_highlightdoc_DATA)'; for p in $$list; do \
++	test -z "$(source_highlightdochtmldir)" || $(mkdir_p) "$(DESTDIR)$(source_highlightdochtmldir)"
++	@list='$(source_highlightdochtml_DATA)'; for p in $$list; do \
+ 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ 	  f=$(am__strip_dir) \
+-	  echo " $(source_highlightdocDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(source_highlightdocdir)/$$f'"; \
+-	  $(source_highlightdocDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(source_highlightdocdir)/$$f"; \
++	  echo " $(source_highlightdochtmlDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(source_highlightdochtmldir)/$$f'"; \
++	  $(source_highlightdochtmlDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(source_highlightdochtmldir)/$$f"; \
+ 	done
+ 
+-uninstall-source_highlightdocDATA:
++uninstall-source_highlightdochtmlDATA:
+ 	@$(NORMAL_UNINSTALL)
+-	@list='$(source_highlightdoc_DATA)'; for p in $$list; do \
++	@list='$(source_highlightdochtml_DATA)'; for p in $$list; do \
+ 	  f=$(am__strip_dir) \
+-	  echo " rm -f '$(DESTDIR)$(source_highlightdocdir)/$$f'"; \
+-	  rm -f "$(DESTDIR)$(source_highlightdocdir)/$$f"; \
++	  echo " rm -f '$(DESTDIR)$(source_highlightdochtmldir)/$$f'"; \
++	  rm -f "$(DESTDIR)$(source_highlightdochtmldir)/$$f"; \
+ 	done
+ tags: TAGS
+ TAGS:
+@@ -502,7 +505,7 @@ check-am: all-am
+ check: check-am
+ all-am: Makefile $(INFO_DEPS) $(MANS) $(DATA)
+ installdirs:
+-	for dir in "$(DESTDIR)$(infodir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(source_highlightdocdir)"; do \
++	for dir in "$(DESTDIR)$(infodir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(source_highlightdochtmldir)"; do \
+ 	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+ 	done
+ install: install-am
+@@ -551,7 +554,7 @@ info: info-am
+ info-am: $(INFO_DEPS)
+ 
+ install-data-am: install-info-am install-man \
+-	install-source_highlightdocDATA
++	install-source_highlightdochtmlDATA
+ 
+ install-exec-am:
+ 
+@@ -609,7 +612,7 @@ ps: ps-am
+ ps-am: $(PSS)
+ 
+ uninstall-am: uninstall-info-am uninstall-man \
+-	uninstall-source_highlightdocDATA
++	uninstall-source_highlightdochtmlDATA
+ 
+ uninstall-man: uninstall-man1
+ 
+@@ -617,13 +620,14 @@ uninstall-man: uninstall-man1
+ 	distclean distclean-generic distdir dvi dvi-am html html-am \
+ 	info info-am install install-am install-data install-data-am \
+ 	install-exec install-exec-am install-info install-info-am \
+-	install-man install-man1 install-source_highlightdocDATA \
++	install-man install-man1 install-source_highlightdochtmlDATA \
+ 	install-strip installcheck installcheck-am installdirs \
+ 	maintainer-clean maintainer-clean-aminfo \
+ 	maintainer-clean-generic maintainer-clean-vti mostlyclean \
+ 	mostlyclean-aminfo mostlyclean-generic mostlyclean-vti pdf \
+ 	pdf-am ps ps-am uninstall uninstall-am uninstall-info-am \
+-	uninstall-man uninstall-man1 uninstall-source_highlightdocDATA
++	uninstall-man uninstall-man1 \
++	uninstall-source_highlightdochtmlDATA
+ 
+ 
+ source-highlight.texinfo: help-output.texinfo lang-list.texinfo outlang-list.texinfo test.java.texinfo debug.java.texinfo style.texinfo
diff --git a/textproc/source-highlight/patches/patch-ag b/textproc/source-highlight/patches/patch-ag
index dbe6eb33144..79cb3ca092f 100644
--- a/textproc/source-highlight/patches/patch-ag
+++ b/textproc/source-highlight/patches/patch-ag
@@ -1,13 +1,126 @@
-$NetBSD: patch-ag,v 1.6 2004/10/21 00:15:47 seb Exp $
+$NetBSD: patch-ag,v 1.7 2005/10/10 09:05:59 seb Exp $
 
---- tests/Makefile.am.orig	2004-09-28 07:22:00.000000000 +0000
-+++ tests/Makefile.am
-@@ -287,7 +287,7 @@ check_log: test.log.html
- 	diff $(srcdir)/error.log.html error.log.out.html
- 	diff $(srcdir)/syslog.log.html syslog.log.out.html
- 
+--- tests/Makefile.in.orig	2005-10-09 09:27:08.000000000 +0000
++++ tests/Makefile.in
+@@ -55,6 +55,8 @@ am__configure_deps = $(am__aclocal_m4_de
+ mkinstalldirs = $(install_sh) -d
+ CONFIG_HEADER = $(top_builddir)/config.h
+ CONFIG_CLEAN_FILES = valgrind_tests.sh valgrind_test.sh
++depcomp =
++am__depfiles_maybe =
+ SOURCES =
+ DIST_SOURCES =
+ am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+@@ -63,9 +65,9 @@ am__vpath_adj = case $$p in \
+     *) f=$$p;; \
+   esac;
+ am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+-am__installdirs = "$(DESTDIR)$(source_highlightdocdir)"
+-source_highlightdocDATA_INSTALL = $(INSTALL_DATA)
+-DATA = $(source_highlightdoc_DATA)
++am__installdirs = "$(DESTDIR)$(source_highlightdochtmldir)"
++source_highlightdochtmlDATA_INSTALL = $(INSTALL_DATA)
++DATA = $(source_highlightdochtml_DATA)
+ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ ACLOCAL = @ACLOCAL@
+ AMDEP_FALSE = @AMDEP_FALSE@
+@@ -168,6 +170,7 @@ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
+ source_highlightdatadir = @source_highlightdatadir@
+ source_highlightdocdir = @source_highlightdocdir@
++source_highlightdochtmldir = @source_highlightdochtmldir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+ STD_TAGS = --style-file $(top_srcdir)/src/default.style
+@@ -261,7 +264,7 @@ erasedir.sed erasedir2.sed
+ PROG_NOLANGDEF = $(PROGEXE) --outlang-def=$(srcdir)/simple.outlang $(STD_TAGS) --data-dir=$(srcdir)/
+ PROG_NOOUTLANGDEF = $(PROGEXE) --lang-def=$(srcdir)/simple.lang $(STD_TAGS)
+ 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.lua.html test.ml.html \
- test.sml.html test.log.html access.log.html auth.log.html error.log.html syslog.log.html \
- tags.syslog tags.esc
+ test.sml.html test.log.html access.log.html auth.log.html error.log.html syslog.log.html test.htm.html test.java.tex.html \
+ syslog.style
+@@ -281,9 +284,9 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefi
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  tests/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  --ignore-deps tests/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --gnu  tests/Makefile
++	  $(AUTOMAKE) --gnu  --ignore-deps tests/Makefile
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ 	@case '$?' in \
+@@ -306,22 +309,22 @@ valgrind_tests.sh: $(top_builddir)/confi
+ valgrind_test.sh: $(top_builddir)/config.status $(srcdir)/valgrind_test.sh.in
+ 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+ uninstall-info-am:
+-install-source_highlightdocDATA: $(source_highlightdoc_DATA)
++install-source_highlightdochtmlDATA: $(source_highlightdochtml_DATA)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(source_highlightdocdir)" || $(mkdir_p) "$(DESTDIR)$(source_highlightdocdir)"
+-	@list='$(source_highlightdoc_DATA)'; for p in $$list; do \
++	test -z "$(source_highlightdochtmldir)" || $(mkdir_p) "$(DESTDIR)$(source_highlightdochtmldir)"
++	@list='$(source_highlightdochtml_DATA)'; for p in $$list; do \
+ 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ 	  f=$(am__strip_dir) \
+-	  echo " $(source_highlightdocDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(source_highlightdocdir)/$$f'"; \
+-	  $(source_highlightdocDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(source_highlightdocdir)/$$f"; \
++	  echo " $(source_highlightdochtmlDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(source_highlightdochtmldir)/$$f'"; \
++	  $(source_highlightdochtmlDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(source_highlightdochtmldir)/$$f"; \
+ 	done
+ 
+-uninstall-source_highlightdocDATA:
++uninstall-source_highlightdochtmlDATA:
+ 	@$(NORMAL_UNINSTALL)
+-	@list='$(source_highlightdoc_DATA)'; for p in $$list; do \
++	@list='$(source_highlightdochtml_DATA)'; for p in $$list; do \
+ 	  f=$(am__strip_dir) \
+-	  echo " rm -f '$(DESTDIR)$(source_highlightdocdir)/$$f'"; \
+-	  rm -f "$(DESTDIR)$(source_highlightdocdir)/$$f"; \
++	  echo " rm -f '$(DESTDIR)$(source_highlightdochtmldir)/$$f'"; \
++	  rm -f "$(DESTDIR)$(source_highlightdochtmldir)/$$f"; \
+ 	done
+ tags: TAGS
+ TAGS:
+@@ -361,7 +364,7 @@ check-am: all-am
+ check: check-am
+ all-am: Makefile $(DATA)
+ installdirs:
+-	for dir in "$(DESTDIR)$(source_highlightdocdir)"; do \
++	for dir in "$(DESTDIR)$(source_highlightdochtmldir)"; do \
+ 	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+ 	done
+ install: install-am
+@@ -407,7 +410,7 @@ info: info-am
+ 
+ info-am:
+ 
+-install-data-am: install-source_highlightdocDATA
++install-data-am: install-source_highlightdochtmlDATA
+ 
+ install-exec-am:
+ 
+@@ -433,17 +436,17 @@ ps: ps-am
+ 
+ ps-am:
+ 
+-uninstall-am: uninstall-info-am uninstall-source_highlightdocDATA
++uninstall-am: uninstall-info-am uninstall-source_highlightdochtmlDATA
+ 
+ .PHONY: all all-am check check-am clean clean-generic distclean \
+ 	distclean-generic distdir dvi dvi-am html html-am info info-am \
+ 	install install-am install-data install-data-am install-exec \
+ 	install-exec-am install-info install-info-am install-man \
+-	install-source_highlightdocDATA install-strip installcheck \
++	install-source_highlightdochtmlDATA install-strip installcheck \
+ 	installcheck-am installdirs maintainer-clean \
+ 	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
+ 	pdf-am ps ps-am uninstall uninstall-am uninstall-info-am \
+-	uninstall-source_highlightdocDATA
++	uninstall-source_highlightdochtmlDATA
+ 
+ 
+ %.cc.html: %.cc
diff --git a/textproc/source-highlight/patches/patch-ah b/textproc/source-highlight/patches/patch-ah
index 25bd4240aa2..0b1929b204c 100644
--- a/textproc/source-highlight/patches/patch-ah
+++ b/textproc/source-highlight/patches/patch-ah
@@ -1,105 +1,17 @@
-$NetBSD: patch-ah,v 1.7 2004/10/21 00:15:47 seb Exp $
+$NetBSD: patch-ah,v 1.8 2005/10/10 09:05:59 seb Exp $
 
---- tests/Makefile.in.orig	2004-10-20 23:33:28.000000000 +0000
-+++ tests/Makefile.in
-@@ -56,9 +56,9 @@ CONFIG_HEADER = $(top_builddir)/config.h
- CONFIG_CLEAN_FILES =
- SOURCES =
- DIST_SOURCES =
--am__installdirs = "$(DESTDIR)$(source_highlightdocdir)"
--source_highlightdocDATA_INSTALL = $(INSTALL_DATA)
--DATA = $(source_highlightdoc_DATA)
-+am__installdirs = "$(DESTDIR)$(source_highlightdochtmldir)"
-+source_highlightdochtmlDATA_INSTALL = $(INSTALL_DATA)
-+DATA = $(source_highlightdochtml_DATA)
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- ACLOCAL = @ACLOCAL@
- AMDEP_FALSE = @AMDEP_FALSE@
-@@ -156,6 +156,7 @@ sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
- source_highlightdatadir = @source_highlightdatadir@
- source_highlightdocdir = @source_highlightdocdir@
-+source_highlightdochtmldir = @source_highlightdochtmldir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
- TAGS_J2H_OPTION = -f html --tags-file $(top_srcdir)/src/tags.j2h 
-@@ -216,7 +217,7 @@ tags.syslog tags.esc \
- changelog.css
+--- doc/source-highlight.info.orig	2005-10-09 20:07:02.000000000 +0000
++++ doc/source-highlight.info
+@@ -1,6 +1,12 @@
+ This is source-highlight.info, produced by makeinfo version 4.7 from
+ source-highlight.texinfo.
+ 
++INFO-DIR-SECTION Programming & development tools
++START-INFO-DIR-ENTRY
++* GNU Source-highlight: (source-highlight).
++                        Procude syntax highlighted documents from source files.
++END-INFO-DIR-ENTRY
++
+    This file documents the `source-highlight' command which given a
+ source file, produces a document with syntax highlighting.
  
- 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.lua.html test.ml.html \
- test.sml.html test.log.html access.log.html auth.log.html error.log.html syslog.log.html \
- tags.syslog tags.esc
-@@ -255,22 +256,22 @@ $(top_srcdir)/configure:  $(am__configur
- $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- uninstall-info-am:
--install-source_highlightdocDATA: $(source_highlightdoc_DATA)
-+install-source_highlightdochtmlDATA: $(source_highlightdochtml_DATA)
- 	@$(NORMAL_INSTALL)
--	test -z "$(source_highlightdocdir)" || $(mkdir_p) "$(DESTDIR)$(source_highlightdocdir)"
--	@list='$(source_highlightdoc_DATA)'; for p in $$list; do \
-+	test -z "$(source_highlightdochtmldir)" || $(mkdir_p) "$(DESTDIR)$(source_highlightdochtmldir)"
-+	@list='$(source_highlightdochtml_DATA)'; for p in $$list; do \
- 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- 	  f="`echo $$p | sed -e 's|^.*/||'`"; \
--	  echo " $(source_highlightdocDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(source_highlightdocdir)/$$f'"; \
--	  $(source_highlightdocDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(source_highlightdocdir)/$$f"; \
-+	  echo " $(source_highlightdochtmlDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(source_highlightdochtmldir)/$$f'"; \
-+	  $(source_highlightdochtmlDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(source_highlightdochtmldir)/$$f"; \
- 	done
- 
--uninstall-source_highlightdocDATA:
-+uninstall-source_highlightdochtmlDATA:
- 	@$(NORMAL_UNINSTALL)
--	@list='$(source_highlightdoc_DATA)'; for p in $$list; do \
-+	@list='$(source_highlightdochtml_DATA)'; for p in $$list; do \
- 	  f="`echo $$p | sed -e 's|^.*/||'`"; \
--	  echo " rm -f '$(DESTDIR)$(source_highlightdocdir)/$$f'"; \
--	  rm -f "$(DESTDIR)$(source_highlightdocdir)/$$f"; \
-+	  echo " rm -f '$(DESTDIR)$(source_highlightdochtmldir)/$$f'"; \
-+	  rm -f "$(DESTDIR)$(source_highlightdochtmldir)/$$f"; \
- 	done
- tags: TAGS
- TAGS:
-@@ -310,7 +311,7 @@ check-am: all-am
- check: check-am
- all-am: Makefile $(DATA)
- installdirs:
--	for dir in "$(DESTDIR)$(source_highlightdocdir)"; do \
-+	for dir in "$(DESTDIR)$(source_highlightdochtmldir)"; do \
- 	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
- 	done
- install: install-am
-@@ -356,7 +357,7 @@ info: info-am
- 
- info-am:
- 
--install-data-am: install-source_highlightdocDATA
-+install-data-am: install-source_highlightdochtmlDATA
- 
- install-exec-am:
- 
-@@ -382,17 +383,17 @@ ps: ps-am
- 
- ps-am:
- 
--uninstall-am: uninstall-info-am uninstall-source_highlightdocDATA
-+uninstall-am: uninstall-info-am uninstall-source_highlightdochtmlDATA
- 
- .PHONY: all all-am check check-am clean clean-generic distclean \
- 	distclean-generic distdir dvi dvi-am html html-am info info-am \
- 	install install-am install-data install-data-am install-exec \
- 	install-exec-am install-info install-info-am install-man \
--	install-source_highlightdocDATA install-strip installcheck \
-+	install-source_highlightdochtmlDATA install-strip installcheck \
- 	installcheck-am installdirs maintainer-clean \
- 	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
- 	pdf-am ps ps-am uninstall uninstall-am uninstall-info-am \
--	uninstall-source_highlightdocDATA
-+	uninstall-source_highlightdochtmlDATA
- 
- 
- %.cc.html: %.cc