Update to 2.7

PR: ports/116337
Submitted by: Toby Burress <kurin at delete.org>

7 files changed, 151 insertions, 75 deletions

diff --git a/textproc/source-highlight/Makefile b/textproc/source-highlight/Makefile
index fa7aba631b02..a9e992616eda 100644
--- a/textproc/source-highlight/Makefile
+++ b/textproc/source-highlight/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	source-highlight
-PORTVERSION=	1.9
+PORTVERSION=	2.7
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	src-highlite
@@ -14,12 +14,18 @@ MASTER_SITE_SUBDIR=	src-highlite
 MAINTAINER=	kevlo@FreeBSD.org
 COMMENT=	C/C++ and Java sources to HTML converter
 
+LIB_DEPENDS=	boost_regex:${PORTSDIR}/devel/boost
+
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_ARGS= LDFLAGS=-L${LOCALBASE}/lib CPPFLAGS=-I${LOCALBASE}/include
 .if defined(NOPORTDOCS)
 MAKE_ENV+=	NOPORTDOCS="${NOPORTDOCS}"
 .endif
 
-MAN1=		source-highlight.1
+USE_GMAKE=	yes
+
+MAN1=	source-highlight.1
+INFO=	source-highlight
 
 .include <bsd.port.mk>
diff --git a/textproc/source-highlight/distinfo b/textproc/source-highlight/distinfo
index 089517f849fa..2b4c22fabdfb 100644
--- a/textproc/source-highlight/distinfo
+++ b/textproc/source-highlight/distinfo
@@ -1,3 +1,3 @@
-MD5 (source-highlight-1.9.tar.gz) = 88e1ecd5c4c37104ed98c0674f630656
-SHA256 (source-highlight-1.9.tar.gz) = 83e6473a8421336c525e91afed6fa04bb192c8ae701bb9e871c5edcfa471715b
-SIZE (source-highlight-1.9.tar.gz) = 682343
+MD5 (source-highlight-2.7.tar.gz) = 654df5a7c3d9a20063d6220979c04550
+SHA256 (source-highlight-2.7.tar.gz) = a10e1be78a5b69c2992ecdac6f42c4e98a9e1a63da85e3e0d402a734677b4253
+SIZE (source-highlight-2.7.tar.gz) = 1011368
diff --git a/textproc/source-highlight/files/patch-aa b/textproc/source-highlight/files/patch-aa
deleted file mode 100644
index 57714d040c12..000000000000
--- a/textproc/source-highlight/files/patch-aa
+++ /dev/null
@@ -1,18 +0,0 @@
---- Makefile.in.orig	Sat Aug 25 00:30:57 2001
-+++ Makefile.in	Sat Aug 25 00:31:14 2001
-@@ -155,6 +155,7 @@
- 	cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
- 
- install-source_highlightdocDATA: $(source_highlightdoc_DATA)
-+.if !defined(NOPORTDOCS)
- 	@$(NORMAL_INSTALL)
- 	$(mkinstalldirs) $(DESTDIR)$(source_highlightdocdir)
- 	@list='$(source_highlightdoc_DATA)'; for p in $$list; do \
-@@ -166,6 +167,7 @@
- 	    $(INSTALL_DATA) $$p $(DESTDIR)$(source_highlightdocdir)/$$p; \
- 	  fi; fi; \
- 	done
-+.endif
- 
- uninstall-source_highlightdocDATA:
- 	@$(NORMAL_UNINSTALL)
diff --git a/textproc/source-highlight/files/patch-ab b/textproc/source-highlight/files/patch-ab
deleted file mode 100644
index b9f4377af63a..000000000000
--- a/textproc/source-highlight/files/patch-ab
+++ /dev/null
@@ -1,18 +0,0 @@
---- doc/Makefile.in.orig	Mon Jun 11 10:33:58 2001
-+++ doc/Makefile.in	Sat Aug 25 00:28:19 2001
-@@ -134,6 +134,7 @@
- 	cd $(top_builddir) && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
- 
- install-source_highlightdocDATA: $(source_highlightdoc_DATA)
-+.if !defined(NOPORTDOCS)
- 	@$(NORMAL_INSTALL)
- 	$(mkinstalldirs) $(DESTDIR)$(source_highlightdocdir)
- 	@list='$(source_highlightdoc_DATA)'; for p in $$list; do \
-@@ -145,6 +146,7 @@
- 	    $(INSTALL_DATA) $$p $(DESTDIR)$(source_highlightdocdir)/$$p; \
- 	  fi; fi; \
- 	done
-+.endif
- 
- uninstall-source_highlightdocDATA:
- 	@$(NORMAL_UNINSTALL)
diff --git a/textproc/source-highlight/files/patch-ac b/textproc/source-highlight/files/patch-ac
deleted file mode 100644
index 2038038a5957..000000000000
--- a/textproc/source-highlight/files/patch-ac
+++ /dev/null
@@ -1,18 +0,0 @@
---- tests/Makefile.in.orig	Sun Aug 31 22:57:10 2003
-+++ tests/Makefile.in	Fri Oct  3 22:20:56 2003
-@@ -218,6 +218,7 @@
- uninstall-info-am:
- source_highlightdocDATA_INSTALL = $(INSTALL_DATA)
- install-source_highlightdocDATA: $(source_highlightdoc_DATA)
-+.if !defined(NOPORTDOCS)
- 	@$(NORMAL_INSTALL)
- 	$(mkinstalldirs) $(DESTDIR)$(source_highlightdocdir)
- 	@list='$(source_highlightdoc_DATA)'; for p in $$list; do \
-@@ -226,6 +227,7 @@
- 	  echo " $(source_highlightdocDATA_INSTALL) $$d$$p $(DESTDIR)$(source_highlightdocdir)/$$f"; \
- 	  $(source_highlightdocDATA_INSTALL) $$d$$p $(DESTDIR)$(source_highlightdocdir)/$$f; \
- 	done
-+.endif
- 
- uninstall-source_highlightdocDATA:
- 	@$(NORMAL_UNINSTALL)
diff --git a/textproc/source-highlight/files/patch-ad b/textproc/source-highlight/files/patch-ad
deleted file mode 100644
index 6794fa658c13..000000000000
--- a/textproc/source-highlight/files/patch-ad
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/lib/fileutil.cc.orig	Tue Aug 17 13:11:13 2004
-+++ src/lib/fileutil.cc	Tue Aug 17 13:11:41 2004
-@@ -41,7 +41,7 @@
-   // we open it as binary otherwise we may experience problems under
-   // Windows system: when we fread, the number of char read can be
-   // less then char_count, and thus we'd get an error...
--  ifstream file (fileName.c_str (), ios_base::binary);
-+  ifstream file (fileName.c_str (), ios::binary);
-   if (! file.is_open () )
-     file_error ("Error operning", fileName);
-   else
diff --git a/textproc/source-highlight/pkg-plist b/textproc/source-highlight/pkg-plist
index 5bf3507d67b0..5271986430be 100644
--- a/textproc/source-highlight/pkg-plist
+++ b/textproc/source-highlight/pkg-plist
@@ -1,7 +1,7 @@
+bin/check-regexp
 bin/cpp2html
 bin/java2html
 bin/source-highlight
