Update to 2.9:

Version 2.9

   * language definition for C (not C++) files
   * language definition for properties files
   * language definition for KDE desktop and ini files
   * language definition for lsm files (Linux Software Map)
   * language definition for rpm spec files
   * language definition for Haxe files (thanks to Jos Hirth)
   * style.defaults for associating a style for an element (whose style is
     not specified) to the style of another element
   * highlight some KDE programming files (e.g., .rc, .kcfg, etc.)
   * correctly highlight for less when filenames contain paths
   * fixed a bug in file inclusion of langdef files
   * fixed compilation problems for fileutil.cc (thanks to Adrian Reber)
   * xml elements are correctly recognized when containing .
     (thanks to Toby White)
   * references for xhtml output files

Version 2.8

   * lang definition for slang (by John E. Davis)
   * correctly handle words in ' and ` regular expression strings
   * the right delimiter of a delim element can refer to marked subexpressions
     in the left delimiter
   * fixed the definition of C-style comments which are not nested
   * improved perl syntax highlighting
   * javascript regular expression highlighting
   * padding character for line numbers can be specified (thanks to
     Roger Nilsson)
   * removed non standard % make rules

Version 2.7

   * fixed language association for log files.
   * use standard sed arguments
   * check that the ctags program supports the options used by source-highlight
     and disable ctags tests if it does not
   * removed some memory leaks from scanners and parsers
   * fixed regular expression highlighting strings in perl
     (thanks to Elias Pipping)
   * regexp language element
   * infer script languages also checking for the env specification
   * improved error reporting for lang definition files
   * ` ` syntax for regular expressions that permits backreferences
     and conditionals
   * explicit naming for subexpressions syntax
   * added a program, check-regexp, for checking regular expressions
     on the command line
   * fix html tag definitions
   * fix ruby regexp definition
   * --doc option and references for docbook output
   * xhtml output with non fixed font

Version 2.6

   * language definition for makefiles
   * language definition for css files
   * language definition for m4 files
   * fixed some problems in xml.lang
   * fixed some problems in sh.lang
   * the ctags found during configure is correctly used in makefiles
   * --quiet option showing no progress information
     (thanks to C. Michael Pilato)
   * handle direct color specifications in double quotes in style files
   * in style files can specify formatting options for more than one
     element on the same line
   * accept css specifications as style specifications (limited support)
   * handle background color for some output formats (e.g., xhtml)
   * in style files the background color (for the entire output)
     can be specified
   * fixed a problem in configure script on some BSD systems
     (thanks to Thomas Klausner)

6 files changed, 71 insertions, 69 deletions

diff --git a/textproc/source-highlight/Makefile b/textproc/source-highlight/Makefile
index 91d68e9c0b0..973a2f89f96 100644
--- a/textproc/source-highlight/Makefile
+++ b/textproc/source-highlight/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.25 2008/01/04 20:05:12 jmmv Exp $
+# $NetBSD: Makefile,v 1.26 2008/03/13 16:45:33 wiz Exp $
 #
 
-DISTNAME=	source-highlight-2.5
+DISTNAME=	source-highlight-2.9
 SVR4_PKGNAME=	srchl
-PKGREVISION=	1
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_GNU:=src-highlite/}
 
@@ -15,6 +14,7 @@ DEPENDS+=	exctags-[0-9]*:../../devel/exctags
 
 GNU_CONFIGURE=	YES
 USE_LANGUAGES=	c c++
+USE_LIBTOOL=	YES
 CONFIGURE_ENV+=	CTAGS=${LOCALBASE}/bin/exctags
 
 INFO_FILES=	YES
@@ -34,11 +34,5 @@ BUILDLINK_TRANSFORM+=	l:boost_regex:boost_regex-mt
 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 60503b1f0a3..7c38ce3f89f 100644
--- a/textproc/source-highlight/PLIST
+++ b/textproc/source-highlight/PLIST
@@ -1,4 +1,5 @@
-@comment $NetBSD: PLIST,v 1.10 2007/02/22 20:35:34 wiz Exp $
+@comment $NetBSD: PLIST,v 1.11 2008/03/13 16:45:33 wiz Exp $
+bin/check-regexp
 bin/cpp2html
 bin/java2html
 bin/source-highlight
