textproc/source-highlight: Update to 3.1.8

Changelog:
https://www.gnu.org/software/src-highlite/NEWS

Additional port changes:
* Changed to DISTVERSION
* Moved BROKEN_sparc64 to a proper location
* Moved USExx statements into the USExx section
* Replaced examples and docs in pkg-plist with PORTDOCS/PORTEXAMPLES
* Renamed 'test' target into 'do-test' and slightly improved it

Reported by:	portscout
Approved by:	tcberner (mentor, implicit)

3 files changed, 36 insertions, 126 deletions

diff --git a/textproc/source-highlight/Makefile b/textproc/source-highlight/Makefile
index 3df1e17a0112..546ff6e67105 100644
--- a/textproc/source-highlight/Makefile
+++ b/textproc/source-highlight/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	source-highlight
-PORTVERSION=	3.1.6
-PORTREVISION=	9
+DISTVERSION=	3.1.8
 CATEGORIES=	textproc
 MASTER_SITES=	GNU/src-highlite
 
@@ -13,24 +12,25 @@ COMMENT=	C/C++ and Java sources to HTML converter
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
+BROKEN_sparc64=	Does not compile with GCC 4.2
+
 BUILD_DEPENDS=	exctags:devel/ctags
 LIB_DEPENDS=	libboost_regex.so:devel/boost-libs
 
-BROKEN_sparc64=	Does not compile with GCC 4.2
-
+USES=		gmake pathfix libtool localbase
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-bash-completion
-
 INSTALL_TARGET=	install-strip
-
-USES=		gmake pathfix libtool localbase
 USE_LDCONFIG=	yes
 
-INFO=	source-highlight source-highlight-lib
+INFO=		source-highlight source-highlight-lib
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
-test: build
-	@(cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${_MAKE_JOBS} ${MAKE_ARGS} check)
+PORTDOCS=	*
+PORTEXAMPLES=	*
+
+do-test:
+	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${_MAKE_JOBS} ${MAKE_ARGS} check
 
 .include <bsd.port.mk>
diff --git a/textproc/source-highlight/distinfo b/textproc/source-highlight/distinfo
index b6e04ef9fd32..5ffe382d21bb 100644
--- a/textproc/source-highlight/distinfo
+++ b/textproc/source-highlight/distinfo
@@ -1,2 +1,3 @@
-SHA256 (source-highlight-3.1.6.tar.gz) = b513f7f13797cf2cfb46b1d2a0d74f102a944749cba0f2d18b2f306b0e82bf28
-SIZE (source-highlight-3.1.6.tar.gz) = 1592588
+TIMESTAMP = 1518316690
+SHA256 (source-highlight-3.1.8.tar.gz) = 01336a7ea1d1ccc374201f7b81ffa94d0aecb33afc7d6903ebf9fbf33a55ada3
+SIZE (source-highlight-3.1.8.tar.gz) = 1648351
diff --git a/textproc/source-highlight/pkg-plist b/textproc/source-highlight/pkg-plist
index b127d13850ea..aab96da2c7e5 100644
--- a/textproc/source-highlight/pkg-plist
+++ b/textproc/source-highlight/pkg-plist
@@ -2,6 +2,7 @@ bin/check-regexp
 bin/cpp2html
 bin/java2html
 bin/source-highlight
+bin/source-highlight-esc.sh
 bin/source-highlight-settings
 bin/src-hilite-lesspipe.sh
 etc/bash_completion.d/source-highlight
@@ -95,7 +96,7 @@ include/srchilite/wordtokenizer.h
 lib/libsource-highlight.a
 lib/libsource-highlight.so
 lib/libsource-highlight.so.4
-lib/libsource-highlight.so.4.0.0
+lib/libsource-highlight.so.4.0.1
 libdata/pkgconfig/source-highlight.pc
 man/man1/check-regexp.1.gz
 man/man1/source-highlight-settings.1.gz
@@ -117,6 +118,7 @@ man/man1/source-highlight.1.gz
 %%DATADIR%%/clike_vardeclaration.lang
 %%DATADIR%%/clipper.lang
 %%DATADIR%%/cobol.lang
+%%DATADIR%%/coffeescript.lang
 %%DATADIR%%/conf.lang
 %%DATADIR%%/cpp.lang
 %%DATADIR%%/cpp2html.css
@@ -134,19 +136,29 @@ man/man1/source-highlight.1.gz
 %%DATADIR%%/errors.lang
 %%DATADIR%%/esc.outlang
 %%DATADIR%%/esc.style
+%%DATADIR%%/esc256.outlang
+%%DATADIR%%/esc256.style
 %%DATADIR%%/extreme_comment.lang
 %%DATADIR%%/extreme_comment2.lang
 %%DATADIR%%/extreme_comment3.lang
+%%DATADIR%%/feature.lang
 %%DATADIR%%/fixed-fortran.lang
 %%DATADIR%%/flex.lang
 %%DATADIR%%/fortran.lang
 %%DATADIR%%/function.lang
 %%DATADIR%%/glsl.lang
+%%DATADIR%%/go.lang
+%%DATADIR%%/groff_man.outlang
+%%DATADIR%%/groff_mm.outlang
+%%DATADIR%%/groff_mm_color.outlang
+%%DATADIR%%/groovy.lang
 %%DATADIR%%/haskell.lang
 %%DATADIR%%/haskell_literate.lang
 %%DATADIR%%/haxe.lang
 %%DATADIR%%/html.lang
 %%DATADIR%%/html.outlang
+%%DATADIR%%/html5.outlang
+%%DATADIR%%/html5_common.outlang
 %%DATADIR%%/html_common.outlang
 %%DATADIR%%/html_notfixed.outlang
 %%DATADIR%%/html_ref.outlang
@@ -154,11 +166,14 @@ man/man1/source-highlight.1.gz
 %%DATADIR%%/htmlcss.outlang
 %%DATADIR%%/htmltable.outlang
 %%DATADIR%%/htmltablelinenum.outlang
+%%DATADIR%%/islisp.lang
 %%DATADIR%%/java.lang
 %%DATADIR%%/javadoc.outlang
 %%DATADIR%%/javalog.lang
 %%DATADIR%%/javalog.style
 %%DATADIR%%/javascript.lang
+%%DATADIR%%/json.lang
+%%DATADIR%%/json.style
 %%DATADIR%%/key_string.lang
 %%DATADIR%%/lang.map
 %%DATADIR%%/langdef.lang
@@ -166,6 +181,8 @@ man/man1/source-highlight.1.gz
 %%DATADIR%%/latex.outlang
 %%DATADIR%%/latexcolor.outlang
 %%DATADIR%%/ldap.lang
+%%DATADIR%%/lilypond.lang
+%%DATADIR%%/lilypond.style
 %%DATADIR%%/lisp.lang
 %%DATADIR%%/log.lang
 %%DATADIR%%/logtalk.lang
@@ -194,10 +211,14 @@ man/man1/source-highlight.1.gz
 %%DATADIR%%/properties.lang
 %%DATADIR%%/proto.lang
 %%DATADIR%%/python.lang
+%%DATADIR%%/r.lang
+%%DATADIR%%/r.style
 %%DATADIR%%/ruby.lang
+%%DATADIR%%/s.lang
 %%DATADIR%%/scala.lang
 %%DATADIR%%/scheme.lang
 %%DATADIR%%/script_comment.lang
+%%DATADIR%%/sexp.outlang
 %%DATADIR%%/sh.lang
 %%DATADIR%%/sh_acid.css
 %%DATADIR%%/sh_berries-dark.css
@@ -276,116 +297,4 @@ man/man1/source-highlight.1.gz
 %%DATADIR%%/xhtmltable.outlang
 %%DATADIR%%/xml.lang
 %%DATADIR%%/xorg.lang
-%%PORTDOCS%%%%DOCSDIR%%/COPYING
-%%PORTDOCS%%%%DOCSDIR%%/CREDITS
-%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
-%%PORTDOCS%%%%DOCSDIR%%/Hello.css
-%%PORTDOCS%%%%DOCSDIR%%/Hello.java
-%%PORTDOCS%%%%DOCSDIR%%/Hello.java.html
-%%PORTDOCS%%%%DOCSDIR%%/Hello1.html
-%%PORTDOCS%%%%DOCSDIR%%/Hello2.css
-%%PORTDOCS%%%%DOCSDIR%%/Hello2.html
-%%PORTDOCS%%%%DOCSDIR%%/Hello3.html
-%%PORTDOCS%%%%DOCSDIR%%/Hello4.html
-%%PORTDOCS%%%%DOCSDIR%%/Hello5.html
-%%PORTDOCS%%%%DOCSDIR%%/Hello_h_f.html
-%%PORTDOCS%%%%DOCSDIR%%/Hello_lines.html
-%%PORTDOCS%%%%DOCSDIR%%/Hello_notfixed.html
-%%PORTDOCS%%%%DOCSDIR%%/Hello_xhtml.html
-%%PORTDOCS%%%%DOCSDIR%%/Hello_xhtml2.html
-%%PORTDOCS%%%%DOCSDIR%%/INSTALL
-%%PORTDOCS%%%%DOCSDIR%%/NEWS
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/SimpleClass-doc.html
-%%PORTDOCS%%%%DOCSDIR%%/SimpleClass.html
-%%PORTDOCS%%%%DOCSDIR%%/SimpleClass.java
-%%PORTDOCS%%%%DOCSDIR%%/THANKS
-%%PORTDOCS%%%%DOCSDIR%%/TODO.txt
-%%PORTDOCS%%%%DOCSDIR%%/UsageExample.html
-%%PORTDOCS%%%%DOCSDIR%%/UsageExample.java
-%%PORTDOCS%%%%DOCSDIR%%/access.log.html
-%%PORTDOCS%%%%DOCSDIR%%/auth.log.html
-%%PORTDOCS%%%%DOCSDIR%%/c.lang.html
-%%PORTDOCS%%%%DOCSDIR%%/cmdline.h.html
-%%PORTDOCS%%%%DOCSDIR%%/colors.html
-%%PORTDOCS%%%%DOCSDIR%%/cpp2html.css
-%%PORTDOCS%%%%DOCSDIR%%/default.css
-%%PORTDOCS%%%%DOCSDIR%%/default.style.html
-%%PORTDOCS%%%%DOCSDIR%%/error.log.html
-%%PORTDOCS%%%%DOCSDIR%%/examples.html
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/infoformatter-main.cpp
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/infoformatter.h
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/source-highlight-console-main.cpp
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/styleformatter-main.cpp
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/styleformatter.h
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/styleformatterfactory.h
-%%PORTDOCS%%%%DOCSDIR%%/flex_scanner.ll.html
-%%PORTDOCS%%%%DOCSDIR%%/footer.html
-%%PORTDOCS%%%%DOCSDIR%%/header.html
-%%PORTDOCS%%%%DOCSDIR%%/index.html
-%%PORTDOCS%%%%DOCSDIR%%/langdef.lang.html
-%%PORTDOCS%%%%DOCSDIR%%/log.lang.html
-%%PORTDOCS%%%%DOCSDIR%%/mono-alt.css
-%%PORTDOCS%%%%DOCSDIR%%/mono.css
-%%PORTDOCS%%%%DOCSDIR%%/sh_acid.css
-%%PORTDOCS%%%%DOCSDIR%%/sh_berries-dark.css
-%%PORTDOCS%%%%DOCSDIR%%/sh_berries-light.css
-%%PORTDOCS%%%%DOCSDIR%%/sh_bipolar.css
-%%PORTDOCS%%%%DOCSDIR%%/sh_blacknblue.css
-%%PORTDOCS%%%%DOCSDIR%%/sh_bright.css
-%%PORTDOCS%%%%DOCSDIR%%/sh_contrast.css
-%%PORTDOCS%%%%DOCSDIR%%/sh_darkblue.css
-%%PORTDOCS%%%%DOCSDIR%%/sh_darkness.css
-%%PORTDOCS%%%%DOCSDIR%%/sh_desert.css
-%%PORTDOCS%%%%DOCSDIR%%/sh_dull.css
-%%PORTDOCS%%%%DOCSDIR%%/sh_easter.css
-%%PORTDOCS%%%%DOCSDIR%%/sh_emacs.css
-%%PORTDOCS%%%%DOCSDIR%%/sh_golden.css
-%%PORTDOCS%%%%DOCSDIR%%/sh_greenlcd.css
-%%PORTDOCS%%%%DOCSDIR%%/sh_ide-anjuta.css
-%%PORTDOCS%%%%DOCSDIR%%/sh_ide-codewarrior.css
-%%PORTDOCS%%%%DOCSDIR%%/sh_ide-devcpp.css
-%%PORTDOCS%%%%DOCSDIR%%/sh_ide-eclipse.css
-%%PORTDOCS%%%%DOCSDIR%%/sh_ide-kdev.css
-%%PORTDOCS%%%%DOCSDIR%%/sh_ide-msvcpp.css
-%%PORTDOCS%%%%DOCSDIR%%/sh_kwrite.css
-%%PORTDOCS%%%%DOCSDIR%%/sh_matlab.css
-%%PORTDOCS%%%%DOCSDIR%%/sh_navy.css
-%%PORTDOCS%%%%DOCSDIR%%/sh_nedit.css
-%%PORTDOCS%%%%DOCSDIR%%/sh_neon.css
-%%PORTDOCS%%%%DOCSDIR%%/sh_night.css
-%%PORTDOCS%%%%DOCSDIR%%/sh_pablo.css
-%%PORTDOCS%%%%DOCSDIR%%/sh_peachpuff.css
-%%PORTDOCS%%%%DOCSDIR%%/sh_print.css
-%%PORTDOCS%%%%DOCSDIR%%/sh_rand01.css
-%%PORTDOCS%%%%DOCSDIR%%/sh_the.css
-%%PORTDOCS%%%%DOCSDIR%%/sh_typical.css
-%%PORTDOCS%%%%DOCSDIR%%/sh_vampire.css
-%%PORTDOCS%%%%DOCSDIR%%/sh_vim-dark.css
-%%PORTDOCS%%%%DOCSDIR%%/sh_vim.css
-%%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%%/style_examples.html
-%%PORTDOCS%%%%DOCSDIR%%/syslog.log.html
-%%PORTDOCS%%%%DOCSDIR%%/syslog.style.html
-%%PORTDOCS%%%%DOCSDIR%%/test.htm.html
-%%PORTDOCS%%%%DOCSDIR%%/test.java.html
-%%PORTDOCS%%%%DOCSDIR%%/test.java.tex.html
-%%PORTDOCS%%%%DOCSDIR%%/test.js.html
-%%PORTDOCS%%%%DOCSDIR%%/test.log.html
-%%PORTDOCS%%%%DOCSDIR%%/test.lua.html
-%%PORTDOCS%%%%DOCSDIR%%/test.ml.html
-%%PORTDOCS%%%%DOCSDIR%%/test.php3.html
-%%PORTDOCS%%%%DOCSDIR%%/test.pl.html
-%%PORTDOCS%%%%DOCSDIR%%/test.pm.html
-%%PORTDOCS%%%%DOCSDIR%%/test.py.html
-%%PORTDOCS%%%%DOCSDIR%%/test.rb.html
-%%PORTDOCS%%%%DOCSDIR%%/test.sml.html
-%%PORTDOCS%%%%DOCSDIR%%/test_linerange_sep.html
-%%PORTDOCS%%%%DOCSDIR%%/test_refs.cpp.html
-%%PORTDOCS%%%%DOCSDIR%%/test_refs.h.html
-%%PORTDOCS%%%%DOCSDIR%%/test_regexrange4.html
-%%PORTDOCS%%%%DOCSDIR%%/xhtml.css
+%%DATADIR%%/zsh.lang