Update to version 1.11

Changes since last packaged version (1.10):
* errors in tags error files are reported more correctly and make
  the program exit
* more tag options added
* "linenum" tag for specifying the style of line numbers

Package changes:
* set USE_LANGUAGES
* fix HTML installation directory in manpage

6 files changed, 47 insertions, 21 deletions

diff --git a/textproc/source-highlight/Makefile b/textproc/source-highlight/Makefile
index 92f012e06ad..54f33b97e0c 100644
--- a/textproc/source-highlight/Makefile
+++ b/textproc/source-highlight/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.14 2004/08/16 15:21:45 seb Exp $
+# $NetBSD: Makefile,v 1.15 2004/10/21 00:15:47 seb Exp $
 #
 
-DISTNAME=	source-highlight-1.10
+DISTNAME=	source-highlight-1.11
 SVR4_PKGNAME=	srchl
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_GNU:=src-highlite/}
@@ -12,6 +12,7 @@ COMMENT=	Highlight syntax of various languages source into HTML document
 
 GNU_CONFIGURE=	YES
 USE_BUILDLINK3=	YES
+USE_LANGUAGES=	c c++
 
 TEST_TARGET=	check
 
diff --git a/textproc/source-highlight/PLIST b/textproc/source-highlight/PLIST
index 92a9ecbddad..ef026c22d60 100644
--- a/textproc/source-highlight/PLIST
+++ b/textproc/source-highlight/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2004/08/16 15:21:45 seb Exp $
+@comment $NetBSD: PLIST,v 1.8 2004/10/21 00:15:47 seb Exp $
 bin/cpp2html
 bin/java2html
 bin/source-highlight
@@ -31,6 +31,7 @@ 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/test.js.html
 share/doc/html/source-highlight/test.log.html
diff --git a/textproc/source-highlight/distinfo b/textproc/source-highlight/distinfo
index 0cb44796d7f..406d7821a18 100644
--- a/textproc/source-highlight/distinfo
+++ b/textproc/source-highlight/distinfo
@@ -1,11 +1,12 @@
-$NetBSD: distinfo,v 1.9 2004/08/16 15:21:45 seb Exp $
+$NetBSD: distinfo,v 1.10 2004/10/21 00:15:47 seb Exp $
 
-SHA1 (source-highlight-1.10.tar.gz) = 2ae61f792d48262339b2a07d4d39af978d78b0a1
-Size (source-highlight-1.10.tar.gz) = 721159 bytes
+SHA1 (source-highlight-1.11.tar.gz) = 67bfdfcfe525dc4e61143e8e5865f8d977fe2b58
+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-ag) = 8276d263a44fb4e06547d399c32d9e5c76ea4b7f
-SHA1 (patch-ah) = 3557d9ab161b803150267ae7c3976477836b04c7
+SHA1 (patch-af) = 55f91e0f744ca0028db5aa04806084e057191637
+SHA1 (patch-ag) = e56f2f94ae8cc22766d11ee3729ad3e6410f3240
+SHA1 (patch-ah) = ba914d5f459bda5da8a57ad83b53abb4bc474701
diff --git a/textproc/source-highlight/patches/patch-af b/textproc/source-highlight/patches/patch-af
new file mode 100644
index 00000000000..c6245bc1ab6
--- /dev/null
+++ b/textproc/source-highlight/patches/patch-af
@@ -0,0 +1,23 @@
+$NetBSD: patch-af,v 1.4 2004/10/21 00:15:47 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.
diff --git a/textproc/source-highlight/patches/patch-ag b/textproc/source-highlight/patches/patch-ag
index 2c5be483c50..dbe6eb33144 100644
--- a/textproc/source-highlight/patches/patch-ag
+++ b/textproc/source-highlight/patches/patch-ag
@@ -1,8 +1,8 @@
-$NetBSD: patch-ag,v 1.5 2004/08/16 15:21:45 seb Exp $
+$NetBSD: patch-ag,v 1.6 2004/10/21 00:15:47 seb Exp $
 
---- tests/Makefile.am.orig	2004-07-11 12:58:38.000000000 +0000
+--- tests/Makefile.am.orig	2004-09-28 07:22:00.000000000 +0000
 +++ tests/Makefile.am
-@@ -279,7 +279,7 @@ check_log: test.log.html
+@@ -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
  
@@ -10,4 +10,4 @@ $NetBSD: patch-ag,v 1.5 2004/08/16 15:21:45 seb Exp $
 +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.syslog tags.esc
diff --git a/textproc/source-highlight/patches/patch-ah b/textproc/source-highlight/patches/patch-ah
index b32dc8ac1ac..25bd4240aa2 100644
--- a/textproc/source-highlight/patches/patch-ah
+++ b/textproc/source-highlight/patches/patch-ah
@@ -1,6 +1,6 @@
-$NetBSD: patch-ah,v 1.6 2004/08/16 15:21:45 seb Exp $
+$NetBSD: patch-ah,v 1.7 2004/10/21 00:15:47 seb Exp $
 
---- tests/Makefile.in.orig	2004-08-16 14:10:24.000000000 +0000
+--- 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 =
@@ -23,16 +23,16 @@ $NetBSD: patch-ah,v 1.6 2004/08/16 15:21:45 seb Exp $
  sysconfdir = @sysconfdir@
  target_alias = @target_alias@
  TAGS_J2H_OPTION = -f html --tags-file $(top_srcdir)/src/tags.j2h 
-@@ -214,7 +215,7 @@ syslog.log syslog.log.html \
- tags.syslog
+@@ -216,7 +217,7 @@ tags.syslog tags.esc \
+ changelog.css
  
  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
-@@ -253,22 +254,22 @@ $(top_srcdir)/configure:  $(am__configur
+ 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:
@@ -64,7 +64,7 @@ $NetBSD: patch-ah,v 1.6 2004/08/16 15:21:45 seb Exp $
  	done
  tags: TAGS
  TAGS:
-@@ -308,7 +309,7 @@ check-am: all-am
+@@ -310,7 +311,7 @@ check-am: all-am
  check: check-am
  all-am: Makefile $(DATA)
  installdirs:
@@ -73,7 +73,7 @@ $NetBSD: patch-ah,v 1.6 2004/08/16 15:21:45 seb Exp $
  	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
  	done
  install: install-am
-@@ -354,7 +355,7 @@ info: info-am
+@@ -356,7 +357,7 @@ info: info-am
  
  info-am:
  
@@ -82,7 +82,7 @@ $NetBSD: patch-ah,v 1.6 2004/08/16 15:21:45 seb Exp $
  
  install-exec-am:
  
-@@ -380,17 +381,17 @@ ps: ps-am
+@@ -382,17 +383,17 @@ ps: ps-am
  
  ps-am: