7 files changed, 52 insertions, 32 deletions
diff --git a/textproc/source-highlight/Makefile b/textproc/source-highlight/Makefile
index 2a3301543bd1..4c62ec32e392 100644
--- a/textproc/source-highlight/Makefile
+++ b/textproc/source-highlight/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	source-highlight
-PORTVERSION=	3.1.3
+PORTVERSION=	3.1.6
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	src-highlite
diff --git a/textproc/source-highlight/distinfo b/textproc/source-highlight/distinfo
index 7e835cab905a..b6e04ef9fd32 100644
--- a/textproc/source-highlight/distinfo
+++ b/textproc/source-highlight/distinfo
@@ -1,2 +1,2 @@
-SHA256 (source-highlight-3.1.3.tar.gz) = 2d819f2ffdc8bb23a87635bdfbc51545db22605a8e544f66f86054b8075af0b5
-SIZE (source-highlight-3.1.3.tar.gz) = 1508758
+SHA256 (source-highlight-3.1.6.tar.gz) = b513f7f13797cf2cfb46b1d2a0d74f102a944749cba0f2d18b2f306b0e82bf28
+SIZE (source-highlight-3.1.6.tar.gz) = 1592588
diff --git a/textproc/source-highlight/files/patch-configure b/textproc/source-highlight/files/patch-configure
index e121f5998f0f..b656f3d87c93 100644
--- a/textproc/source-highlight/files/patch-configure
+++ b/textproc/source-highlight/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	2010-01-20 02:17:27.000000000 -0500
-+++ configure	2010-01-20 02:26:25.000000000 -0500
-@@ -3853,7 +3853,7 @@
+--- configure.orig	2011-12-23 17:28:29.000000000 +0800
++++ configure	2012-01-03 13:49:13.000000000 +0800
+@@ -3701,7 +3701,7 @@
  source_highlightdatadir=$datadir/source-highlight
  source_highlightdocdir=$docdir
  source_highlightlibdocdir=$docdir/api
@@ -9,7 +9,7 @@
  bash_completiondir=$sysconfdir/bash_completion.d
  
  LIBRARY_NAMESPACE=srchilite
-@@ -20347,7 +20347,7 @@
+@@ -20546,7 +20546,7 @@
  fi
  
  
diff --git a/textproc/source-highlight/files/patch-gl_getopt.in.h b/textproc/source-highlight/files/patch-gl_getopt.in.h
new file mode 100644
index 000000000000..7134c9a86d0a
--- /dev/null
+++ b/textproc/source-highlight/files/patch-gl_getopt.in.h
@@ -0,0 +1,18 @@
+--- gl/getopt.in.h.orig	2012-01-03 16:35:41.000000000 +0800
++++ gl/getopt.in.h	2012-01-03 16:36:24.000000000 +0800
+@@ -23,15 +23,6 @@
+ #endif
+ @PRAGMA_COLUMNS@
+ 
+-/* The include_next requires a split double-inclusion guard.  We must
+-   also inform the replacement unistd.h to not recursively use
+-   <getopt.h>; our definitions will be present soon enough.  */
+-#if @HAVE_GETOPT_H@
+-# define _GL_SYSTEM_GETOPT
+-# @INCLUDE_NEXT@ @NEXT_GETOPT_H@
+-# undef _GL_SYSTEM_GETOPT
+-#endif
+-
+ #ifndef _@GUARD_PREFIX@_GETOPT_H
+ 
+ #ifndef __need_getopt
diff --git a/textproc/source-highlight/files/patch-lib_srchilite_fileutil.h b/textproc/source-highlight/files/patch-lib_srchilite_fileutil.h
deleted file mode 100644
index 1ebfb15ebc33..000000000000
--- a/textproc/source-highlight/files/patch-lib_srchilite_fileutil.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- lib/srchilite/fileutil.h.orig	2010-01-19 00:12:06.000000000 -0500
-+++ lib/srchilite/fileutil.h	2010-01-19 00:12:30.000000000 -0500
-@@ -9,6 +9,7 @@
- 
- #include <iostream>
- #include <string>
-+#include <cstdio>
- #include "ioexception.h"
- 
- using std::istream;
diff --git a/textproc/source-highlight/files/patch-m4_Makefile.in b/textproc/source-highlight/files/patch-m4_Makefile.in
deleted file mode 100644
index 662c464947a3..000000000000
--- a/textproc/source-highlight/files/patch-m4_Makefile.in
+++ /dev/null
@@ -1,13 +0,0 @@
---- m4/Makefile.in.orig	2010-01-19 18:51:38.000000000 -0500
-+++ m4/Makefile.in	2010-01-19 18:56:21.000000000 -0500
-@@ -841,7 +841,9 @@
- 
- info-am:
- 
--install-data-am: install-aclocalDATA
-+#if the aclocalDATA files are needed, install the devel/autoconf-archive port
-+#install-data-am: install-aclocalDATA
-+install-data-am:
- 
- install-dvi: install-dvi-recursive
- 
diff --git a/textproc/source-highlight/pkg-plist b/textproc/source-highlight/pkg-plist
index 7f35632fee23..7bc434701ae8 100644
--- a/textproc/source-highlight/pkg-plist
+++ b/textproc/source-highlight/pkg-plist
@@ -4,7 +4,7 @@ bin/java2html
 bin/source-highlight
 bin/source-highlight-settings
 bin/src-hilite-lesspipe.sh
