Update to 2.6.14: new langauges, various bug fixes, and the option to

output SVG.  See bundled ChangeLog for full details.

5 files changed, 42 insertions, 30 deletions

diff --git a/textproc/highlight/Makefile b/textproc/highlight/Makefile
index 5f59d1028aa..7443dcb4340 100644
--- a/textproc/highlight/Makefile
+++ b/textproc/highlight/Makefile
@@ -1,7 +1,6 @@
-#	$NetBSD: Makefile,v 1.2 2008/07/14 12:56:13 joerg Exp $
-#
+#	$NetBSD: Makefile,v 1.3 2008/11/07 21:12:12 snj Exp $
 
-DISTNAME=		highlight-2.6.8
+DISTNAME=		highlight-2.6.14
 CATEGORIES=		textproc
 MASTER_SITES=		http://www.andre-simon.de/zip/
 EXTRACT_SUFX=		.tar.bz2
diff --git a/textproc/highlight/PLIST b/textproc/highlight/PLIST
index e671e947d25..840648d3423 100644
--- a/textproc/highlight/PLIST
+++ b/textproc/highlight/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2008/02/19 02:23:44 rh Exp $
+@comment $NetBSD: PLIST,v 1.2 2008/11/07 21:12:12 snj Exp $
 bin/highlight
 man/man1/highlight.1
 share/doc/highlight/AUTHORS
@@ -11,6 +11,9 @@ share/doc/highlight/README_INDENT
 share/doc/highlight/README_LANGLIST
 share/doc/highlight/README_REGEX
 share/doc/highlight/README_SWIG
+share/doc/highlight/examples/highlight_pipe.php
+share/doc/highlight/examples/highlight_pipe.pm
+share/doc/highlight/examples/highlight_pipe.py
 share/doc/highlight/examples/plugins/dokuwiki/syntax.php
 share/doc/highlight/examples/plugins/movabletype/README
 share/doc/highlight/examples/plugins/movabletype/highlight.pl
@@ -27,6 +30,7 @@ share/highlight/helpmsg/de.help
 share/highlight/helpmsg/en.help
 share/highlight/helpmsg/es.help
 share/highlight/helpmsg/fr.help
+share/highlight/helpmsg/ja.help
 share/highlight/indentSchemes/acid.indent
 share/highlight/indentSchemes/ansi.indent
 share/highlight/indentSchemes/gnu.indent
@@ -41,6 +45,7 @@ share/highlight/langDefs/agda.lang
 share/highlight/langDefs/ampl.lang
 share/highlight/langDefs/amtrix.lang
 share/highlight/langDefs/applescript.lang
+share/highlight/langDefs/arc.lang
 share/highlight/langDefs/arm.lang
 share/highlight/langDefs/as.lang
 share/highlight/langDefs/asm.lang
@@ -88,11 +93,14 @@ share/highlight/langDefs/js.lang
 share/highlight/langDefs/jsp.lang
 share/highlight/langDefs/lbn.lang
 share/highlight/langDefs/ldif.lang
+share/highlight/langDefs/lgt.lang
+share/highlight/langDefs/lhs.lang
 share/highlight/langDefs/lisp.lang
 share/highlight/langDefs/lotos.lang
 share/highlight/langDefs/ls.lang
 share/highlight/langDefs/lsl.lang
 share/highlight/langDefs/lua.lang
+share/highlight/langDefs/ly.lang
 share/highlight/langDefs/m.lang
 share/highlight/langDefs/make.lang
 share/highlight/langDefs/mel.lang
@@ -142,7 +150,7 @@ share/highlight/langDefs/sh.lang
 share/highlight/langDefs/sma.lang
 share/highlight/langDefs/smalltalk.lang
 share/highlight/langDefs/sml.lang
-share/highlight/langDefs/snobol.lang
+share/highlight/langDefs/sno.lang
 share/highlight/langDefs/spec.lang
 share/highlight/langDefs/spn.lang
 share/highlight/langDefs/sql.lang
