Update to 2.5:

Version 2.5

   * fixed lang.map for php files
   * fixed url.lang
   * --debug-langdef can be interactive
   * nohilite.lang that does not perform any highlighting, but
     only formats the input file into the output format (dealing
     with output format special characters)
   * default.lang to which source-highlight falls back when no
     input language is specified or available
   * infer script languages
   * --header and --footer options do not require --doc option
   * --statistics print elapsed time
   * highlight cls, dtx and sty LaTeX files
   * language definition for Tcl
   * language definition for Sql
   * language definition for bibtex
   * infer language of script files

Version 2.4

   * language definition for C# (thanks to Hemmi Shigeru)
   * language definition for XML (thanks to Andy Buckley)
   * language definition for shell scripts (thanks to Dirk Jagdmann)
   * fixed language definition for HTML (tags with numbers are highlighted,
     e.g., <h1>)
   * updated language definition for logtalk (thanks to Paulo Moura)
   * produces the list of elements of a language definition file
     (--show-lang-elements)
   * output format definition for HTML where fonts by default are
     not fixed width.
   * bug fix in url regular expressions
   * bug fix with nonsensitive keywords (thanks to Andrea Ercolino)
   * improved documentation concerning installation of Boost regex library

Version 2.3

   * the regex automaton is printed on the standard output
     (instead of the standard error)
   * language definition for postscript
   * DocBook output format
   * fixed bug in .map files with \r characters
   * fixed expression for email

Version 2.2

   * fixed a bug that sigsegv when more than one input file
     is provided
   * fixed a compilation error with gcc 4.0
   * generate references using ctags
   * fixed a bug with LaTeX output of " with some inputencs
     and with latexcolor
   * handle direct color specifications independently from HTML
   * fixed conversion of hexadecimal characters in output language
     definitions
   * fixed compilation error with regex 1.33
   * include man page
   * language definition for diff output
   * fixed bugs in generation of the regular expression automaton
   * extended documentation with some tutorials on input language
     definitions
   * generate more compact output (reduced size)
   * in LaTeX output longtable is not used anymore

11 files changed, 128 insertions, 851 deletions

diff --git a/textproc/source-highlight/Makefile b/textproc/source-highlight/Makefile
index 80a062cc742..4f850be6880 100644
--- a/textproc/source-highlight/Makefile
+++ b/textproc/source-highlight/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.22 2006/04/07 19:54:17 jlam Exp $
+# $NetBSD: Makefile,v 1.23 2007/02/22 20:35:34 wiz Exp $
 #
 
-DISTNAME=	source-highlight-2.1.2
-PKGREVISION=	1
+DISTNAME=	source-highlight-2.5
 SVR4_PKGNAME=	srchl
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_GNU:=src-highlite/}
@@ -11,10 +10,13 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.gnu.org/software/src-highlite/
 COMMENT=	Highlight syntax of various languages source into HTML document
 
+DEPENDS+=	exctags-[0-9]*:../../devel/exctags
+
 GNU_CONFIGURE=	YES
 USE_LANGUAGES=	c c++
+CONFIGURE_ENV+=	CTAGS=${LOCALBASE}/bin/exctags
 
-INFO_FILES=	# PLIST
+INFO_FILES=	YES
 
 # this is only really needed for the 'test' target
 USE_TOOLS+=	gmake gsed
diff --git a/textproc/source-highlight/PLIST b/textproc/source-highlight/PLIST
index a3b2342ec18..60503b1f0a3 100644
--- a/textproc/source-highlight/PLIST
+++ b/textproc/source-highlight/PLIST
@@ -1,80 +1,104 @@
-@comment $NetBSD: PLIST,v 1.9 2005/10/10 09:05:59 seb Exp $
+@comment $NetBSD: PLIST,v 1.10 2007/02/22 20:35:34 wiz Exp $
 bin/cpp2html
 bin/java2html
 bin/source-highlight
 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
