sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-05-31 10:26:28 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update to version 3.60.

Browse source
This commit is contained in:
Alexey Dokuchaev 2021-01-29 11:14:48 +00:00
parent dcf7a64ce2
commit b255a8f0ab
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=563200
5 changed files with 166 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
textproc/highlight/Makefile
View file

@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= highlight
PORTVERSION= 3.43
PORTREVISION= 8
PORTVERSION= 3.60
PORTEPOCH= 3
CATEGORIES= textproc
MASTER_SITES= http://www.andre-simon.de/zip/
@ -27,15 +26,6 @@ PORTDOCS= *
OPTIONS_DEFINE= DOCS
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

6
textproc/highlight/distinfo
View file

@ -1,3 +1,3 @@
TIMESTAMP = 1526852095
SHA256 (highlight-3.43.tar.bz2) = db957ebd73048dcb46347f44a1fe8a949fda40b5ecb360bf0df2da0d8d92e902
SIZE (highlight-3.43.tar.bz2) = 1311318
TIMESTAMP = 1608548581
SHA256 (highlight-3.60.tar.bz2) = a65cb4bf6e3d9440500ddd5116ce96edd14014c3d44eb77eba533870e4e71d25
SIZE (highlight-3.60.tar.bz2) = 1412486

10
textproc/highlight/files/patch-makefile
View file

@ -1,4 +1,4 @@
--- makefile.orig 2017-03-30 18:12:23 UTC
--- makefile.orig 2020-12-21 10:56:19 UTC
+++ makefile
@@ -4,10 +4,10 @@
# Installation directories:
@ -16,14 +16,14 @@
@@ -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 man pages:
-man_dir = ${PREFIX}/share/man/
+man_dir = ${PREFIX}/man/
# Location of the highlight documentation:
doc_dir = ${PREFIX}/share/doc/highlight/
@@ -25,8 +25,8 @@ doc_dir = ${PREFIX}/share/doc/highlight/
examples_dir = ${doc_dir}examples/
examples_dir = ${doc_dir}extras/
# Location of the highlight config files:
-conf_dir = /etc/highlight/

33
textproc/highlight/files/patch-src_makefile
View file

@ -1,33 +1,20 @@
--- src/makefile.orig 2017-03-30 18:12:23 UTC
--- src/makefile.orig 2020-12-21 10:56:19 UTC
+++ src/makefile
@@ -13,7 +13,7 @@
# See src/gui-qt/highlight.pro for the Qt GUI compilation options
@@ -36,7 +36,7 @@ GUI_QT_DIR=./gui-qt/
INCLUDE_DIR=./include/
#CXX=clang++
-CXX=g++
+CXX?=c++
# try to detect Lua versioning scheme
-LUA_PKG_NAME=lua5.3
+LUA_PKG_NAME=lua-$(LUA_VER)
LUA_TEST=$(shell pkg-config --exists ${LUA_PKG_NAME}; echo $$?)
# 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-$(LUA_VER))
# default lua lib
-LUA_LIBS=$(shell pkg-config --libs lua)
+LUA_LIBS=$(shell pkg-config --libs lua-$(LUA_VER))
# luajit lib
# LUA_LIBS=$(shell pkg-config --libs luajit)
@@ -73,7 +73,7 @@ LDFLAGS = -ldl
ifeq (${LUA_TEST},1)
@@ -75,7 +75,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}
+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}\"

148
textproc/highlight/pkg-plist
View file