@@ -153,6 +161,7 @@ share/highlight/langDefs/test_re.lang
 share/highlight/langDefs/tex.lang
 share/highlight/langDefs/ttcn3.lang
 share/highlight/langDefs/txt.lang
+share/highlight/langDefs/vala.lang
 share/highlight/langDefs/vb.lang
 share/highlight/langDefs/verilog.lang
 share/highlight/langDefs/vhd.lang
diff --git a/textproc/highlight/distinfo b/textproc/highlight/distinfo
index c09c334feb9..c661f553596 100644
--- a/textproc/highlight/distinfo
+++ b/textproc/highlight/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.1.1.1 2008/02/19 02:23:44 rh Exp $
+$NetBSD: distinfo,v 1.2 2008/11/07 21:12:12 snj Exp $
 
-SHA1 (highlight-2.6.8.tar.bz2) = f648ff731380752b147db7d6f774717e4a234575
-RMD160 (highlight-2.6.8.tar.bz2) = 0d872baba00913204095e5744cdfe20d4b90b0c5
-Size (highlight-2.6.8.tar.bz2) = 391114 bytes
-SHA1 (patch-aa) = b55972e8f432b9188f826725cca93f48e63a515b
-SHA1 (patch-ab) = 2b9d832d9beaef3975826c537e98bdf7a3f42869
+SHA1 (highlight-2.6.14.tar.bz2) = 9e0890ef3042b6ed5b1249a8cc074822fa4dc141
+RMD160 (highlight-2.6.14.tar.bz2) = fe01d991906c13203923215cbb3e846ff59d7500
+Size (highlight-2.6.14.tar.bz2) = 393390 bytes
+SHA1 (patch-aa) = 6c082bf2fb07a5a8859da2717bef799389e7831d
+SHA1 (patch-ab) = a117fb98e2e4bfdb3e2c56e10092fbe17a2b4d4e
diff --git a/textproc/highlight/patches/patch-aa b/textproc/highlight/patches/patch-aa
index c579f408410..69e9fd2e94e 100644
--- a/textproc/highlight/patches/patch-aa
+++ b/textproc/highlight/patches/patch-aa
@@ -1,16 +1,16 @@
-$NetBSD: patch-aa,v 1.1.1.1 2008/02/19 02:23:44 rh Exp $
+$NetBSD: patch-aa,v 1.2 2008/11/07 21:12:12 snj Exp $
 
---- makefile.orig	2008-01-30 12:38:21.000000000 +1000
-+++ makefile
-@@ -7,7 +7,6 @@
- DESTDIR = 
+--- makefile.orig	2008-10-28 21:53:41.000000000 -0700
++++ makefile	2008-11-07 11:55:20.000000000 -0800
+@@ -8,7 +8,6 @@
+ DESTDIR =
  
  # Root directory for final installation
 -PREFIX = /usr
  
  # Location of the highlight data files:
  data_dir = ${PREFIX}/share/highlight/
-@@ -16,7 +15,7 @@ data_dir = ${PREFIX}/share/highlight/
+@@ -17,7 +16,7 @@ data_dir = ${PREFIX}/share/highlight/
  bin_dir = ${PREFIX}/bin/
  
  # Location of the highlight man page:
@@ -19,12 +19,16 @@ $NetBSD: patch-aa,v 1.1.1.1 2008/02/19 02:23:44 rh Exp $
  
  # Location of the highlight documentation:
  doc_dir = ${PREFIX}/share/doc/highlight/
-@@ -25,13 +24,13 @@ doc_dir = ${PREFIX}/share/doc/highlight/
+@@ -26,17 +25,17 @@ doc_dir = ${PREFIX}/share/doc/highlight/
  examples_dir = ${PREFIX}/share/doc/highlight/examples/
  
  # Location of the highlight config files:
--conf_dir = ${PREFIX}/etc/highlight/
+-conf_dir = /etc/highlight/
 +conf_dir = ${PREFIX}/share/examples/highlight/