-bin/source-highlight-cgi
 bin/src-hilite-lesspipe.sh
 %%PORTDOCS%%%%DOCSDIR%%/COPYING
 %%PORTDOCS%%%%DOCSDIR%%/CREDITS
@@ -17,24 +17,83 @@ bin/src-hilite-lesspipe.sh
 %%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%%/README.compile_VC6
+%%PORTDOCS%%%%DOCSDIR%%/SimpleClass-doc.html
+%%PORTDOCS%%%%DOCSDIR%%/SimpleClass.html
+%%PORTDOCS%%%%DOCSDIR%%/SimpleClass.java
 %%PORTDOCS%%%%DOCSDIR%%/THANKS
 %%PORTDOCS%%%%DOCSDIR%%/TODO.txt
-%%PORTDOCS%%%%DOCSDIR%%/cmdline.c.html
+%%PORTDOCS%%%%DOCSDIR%%/UsageExample.html
+%%PORTDOCS%%%%DOCSDIR%%/UsageExample.java
+%%PORTDOCS%%%%DOCSDIR%%/access.log.html
+%%PORTDOCS%%%%DOCSDIR%%/auth.log.html
 %%PORTDOCS%%%%DOCSDIR%%/cmdline.h.html
 %%PORTDOCS%%%%DOCSDIR%%/colors.html