-share/doc/html/source-highlight/Hello.java.html
-share/doc/html/source-highlight/Hello1.html
-share/doc/html/source-highlight/Hello2.css
-share/doc/html/source-highlight/Hello2.html
-share/doc/html/source-highlight/Hello3.html
-share/doc/html/source-highlight/Hello4.html
-share/doc/html/source-highlight/Hello5.html
-share/doc/html/source-highlight/Hello_h_f.html
-share/doc/html/source-highlight/Hello_lines.html
-share/doc/html/source-highlight/Hello_xhtml.html
-share/doc/html/source-highlight/Hello_xhtml2.html
-share/doc/html/source-highlight/access.log.html
-share/doc/html/source-highlight/auth.log.html
-share/doc/html/source-highlight/cmdline.c.html
-share/doc/html/source-highlight/cmdline.h.html
-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/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
-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
 share/doc/source-highlight/ChangeLog
+share/doc/source-highlight/Hello.css
+share/doc/source-highlight/Hello.java
+share/doc/source-highlight/Hello.java.html
+share/doc/source-highlight/Hello1.html
+share/doc/source-highlight/Hello2.css
+share/doc/source-highlight/Hello2.html
+share/doc/source-highlight/Hello3.html
+share/doc/source-highlight/Hello4.html
+share/doc/source-highlight/Hello5.html
+share/doc/source-highlight/Hello_h_f.html
+share/doc/source-highlight/Hello_lines.html
+share/doc/source-highlight/Hello_notfixed.html
+share/doc/source-highlight/Hello_xhtml.html
+share/doc/source-highlight/Hello_xhtml2.html
 share/doc/source-highlight/INSTALL
 share/doc/source-highlight/NEWS
 share/doc/source-highlight/README
-share/doc/source-highlight/README.compile_VC6
+share/doc/source-highlight/SimpleClass-doc.html
+share/doc/source-highlight/SimpleClass.html
+share/doc/source-highlight/SimpleClass.java
 share/doc/source-highlight/THANKS
 share/doc/source-highlight/TODO.txt
+share/doc/source-highlight/UsageExample.html
+share/doc/source-highlight/UsageExample.java
+share/doc/source-highlight/access.log.html
+share/doc/source-highlight/auth.log.html
+share/doc/source-highlight/cmdline.h.html
+share/doc/source-highlight/colors.html
+share/doc/source-highlight/cpp.lang.html
+share/doc/source-highlight/cpp2html.css
+share/doc/source-highlight/default.style.html
+share/doc/source-highlight/error.log.html
+share/doc/source-highlight/flex_scanner.ll.html
+share/doc/source-highlight/footer.html
+share/doc/source-highlight/header.html
+share/doc/source-highlight/index.html
+share/doc/source-highlight/langdef.lang.html
+share/doc/source-highlight/log.lang.html
+share/doc/source-highlight/mono-alt.css
+share/doc/source-highlight/mono.css
+share/doc/source-highlight/source-highlight.html
+share/doc/source-highlight/startapp.cc.html
+share/doc/source-highlight/syslog.log.html
+share/doc/source-highlight/syslog.style
+share/doc/source-highlight/test.htm.html
+share/doc/source-highlight/test.java.tex.html
+share/doc/source-highlight/test.js.html
+share/doc/source-highlight/test.log.html
+share/doc/source-highlight/test.lua.html
+share/doc/source-highlight/test.ml.html
+share/doc/source-highlight/test.php3.html
+share/doc/source-highlight/test.pl.html
+share/doc/source-highlight/test.pm.html
+share/doc/source-highlight/test.py.html
+share/doc/source-highlight/test.rb.html
+share/doc/source-highlight/test.sml.html
+share/doc/source-highlight/test_refs.cpp.html
+share/doc/source-highlight/test_refs.h.html
+share/doc/source-highlight/xhtml.css
+share/source-highlight/bib.lang
 share/source-highlight/bison.lang
 share/source-highlight/c_comment.lang
+share/source-highlight/c_string.lang
 share/source-highlight/caml.lang
 share/source-highlight/changelog.lang
 share/source-highlight/cpp.lang
+share/source-highlight/csharp.lang
 share/source-highlight/css_common.outlang
 share/source-highlight/cssdoc.outlang
+share/source-highlight/default.lang
 share/source-highlight/default.style
+share/source-highlight/diff.lang
+share/source-highlight/docbook.outlang
 share/source-highlight/esc.outlang
 share/source-highlight/esc.style
+share/source-highlight/extreme_comment.lang
+share/source-highlight/extreme_comment2.lang
+share/source-highlight/extreme_comment3.lang
 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/html_notfixed.outlang
 share/source-highlight/htmldoc.outlang
 share/source-highlight/java.lang
+share/source-highlight/javadoc.outlang
 share/source-highlight/javascript.lang
 share/source-highlight/lang.map
+share/source-highlight/langdef.lang
 share/source-highlight/latex.lang
 share/source-highlight/latex.outlang
 share/source-highlight/latexcolor.outlang
@@ -83,24 +107,32 @@ share/source-highlight/latexdoc.outlang
 share/source-highlight/log.lang
 share/source-highlight/logtalk.lang
 share/source-highlight/lua.lang
+share/source-highlight/nohilite.lang
 share/source-highlight/number.lang
+share/source-highlight/outlang.lang
 share/source-highlight/outlang.map
 share/source-highlight/pascal.lang
 share/source-highlight/perl.lang
 share/source-highlight/php.lang
+share/source-highlight/postscript.lang
 share/source-highlight/prolog.lang
 share/source-highlight/python.lang
 share/source-highlight/ruby.lang
+share/source-highlight/script_comment.lang
+share/source-highlight/sh.lang
 share/source-highlight/sml.lang
+share/source-highlight/sql.lang
+share/source-highlight/style.lang
 share/source-highlight/style2.style
 share/source-highlight/style3.style
 share/source-highlight/symbols.lang
+share/source-highlight/tcl.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
+share/source-highlight/xml.lang
 @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 8d1c00af5e9..2e34a0778e0 100644
--- a/textproc/source-highlight/distinfo
+++ b/textproc/source-highlight/distinfo
@@ -1,14 +1,10 @@
-$NetBSD: distinfo,v 1.15 2006/10/02 23:41:01 rillig Exp $
+$NetBSD: distinfo,v 1.16 2007/02/22 20:35:35 wiz Exp $
 
-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) = 85096ce664b2b3a60ed30314f5bea4b8584cb5a6
+SHA1 (source-highlight-2.5.tar.gz) = 4ba76ae656098f54904955cd227e53f18be454f7
+RMD160 (source-highlight-2.5.tar.gz) = f5dd7747960b0534cfb57744c036842c2643423d
+Size (source-highlight-2.5.tar.gz) = 681021 bytes
+SHA1 (patch-aa) = c64dd752c2040723354be2d2e54c8123df618afb
+SHA1 (patch-ab) = 0c235b51e97cfea58100933c7eb1d668fdbe8a84
+SHA1 (patch-ac) = 0b3056ceb63966bb4d4031ffc8ab0f2c5edcfa3e
 SHA1 (patch-ae) = 1695543aaee9a414fe0267c8e4798be7ed507760
-SHA1 (patch-af) = 6131f0c5be4c6c0819abc591fd0f8a7a6ab8a05a
-SHA1 (patch-ag) = 469d098f73ab695a46bf3ac4a69f033f85f676e8
-SHA1 (patch-ah) = 8b001b2fb917e067bfb8a2f45c41b24f3294b05b
-SHA1 (patch-ai) = 8571124ee2190bc0da0d78046aa8bcd542296857
+SHA1 (patch-ai) = 1d2a68802d8b90cf64753f34705f22b9a4ca2575
diff --git a/textproc/source-highlight/patches/patch-aa b/textproc/source-highlight/patches/patch-aa
index be2b56ec38b..5db5237b966 100644
--- a/textproc/source-highlight/patches/patch-aa
+++ b/textproc/source-highlight/patches/patch-aa
@@ -1,23 +1,13 @@
-$NetBSD: patch-aa,v 1.2 2005/10/10 09:05:59 seb Exp $
+$NetBSD: patch-aa,v 1.3 2007/02/22 20:35:35 wiz Exp $
 
