Index: head/textproc/highlight/Makefile =================================================================== --- head/textproc/highlight/Makefile (revision 441508) +++ head/textproc/highlight/Makefile (revision 441509) @@ -1,40 +1,41 @@ # Created by: Adam Weinberger # $FreeBSD$ -# 3.29+ needs to_string() which gcc48 (for 9.3-R) doesn't provide PORTNAME= highlight -PORTVERSION= 3.29 -PORTREVISION= 4 +PORTVERSION= 3.36 PORTEPOCH= 3 CATEGORIES= textproc MASTER_SITES= http://www.andre-simon.de/zip/ MAINTAINER= kwm@FreeBSD.org COMMENT= Customizable syntax highlighter +LICENSE= GPLv3 +LICENSE_FILE= ${WRKSRC}/COPYING + BUILD_DEPENDS= boost-libs>0:devel/boost-libs -USES= compiler:c++11-lib dos2unix gmake lua:52 pkgconfig tar:bzip2 +USES= compiler:c++11-lib gmake lua:52 pkgconfig tar:bzip2 USE_CXXSTD= c++11 MAKEFILE= makefile MAKE_ARGS= CXX="${CXX}" \ CFLAGS="${CXXFLAGS} ${CPPFLAGS} -DHAVE_DECL_GETOPT" \ LDFLAGS="${LDFLAGS}" PORTDOCS= * post-patch: @${REINPLACE_CMD} \ -e 's|^PREFIX =|PREFIX ?=|' \ -e 's|^conf_dir =.*|conf_dir = $${PREFIX}/etc/highlight/|' \ ${WRKSRC}/${MAKEFILE} @${REINPLACE_CMD} -e 's|^CXX=|CXX?=|' \ -e 's|%%LOCALBASE%%|${LOCALBASE}|' \ ${WRKSRC}/src/${MAKEFILE} post-install: @cd ${STAGEDIR}${PREFIX}/etc/highlight && ${MV} filetypes.conf \ filetypes.conf.sample @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/highlight .include Index: head/textproc/highlight/distinfo =================================================================== --- head/textproc/highlight/distinfo (revision 441508) +++ head/textproc/highlight/distinfo (revision 441509) @@ -1,3 +1,3 @@ -TIMESTAMP = 1472157593 -SHA256 (highlight-3.29.tar.bz2) = 76cc769d98778985235c0b7d1345cff78c99f597b51edd4e9be7d3fc0160bf92 -SIZE (highlight-3.29.tar.bz2) = 670624 +TIMESTAMP = 1495523172 +SHA256 (highlight-3.36.tar.bz2) = 34cd5bcf52714f83364460c0c3551320564c56ff4e117353034e532275792171 +SIZE (highlight-3.36.tar.bz2) = 1221219 Index: head/textproc/highlight/files/patch-makefile =================================================================== --- head/textproc/highlight/files/patch-makefile (revision 441508) +++ head/textproc/highlight/files/patch-makefile (revision 441509) @@ -1,35 +1,35 @@ ---- makefile.orig 2014-04-25 16:45:48.000000000 +0200 -+++ makefile 2014-04-25 16:46:45.000000000 +0200 +--- makefile.orig 2017-03-30 18:12:23 UTC ++++ makefile @@ -4,10 +4,10 @@ # Installation directories: # Destination directory for installation (intended for packagers) -DESTDIR = +DESTDIR ?= # Root directory for final installation -PREFIX = /usr +PREFIX ?= /usr # Location of the highlight data files: data_dir = ${PREFIX}/share/highlight/ -@@ -16,7 +16,7 @@ +@@ -16,7 +16,7 @@ data_dir = ${PREFIX}/share/highlight/ bin_dir = ${PREFIX}/bin/ # Location of the highlight man page: -man_dir = ${PREFIX}/share/man/man1/ +man_dir = ${PREFIX}/man/man1/ # Location of the highlight documentation: doc_dir = ${PREFIX}/share/doc/highlight/ -@@ -25,8 +25,8 @@ +@@ -25,8 +25,8 @@ doc_dir = ${PREFIX}/share/doc/highlight/ examples_dir = ${doc_dir}examples/ # Location of the highlight config files: -conf_dir = /etc/highlight/ -#conf_dir = ${PREFIX}/etc/highlight/ +#conf_dir = /etc/highlight/ +conf_dir = ${PREFIX}/etc/highlight/ # Location of additional gui files desktop_apps = ${PREFIX}/share/applications/ Index: head/textproc/highlight/files/patch-src_makefile =================================================================== --- head/textproc/highlight/files/patch-src_makefile (revision 441508) +++ head/textproc/highlight/files/patch-src_makefile (revision 441509) @@ -1,33 +1,33 @@ ---- src/makefile.orig 2015-07-02 16:51:26.582456000 +0200 -+++ src/makefile 2015-07-02 16:51:53.706070000 +0200 -@@ -12,7 +12,7 @@ - +--- src/makefile.orig 2017-03-30 18:12:23 UTC ++++ src/makefile +@@ -13,7 +13,7 @@ # See src/gui-qt/highlight.pro for the Qt GUI compilation options --CXX=c++ + #CXX=clang++ +-CXX=g++ +CXX?=c++ - # Added -qt4 because of Arch Linux Qt5 migration - QMAKE=qmake-qt4 -@@ -37,10 +37,10 @@ + # was: qmake-qt5 + QMAKE=qmake +@@ -39,10 +39,10 @@ INCLUDE_DIR=./include/ # If Lua 5.2 is not default on your system yet you have to # use lua5.1 in the pkg-config calls -LUA_CFLAGS=$(shell pkg-config --cflags lua) +LUA_CFLAGS=$(shell pkg-config --cflags lua-5.2) # default lua lib -LUA_LIBS=$(shell pkg-config --libs lua) +LUA_LIBS=$(shell pkg-config --libs lua-5.2) # luajit lib # LUA_LIBS=$(shell pkg-config --libs luajit) -@@ -67,7 +67,7 @@ +@@ -73,7 +73,7 @@ LDFLAGS = -ldl #LDFLAGS = ${LDFLAGS} -s #LDFLAGS= -Wl,--as-needed -CXX_COMPILE=${CXX} ${CFLAGS} -c -I ${INCLUDE_DIR} ${LUA_CFLAGS} +CXX_COMPILE=${CXX} ${CFLAGS} -c -I ${INCLUDE_DIR} -I%%LOCALBASE%%/include ${LUA_CFLAGS} # Data directories (data dir, configuration file dir) CXX_DIR=-DHL_DATA_DIR=\"${HL_DATA_DIR}\" -DHL_CONFIG_DIR=\"${HL_CONFIG_DIR}\" Index: head/textproc/highlight/pkg-plist =================================================================== --- head/textproc/highlight/pkg-plist (revision 441508) +++ head/textproc/highlight/pkg-plist (revision 441509) @@ -1,319 +1,339 @@ bin/highlight @sample %%ETCDIR%%/filetypes.conf.sample man/man1/highlight.1.gz %%DATADIR%%/langDefs/abap4.lang %%DATADIR%%/langDefs/abc.lang %%DATADIR%%/langDefs/abnf.lang %%DATADIR%%/langDefs/actionscript.lang %%DATADIR%%/langDefs/ada.lang %%DATADIR%%/langDefs/agda.lang %%DATADIR%%/langDefs/algol.lang %%DATADIR%%/langDefs/ampl.lang %%DATADIR%%/langDefs/amtrix.lang %%DATADIR%%/langDefs/applescript.lang %%DATADIR%%/langDefs/arc.lang %%DATADIR%%/langDefs/arm.lang %%DATADIR%%/langDefs/as400cl.lang %%DATADIR%%/langDefs/ascend.lang %%DATADIR%%/langDefs/asp.lang %%DATADIR%%/langDefs/aspect.lang %%DATADIR%%/langDefs/assembler.lang %%DATADIR%%/langDefs/ats.lang %%DATADIR%%/langDefs/autohotkey.lang %%DATADIR%%/langDefs/autoit.lang %%DATADIR%%/langDefs/avenue.lang %%DATADIR%%/langDefs/awk.lang %%DATADIR%%/langDefs/bat.lang %%DATADIR%%/langDefs/bbcode.lang %%DATADIR%%/langDefs/bcpl.lang %%DATADIR%%/langDefs/bibtex.lang %%DATADIR%%/langDefs/biferno.lang %%DATADIR%%/langDefs/bison.lang %%DATADIR%%/langDefs/blitzbasic.lang %%DATADIR%%/langDefs/bms.lang %%DATADIR%%/langDefs/bnf.lang %%DATADIR%%/langDefs/boo.lang %%DATADIR%%/langDefs/c.lang %%DATADIR%%/langDefs/ceylon.lang %%DATADIR%%/langDefs/charmm.lang %%DATADIR%%/langDefs/chill.lang +%%DATADIR%%/langDefs/chpl.lang %%DATADIR%%/langDefs/clean.lang %%DATADIR%%/langDefs/clearbasic.lang %%DATADIR%%/langDefs/clipper.lang %%DATADIR%%/langDefs/clojure.lang %%DATADIR%%/langDefs/clp.lang %%DATADIR%%/langDefs/cobol.lang +%%DATADIR%%/langDefs/coffee.lang %%DATADIR%%/langDefs/coldfusion.lang %%DATADIR%%/langDefs/conf.lang %%DATADIR%%/langDefs/crk.lang +%%DATADIR%%/langDefs/cs_block_regex.lang %%DATADIR%%/langDefs/csharp.lang %%DATADIR%%/langDefs/css.lang %%DATADIR%%/langDefs/d.lang %%DATADIR%%/langDefs/dart.lang %%DATADIR%%/langDefs/diff.lang %%DATADIR%%/langDefs/dts.lang %%DATADIR%%/langDefs/dylan.lang %%DATADIR%%/langDefs/ebnf.lang %%DATADIR%%/langDefs/eiffel.lang %%DATADIR%%/langDefs/erlang.lang %%DATADIR%%/langDefs/euphoria.lang %%DATADIR%%/langDefs/express.lang %%DATADIR%%/langDefs/fame.lang +%%DATADIR%%/langDefs/fasm.lang %%DATADIR%%/langDefs/felix.lang %%DATADIR%%/langDefs/fortran77.lang %%DATADIR%%/langDefs/fortran90.lang %%DATADIR%%/langDefs/frink.lang %%DATADIR%%/langDefs/fsharp.lang %%DATADIR%%/langDefs/fx.lang %%DATADIR%%/langDefs/gambas.lang %%DATADIR%%/langDefs/gdb.lang +%%DATADIR%%/langDefs/gdscript.lang %%DATADIR%%/langDefs/go.lang %%DATADIR%%/langDefs/graphviz.lang %%DATADIR%%/langDefs/haskell.lang %%DATADIR%%/langDefs/haxe.lang %%DATADIR%%/langDefs/hcl.lang %%DATADIR%%/langDefs/html.lang %%DATADIR%%/langDefs/httpd.lang %%DATADIR%%/langDefs/icon.lang %%DATADIR%%/langDefs/idl.lang %%DATADIR%%/langDefs/idlang.lang %%DATADIR%%/langDefs/inc_luatex.lang %%DATADIR%%/langDefs/informix.lang %%DATADIR%%/langDefs/ini.lang %%DATADIR%%/langDefs/innosetup.lang %%DATADIR%%/langDefs/interlis.lang %%DATADIR%%/langDefs/io.lang %%DATADIR%%/langDefs/jasmin.lang %%DATADIR%%/langDefs/java.lang %%DATADIR%%/langDefs/js.lang +%%DATADIR%%/langDefs/js_regex.lang %%DATADIR%%/langDefs/json.lang %%DATADIR%%/langDefs/jsp.lang +%%DATADIR%%/langDefs/jsx.lang %%DATADIR%%/langDefs/julia.lang %%DATADIR%%/langDefs/kotlin.lang %%DATADIR%%/langDefs/ldif.lang %%DATADIR%%/langDefs/less.lang %%DATADIR%%/langDefs/lhs.lang %%DATADIR%%/langDefs/lilypond.lang %%DATADIR%%/langDefs/limbo.lang %%DATADIR%%/langDefs/lindenscript.lang %%DATADIR%%/langDefs/lisp.lang %%DATADIR%%/langDefs/logtalk.lang %%DATADIR%%/langDefs/lotos.lang %%DATADIR%%/langDefs/lotus.lang %%DATADIR%%/langDefs/lua.lang %%DATADIR%%/langDefs/luban.lang %%DATADIR%%/langDefs/make.lang %%DATADIR%%/langDefs/maple.lang %%DATADIR%%/langDefs/matlab.lang %%DATADIR%%/langDefs/maya.lang %%DATADIR%%/langDefs/md.lang %%DATADIR%%/langDefs/mercury.lang %%DATADIR%%/langDefs/miranda.lang %%DATADIR%%/langDefs/mod2.lang %%DATADIR%%/langDefs/mod3.lang %%DATADIR%%/langDefs/modelica.lang %%DATADIR%%/langDefs/moon.lang %%DATADIR%%/langDefs/ms.lang %%DATADIR%%/langDefs/msl.lang %%DATADIR%%/langDefs/mssql.lang %%DATADIR%%/langDefs/mxml.lang %%DATADIR%%/langDefs/n3.lang %%DATADIR%%/langDefs/nasal.lang %%DATADIR%%/langDefs/nbc.lang %%DATADIR%%/langDefs/nemerle.lang %%DATADIR%%/langDefs/netrexx.lang %%DATADIR%%/langDefs/nginx.lang %%DATADIR%%/langDefs/nice.lang %%DATADIR%%/langDefs/nim.lang %%DATADIR%%/langDefs/nsis.lang %%DATADIR%%/langDefs/nxc.lang %%DATADIR%%/langDefs/oberon.lang %%DATADIR%%/langDefs/objc.lang %%DATADIR%%/langDefs/ocaml.lang %%DATADIR%%/langDefs/octave.lang %%DATADIR%%/langDefs/oorexx.lang %%DATADIR%%/langDefs/os.lang %%DATADIR%%/langDefs/oz.lang %%DATADIR%%/langDefs/paradox.lang %%DATADIR%%/langDefs/pas.lang %%DATADIR%%/langDefs/pdf.lang %%DATADIR%%/langDefs/perl.lang %%DATADIR%%/langDefs/php.lang %%DATADIR%%/langDefs/pike.lang %%DATADIR%%/langDefs/pl1.lang %%DATADIR%%/langDefs/plperl.lang %%DATADIR%%/langDefs/plpython.lang %%DATADIR%%/langDefs/pltcl.lang +%%DATADIR%%/langDefs/po.lang +%%DATADIR%%/langDefs/pony.lang %%DATADIR%%/langDefs/pov.lang %%DATADIR%%/langDefs/pro.lang %%DATADIR%%/langDefs/progress.lang %%DATADIR%%/langDefs/ps.lang %%DATADIR%%/langDefs/ps1.lang %%DATADIR%%/langDefs/psl.lang %%DATADIR%%/langDefs/pure.lang +%%DATADIR%%/langDefs/purebasic.lang %%DATADIR%%/langDefs/pyrex.lang %%DATADIR%%/langDefs/python.lang %%DATADIR%%/langDefs/q.lang %%DATADIR%%/langDefs/qmake.lang %%DATADIR%%/langDefs/qml.lang %%DATADIR%%/langDefs/qu.lang %%DATADIR%%/langDefs/r.lang %%DATADIR%%/langDefs/rebol.lang %%DATADIR%%/langDefs/rexx.lang %%DATADIR%%/langDefs/rnc.lang %%DATADIR%%/langDefs/rpg.lang %%DATADIR%%/langDefs/rpl.lang %%DATADIR%%/langDefs/rs.lang %%DATADIR%%/langDefs/ruby.lang %%DATADIR%%/langDefs/s.lang %%DATADIR%%/langDefs/sas.lang %%DATADIR%%/langDefs/scala.lang %%DATADIR%%/langDefs/scilab.lang %%DATADIR%%/langDefs/scss.lang %%DATADIR%%/langDefs/sh.lang %%DATADIR%%/langDefs/small.lang %%DATADIR%%/langDefs/smalltalk.lang %%DATADIR%%/langDefs/sml.lang %%DATADIR%%/langDefs/snmp.lang %%DATADIR%%/langDefs/snobol.lang %%DATADIR%%/langDefs/spec.lang %%DATADIR%%/langDefs/spn.lang %%DATADIR%%/langDefs/sql.lang %%DATADIR%%/langDefs/squirrel.lang %%DATADIR%%/langDefs/styl.lang %%DATADIR%%/langDefs/svg.lang %%DATADIR%%/langDefs/swift.lang %%DATADIR%%/langDefs/sybase.lang %%DATADIR%%/langDefs/tcl.lang %%DATADIR%%/langDefs/tcsh.lang %%DATADIR%%/langDefs/tex.lang %%DATADIR%%/langDefs/ts.lang %%DATADIR%%/langDefs/tsql.lang %%DATADIR%%/langDefs/ttcn3.lang %%DATADIR%%/langDefs/txt.lang %%DATADIR%%/langDefs/upc.lang %%DATADIR%%/langDefs/vala.lang %%DATADIR%%/langDefs/vb.lang %%DATADIR%%/langDefs/verilog.lang %%DATADIR%%/langDefs/vhd.lang +%%DATADIR%%/langDefs/vimscript.lang +%%DATADIR%%/langDefs/whiley.lang %%DATADIR%%/langDefs/xml.lang %%DATADIR%%/langDefs/xpp.lang %%DATADIR%%/langDefs/yaiff.lang +%%DATADIR%%/langDefs/yaml.lang %%DATADIR%%/langDefs/yang.lang %%DATADIR%%/langDefs/znn.lang %%DATADIR%%/plugins/asciidoc_html_add_links.lua %%DATADIR%%/plugins/bash_functions.lua -%%DATADIR%%/plugins/bash_ref_linuxmanpages_com.lua %%DATADIR%%/plugins/comment_links.lua %%DATADIR%%/plugins/cpp_qt.lua %%DATADIR%%/plugins/cpp_ref_cplusplus_com.lua %%DATADIR%%/plugins/cpp_ref_gtk_gnome_org.lua %%DATADIR%%/plugins/cpp_ref_local_includes.lua %%DATADIR%%/plugins/cpp_ref_qtproject_org.lua %%DATADIR%%/plugins/cpp_ref_wxwidgets_org.lua %%DATADIR%%/plugins/cpp_syslog.lua %%DATADIR%%/plugins/cpp_wx.lua %%DATADIR%%/plugins/ctags_html_tooltips.lua %%DATADIR%%/plugins/java_library.lua %%DATADIR%%/plugins/keywords_capitalize.lua %%DATADIR%%/plugins/keywords_lowercase.lua %%DATADIR%%/plugins/keywords_uppercase.lua %%DATADIR%%/plugins/mark_lines.lua %%DATADIR%%/plugins/outhtml_add_background_stripes.lua %%DATADIR%%/plugins/outhtml_add_background_svg.lua +%%DATADIR%%/plugins/outhtml_add_figure.lua %%DATADIR%%/plugins/outhtml_add_line.lua %%DATADIR%%/plugins/outhtml_add_shadow.lua %%DATADIR%%/plugins/outhtml_codefold.lua %%DATADIR%%/plugins/outhtml_curly_brackets_matcher.lua +%%DATADIR%%/plugins/outhtml_ie7_webctrl.lua %%DATADIR%%/plugins/outhtml_keyword_matcher.lua %%DATADIR%%/plugins/outhtml_modern_fonts.lua %%DATADIR%%/plugins/outhtml_parantheses_matcher.lua %%DATADIR%%/plugins/outhtml_tooltips.lua %%DATADIR%%/plugins/perl_ref_perl_org.lua %%DATADIR%%/plugins/python_ref_python_org.lua %%DATADIR%%/plugins/reduce_filesize.lua %%DATADIR%%/plugins/scala_ref_scala_lang_org.lua %%DATADIR%%/plugins/theme_invert.lua %%DATADIR%%/plugins/token_add_state_ids.lua %%DATADIR%%/themes/acid.theme %%DATADIR%%/themes/aiseered.theme %%DATADIR%%/themes/andes.theme %%DATADIR%%/themes/anotherdark.theme %%DATADIR%%/themes/autumn.theme %%DATADIR%%/themes/baycomb.theme %%DATADIR%%/themes/bclear.theme %%DATADIR%%/themes/biogoo.theme %%DATADIR%%/themes/bipolar.theme %%DATADIR%%/themes/blacknblue.theme %%DATADIR%%/themes/bluegreen.theme %%DATADIR%%/themes/breeze.theme %%DATADIR%%/themes/bright.theme %%DATADIR%%/themes/camo.theme %%DATADIR%%/themes/candy.theme %%DATADIR%%/themes/clarity.theme %%DATADIR%%/themes/dante.theme %%DATADIR%%/themes/darkblue.theme %%DATADIR%%/themes/darkbone.theme %%DATADIR%%/themes/darkness.theme %%DATADIR%%/themes/darkslategray.theme %%DATADIR%%/themes/darkspectrum.theme %%DATADIR%%/themes/denim.theme %%DATADIR%%/themes/dusk.theme %%DATADIR%%/themes/earendel.theme %%DATADIR%%/themes/easter.theme %%DATADIR%%/themes/edit-anjuta.theme +%%DATADIR%%/themes/edit-bbedit.theme %%DATADIR%%/themes/edit-eclipse.theme %%DATADIR%%/themes/edit-emacs.theme +%%DATADIR%%/themes/edit-fasm.theme %%DATADIR%%/themes/edit-flashdevelop.theme %%DATADIR%%/themes/edit-gedit.theme +%%DATADIR%%/themes/edit-godot.theme %%DATADIR%%/themes/edit-jedit.theme %%DATADIR%%/themes/edit-kwrite.theme %%DATADIR%%/themes/edit-matlab.theme %%DATADIR%%/themes/edit-msvs2008.theme %%DATADIR%%/themes/edit-nedit.theme +%%DATADIR%%/themes/edit-purebasic.theme %%DATADIR%%/themes/edit-vim-dark.theme %%DATADIR%%/themes/edit-vim.theme %%DATADIR%%/themes/edit-xcode.theme %%DATADIR%%/themes/ekvoli.theme %%DATADIR%%/themes/fine_blue.theme %%DATADIR%%/themes/freya.theme %%DATADIR%%/themes/fruit.theme +%%DATADIR%%/themes/github.theme %%DATADIR%%/themes/golden.theme %%DATADIR%%/themes/greenlcd.theme %%DATADIR%%/themes/kellys.theme %%DATADIR%%/themes/leo.theme %%DATADIR%%/themes/lucretia.theme %%DATADIR%%/themes/manxome.theme %%DATADIR%%/themes/maroloccio.theme %%DATADIR%%/themes/matrix.theme %%DATADIR%%/themes/moe.theme %%DATADIR%%/themes/molokai.theme %%DATADIR%%/themes/moria.theme %%DATADIR%%/themes/navajo-night.theme %%DATADIR%%/themes/navy.theme %%DATADIR%%/themes/neon.theme %%DATADIR%%/themes/night.theme %%DATADIR%%/themes/nightshimmer.theme %%DATADIR%%/themes/nuvola.theme %%DATADIR%%/themes/olive.theme %%DATADIR%%/themes/orion.theme %%DATADIR%%/themes/oxygenated.theme %%DATADIR%%/themes/pablo.theme %%DATADIR%%/themes/peaksea.theme %%DATADIR%%/themes/print.theme %%DATADIR%%/themes/rand01.theme %%DATADIR%%/themes/rdark.theme %%DATADIR%%/themes/relaxedgreen.theme %%DATADIR%%/themes/rootwater.theme %%DATADIR%%/themes/seashell.theme %%DATADIR%%/themes/solarized-dark.theme %%DATADIR%%/themes/solarized-light.theme +%%DATADIR%%/themes/sourceforge.theme %%DATADIR%%/themes/tabula.theme %%DATADIR%%/themes/tcsoft.theme %%DATADIR%%/themes/the.theme %%DATADIR%%/themes/vampire.theme %%DATADIR%%/themes/whitengrey.theme %%DATADIR%%/themes/xoria256.theme %%DATADIR%%/themes/zellner.theme %%DATADIR%%/themes/zenburn.theme %%DATADIR%%/themes/zmrok.theme