Update to 2.10

5 files changed, 44 insertions, 11 deletions

diff --git a/textproc/source-highlight/Makefile b/textproc/source-highlight/Makefile
index 4e649ddda7b8..2afa866331c5 100644
--- a/textproc/source-highlight/Makefile
+++ b/textproc/source-highlight/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	source-highlight
-PORTVERSION=	2.7
+PORTVERSION=	2.10
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	src-highlite
@@ -14,6 +14,7 @@ MASTER_SITE_SUBDIR=	src-highlite
 MAINTAINER=	kevlo@FreeBSD.org
 COMMENT=	C/C++ and Java sources to HTML converter
 
+BUILD_DEPENDS=	exctags:${PORTSDIR}/devel/ctags
 LIB_DEPENDS=	boost_regex:${PORTSDIR}/devel/boost
 
 GNU_CONFIGURE=	yes
diff --git a/textproc/source-highlight/distinfo b/textproc/source-highlight/distinfo
index 2b4c22fabdfb..8ad89c535f7c 100644
--- a/textproc/source-highlight/distinfo
+++ b/textproc/source-highlight/distinfo
@@ -1,3 +1,3 @@
-MD5 (source-highlight-2.7.tar.gz) = 654df5a7c3d9a20063d6220979c04550
-SHA256 (source-highlight-2.7.tar.gz) = a10e1be78a5b69c2992ecdac6f42c4e98a9e1a63da85e3e0d402a734677b4253
-SIZE (source-highlight-2.7.tar.gz) = 1011368
+MD5 (source-highlight-2.10.tar.gz) = 03e9cf03580873b76ca0a89f0468b146
+SHA256 (source-highlight-2.10.tar.gz) = 68043250d6fb9761545d5f09b7899b25436fcd38f4b81c63b0ab2a3a6e3fe6a6
+SIZE (source-highlight-2.10.tar.gz) = 1202087
diff --git a/textproc/source-highlight/files/patch-configure b/textproc/source-highlight/files/patch-configure
new file mode 100644
index 000000000000..5c45ef6fb813
--- /dev/null
+++ b/textproc/source-highlight/files/patch-configure
@@ -0,0 +1,11 @@
+--- configure.orig	2008-08-19 14:41:57.000000000 +0800
++++ configure	2008-08-19 14:42:09.000000000 +0800
+@@ -23377,7 +23377,7 @@
+ fi
+ 
+ 
+-for ac_prog in ctags exuberant-ctags
++for ac_prog in exctags exuberant-ctags
+ do
+   # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
diff --git a/textproc/source-highlight/files/patch-src-cmdline.c b/textproc/source-highlight/files/patch-src-cmdline.c
new file mode 100644
index 000000000000..15b90af60624
--- /dev/null
+++ b/textproc/source-highlight/files/patch-src-cmdline.c
@@ -0,0 +1,11 @@
+--- src/cmdline.c.orig	2008-08-19 15:33:35.000000000 +0800
++++ src/cmdline.c	2008-08-19 15:35:06.000000000 +0800
+@@ -194,7 +194,7 @@
+   args_info->gen_references_orig = NULL;
+   args_info->ctags_file_arg = gengetopt_strdup ("tags");
+   args_info->ctags_file_orig = NULL;
+-  args_info->ctags_arg = gengetopt_strdup ("ctags --excmd=n --tag-relative=yes");
++  args_info->ctags_arg = gengetopt_strdup ("exctags --excmd=n --tag-relative=yes");
+   args_info->ctags_orig = NULL;
+   args_info->gen_version_flag = 1;
+   args_info->check_lang_arg = NULL;
diff --git a/textproc/source-highlight/pkg-plist b/textproc/source-highlight/pkg-plist
index 5271986430be..55ab96294b73 100644
--- a/textproc/source-highlight/pkg-plist
+++ b/textproc/source-highlight/pkg-plist
@@ -33,9 +33,10 @@ bin/src-hilite-lesspipe.sh
 %%PORTDOCS%%%%DOCSDIR%%/access.log.html
 %%PORTDOCS%%%%DOCSDIR%%/auth.log.html
 %%PORTDOCS%%%%DOCSDIR%%/cmdline.h.html
+%%PORTDOCS%%%%DOCSDIR%%/c.lang.html
 %%PORTDOCS%%%%DOCSDIR%%/colors.html
-%%PORTDOCS%%%%DOCSDIR%%/cpp.lang.html
 %%PORTDOCS%%%%DOCSDIR%%/cpp2html.css
+%%PORTDOCS%%%%DOCSDIR%%/default.css
 %%PORTDOCS%%%%DOCSDIR%%/default.style.html
 %%PORTDOCS%%%%DOCSDIR%%/error.log.html
 %%PORTDOCS%%%%DOCSDIR%%/flex_scanner.ll.html