+%%PORTDOCS%%%%DOCSDIR%%/cpp.lang.html
 %%PORTDOCS%%%%DOCSDIR%%/cpp2html.css
+%%PORTDOCS%%%%DOCSDIR%%/default.style.html
+%%PORTDOCS%%%%DOCSDIR%%/error.log.html
 %%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.html
 %%PORTDOCS%%%%DOCSDIR%%/startapp.cc.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.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
@@ -43,8 +102,84 @@ bin/src-hilite-lesspipe.sh
 %%PORTDOCS%%%%DOCSDIR%%/test.py.html
 %%PORTDOCS%%%%DOCSDIR%%/test.rb.html
 %%PORTDOCS%%%%DOCSDIR%%/test.sml.html
+%%PORTDOCS%%%%DOCSDIR%%/test_refs.cpp.html
+%%PORTDOCS%%%%DOCSDIR%%/test_refs.h.html
 %%PORTDOCS%%%%DOCSDIR%%/xhtml.css
-%%DATADIR%%/tags.j2h
-%%DATADIR%%/tags2.j2h
+%%DATADIR%%/bib.lang
+%%DATADIR%%/bison.lang
+%%DATADIR%%/c_comment.lang
+%%DATADIR%%/c_string.lang
+%%DATADIR%%/caml.lang
+%%DATADIR%%/changelog.lang
+%%DATADIR%%/cpp.lang
+%%DATADIR%%/csharp.lang
+%%DATADIR%%/css.lang
+%%DATADIR%%/css_common.outlang
+%%DATADIR%%/default.css
+%%DATADIR%%/default.lang
+%%DATADIR%%/default.style
+%%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%%/flex.lang
+%%DATADIR%%/fortran.lang
+%%DATADIR%%/function.lang
+%%DATADIR%%/html.lang
+%%DATADIR%%/html.outlang
+%%DATADIR%%/html_common.outlang
+%%DATADIR%%/html_notfixed.outlang
+%%DATADIR%%/htmlcss.outlang
+%%DATADIR%%/htmldoc.outlang
+%%DATADIR%%/htmltable.outlang
+%%DATADIR%%/java.lang
+%%DATADIR%%/javadoc.outlang
+%%DATADIR%%/javascript.lang
+%%DATADIR%%/lang.map
+%%DATADIR%%/langdef.lang
+%%DATADIR%%/latex.lang
+%%DATADIR%%/latex.outlang
+%%DATADIR%%/latexcolor.outlang
+%%DATADIR%%/latexcolordoc.outlang
+%%DATADIR%%/latexdoc.outlang
+%%DATADIR%%/log.lang
+%%DATADIR%%/logtalk.lang
+%%DATADIR%%/lua.lang
+%%DATADIR%%/m4.lang
+%%DATADIR%%/makefile.lang
+%%DATADIR%%/nohilite.lang
+%%DATADIR%%/number.lang
+%%DATADIR%%/outlang.lang
+%%DATADIR%%/outlang.map
+%%DATADIR%%/pascal.lang
+%%DATADIR%%/perl.lang
+%%DATADIR%%/php.lang
+%%DATADIR%%/postscript.lang
+%%DATADIR%%/prolog.lang
+%%DATADIR%%/python.lang
+%%DATADIR%%/ruby.lang
+%%DATADIR%%/script_comment.lang
+%%DATADIR%%/sh.lang
+%%DATADIR%%/sml.lang
+%%DATADIR%%/sql.lang
+%%DATADIR%%/style.lang
+%%DATADIR%%/style2.style
+%%DATADIR%%/style3.style
+%%DATADIR%%/symbols.lang
+%%DATADIR%%/tcl.lang
+%%DATADIR%%/texinfo.outlang
+%%DATADIR%%/texinfo.style
+%%DATADIR%%/url.lang
+%%DATADIR%%/xhtml.outlang
+%%DATADIR%%/xhtml_common.outlang
+%%DATADIR%%/xhtml_notfixed.outlang
+%%DATADIR%%/xhtmlcss.outlang
+%%DATADIR%%/xhtmldoc.outlang
+%%DATADIR%%/xhtmltable.outlang
+%%DATADIR%%/xml.lang
 @dirrm %%DATADIR%%
 %%PORTDOCS%%@dirrm %%DOCSDIR%%