@ -1,12 +1,14 @@
bin/highlight
@sample %%ETCDIR%%/filetypes.conf.sample
man/man1/highlight.1.gz
man/man5/filetypes.conf.5.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/alan.lang
%%DATADIR%%/langDefs/algol.lang
%%DATADIR%%/langDefs/ampl.lang
%%DATADIR%%/langDefs/amtrix.lang
@ -15,6 +17,7 @@ man/man1/highlight.1.gz
%%DATADIR%%/langDefs/arm.lang
%%DATADIR%%/langDefs/as400cl.lang
%%DATADIR%%/langDefs/ascend.lang
%%DATADIR%%/langDefs/asciidoc.lang
%%DATADIR%%/langDefs/asp.lang
%%DATADIR%%/langDefs/aspect.lang
%%DATADIR%%/langDefs/assembler.lang
@ -23,6 +26,7 @@ man/man1/highlight.1.gz
%%DATADIR%%/langDefs/autoit.lang
%%DATADIR%%/langDefs/avenue.lang
%%DATADIR%%/langDefs/awk.lang
%%DATADIR%%/langDefs/ballerina.lang
%%DATADIR%%/langDefs/bat.lang
%%DATADIR%%/langDefs/bbcode.lang
%%DATADIR%%/langDefs/bcpl.lang
@ -49,11 +53,13 @@ man/man1/highlight.1.gz
%%DATADIR%%/langDefs/coldfusion.lang
%%DATADIR%%/langDefs/conf.lang
%%DATADIR%%/langDefs/crk.lang
%%DATADIR%%/langDefs/crystal.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/delphi.lang
%%DATADIR%%/langDefs/diff.lang
%%DATADIR%%/langDefs/docker.lang
%%DATADIR%%/langDefs/dts.lang
@ -63,13 +69,16 @@ man/man1/highlight.1.gz
%%DATADIR%%/langDefs/eiffel.lang
%%DATADIR%%/langDefs/elixir.lang
%%DATADIR%%/langDefs/email.lang
%%DATADIR%%/langDefs/erb.lang
%%DATADIR%%/langDefs/erlang.lang
%%DATADIR%%/langDefs/euphoria.lang
%%DATADIR%%/langDefs/exapunks.lang
%%DATADIR%%/langDefs/excel.lang
%%DATADIR%%/langDefs/express.lang
%%DATADIR%%/langDefs/fame.lang
%%DATADIR%%/langDefs/fasm.lang
%%DATADIR%%/langDefs/felix.lang
%%DATADIR%%/langDefs/fish.lang
%%DATADIR%%/langDefs/fortran77.lang
%%DATADIR%%/langDefs/fortran90.lang
%%DATADIR%%/langDefs/frink.lang
@ -81,11 +90,13 @@ man/man1/highlight.1.gz
%%DATADIR%%/langDefs/gdscript.lang
%%DATADIR%%/langDefs/go.lang
%%DATADIR%%/langDefs/graphviz.lang
%%DATADIR%%/langDefs/haml.lang
%%DATADIR%%/langDefs/haskell.lang
%%DATADIR%%/langDefs/haxe.lang
%%DATADIR%%/langDefs/hcl.lang
%%DATADIR%%/langDefs/html.lang
%%DATADIR%%/langDefs/httpd.lang
%%DATADIR%%/langDefs/hugo.lang
%%DATADIR%%/langDefs/icon.lang
%%DATADIR%%/langDefs/idl.lang
%%DATADIR%%/langDefs/idlang.lang
@ -118,10 +129,11 @@ man/man1/highlight.1.gz
%%DATADIR%%/langDefs/luban.lang
%%DATADIR%%/langDefs/make.lang
%%DATADIR%%/langDefs/maple.lang
%%DATADIR%%/langDefs/markdown.lang
%%DATADIR%%/langDefs/matlab.lang
%%DATADIR%%/langDefs/maya.lang
%%DATADIR%%/langDefs/md.lang
%%DATADIR%%/langDefs/mercury.lang
%%DATADIR%%/langDefs/meson.lang
%%DATADIR%%/langDefs/miranda.lang
%%DATADIR%%/langDefs/mod2.lang
%%DATADIR%%/langDefs/mod3.lang
@ -146,6 +158,7 @@ man/man1/highlight.1.gz
%%DATADIR%%/langDefs/ocaml.lang
%%DATADIR%%/langDefs/octave.lang
%%DATADIR%%/langDefs/oorexx.lang
%%DATADIR%%/langDefs/org.lang
%%DATADIR%%/langDefs/os.lang
%%DATADIR%%/langDefs/oz.lang
%%DATADIR%%/langDefs/paradox.lang
@ -177,23 +190,29 @@ man/man1/highlight.1.gz
%%DATADIR%%/langDefs/qu.lang
%%DATADIR%%/langDefs/r.lang
%%DATADIR%%/langDefs/rebol.lang
%%DATADIR%%/langDefs/rego.lang
%%DATADIR%%/langDefs/rexx.lang
%%DATADIR%%/langDefs/rnc.lang
%%DATADIR%%/langDefs/rpg.lang
%%DATADIR%%/langDefs/rpl.lang
%%DATADIR%%/langDefs/rs.lang
%%DATADIR%%/langDefs/rst.lang
%%DATADIR%%/langDefs/ruby.lang
%%DATADIR%%/langDefs/s.lang
%%DATADIR%%/langDefs/sam.lang
%%DATADIR%%/langDefs/sas.lang
%%DATADIR%%/langDefs/scad.lang
%%DATADIR%%/langDefs/scala.lang
%%DATADIR%%/langDefs/scilab.lang
%%DATADIR%%/langDefs/scss.lang
%%DATADIR%%/langDefs/sh.lang
%%DATADIR%%/langDefs/slim.lang
%%DATADIR%%/langDefs/small.lang
%%DATADIR%%/langDefs/smalltalk.lang
%%DATADIR%%/langDefs/sml.lang
%%DATADIR%%/langDefs/snmp.lang
%%DATADIR%%/langDefs/snobol.lang
%%DATADIR%%/langDefs/solidity.lang
%%DATADIR%%/langDefs/spec.lang
%%DATADIR%%/langDefs/spn.lang
%%DATADIR%%/langDefs/sql.lang
@ -204,9 +223,12 @@ man/man1/highlight.1.gz
%%DATADIR%%/langDefs/sybase.lang
%%DATADIR%%/langDefs/tcl.lang
%%DATADIR%%/langDefs/tcsh.lang
%%DATADIR%%/langDefs/terraform.lang
%%DATADIR%%/langDefs/tex.lang
%%DATADIR%%/langDefs/toml.lang
%%DATADIR%%/langDefs/ts.lang
%%DATADIR%%/langDefs/tsql.lang
%%DATADIR%%/langDefs/tsx.lang
%%DATADIR%%/langDefs/ttcn3.lang
%%DATADIR%%/langDefs/txt.lang
%%DATADIR%%/langDefs/upc.lang
@ -215,7 +237,10 @@ man/man1/highlight.1.gz
%%DATADIR%%/langDefs/verilog.lang
%%DATADIR%%/langDefs/vhd.lang
%%DATADIR%%/langDefs/vimscript.lang
%%DATADIR%%/langDefs/vue.lang
%%DATADIR%%/langDefs/wat.lang
%%DATADIR%%/langDefs/whiley.lang
%%DATADIR%%/langDefs/wren.lang
%%DATADIR%%/langDefs/xml.lang
%%DATADIR%%/langDefs/xpp.lang
%%DATADIR%%/langDefs/yaiff.lang
@ -239,23 +264,30 @@ man/man1/highlight.1.gz
%%DATADIR%%/plugins/keywords_capitalize.lua
%%DATADIR%%/plugins/keywords_lowercase.lua
%%DATADIR%%/plugins/keywords_uppercase.lua
%%DATADIR%%/plugins/latex_single_outfile.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_ansi_esc.lua
%%DATADIR%%/plugins/outhtml_codefold.lua
%%DATADIR%%/plugins/outhtml_copy_clipboard.lua
%%DATADIR%%/plugins/outhtml_curly_brackets_matcher.lua
%%DATADIR%%/plugins/outhtml_ie7_webctrl.lua
%%DATADIR%%/plugins/outhtml_keyword_matcher.lua
%%DATADIR%%/plugins/outhtml_ligature_fonts.lua
%%DATADIR%%/plugins/outhtml_lsp_clangd.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/sam_seq.lua
%%DATADIR%%/plugins/scala_ref_scala_lang_org.lua
%%DATADIR%%/plugins/terminal_add_info.lua
%%DATADIR%%/plugins/theme_invert.lua
%%DATADIR%%/plugins/token_add_state_ids.lua
%%DATADIR%%/themes/acid.theme
@ -263,6 +295,113 @@ man/man1/highlight.1.gz
%%DATADIR%%/themes/andes.theme
%%DATADIR%%/themes/anotherdark.theme
%%DATADIR%%/themes/autumn.theme
%%DATADIR%%/themes/base16/3024.theme
%%DATADIR%%/themes/base16/apathy.theme
%%DATADIR%%/themes/base16/ashes.theme
%%DATADIR%%/themes/base16/atelier-cave-light.theme
%%DATADIR%%/themes/base16/atelier-cave.theme
%%DATADIR%%/themes/base16/atelier-dune-light.theme
%%DATADIR%%/themes/base16/atelier-dune.theme
%%DATADIR%%/themes/base16/atelier-estuary-light.theme
%%DATADIR%%/themes/base16/atelier-estuary.theme
%%DATADIR%%/themes/base16/atelier-forest-light.theme
%%DATADIR%%/themes/base16/atelier-forest.theme
%%DATADIR%%/themes/base16/atelier-heath-light.theme
%%DATADIR%%/themes/base16/atelier-heath.theme
%%DATADIR%%/themes/base16/atelier-lakeside-light.theme
%%DATADIR%%/themes/base16/atelier-lakeside.theme
%%DATADIR%%/themes/base16/atelier-plateau-light.theme
%%DATADIR%%/themes/base16/atelier-plateau.theme
%%DATADIR%%/themes/base16/atelier-savanna-light.theme
%%DATADIR%%/themes/base16/atelier-savanna.theme
%%DATADIR%%/themes/base16/atelier-seaside-light.theme
%%DATADIR%%/themes/base16/atelier-seaside.theme
%%DATADIR%%/themes/base16/atelier-sulphurpool-light.theme
%%DATADIR%%/themes/base16/atelier-sulphurpool.theme
%%DATADIR%%/themes/base16/bespin.theme
%%DATADIR%%/themes/base16/brewer.theme
%%DATADIR%%/themes/base16/bright.theme
%%DATADIR%%/themes/base16/brushtrees-dark.theme
%%DATADIR%%/themes/base16/brushtrees.theme
%%DATADIR%%/themes/base16/chalk.theme
%%DATADIR%%/themes/base16/circus.theme
%%DATADIR%%/themes/base16/classic-dark.theme
%%DATADIR%%/themes/base16/classic-light.theme
%%DATADIR%%/themes/base16/codeschool.theme
%%DATADIR%%/themes/base16/cupcake.theme
%%DATADIR%%/themes/base16/cupertino.theme
%%DATADIR%%/themes/base16/darktooth.theme
%%DATADIR%%/themes/base16/default-dark.theme
%%DATADIR%%/themes/base16/default-light.theme
%%DATADIR%%/themes/base16/dracula.theme
%%DATADIR%%/themes/base16/eighties.theme
%%DATADIR%%/themes/base16/embers.theme
%%DATADIR%%/themes/base16/flat.theme
%%DATADIR%%/themes/base16/github.theme
%%DATADIR%%/themes/base16/google-dark.theme
%%DATADIR%%/themes/base16/google-light.theme
%%DATADIR%%/themes/base16/grayscale-dark.theme
%%DATADIR%%/themes/base16/grayscale-light.theme
%%DATADIR%%/themes/base16/greenscreen.theme
%%DATADIR%%/themes/base16/gruvbox-dark-hard.theme
%%DATADIR%%/themes/base16/gruvbox-dark-medium.theme
%%DATADIR%%/themes/base16/gruvbox-dark-pale.theme
%%DATADIR%%/themes/base16/gruvbox-dark-soft.theme
%%DATADIR%%/themes/base16/gruvbox-light-hard.theme
%%DATADIR%%/themes/base16/gruvbox-light-medium.theme
%%DATADIR%%/themes/base16/gruvbox-light-soft.theme
%%DATADIR%%/themes/base16/harmonic-dark.theme
%%DATADIR%%/themes/base16/harmonic-light.theme
%%DATADIR%%/themes/base16/hopscotch.theme
%%DATADIR%%/themes/base16/ia-dark.theme
%%DATADIR%%/themes/base16/ia-light.theme
%%DATADIR%%/themes/base16/icy.theme
%%DATADIR%%/themes/base16/irblack.theme
%%DATADIR%%/themes/base16/isotope.theme
%%DATADIR%%/themes/base16/macintosh.theme
%%DATADIR%%/themes/base16/marrakesh.theme
%%DATADIR%%/themes/base16/materia.theme
%%DATADIR%%/themes/base16/material-darker.theme
%%DATADIR%%/themes/base16/material-lighter.theme
%%DATADIR%%/themes/base16/material-palenight.theme
%%DATADIR%%/themes/base16/material-vivid.theme
%%DATADIR%%/themes/base16/material.theme
%%DATADIR%%/themes/base16/mellow-purple.theme
%%DATADIR%%/themes/base16/mexico-light.theme
%%DATADIR%%/themes/base16/mocha.theme
%%DATADIR%%/themes/base16/monokai.theme
%%DATADIR%%/themes/base16/nord.theme
%%DATADIR%%/themes/base16/ocean.theme
%%DATADIR%%/themes/base16/oceanicnext.theme
%%DATADIR%%/themes/base16/one-light.theme
%%DATADIR%%/themes/base16/onedark.theme
%%DATADIR%%/themes/base16/outrun-dark.theme
%%DATADIR%%/themes/base16/paraiso.theme
%%DATADIR%%/themes/base16/phd.theme
%%DATADIR%%/themes/base16/pico.theme
%%DATADIR%%/themes/base16/pop.theme
%%DATADIR%%/themes/base16/porple.theme
%%DATADIR%%/themes/base16/railscasts.theme
%%DATADIR%%/themes/base16/rebecca.theme
%%DATADIR%%/themes/base16/seti.theme
%%DATADIR%%/themes/base16/shapeshifter.theme
%%DATADIR%%/themes/base16/snazzy.theme
%%DATADIR%%/themes/base16/solarflare.theme
%%DATADIR%%/themes/base16/solarized-dark.theme
%%DATADIR%%/themes/base16/solarized-light.theme
%%DATADIR%%/themes/base16/spacemacs.theme
%%DATADIR%%/themes/base16/summerfruit-dark.theme
%%DATADIR%%/themes/base16/summerfruit-light.theme
%%DATADIR%%/themes/base16/tomorrow-night.theme
%%DATADIR%%/themes/base16/tomorrow.theme
%%DATADIR%%/themes/base16/tube.theme
%%DATADIR%%/themes/base16/twilight.theme
%%DATADIR%%/themes/base16/unikitty-dark.theme
%%DATADIR%%/themes/base16/unikitty-light.theme
%%DATADIR%%/themes/base16/unikitty-reversible.theme
%%DATADIR%%/themes/base16/woodland.theme
%%DATADIR%%/themes/base16/xcode-dusk.theme
%%DATADIR%%/themes/base16/zenburn.theme
%%DATADIR%%/themes/baycomb.theme
%%DATADIR%%/themes/bclear.theme
%%DATADIR%%/themes/biogoo.theme
@ -278,9 +417,15 @@ man/man1/highlight.1.gz
%%DATADIR%%/themes/darkblue.theme
%%DATADIR%%/themes/darkbone.theme
%%DATADIR%%/themes/darkness.theme
%%DATADIR%%/themes/darkplus.theme
%%DATADIR%%/themes/darkslategray.theme
%%DATADIR%%/themes/darkspectrum.theme
%%DATADIR%%/themes/denim.theme
%%DATADIR%%/themes/duotone-dark-earth.theme
%%DATADIR%%/themes/duotone-dark-forest.theme
%%DATADIR%%/themes/duotone-dark-sea.theme
%%DATADIR%%/themes/duotone-dark-sky.theme
%%DATADIR%%/themes/duotone-dark-space.theme
%%DATADIR%%/themes/dusk.theme
%%DATADIR%%/themes/earendel.theme
%%DATADIR%%/themes/easter.theme
@ -322,6 +467,7 @@ man/man1/highlight.1.gz
%%DATADIR%%/themes/neon.theme
%%DATADIR%%/themes/night.theme
%%DATADIR%%/themes/nightshimmer.theme
%%DATADIR%%/themes/nord.theme
%%DATADIR%%/themes/nuvola.theme
%%DATADIR%%/themes/olive.theme
%%DATADIR%%/themes/orion.theme