@@ -85,8 +86,8 @@ bin/src-hilite-lesspipe.sh
 %%PORTDOCS%%%%DOCSDIR%%/sh_whatis.css
 %%PORTDOCS%%%%DOCSDIR%%/sh_whitengrey.css
 %%PORTDOCS%%%%DOCSDIR%%/sh_zellner.css
+%%PORTDOCS%%%%DOCSDIR%%/source-highlight.cc.html
 %%PORTDOCS%%%%DOCSDIR%%/source-highlight.html
-%%PORTDOCS%%%%DOCSDIR%%/startapp.cc.html
 %%PORTDOCS%%%%DOCSDIR%%/style_examples.html
 %%PORTDOCS%%%%DOCSDIR%%/syslog.log.html
 %%PORTDOCS%%%%DOCSDIR%%/syslog.style.html
@@ -107,6 +108,7 @@ bin/src-hilite-lesspipe.sh
 %%PORTDOCS%%%%DOCSDIR%%/xhtml.css
 %%DATADIR%%/bib.lang
 %%DATADIR%%/bison.lang
+%%DATADIR%%/c.lang
 %%DATADIR%%/c_comment.lang
 %%DATADIR%%/c_string.lang
 %%DATADIR%%/caml.lang
@@ -118,36 +120,41 @@ bin/src-hilite-lesspipe.sh
 %%DATADIR%%/default.css
 %%DATADIR%%/default.lang
 %%DATADIR%%/default.style
+%%DATADIR%%/desktop.lang
 %%DATADIR%%/diff.lang
 %%DATADIR%%/docbook.outlang
-%%DATADIR%%/docbookdoc.outlang
 %%DATADIR%%/esc.outlang
 %%DATADIR%%/esc.style
 %%DATADIR%%/extreme_comment.lang
 %%DATADIR%%/extreme_comment2.lang
 %%DATADIR%%/extreme_comment3.lang
+%%DATADIR%%/fixed-fortran.lang
 %%DATADIR%%/flex.lang
 %%DATADIR%%/fortran.lang
 %%DATADIR%%/function.lang
+%%DATADIR%%/glsl.lang
+%%DATADIR%%/haxe.lang
 %%DATADIR%%/html.lang
 %%DATADIR%%/html.outlang
 %%DATADIR%%/html_common.outlang
 %%DATADIR%%/html_notfixed.outlang
+%%DATADIR%%/html_ref.outlang
 %%DATADIR%%/htmlcss.outlang
-%%DATADIR%%/htmldoc.outlang
 %%DATADIR%%/htmltable.outlang
+%%DATADIR%%/htmltablelinenum.outlang
 %%DATADIR%%/java.lang
 %%DATADIR%%/javadoc.outlang
 %%DATADIR%%/javascript.lang
+%%DATADIR%%/key_string.lang
 %%DATADIR%%/lang.map
 %%DATADIR%%/langdef.lang
 %%DATADIR%%/latex.lang
 %%DATADIR%%/latex.outlang
 %%DATADIR%%/latexcolor.outlang
-%%DATADIR%%/latexcolordoc.outlang
-%%DATADIR%%/latexdoc.outlang
+%%DATADIR%%/ldap.lang
 %%DATADIR%%/log.lang
 %%DATADIR%%/logtalk.lang
+%%DATADIR%%/lsm.lang
 %%DATADIR%%/lua.lang
 %%DATADIR%%/m4.lang
 %%DATADIR%%/makefile.lang
@@ -160,12 +167,16 @@ bin/src-hilite-lesspipe.sh
 %%DATADIR%%/php.lang
 %%DATADIR%%/postscript.lang
 %%DATADIR%%/prolog.lang
+%%DATADIR%%/properties.lang
 %%DATADIR%%/python.lang
 %%DATADIR%%/ruby.lang
 %%DATADIR%%/script_comment.lang
 %%DATADIR%%/sh.lang
+%%DATADIR%%/slang.lang
 %%DATADIR%%/sml.lang
+%%DATADIR%%/spec.lang
 %%DATADIR%%/sql.lang
+%%DATADIR%%/style.defaults
 %%DATADIR%%/style.lang
 %%DATADIR%%/style2.style
 %%DATADIR%%/style3.style
@@ -178,7 +189,6 @@ bin/src-hilite-lesspipe.sh
 %%DATADIR%%/xhtml_common.outlang
 %%DATADIR%%/xhtml_notfixed.outlang
 %%DATADIR%%/xhtmlcss.outlang
-%%DATADIR%%/xhtmldoc.outlang
 %%DATADIR%%/xhtmltable.outlang
 %%DATADIR%%/xml.lang
 @dirrm %%DATADIR%%