head 1.6; access; symbols pkgsrc-2014Q2:1.3.0.44 pkgsrc-2014Q2-base:1.3 pkgsrc-2014Q1:1.3.0.42 pkgsrc-2014Q1-base:1.3 pkgsrc-2013Q4:1.3.0.40 pkgsrc-2013Q4-base:1.3 pkgsrc-2013Q3:1.3.0.38 pkgsrc-2013Q3-base:1.3 pkgsrc-2013Q2:1.3.0.36 pkgsrc-2013Q2-base:1.3 pkgsrc-2013Q1:1.3.0.34 pkgsrc-2013Q1-base:1.3 pkgsrc-2012Q4:1.3.0.32 pkgsrc-2012Q4-base:1.3 pkgsrc-2012Q3:1.3.0.30 pkgsrc-2012Q3-base:1.3 pkgsrc-2012Q2:1.3.0.28 pkgsrc-2012Q2-base:1.3 pkgsrc-2012Q1:1.3.0.26 pkgsrc-2012Q1-base:1.3 pkgsrc-2011Q4:1.3.0.24 pkgsrc-2011Q4-base:1.3 pkgsrc-2011Q3:1.3.0.22 pkgsrc-2011Q3-base:1.3 pkgsrc-2011Q2:1.3.0.20 pkgsrc-2011Q2-base:1.3 pkgsrc-2011Q1:1.3.0.18 pkgsrc-2011Q1-base:1.3 pkgsrc-2010Q4:1.3.0.16 pkgsrc-2010Q4-base:1.3 pkgsrc-2010Q3:1.3.0.14 pkgsrc-2010Q3-base:1.3 pkgsrc-2010Q2:1.3.0.12 pkgsrc-2010Q2-base:1.3 pkgsrc-2010Q1:1.3.0.10 pkgsrc-2010Q1-base:1.3 pkgsrc-2009Q4:1.3.0.8 pkgsrc-2009Q4-base:1.3 pkgsrc-2009Q3:1.3.0.6 pkgsrc-2009Q3-base:1.3 pkgsrc-2009Q2:1.3.0.4 pkgsrc-2009Q2-base:1.3 pkgsrc-2009Q1:1.3.0.2 pkgsrc-2009Q1-base:1.3 pkgsrc-2008Q4:1.2.0.2 pkgsrc-2008Q4-base:1.2 pkgsrc-2008Q3:1.1.1.1.0.10 pkgsrc-2008Q3-base:1.1.1.1 cube-native-xorg:1.1.1.1.0.8 cube-native-xorg-base:1.1.1.1 pkgsrc-2008Q2:1.1.1.1.0.6 pkgsrc-2008Q2-base:1.1.1.1 cwrapper:1.1.1.1.0.4 pkgsrc-2008Q1:1.1.1.1.0.2 pkgsrc-2008Q1-base:1.1.1.1 pkgsrc-base:1.1.1.1 TNF:1.1.1; locks; strict; comment @# @; 1.6 date 2014.08.18.01.24.59; author schmonz; state dead; branches; next 1.5; commitid fJZDY15Y8gTLwMMx; 1.5 date 2014.08.15.06.49.45; author schmonz; state Exp; branches; next 1.4; commitid jgz8pmbBHyIhqqMx; 1.4 date 2014.08.09.16.55.03; author schmonz; state Exp; branches; next 1.3; commitid w5xTTOh9rswTXHLx; 1.3 date 2009.03.02.22.10.27; author rh; state Exp; branches; next 1.2; 1.2 date 2008.11.07.21.12.12; author snj; state Exp; branches; next 1.1; 1.1 date 2008.02.19.02.23.44; author rh; state Exp; branches 1.1.1.1; next ; 1.1.1.1 date 2008.02.19.02.23.44; author rh; state Exp; branches; next ; desc @@ 1.6 log @Rename old patches by new convention. @ text @$NetBSD: patch-ab,v 1.5 2014/08/15 06:49:45 schmonz Exp $ Use pkgsrc-specified compiler and flags. --- src/makefile.orig 2014-04-04 17:26:25.000000000 +0000 +++ src/makefile @@@@ -12,12 +12,12 @@@@ # 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 -CFLAGS:=-Wall -O2 ${CFLAGS} -DNDEBUG +#CFLAGS:=-Wall -O2 ${CFLAGS} -DNDEBUG #CFLAGS:=-ggdb ${CFLAGS} CFLAGS_DILU=-fno-strict-aliasing @@@@ -61,7 +61,7 @@@@ 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) @ 1.5 log @Add missing pkg-config to USE_TOOLS. Respect flags passed down from dlopen.buildlink3.mk. Fixes build on NetBSD (and probably elsewhere). @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.4 2014/08/09 16:55:03 schmonz Exp $ @ 1.4 log @Update to 3.18. From the changelog: -filenames without extension (ie. makefile) can be mapped in filetypes.conf (suggested by Sam Craig) -fixed Rexx highlighting -added GDB language definition (thanks to A. Aniruddha) -added the.theme (thanks to Mark Hessling) -updated astyle code to release 2.04 -added astyle reformatting styles google, pico and lisp -improved raw string parsing in cs.lang (patch by smdn.jp) -added regex recognition in js.lang (patch by Troy Sankey) -added PDF language definition (thanks to Roland Hieber) -fixed debug output in sh.lang (https://sourceforge.net/p/syntaxhighlight/bugs/9/) -updated astyle code to release 2.03 -added heredoc string literal parsing for Lisp, Perl, PHP, Ruby and Bash -revised several language definitions -added DataDir::searchDataDir for the Perl SWIG bindings (thanks to David Bremner) -added SWIG PHP binding (patch by G. Wijaya) -updated Diluculum code to release 1.0 (support of Lua 5.2) -patched Diluculum to support Lua 5.1 and 5.2 -added support for Yang (thanks to A. Aniruddha) -fixed Ruby definition -added HeaderInjection and FooterInjection variables for syntax plug-ins -fixed handling of CRLF files on Linux (suggested by William Bell) -replaced single data directory by a dynamic config file search; see README (suggested by Daniel) -added plug-ins outhtml_parantheses_matcher.lua, outhtml_keyword_matcher.lua -CLI: added --list-scripts option -CLI: marked --data-dir, --list-langs, --list-themes options as deprecated -CLI: removed --add-config-dir option -added support for Crack (thanks to Conrad Steenberg) -added XML shebang regex (thanks to Ferry Huberts) -added hints to makefile to deal with Lua 5.1 and LuaJIT system libs -updated cpp_ref_gtk_gnome.lua plug-in -updated cpp_ref_cplusplus_com.lua plug-in -CLI: fixed segfault if --force was applied and unknown files were parsed (thanks to Jussi Judin) -GUI: fixed unselected theme after first program start -CSS class name is omitted in HTML output if class-name option is set to NONE -added support for highlighting of string interpolation -added support for Dart and TypeScript -fixed SWIG module -GUI: added Simplified Chinese translation (thanks to Love NoAny) -replaced Pattern/Matcher classes by the Boost xpressive library (now swig example is broken) -updated Relax NG syntax (thanks to Roger Sperberg) -added new oxygenated theme (thanks to Roger Sperberg) -fixed highlight.pro to include correct lua5.1 paths -GUI: fixed shebang recognition -fixed HTML ordered lists to improve copy&paste in browsers (suggested by Nash) -changed default output from HTML 4.01 to HTML5 -changed default HTML font family to include the generic monospace font -added ODT Flat XML output format (--out-format=odt) -added fontenc package in LaTeX output (patch by Yimin Li) -fixed RTF hyperlink output in several plug-ins -removed ctags option (functionality was replaced by plug-in) -CLI: added --wrap-no-numbers option (patch by Michael Enßlin) -GUI: replaced Qt file dialogs by native dialogs -enhanced the plug-in interface (added Decorator function and Injections property) -added several example plug-ins which show how to add keyword links to online references (e.g. cplusplus.com, perldoc.perl.org, qtproject_org) -added ctags plugin (ctags_html_tooltips.lua) -improved Perl and N3 definitions (thanks to Heiko Jansen) -CLI: marked --ctags-file option as deprecated -CLI: added --plug-in-read option to define an input file for plug-ins -CLI: fixed file suffix recognition -GUI: added input field for a plug-in input file -GUI: fixed initial input tab selection -GUI: set initial font selection to Courier -updated astyle code to release 2.02.1 -fixed SWIG perl binding makefile (patch by David Bremner) -fixed shebang recognition (patch by Georgios M. Zarkadas) -fixed file suffix recognition (patch by Georgios M. Zarkadas) -fixed memory leak in astyle's ASFormatter (patch by MENG Wei) -added support for Biferno (thanks to Sandro Bilbeisi) -added support for RPL (thanks to Frank Seidinger) -added support for Ceylon -fixed Ruby definition -HTML font string may contain a list of fonts, which is not enclosed in quotes (suggested by Sebastiano Poggi) -GUI: added --portable command line option to save config files in the current working directory instead of the user directory (suggested by Royi Avital) -GUI: fixed some language mappings -added support for UPC (thanks to Viraj Sinha) -added support for N3, N-Triples, Turtle, SPARQL (suggested by Heiko Jansen) -added Solarized color theme (thanks to Steve Huff) -fixed OCaml definition (thanks to Kakadu Hafanana) -fixed camo colour theme -removed sienna and desertEx colour themes -CLI: fixed segfault with --print-style option -GUI: added "Dock floating panels" checkbox in the main menu -updated astyle code to release 2.02 -fixed --force option (thanks to Stefan Bühler) -added support for ABC, Algol, AS/400 CL, BCPL, Limbo, Gambas, JavaFX, RPG, Transact-SQL, PL/Perl, PL/Tcl, PL/Python, Charmm -fixed web plugins (Serendipity, DokuWiki, Wordpress) -fixed BBCode closing tag order -GUI: Updated Czech translation (thanks to Pavel Fric) -updated astyle code to release 2.01 -fixed overwriting of files with the same name in recursive batch mode (thanks to Ramanathan U.) -added DataDir class to SWIG interface (patch by David Bremner) -added Andes theme (thanks to Roger Sperberg) -enabled deprecated @@highlight pass-through (suggested by David Bremner) -dropped oceandeep theme -updated documentation -added plug-in function AddKeyword (suggested by Michael Serrano) -language definitions are cached instead of being reloaded if input syntax changes -added keyword group ID parameter to the plug-in function OnStateChange -added plug-in script bash_functions.lua -added theme description in output style's comment -added enum and union keywords in c.lang (thanks to Thiago) -added dl linking flag in Makefile to fix Debian build error (thanks to Michael Serrano) -added NDEBUG flag in makefile to disable asserts -GUI: Added Czech translation (thanks to Pavel Fric) -updated Diluculum to version 0.5.3 -fixed README -fixed conversion without highlighting (--syntax txt) -fixed msxml definition (thanks to Andrei Rosca) -added edit-flashdevelop theme (thanks to Andrei Rosca) -CLI: fixed minor bugs -added --config-file option -CLI: fixed minor bugs -GUI: renamed output specific options tab -GUI: remember state of the dock panel -moved plugin scripts from examples to new plugins directory -fixed web_plugin path in makefile (thanks to Jochen Schmitt) -fixed SWIG interface and example scripts -improved converted VIM colour themes -improved several language definitions (Fortran77, Zonnon, Basic, Verilog, Squirrel, R) -added new plugins (java_library.lua, theme_invert.lua) -GUI: added plug-in description label -GUI: moved setting controls into a dock panel -enabled loading of multiple plugins -added MXML language definition (suggested by Neal Delfeld) -fixed HTML, XML, CSS, Actionscript and JavaScript definitions -converted 60 popular VIM colour themes -language definitions, themes, filetypes.conf were converted to Lua scripts (try examples/*2to3.py to convert old files) -added --plug-in option to enable user scripts -renamed *.style files to *.theme -moved include files from src/core to src/include -moved examples/plugins to examples/web_plugins -renamed --linenumbers to --line-numbers -renamed several language definitions and themes -fixed several string delimiter issues (Ruby, Lua) -changed default theme for xterm256 output to edit-vim-dark -changed short options: -O is --out-format, -d is --out-dir, -T is --doc-title -disabled --mark-line feature -disabled --add-data-dir feature -disabled separate output format options (use --out-format instead) -disabled XML output (use SVG or XHTML) -New dependencies: Lua5.1-devel, Boost Headers (Bind) -updated astyle code to release 1.24 -added indentation styles 1tbs and horstmann -added --no-trailing-nl switch (suggested by Adiel Mittmann) -added Modula2 definition (thanks to Benjamin Kowarsch) -added EBNF definition (thanks to Mate Ory) -added ABNF, AutoHotKey, BBCode and Clean language definitions -updated C++ definition to support C++0x syntax -added StartupNotify switch in desktop file (patch by Jochen Schmitt) -improved HTML nested language patterns (thanks to Simone) -improved Rexx and PL1 definitions (thabnks to Robert Prins) -added support for NXC and NBC -GUI: added copy and paste support (thanks to Torsten Flammiger) -GUI: fixed preview of UTF-8 input -fixed Rexx output (thanks to Marc Hessling) -added support for Go and Pure -added support for BNF (thanks to Julien Fontanet) -updated Logtalk definition (thanks to Paulo Moura) -updated THE theme (thanks to Marc Hessling) -CLI: --quiet switch supresses "Unknown source file extension" error (suggested by Nathan Gray) -fixed SVG output (thanks to Xico) -GUI: added new icon -fixed bug with $INCLUDE statement -fixed ctags file parsing -added nested language recognition within a source file (suggested by Pavel Striz) -added $NESTED statement to language definitions (pas, html, tex) -added support for F# (fs.lang) -added support for haXe (hx.lang) -improved various language definitions -revised documentation -LIB: added version to shared lib output name -CLI: added options --start-nested and --print-style -added BBCode output option (--bbcode, suggested by Qui Peccavit) -added new --delim-cr option to cope with MacOS 9 files (suggested by Steven Haddock) -added shared lib target (make lib-shared, suggested by Dario Teixeira) -list of installed languages (--list-langs) was enhanced to include mapped file extensions (suggested by Martin Kammerlander) -improved many colour themes using Agave (agave.sf.net) -fixed CR parsing bug on MacOS (thanks to Shiro Wilde) -fixed SWIG makefile (thanks to David Bremner) -license changed from GPLv2 to GPLv3 (incl. included libs) -updated Artistic Style lib to version 1.23 -new indentation schemes: stroustrup, whitesmith, banner -removed indentSchemes and helpmsg directories -removed README_INDENT -replaced ide-devcpp theme by a new jedit theme -added support for Interactive Data Language (idlang, thanks to Roberto Mendoza) -added support for Rebol, Oz, Mercury, Zonnon, ATS (Applied Type System), CHILL, NetRexx, Inno Setup and INTERLIS -added pp, rjs, jnlp, groovy, gnad, es, sblc, ooc, gst, sq extensions to filetypes.conf -improved Prolog, Pike, Oberon, Nice, Java, Lisp, Lua, Haskell, C# and SML definitions -improved spec.lang for RPM (thanks to Luoyi Ly) -CLI: option --help-lang is deprecated -API: dropped setSpecialOptions(), renamed initializing methods to init* -added more customized boxes for the LaTeX --pretty-symbols switch (thanks to Romain Francois) -GUI: fixed makefile to pass costum paths to the Qt project makefile (thanks to Joerg Germeroth) -GUI: reduced window height (thanks to Fidel Barrera) -GUI: added Spanish translation (thanks to Fidel Barrera) -GUI: added drag and drop for input files -added --pretty-symbols option to improve LaTeX output quality of tilde and braces (thanks to Romain Francois) -omitted warning message if --syntax parameter is contained in the --skip list (thanks to Bob Smith) -included language descriptions in --list-langs output -dropped dependency of --replace-quotes and --fragment options -enhanced Python SWIG example (testmod.py) -added qmake language definition -fixed SWIG scripts (thanks to David Bremner) -fixed gcc 4.4 compilation (patch by Jochen Schmitt) -dropped core/html32generator.* -dropped src/gui (wxWidgets based interface) -GUI: rewrote the user interface using Qt @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.3 2009/03/02 22:10:27 rh Exp $ d22 9 @ 1.3 log @Update highlight to 2.7. Changes include tons of language updates, new languages, and bug fixes. A detailed list of changes can be found at: http://www.andre-simon.de/doku/highlight/highlight_changelog.html @ text @d1 1 a1 1 $NetBSD$ d3 3 a5 1 --- src/makefile.orig 2009-01-06 12:17:29.000000000 +1000 d7 3 a9 3 @@@@ -10,9 +10,7 @@@@ # Add -DCONFIG_FILE_PATH=\"/your/path/.highlightrc\" if you want to define a # custom path to the highlight configuration file (default: $HOME/.highlightrc) d12 4 d17 3 a19 1 -CFLAGS:=-O2 ${CFLAGS} d21 1 a21 2 # Source paths CORE_DIR=./core/ @ 1.2 log @Update to 2.6.14: new langauges, various bug fixes, and the option to output SVG. See bundled ChangeLog for full details. @ text @d3 2 a4 2 --- src/makefile.orig 2008-10-23 19:08:29.000000000 -0700 +++ src/makefile 2008-11-07 11:56:04.000000000 -0800 d13 2 a14 2 # Do not strip by default (Mac OS X lazy pointer issues) # Add -static to avoid linking with shared libs (can cause trouble when highlight @ 1.1 log @Initial revision @ text @d3 5 a7 5 --- src/makefile.orig 2008-02-19 09:38:29.000000000 +1000 +++ src/makefile @@@@ -13,9 +13,7 @@@@ # Add -DUSE_FN_MATCH to enable better wildcard support with the --batch-recursive option. # See "man 3 fnmatch" for details. @ 1.1.1.1 log @Import highlight-2.6.8, a tool that converts source code to formatted text with syntax highlighting. Based on the wip package (with version update and minor modifications) by dhowland users sf net. @ text @@