---- 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)
-+AC_SUBST(source_highlightdochtmldir)
- 
- source_highlightdatadir=$datadir/source-highlight
- source_highlightdocdir=$datadir/doc/source-highlight
-+source_highlightdochtmldir=$datadir/doc/html/source-highlight
- 
- 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
+--- configure.orig	2006-10-05 16:57:31.000000000 +0000
++++ configure
+@@ -3437,7 +3437,7 @@ cat <<EOF >conftest.c
+ int conftest(void){return 0;}
+ EOF
+ ${CXX} -xar -o conftest.a conftest.c >/dev/null 2>&1
+-if test $? == 0; then
++if test $? = 0; then
+   ar_to_use="\$(CXX) -xar -o"
+ else
+   ar_to_use="\$(AR) cru"
diff --git a/textproc/source-highlight/patches/patch-ab b/textproc/source-highlight/patches/patch-ab
index f751876b845..c332e13d04f 100644
--- a/textproc/source-highlight/patches/patch-ab
+++ b/textproc/source-highlight/patches/patch-ab
@@ -1,20 +1,13 @@
-$NetBSD: patch-ab,v 1.3 2005/10/10 09:05:59 seb Exp $
+$NetBSD: patch-ab,v 1.4 2007/02/22 20:35:35 wiz Exp $
 
---- 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
+--- src/lib/Makefile.in.orig	2006-10-05 16:57:30.000000000 +0000
++++ src/lib/Makefile.in
+@@ -845,7 +845,7 @@ optparser.cc optparser.h: $(srcdir)/optp
+ 	$(YACC) -p opsc_ -o $@ $(srcdir)/optparser.yy --defines=$*.h
  
--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)
+ mytags: $(srcdir)/test_readtags_main.cpp
+-	ctags --excmd=n --fields=+n -o mytags $(srcdir)/test_readtags_main.cpp $(srcdir)/readtags.h
++	$(CTAGS) --excmd=n --fields=+n -o mytags $(srcdir)/test_readtags_main.cpp $(srcdir)/readtags.h
  
--DISTCLEANFILES = $(HTML_GENERATED_FILES) source-highlight.1 $(GENERATEDINFOS)
-\ No newline at end of file
-+DISTCLEANFILES = $(HTML_GENERATED_FILES) source-highlight.1 $(GENERATEDINFOS)
+ outlangtest.outlang: $(srcdir)/outlangtest.outlang.tmpl
+ 	rm -f outlangtest.outlang
diff --git a/textproc/source-highlight/patches/patch-ac b/textproc/source-highlight/patches/patch-ac
index ab4fddf11e5..30283d95b78 100644
--- a/textproc/source-highlight/patches/patch-ac
+++ b/textproc/source-highlight/patches/patch-ac
@@ -1,13 +1,13 @@
-$NetBSD: patch-ac,v 1.3 2005/10/10 09:05:59 seb Exp $
+$NetBSD: patch-ac,v 1.4 2007/02/22 20:35:36 wiz Exp $
 