+ #conf_dir = ${PREFIX}/etc/highlight/
+ 
+ desktop_apps = ${PREFIX}/share/applications/
+ desktop_pixmaps = ${PREFIX}/share/pixmaps/
  
  # Commands:
 -INSTALL_DATA=install -m644
@@ -38,7 +42,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2008/02/19 02:23:44 rh Exp $
  
  all:
  	${MAKE} -C ./src -f ./makefile HL_DATA_DIR=${data_dir} HL_CONFIG_DIR=${conf_dir}
-@@ -67,7 +66,7 @@ install:
+@@ -77,7 +76,7 @@ install:
  		${DESTDIR}${data_dir}langDefs \
  		${DESTDIR}${data_dir}indentSchemes \
  		${DESTDIR}${data_dir}helpmsg
@@ -47,7 +51,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2008/02/19 02:23:44 rh Exp $
  	${MKDIR} ${DESTDIR}${bin_dir}
  
  	${INSTALL_DATA} ./langDefs/*.lang ${DESTDIR}${data_dir}langDefs/
-@@ -75,7 +74,7 @@ install:
+@@ -85,7 +84,7 @@ install:
  	${INSTALL_DATA} ./themes/*.style ${DESTDIR}${data_dir}themes/
  	${INSTALL_DATA} ./indentSchemes/*.indent ${DESTDIR}${data_dir}indentSchemes/
  	${INSTALL_DATA} ./helpmsg/*.help ${DESTDIR}${data_dir}helpmsg/
@@ -56,12 +60,12 @@ $NetBSD: patch-aa,v 1.1.1.1 2008/02/19 02:23:44 rh Exp $
  	${INSTALL_DATA} ./AUTHORS ${DESTDIR}${doc_dir}
  	${INSTALL_DATA} ./README ${DESTDIR}${doc_dir}
  	${INSTALL_DATA} ./README_DE ${DESTDIR}${doc_dir}
-@@ -118,7 +117,7 @@ uninstall:
- 	${RMDIR} ${DESTDIR}${data_dir}
+@@ -132,7 +131,7 @@ uninstall:
  	${RMDIR} ${DESTDIR}${doc_dir}
  	${RMDIR} ${DESTDIR}${conf_dir}
+ 	${RMDIR} ${DESTDIR}${examples_dir}
 -	rm ${DESTDIR}${man_dir}highlight.1.gz
 +	rm ${DESTDIR}${man_dir}highlight.1*
  	rm ${DESTDIR}${bin_dir}highlight
  	rm ${DESTDIR}${bin_dir}highlight-gui
- 	@echo "Done. Have a nice day!"
+ 	rm ${DESTDIR}${desktop_apps}highlight.desktop
diff --git a/textproc/highlight/patches/patch-ab b/textproc/highlight/patches/patch-ab
index c29547a44a9..9fc37f9cc59 100644
--- a/textproc/highlight/patches/patch-ab
+++ b/textproc/highlight/patches/patch-ab
@@ -1,10 +1,10 @@
-$NetBSD: patch-ab,v 1.1.1.1 2008/02/19 02:23:44 rh Exp $
+$NetBSD: patch-ab,v 1.2 2008/11/07 21:12:12 snj Exp $
 
---- src/makefile.orig	2008-02-19 09:38:29.000000000 +1000
-+++ src/makefile
-@@ -13,9 +13,7 @@
- # Add -DUSE_FN_MATCH to enable better wildcard support with the --batch-recursive option.
- # See "man 3 fnmatch" for details.
+--- src/makefile.orig	2008-10-23 19:08:29.000000000 -0700
++++ src/makefile	2008-11-07 11:56:04.000000000 -0800
+@@ -10,9 +10,7 @@
+ # Add -DCONFIG_FILE_PATH=\"/your/path/.highlightrc\" if you want to define a
+ # custom path to the highlight configuration file (default: $HOME/.highlightrc)
  
 -CXX=c++