@@ -34,9 +35,9 @@ 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/c.lang.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
@@ -48,10 +49,50 @@ 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/sh_acid.css
+share/doc/source-highlight/sh_berries-dark.css
+share/doc/source-highlight/sh_berries-light.css
+share/doc/source-highlight/sh_bipolar.css
+share/doc/source-highlight/sh_blacknblue.css
+share/doc/source-highlight/sh_bright.css
+share/doc/source-highlight/sh_contrast.css
+share/doc/source-highlight/sh_darkblue.css
+share/doc/source-highlight/sh_darkness.css
+share/doc/source-highlight/sh_desert.css
+share/doc/source-highlight/sh_dull.css
+share/doc/source-highlight/sh_easter.css
+share/doc/source-highlight/sh_emacs.css
+share/doc/source-highlight/sh_golden.css
+share/doc/source-highlight/sh_greenlcd.css
+share/doc/source-highlight/sh_ide-anjuta.css
+share/doc/source-highlight/sh_ide-codewarrior.css
+share/doc/source-highlight/sh_ide-devcpp.css
+share/doc/source-highlight/sh_ide-eclipse.css
+share/doc/source-highlight/sh_ide-kdev.css
+share/doc/source-highlight/sh_ide-msvcpp.css
+share/doc/source-highlight/sh_kwrite.css
+share/doc/source-highlight/sh_matlab.css
+share/doc/source-highlight/sh_navy.css
+share/doc/source-highlight/sh_nedit.css
+share/doc/source-highlight/sh_neon.css
+share/doc/source-highlight/sh_night.css
+share/doc/source-highlight/sh_pablo.css
+share/doc/source-highlight/sh_peachpuff.css
+share/doc/source-highlight/sh_print.css
+share/doc/source-highlight/sh_rand01.css
+share/doc/source-highlight/sh_the.css
+share/doc/source-highlight/sh_typical.css
+share/doc/source-highlight/sh_vampire.css
+share/doc/source-highlight/sh_vim-dark.css
+share/doc/source-highlight/sh_vim.css
+share/doc/source-highlight/sh_whatis.css
+share/doc/source-highlight/sh_whitengrey.css
+share/doc/source-highlight/sh_zellner.css
 share/doc/source-highlight/source-highlight.html
 share/doc/source-highlight/startapp.cc.html
+share/doc/source-highlight/style_examples.html
 share/doc/source-highlight/syslog.log.html
-share/doc/source-highlight/syslog.style
+share/doc/source-highlight/syslog.style.html
 share/doc/source-highlight/test.htm.html
 share/doc/source-highlight/test.java.tex.html
 share/doc/source-highlight/test.js.html
@@ -69,18 +110,22 @@ 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.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.lang
 share/source-highlight/css_common.outlang
-share/source-highlight/cssdoc.outlang
+share/source-highlight/default.css
 share/source-highlight/default.lang
 share/source-highlight/default.style
+share/source-highlight/desktop.lang
 share/source-highlight/diff.lang
 share/source-highlight/docbook.outlang
+share/source-highlight/docbookdoc.outlang
 share/source-highlight/esc.outlang
 share/source-highlight/esc.style
 share/source-highlight/extreme_comment.lang
@@ -89,14 +134,19 @@ share/source-highlight/extreme_comment3.lang
 share/source-highlight/flex.lang
 share/source-highlight/fortran.lang
 share/source-highlight/function.lang
+share/source-highlight/haxe.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/html_ref.outlang
+share/source-highlight/htmlcss.outlang
 share/source-highlight/htmldoc.outlang
+share/source-highlight/htmltable.outlang
 share/source-highlight/java.lang
 share/source-highlight/javadoc.outlang
 share/source-highlight/javascript.lang
+share/source-highlight/key_string.lang
 share/source-highlight/lang.map
 share/source-highlight/langdef.lang
 share/source-highlight/latex.lang
@@ -106,7 +156,10 @@ share/source-highlight/latexcolordoc.outlang
 share/source-highlight/latexdoc.outlang
 share/source-highlight/log.lang
 share/source-highlight/logtalk.lang
+share/source-highlight/lsm.lang
 share/source-highlight/lua.lang
+share/source-highlight/m4.lang
+share/source-highlight/makefile.lang
 share/source-highlight/nohilite.lang
 share/source-highlight/number.lang
 share/source-highlight/outlang.lang
@@ -116,12 +169,16 @@ share/source-highlight/perl.lang
 share/source-highlight/php.lang
 share/source-highlight/postscript.lang
 share/source-highlight/prolog.lang
+share/source-highlight/properties.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/slang.lang
 share/source-highlight/sml.lang
+share/source-highlight/spec.lang
 share/source-highlight/sql.lang
+share/source-highlight/style.defaults
 share/source-highlight/style.lang
 share/source-highlight/style2.style
 share/source-highlight/style3.style
@@ -131,8 +188,11 @@ share/source-highlight/texinfo.outlang
 share/source-highlight/texinfo.style
 share/source-highlight/url.lang
 share/source-highlight/xhtml.outlang
+share/source-highlight/xhtml_common.outlang
+share/source-highlight/xhtml_notfixed.outlang
 share/source-highlight/xhtmlcss.outlang
 share/source-highlight/xhtmldoc.outlang
+share/source-highlight/xhtmltable.outlang
 share/source-highlight/xml.lang
 @dirrm share/source-highlight
 @dirrm share/doc/source-highlight
diff --git a/textproc/source-highlight/distinfo b/textproc/source-highlight/distinfo
index 35fa8775268..e47353d1c8f 100644
--- a/textproc/source-highlight/distinfo
+++ b/textproc/source-highlight/distinfo
@@ -1,8 +1,5 @@
-$NetBSD: distinfo,v 1.18 2007/03/07 18:52:18 joerg Exp $
+$NetBSD: distinfo,v 1.19 2008/03/13 16:45:33 wiz Exp $
 
-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) = f0ed08af1c585916fd98e23fee7283d7c1cb878f
-SHA1 (patch-ab) = 0c235b51e97cfea58100933c7eb1d668fdbe8a84
-SHA1 (patch-ac) = 0b3056ceb63966bb4d4031ffc8ab0f2c5edcfa3e
+SHA1 (source-highlight-2.9.tar.gz) = 641266525eccb985ced8c820a1c64ef88853cc70
+RMD160 (source-highlight-2.9.tar.gz) = 6611fc22dfcead5157517eb6c321aaa2be5fbe1b
+Size (source-highlight-2.9.tar.gz) = 1106407 bytes
diff --git a/textproc/source-highlight/patches/patch-aa b/textproc/source-highlight/patches/patch-aa
deleted file mode 100644
index 5a14f480b7f..00000000000
--- a/textproc/source-highlight/patches/patch-aa
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-aa,v 1.4 2007/03/07 18:52:18 joerg Exp $
-
---- 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"
-@@ -6216,7 +6216,8 @@ ac_res=`eval echo '${'$as_ac_Lib'}'`
- 	       { echo "$as_me:$LINENO: result: $ac_res" >&5
- echo "${ECHO_T}$ac_res" >&6; }
- if test `eval echo '${'$as_ac_Lib'}'` = yes; then
--  BOOST_REGEX_LIB=$ax_lib break
-+  BOOST_REGEX_LIB=$ax_lib
-+  break
- fi
- 
-   done
diff --git a/textproc/source-highlight/patches/patch-ab b/textproc/source-highlight/patches/patch-ab
deleted file mode 100644
index c332e13d04f..00000000000
--- a/textproc/source-highlight/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.4 2007/02/22 20:35:35 wiz Exp $
-
---- 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
- 
- 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
- 
- 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
deleted file mode 100644
index 30283d95b78..00000000000
--- a/textproc/source-highlight/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.4 2007/02/22 20:35:36 wiz Exp $
-
---- 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