head 1.4; access; symbols pkgsrc-2018Q1:1.1.0.32 pkgsrc-2018Q1-base:1.1 pkgsrc-2017Q4:1.1.0.30 pkgsrc-2017Q4-base:1.1 pkgsrc-2017Q3:1.1.0.28 pkgsrc-2017Q3-base:1.1 pkgsrc-2017Q2:1.1.0.24 pkgsrc-2017Q2-base:1.1 pkgsrc-2017Q1:1.1.0.22 pkgsrc-2017Q1-base:1.1 pkgsrc-2016Q4:1.1.0.20 pkgsrc-2016Q4-base:1.1 pkgsrc-2016Q3:1.1.0.18 pkgsrc-2016Q3-base:1.1 pkgsrc-2016Q2:1.1.0.16 pkgsrc-2016Q2-base:1.1 pkgsrc-2016Q1:1.1.0.14 pkgsrc-2016Q1-base:1.1 pkgsrc-2015Q4:1.1.0.12 pkgsrc-2015Q4-base:1.1 pkgsrc-2015Q3:1.1.0.10 pkgsrc-2015Q3-base:1.1 pkgsrc-2015Q2:1.1.0.8 pkgsrc-2015Q2-base:1.1 pkgsrc-2015Q1:1.1.0.6 pkgsrc-2015Q1-base:1.1 pkgsrc-2014Q4:1.1.0.4 pkgsrc-2014Q4-base:1.1 pkgsrc-2014Q3:1.1.0.2 pkgsrc-2014Q3-base:1.1; locks; strict; comment @# @; 1.4 date 2018.05.03.13.13.51; author schmonz; state dead; branches; next 1.3; commitid 8ebyE1g9RmpGVQAA; 1.3 date 2018.04.09.20.17.46; author schmonz; state Exp; branches; next 1.2; commitid NArb7vYPFVOR2OxA; 1.2 date 2018.04.08.19.40.29; author schmonz; state Exp; branches; next 1.1; commitid q3iy67UlfdP8SFxA; 1.1 date 2014.08.18.01.24.59; author schmonz; state Exp; branches; next ; commitid fJZDY15Y8gTLwMMx; desc @@ 1.4 log @Update to 3.43. From the changelog: -updated astyle code to release 3.1 (Rev. 655) -added webkit reformatting style -improved several language definitions -fixed Matlab string recognition (https://github.com/andre-simon/highlight/issues/61) -fixed Autohotkey escape sequence recognition (thanks to Klaus Daube) -added excel.lang (https://github.com/andre-simon/highlight/pull/60) -improved Qt pro file (https://github.com/andre-simon/highlight/pull/59) -CLI: added --reformat-option (https://github.com/andre-simon/highlight/issues/62) -CLI: added --line-range (https://github.com/andre-simon/highlight/issues/64) -GUI: added Bulgarian translation (thanks to Georgi Sotirov) -fixed HL_OUTPUT in Lua state for HL_FORMAT_XHTML and HL_FORMAT_TRUECOLOR values -fixed lib-shared make target -updated astyle code to release 3.1.0 beta -added Polygen and EBNF2 syntax definitions (thanks to Tristano Ajmone) -added pywal terminal colouring template in extras/pywal -added reformatting style ratliff (replaces banner) -added extras/langDefs-resources/cleanslate.lang (thanks to Tristano Ajmone) -improved Perl6 compatibility -improved PHP string interpolation -improved Haskell definition (https://github.com/andre-simon/highlight/pull/52) -CLI: added --canvas option to define background color padding in ANSI output (https://github.com/andre-simon/highlight/issues/40) -GUI: added French translation (thanks to Antoine Belvire) -GUI: added Scripts tab (suggested by Tristano Ajmone) -GUI: minor bugfixes -renamed examples directory to extras -line anchors (-a) are attached as id attribute to the first span or li tag in HTML output (https://github.com/andre-simon/highlight/issues/36) -renamed ID prefix in outhtml_codefold plug-in to be compatible with -a IDs -added fstab.lang and added anacrontab in filetypes.conf -removed references to OutputType::HTML32 -added extras/css-themes and extras/langDefs-resources (thanks to Tristano Ajmone) -CLI: removed deprecated indicator of --data-dir option -CLI: added --no-version-info option -GUI: fixed initial theme selection -GUI: added "Omit version info comment" option -GUI: added "Copy with MIME type" option for HTML output (https://github.com/andre-simon/highlight/issues/32) -fixed Ruby string parsing (thanks to Jens Schleusener) -fixed segfault on sparc64 (patch by James Clarke) -fixed PureBasic definition (https://github.com/andre-simon/highlight/issues/25) -added CMake definition (https://github.com/andre-simon/highlight/issues/20) -added email definition (https://github.com/andre-simon/highlight/issues/21) -linked scm suffix to lisp definition (https://github.com/andre-simon/highlight/issues/22) -W32 CLI: support HIGHLIGHT_DATADIR and --data-dir options (https://github.com/andre-simon/highlight/issues/24) -revised documentation -added syntax for Docker and Elixir -improved HTML, Julia, Kotlin and Smalltalk syntax definitions -GUI: added "Paste, Convert and Copy" button (https://sourceforge.net/p/syntaxhighlight/support-requests/4/) -fixed Bash variable highlighting issue -updated astyle code to release 3.0.1 (https://sourceforge.net/p/astyle/bugs/438) -added bash_ref_man7_org.lua plugin -fixed Perl string highlighting issue -fixed highlighting if a line continues after the nested code delimiter -updated astyle code to release 3.0 -added examples/pandoc (thanks to Tristano Ajmone) -added syntax mapping for markdown (https://github.com/andre-simon/highlight/issues/11) -added syntax mapping for clj (https://github.com/andre-simon/highlight/issues/15) -improved Java definition (https://github.com/andre-simon/highlight/issues/13) -added theme to JSON converter in examples/json (https://github.com/andre-simon/highlight/issues/8) -CLI: added support for environment variable HIGHLIGHT_OPTIONS (https://github.com/andre-simon/highlight/issues/17) -fixed code folding plugin to support more Ruby conditional modifiers (thanks to Jens Schleusener) -fixed Perl quoted string highlighting (thanks to Jens Schleusener) -added new GeneratorOverride syntax definition parameter -added Filenames parameter in filetypes.conf to assign input filenames to syntax types (suggested by Andy) -added FASM definition and edit-fasm theme (thanks to Tristano Ajmone) -added outhtml_ie7_webctrl plug-in (suggested by Tristano Ajmone) -GUI: file extensions can be configured for multiple languages, triggers syntax selection prompt -GUI: added Italian translation (thanks to Tristano Ajmone) -fixed code folding plugin to support Ruby conditional modifiers -fixed JSON definition (thanks to Timothee Cour) -fixed output of unknown syntax warning with applied force switch (thanks to Andy) -added state trace parameter to Decorate plug-in function -added GDScript definition and edit-godot theme (thanks to Tristano Ajmone) -updated SWIG code samples -updated Artistic Style lib (SVN Rev. 553) -revised docs -CLI: fixed creation of hidden files if output filename is prepended by its input path -CLI: added switch --stdout (https://sourceforge.net/p/syntaxhighlight/bugs/14) -fixed segfault with --skip applied on a single file input list (thanks to Jens Schleusener) -added support for Python 3.6 syntax -added Github and Sourceforge themes -fixed highlighting of nested section delimiters -fixed PHP definition (thanks to Christoph Burschka) -fixed font family declaration in SVG -fixed user defined encoding in ODT -fixed unnecessary output of style file with --inline-css (thanks to Jens Schleusener) -added vimscript language definition (thanks to Max Christian Pohle) -added Coffeescript language definition (thanks to Jess Austin) -added PureBasic definition and theme (thanks to Tristano Ajmone) -added JSX language definition (suggested by Max Stoiber) -added PO translation definition -added plug-in outhtml_add_figure.lua -updated js definition -updated Artistic Style lib (SVN Rev. 521) -improved various color themes and syntax definitions -added support for true color escape codes (--out-format truecolor) -fixed xterm256 output for paging with less (thanks to Fylwind) -fixed operator regex in rnc.lang, crk.lang and yaml.lang (thanks to Joe Klauza) -added Pony and Whiley definitions -updated Ceylon, Julia and TypeScript definitions -added Go, AutoHotKey, TypeScript and R to the foldable list in the outhtml_codefold.lua plug-in -removed plugins/bash_ref_linuxmanpages_com.lua -GUI: fixed README, ChangeLog and License file paths on Linux -revised documentation -GUI: fixed minor layout issues -the data directory can be defined with the HIGHLIGHT_DATADIR environment variable -fixed RTF output of UTF-8 input; needs input encoding set to utf-8 (thanks to Kamigishi Rei) -fixed XML comment recognition (thanks to Mani) -data search directories were appended to the result of --list-scripts -revised older syntax definitions -updated base URLs of bash_ref_linuxmanpages and cpp_ref_qtproject plug-ins -GUI: added system copy and paste shortcuts for clipboard functions (suggested by Kamigishi Rei) -added Ansible Yaml definition (thanks to Raphael Droz) -added Chapel definition (thanks to Lydia Duncan) -fixed gcc 6 warnings about deprecated auto_ptr usage -src/makefile: added -std=c++11 because of auto_ptr to unique_ptr transition (thanks to Jens Schleusener) -GUI: fixed style file output if "write to source directory" option is checked (thanks to Jim Pattee) -added support of Pascal, Lua, Ruby and C# regions in outhtml_codefold.lua -improved outhtml_codefold.lua to handle embedded languages -added string delimiters in the Ruby definition -added new AssertEqualLength flag in string section of language definitions -improved heredoc parsing -fixed Lua multiline string recognition -improved SVG whitespace output (patch by Paul de Vrieze) -added Nim and mIRC Scripting definitions -improved outhtml_codefold.lua to ignore brackets on the same line -added RTF output to mark_lines.lua -fixed Powershell and NSIS definitions -added JSON and Github Markdown definitions -CLI: added --keep-injections option to force plugin injection output with -f -GUI: added keep injections checkbox -GUI: fixed crash after removing selected plugins -added HL_REJECT state to be used in a OnStateChange function -added DecorateLineBegin and DecorateLineEnd hooks -added mark_lines.lua, outhtml_codefold.lua, comment_links.lua plug-ins -fixed font face in ODT output -fixed Operators parameter in frink.lang and oorexx.lang -fixed regular expression parsing within strings for JS, Perl and Ruby -CLI: added --page-color option to include a page color in RTF output -GUI: added RTF page color checkbox -added new SVG definition to support embedded scripting -improved js.lang, css.lang, scss.lang, less.lang, tsql.lang -modified HTML ordered list output to work better with new plug-ins -renamed plug-in variable HL_INPUT_FILE to HL_PLUGIN_PARAM -CLI: renamed --plug-in-read option to --plug-in-param -GUI: updated plug-in parameter label and tool-tips -GUI: fixed minor issues -fixed TeX output for cweb documents (patch by Ingo Krabbe) -fixed string interpolation in bat.lang -added reduce_filesize.lua, outhtml_add_shadow.lua, outhtml_add_background_svg.lua, outhtml_add_background_stripes.lua, outhtml_add_line.lua plug-ins -added TCL extension in examples/tcl -added kotlin.lang, nginx.lang and julia.lang -updated php.lang to include version 7 keywords -updated ceylon.lang to include version 1.2 keywords -updated scripts in examples directory -CLI: style-infile option marked as deprecated -GUI: shortened paths in file input lists -added rs.lang -added conf.lang (thanks to Victor Ananjevsky) -added some extensions in filetypes.conf (patch by Victor Ananjevsky) -fixed Matlab definition and style (thanks to Justin Pearson) -CLI: fixed --list-scripts with unknown argument (thanks to Jens Schleusener) -updated astyle code to release 2.05.1 -fixed shebang recognition (thanks to Victor Ananjevsky) -GUI: added option to define line numbering start -added support for LESS, SASS and Stylus CSS processors (suggested by Marcel Bischoff) -added support for Lua 5.3, removed LUA52 makefile option -fixed heredoc matching in perl.lang (thanks to cornucopia) -fixed Haskell lang (thanks to Daan Michiels) -fixed RNC lang (thanks to Daan Michiels) -fixed regex pattern in js.lang -updated astyle code to release 2.05 -added astyle reformatting style vtk -added bold, italic and underline attributes to xterm256 ANSI output (patch by Andrew Fuller) -fixed assembler mapping in filetypes.conf (thanks to Jens Schleusener) -added Swift definition -improved ASP, F#, OCaml and Lisp syntax definitions -added interpolation patterns to several definitions -updated base URLs in cpp_ref_gtk_gnome and cpp_ref_qtproject plug-ins -CLI: added Pango markup output option (patch by Dominik Schmidt) @ text @$NetBSD: patch-src_makefile,v 1.3 2018/04/09 20:17:46 schmonz Exp $ Use pkgsrc-specified compiler and flags. --- src/makefile.orig 2014-04-04 17:26:25.000000000 +0000 +++ src/makefile @@@@ -12,18 +12,18 @@@@ # See src/gui-qt/highlight.pro for the Qt GUI compilation options -CXX=c++ +#CXX=c++ # Added -qt4 because of Arch Linux Qt5 migration -QMAKE=qmake-qt4 +#QMAKE=qmake-qt4 -CFLAGS:=-Wall -O2 ${CFLAGS} -DNDEBUG +#CFLAGS:=-Wall -O2 ${CFLAGS} -DNDEBUG #CFLAGS:=-ggdb ${CFLAGS} CFLAGS_DILU=-fno-strict-aliasing SO_VERSION=3.17 - +LSO_VERSION=$(shell echo ${SO_VERSION} | awk -F. '{ printf "%d:%d:0\n", $$1 - 1, $$2 }') # Source paths CORE_DIR=./core/ @@@@ -61,14 +61,16 @@@@ ifdef PIC CFLAGS+=-fPIC endif -LDFLAGS = -ldl +#LDFLAGS = -ldl # Do not strip by default (Mac OS X lazy pointer issues) # Add -static to avoid linking with shared libs (can cause trouble when highlight # is run as service) #LDFLAGS = ${LDFLAGS} -s #LDFLAGS= -Wl,--as-needed -CXX_COMPILE=${CXX} ${CFLAGS} -c -I ${INCLUDE_DIR} ${LUA_CFLAGS} +LIBTOOL=libtool --tag=CXX + +CXX_COMPILE=${LIBTOOL} --mode=compile ${CXX} ${CFLAGS} ${CXX_DIR} -I ${INCLUDE_DIR} ${LUA_CFLAGS} -c # Data directories (data dir, configuration file dir) CXX_DIR=-DHL_DATA_DIR=\"${HL_DATA_DIR}\" -DHL_CONFIG_DIR=\"${HL_CONFIG_DIR}\" @@@@ -96,18 +98,18 @@@@ GUI_OBJECTS:=${GUI_QT_DIR}main.cpp ${GUI ${GUI_QT_DIR}showtextfile.cpp -cli: libhighlight.a ${CLI_OBJECTS} - ${CXX} ${LDFLAGS} -o highlight ${CLI_OBJECTS} -L. -lhighlight ${LUA_LIBS} +cli: ${CLI_OBJECTS} + ${CXX} ${LDFLAGS} -o highlight ${CLI_OBJECTS} -lhighlight ${LUA_LIBS} lib-static libhighlight.a: ${CORE_OBJECTS} ${AR} ${ARFLAGS} libhighlight.a ${CORE_OBJECTS} ${DILU_OBJECTS} lib-shared libhighlight.so.1.0: ${CORE_OBJECTS} - ld -shared -soname libhighlight.so.1 -o libhighlight.so.${SO_VERSION} -lc ${CORE_OBJECTS} + ${LIBTOOL} --mode=link ${CXX} ${LDFLAGS} -o libhighlight.la ${CORE_OBJECTS:%.o=%.lo} ${DILU_OBJECTS:%.o=%.lo} -version-info ${LSO_VERSION} -rpath ${PREFIX}/lib gui-qt: highlight-gui -highlight-gui: libhighlight.a ${GUI_OBJECTS} +highlight-gui: ${GUI_OBJECTS} cd gui-qt && \ ${QMAKE} 'DEFINES+=DATA_DIR=\\\"${HL_DATA_DIR}\\\" CONFIG_DIR=\\\"${HL_CONFIG_DIR}\\\" DOC_DIR=\\\"${HL_DOC_DIR}\\\" ' && \ $(MAKE) @@@@ -116,7 +118,7 @@@@ $(OBJECTFILES) : makefile datadir.o: ${CORE_DIR}datadir.cpp ${INCLUDE_DIR}datadir.h ${INCLUDE_DIR}platform_fs.h - ${CXX_COMPILE} ${CORE_DIR}datadir.cpp ${CXX_DIR} + ${CXX_COMPILE} ${CORE_DIR}datadir.cpp platform_fs.o: ${CORE_DIR}platform_fs.cpp ${INCLUDE_DIR}platform_fs.h ${CXX_COMPILE} ${CORE_DIR}platform_fs.cpp @@@@ -197,7 +199,7 @@@@ main.o: ${CLI_DIR}main.cpp ${CLI_DIR}mai ${INCLUDE_DIR}syntaxreader.h ${INCLUDE_DIR}themereader.h ${INCLUDE_DIR}elementstyle.h \ ${INCLUDE_DIR}stylecolour.h ${INCLUDE_DIR}preformatter.h \ ${CLI_DIR}help.h ${INCLUDE_DIR}version.h - ${CXX_COMPILE} ${CLI_DIR}main.cpp ${CXX_DIR} + ${CXX_COMPILE} ${CLI_DIR}main.cpp #3rd party libs @ 1.3 log @Add 'x11' option. Bump PKGREVISION. @ text @d1 1 a1 1 $NetBSD: patch-src_makefile,v 1.2 2018/04/08 19:40:29 schmonz Exp $ @ 1.2 log @Extract libhighlight (libtoolized for portability) to its own package, which highlight and p5-highlight buildlink instead of making their own static copies (so bump their PKGREVISIONS). While here, fix build on SmartOS. @ text @d1 1 a1 1 $NetBSD: patch-src_makefile,v 1.1 2014/08/18 01:24:59 schmonz Exp $ d15 2 a16 1 QMAKE=qmake-qt4 d49 1 a49 1 @@@@ -96,14 +98,14 @@@@ GUI_OBJECTS:=${GUI_QT_DIR}main.cpp ${GUI d67 5 @ 1.1 log @Rename old patches by new convention. @ text @d1 1 a1 1 $NetBSD$ d7 1 a7 1 @@@@ -12,12 +12,12 @@@@ d22 8 a29 1 @@@@ -61,7 +61,7 @@@@ ifdef PIC d38 46 @