-%%BASH%%etc/bash_completion.d/source-highlight-bash-completion
+%%BASH%%etc/bash_completion.d/source-highlight
 include/srchilite/bufferedoutput.h
 include/srchilite/chartranslator.h
 include/srchilite/colormap.h
@@ -95,7 +95,7 @@ include/srchilite/wordtokenizer.h
 lib/libsource-highlight.a
 lib/libsource-highlight.la
 lib/libsource-highlight.so
-lib/libsource-highlight.so.3
+lib/libsource-highlight.so.4
 libdata/pkgconfig/source-highlight.pc
 %%PORTDATA%%%%DATADIR%%/Hello.css
 %%PORTDATA%%%%DATADIR%%/Hello2.css
@@ -140,17 +140,21 @@ libdata/pkgconfig/source-highlight.pc
 %%PORTDATA%%%%DATADIR%%/function.lang
 %%PORTDATA%%%%DATADIR%%/glsl.lang
 %%PORTDATA%%%%DATADIR%%/haskell.lang
+%%PORTDATA%%%%DATADIR%%/haskell_literate.lang
 %%PORTDATA%%%%DATADIR%%/haxe.lang
 %%PORTDATA%%%%DATADIR%%/html.lang
 %%PORTDATA%%%%DATADIR%%/html.outlang
 %%PORTDATA%%%%DATADIR%%/html_common.outlang
 %%PORTDATA%%%%DATADIR%%/html_notfixed.outlang
 %%PORTDATA%%%%DATADIR%%/html_ref.outlang
+%%PORTDATA%%%%DATADIR%%/html_simple.lang
 %%PORTDATA%%%%DATADIR%%/htmlcss.outlang
 %%PORTDATA%%%%DATADIR%%/htmltable.outlang
 %%PORTDATA%%%%DATADIR%%/htmltablelinenum.outlang
 %%PORTDATA%%%%DATADIR%%/java.lang
 %%PORTDATA%%%%DATADIR%%/javadoc.outlang
+%%PORTDATA%%%%DATADIR%%/javalog.lang
+%%PORTDATA%%%%DATADIR%%/javalog.style
 %%PORTDATA%%%%DATADIR%%/javascript.lang
 %%PORTDATA%%%%DATADIR%%/key_string.lang
 %%PORTDATA%%%%DATADIR%%/lang.map
@@ -159,6 +163,7 @@ libdata/pkgconfig/source-highlight.pc
 %%PORTDATA%%%%DATADIR%%/latex.outlang
 %%PORTDATA%%%%DATADIR%%/latexcolor.outlang
 %%PORTDATA%%%%DATADIR%%/ldap.lang