---- 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 = 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
+--- tests/Makefile.in.orig	2006-10-05 16:57:31.000000000 +0000
++++ tests/Makefile.in
+@@ -315,7 +315,7 @@ cpp.langelems
+ PROG_NOLANGDEF = $(PROGEXE) --outlang-def=$(srcdir)/simple.outlang $(STD_STYLE) --data-dir=$(srcdir)/
+ PROG_NOOUTLANGDEF = $(PROGEXE) --lang-def=$(srcdir)/simple.lang $(STD_STYLE)
+ CPP2HTML_WHEADERS = $(CPP2HTML) --header=$(srcdir)/header.html --footer=$(srcdir)/footer.html --title="Header and footer test"
+-CPP2HTML_WREFS = $(CPP2HTML) --title="Contains references to tags" --gen-references=inline --ctags="ctags --excmd=n --tag-relative=yes -o my_test_ref.tags"
++CPP2HTML_WREFS = $(CPP2HTML) --title="Contains references to tags" --gen-references=inline --ctags="$(CTAGS) --excmd=n --tag-relative=yes -o my_test_ref.tags"
+ CPP2LATEX_WREFS = $(CPP2TEX) --title="Contains references to tags" --gen-references=postline --line-number --ctags=""
+ CPP2LATEX_WREFSPOST = $(CPP2TEX) --title="Contains references to tags" --gen-references=postdoc --line-number --ctags=""
+ CTAGS_CMD = $(CTAGS) --excmd=n --tag-relative=yes 
diff --git a/textproc/source-highlight/patches/patch-ad b/textproc/source-highlight/patches/patch-ad
deleted file mode 100644
index 6c559634d72..00000000000
--- a/textproc/source-highlight/patches/patch-ad
+++ /dev/null
@@ -1,455 +0,0 @@
-$NetBSD: patch-ad,v 1.7 2006/10/02 23:41:01 rillig Exp $
-
---- configure.orig	2005-08-25 16:11:30.000000000 +0200
-+++ configure	2006-10-03 01:34:07.000000000 +0200
-@@ -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 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=''
- 
- # 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
- 
-@@ -1761,8 +1761,10 @@ am__tar='${AMTAR} chof - "$$tardir"'; am
- 
- 
- 
-+
- source_highlightdatadir=$datadir/source-highlight
- source_highlightdocdir=$datadir/doc/source-highlight
-+source_highlightdochtmldir=$datadir/doc/html/source-highlight
- 
- 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=$?
-@@ -2893,7 +2901,7 @@ cat <<EOF >conftest.c
- int conftest(void){return 0;}
- EOF
- ${CXX} -xar -o conftest.a conftest.c >/dev/null 2>&1
--if test $? == 0; then
-+if test $? = 0; then
-   ar_to_use="\$(CXX) -xar -o"
- else
-   ar_to_use="\$(AR) cru"
-@@ -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=$?
-@@ -5195,7 +5221,8 @@ fi
- echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Lib'}'`" >&5
- echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6
- if test `eval echo '${'$as_ac_Lib'}'` = yes; then
--  BOOST_REGEX_LIB=$ax_lib break
-+  BOOST_REGEX_LIB=$ax_lib
-+  break
- fi
- 
-   done
-@@ -5467,7 +5494,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 +5770,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 +5837,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 +5927,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 +6000,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 +6068,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 +6169,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 +6246,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 +6413,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 +6599,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 +6670,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 +6855,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 +6925,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 +8014,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 +8231,11 @@ esac
-   *) ac_INSTALL=$ac_top_builddir$INSTALL ;;
-   esac
- 
-+  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 +8274,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-af b/textproc/source-highlight/patches/patch-af
deleted file mode 100644
index 0369ac7bef0..00000000000
--- a/textproc/source-highlight/patches/patch-af
+++ /dev/null
@@ -1,138 +0,0 @@
-$NetBSD: patch-af,v 1.5 2005/10/10 09:05:59 seb Exp $
-
---- 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
deleted file mode 100644
index 79cb3ca092f..00000000000
--- a/textproc/source-highlight/patches/patch-ag
+++ /dev/null
@@ -1,126 +0,0 @@
-$NetBSD: patch-ag,v 1.7 2005/10/10 09:05:59 seb Exp $
-
---- 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 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
deleted file mode 100644
index 0b1929b204c..00000000000
--- a/textproc/source-highlight/patches/patch-ah
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-ah,v 1.8 2005/10/10 09:05:59 seb Exp $
-
---- 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.
- 
diff --git a/textproc/source-highlight/patches/patch-ai b/textproc/source-highlight/patches/patch-ai
index 61e6fb89522..eed58a5f0fa 100644
--- a/textproc/source-highlight/patches/patch-ai
+++ b/textproc/source-highlight/patches/patch-ai
@@ -1,6 +1,6 @@
-$NetBSD: patch-ai,v 1.1 2004/10/23 17:47:16 seb Exp $
+$NetBSD: patch-ai,v 1.2 2007/02/22 20:35:37 wiz Exp $
 
---- src/lib/outputgenerator.h.orig	2004-09-26 09:34:55.000000000 +0000
+--- src/lib/outputgenerator.h.orig	2006-08-22 13:50:10.000000000 +0000
 +++ src/lib/outputgenerator.h
 @@ -13,6 +13,7 @@
  #define OUTPUTGENERATOR_H
@@ -8,5 +8,5 @@ $NetBSD: patch-ai,v 1.1 2004/10/23 17:47:16 seb Exp $
  #include <iostream>
 +#include <string>
  
- class OutputBuffer;
- 
+ /**
+ base class that actually writes the generated output to the output stream