+%%PORTDATA%%%%DATADIR%%/lisp.lang
 %%PORTDATA%%%%DATADIR%%/log.lang
 %%PORTDATA%%%%DATADIR%%/logtalk.lang
 %%PORTDATA%%%%DATADIR%%/lsm.lang
@@ -166,10 +171,13 @@ libdata/pkgconfig/source-highlight.pc
 %%PORTDATA%%%%DATADIR%%/m4.lang
 %%PORTDATA%%%%DATADIR%%/makefile.lang
 %%PORTDATA%%%%DATADIR%%/manifest.lang
+%%PORTDATA%%%%DATADIR%%/mediawiki.outlang
 %%PORTDATA%%%%DATADIR%%/mono-alt.css
 %%PORTDATA%%%%DATADIR%%/mono.css
 %%PORTDATA%%%%DATADIR%%/nohilite.lang
 %%PORTDATA%%%%DATADIR%%/number.lang
+%%PORTDATA%%%%DATADIR%%/odf.outlang
+%%PORTDATA%%%%DATADIR%%/opa.lang
 %%PORTDATA%%%%DATADIR%%/outlang.lang
 %%PORTDATA%%%%DATADIR%%/outlang.map
 %%PORTDATA%%%%DATADIR%%/oz.lang
@@ -177,12 +185,15 @@ libdata/pkgconfig/source-highlight.pc
 %%PORTDATA%%%%DATADIR%%/pc.lang
 %%PORTDATA%%%%DATADIR%%/perl.lang
 %%PORTDATA%%%%DATADIR%%/php.lang
+%%PORTDATA%%%%DATADIR%%/po.lang
 %%PORTDATA%%%%DATADIR%%/postscript.lang
 %%PORTDATA%%%%DATADIR%%/prolog.lang
 %%PORTDATA%%%%DATADIR%%/properties.lang
+%%PORTDATA%%%%DATADIR%%/proto.lang
 %%PORTDATA%%%%DATADIR%%/python.lang
 %%PORTDATA%%%%DATADIR%%/ruby.lang
 %%PORTDATA%%%%DATADIR%%/scala.lang
+%%PORTDATA%%%%DATADIR%%/scheme.lang
 %%PORTDATA%%%%DATADIR%%/script_comment.lang
 %%PORTDATA%%%%DATADIR%%/sh.lang
 %%PORTDATA%%%%DATADIR%%/sh_acid.css
@@ -237,8 +248,22 @@ libdata/pkgconfig/source-highlight.pc
 %%PORTDATA%%%%DATADIR%%/texinfo.lang
 %%PORTDATA%%%%DATADIR%%/texinfo.outlang
 %%PORTDATA%%%%DATADIR%%/texinfo.style
+%%PORTDATA%%%%DATADIR%%/tml.lang
+%%PORTDATA%%%%DATADIR%%/tml_formatting.lang
+%%PORTDATA%%%%DATADIR%%/tml_formatting_all.lang
+%%PORTDATA%%%%DATADIR%%/tml_glue.lang
+%%PORTDATA%%%%DATADIR%%/tml_macrolinks.lang
+%%PORTDATA%%%%DATADIR%%/tml_macros.lang
+%%PORTDATA%%%%DATADIR%%/tml_macros1.lang
+%%PORTDATA%%%%DATADIR%%/tml_macros2.lang
+%%PORTDATA%%%%DATADIR%%/tml_macrosdelayed1.lang
+%%PORTDATA%%%%DATADIR%%/tml_macrosdelayed2.lang
+%%PORTDATA%%%%DATADIR%%/tml_macrosdelayed3.lang
+%%PORTDATA%%%%DATADIR%%/tml_macrotokens.lang
 %%PORTDATA%%%%DATADIR%%/todo.lang
+%%PORTDATA%%%%DATADIR%%/upc.lang
 %%PORTDATA%%%%DATADIR%%/url.lang
+%%PORTDATA%%%%DATADIR%%/vala.lang
 %%PORTDATA%%%%DATADIR%%/vbscript.lang
 %%PORTDATA%%%%DATADIR%%/xhtml.css
 %%PORTDATA%%%%DATADIR%%/xhtml.outlang