diff options
author | adam <adam@pkgsrc.org> | 2010-12-02 18:00:14 +0000 |
---|---|---|
committer | adam <adam@pkgsrc.org> | 2010-12-02 18:00:14 +0000 |
commit | 5089cf8f3e70ec9f20c2277e0d0b59a0c074dc10 (patch) | |
tree | 1370375729df7bd97198091a1a6676347ad86f48 /textproc | |
parent | 47d8b2f4c8f0db874a513b9c53b866b72cb90c7b (diff) | |
download | pkgsrc-5089cf8f3e70ec9f20c2277e0d0b59a0c074dc10.tar.gz |
Changes 3.1.4:
* fixed compilation problems for Sun CC
* php handles embedded html
* html handles embedded css and javascript
* Google's Protocol Buffers language definition added
* CakePhp template files highlighted as php
* haskell literate programming highlighting
* vala language definition
* lisp language definition
Changes 3.1.3:
* --tab option is correcly handled
* install script with the executable bit
* bash is highlighted
Changes 3.1.2:
* infer language for files starting with <? and <!doctype
* language definition for manifest files, asm, applescript,
vbscript, awk, bat, clipper, cobol, D, Erlang
* lang def file for compiler output errors
* style for label and path
* label element recognized in C/C++
* qmake based build system available
* searches for home directory also on windows
* improved logtalk.lang
* improved email regular expression in url.lang
Diffstat (limited to 'textproc')
-rw-r--r-- | textproc/source-highlight/Makefile | 20 | ||||
-rw-r--r-- | textproc/source-highlight/PLIST | 190 | ||||
-rw-r--r-- | textproc/source-highlight/distinfo | 9 | ||||
-rw-r--r-- | textproc/source-highlight/patches/patch-aa | 48 |
4 files changed, 247 insertions, 20 deletions
diff --git a/textproc/source-highlight/Makefile b/textproc/source-highlight/Makefile index a48fea8b89b..04ba36848e3 100644 --- a/textproc/source-highlight/Makefile +++ b/textproc/source-highlight/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.28 2009/12/03 14:31:14 joerg Exp $ -# +# $NetBSD: Makefile,v 1.29 2010/12/02 18:00:14 adam Exp $ -DISTNAME= source-highlight-2.9 +DISTNAME= source-highlight-3.1.4 SVR4_PKGNAME= srchl CATEGORIES= textproc MASTER_SITES= ${MASTER_SITE_GNU:=src-highlite/} @@ -9,15 +8,20 @@ MASTER_SITES= ${MASTER_SITE_GNU:=src-highlite/} MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://www.gnu.org/software/src-highlite/ COMMENT= Highlight syntax of various languages source into HTML document +LICENSE= gnu-gpl-v3 PKG_DESTDIR_SUPPORT= user-destdir DEPENDS+= exctags-[0-9]*:../../devel/exctags -GNU_CONFIGURE= YES -USE_LANGUAGES= c c++ -USE_LIBTOOL= YES -CONFIGURE_ENV+= CTAGS=${LOCALBASE}/bin/exctags +USE_LANGUAGES= c c++ +USE_LIBTOOL= yes +GNU_CONFIGURE= yes +CONFIGURE_ARGS+= --with-boost-regex=boost_regex +CONFIGURE_ARGS+= --without-bash-completion +CONFIGURE_ENV+= CTAGS=${LOCALBASE}/bin/exctags + +PKGCONFIG_OVERRIDE= source-highlight.pc.in INFO_FILES= YES @@ -25,8 +29,6 @@ INFO_FILES= YES USE_TOOLS+= gmake gsed TEST_TARGET= check -CONFIGURE_ARGS+= --with-boost-regex - .include "../../mk/bsd.prefs.mk" .if ${OPSYS} == "NetBSD" diff --git a/textproc/source-highlight/PLIST b/textproc/source-highlight/PLIST index 4899a47fd2c..bb5c91b12c3 100644 --- a/textproc/source-highlight/PLIST +++ b/textproc/source-highlight/PLIST @@ -1,11 +1,106 @@ -@comment $NetBSD: PLIST,v 1.12 2009/06/14 18:17:31 joerg Exp $ +@comment $NetBSD: PLIST,v 1.13 2010/12/02 18:00:14 adam Exp $ bin/check-regexp bin/cpp2html bin/java2html bin/source-highlight +bin/source-highlight-settings bin/src-hilite-lesspipe.sh +include/srchilite/bufferedoutput.h +include/srchilite/chartranslator.h +include/srchilite/colormap.h +include/srchilite/colors.h +include/srchilite/ctagscollector.h +include/srchilite/ctagsformatter.h +include/srchilite/ctagsmanager.h +include/srchilite/debuglistener.h +include/srchilite/delimitedlangelem.h +include/srchilite/docgenerator.h +include/srchilite/doctemplate.h +include/srchilite/eventgenerator.h +include/srchilite/fileinfo.h +include/srchilite/fileutil.h +include/srchilite/formatter.h +include/srchilite/formatterfactory.h +include/srchilite/formattermanager.h +include/srchilite/formatterparams.h +include/srchilite/highlightbuilderexception.h +include/srchilite/highlightevent.h +include/srchilite/highlighteventlistener.h +include/srchilite/highlightrule.h +include/srchilite/highlightrulefactory.h +include/srchilite/highlightstate.h +include/srchilite/highlightstatebuilder.h +include/srchilite/highlightstateprinter.h +include/srchilite/highlighttoken.h +include/srchilite/instances.h +include/srchilite/ioexception.h +include/srchilite/keys.h +include/srchilite/langdefmanager.h +include/srchilite/langdefparser.h +include/srchilite/langdefparserfun.h +include/srchilite/langdefscanner.h +include/srchilite/langelem.h +include/srchilite/langelems.h +include/srchilite/langelemsprinter.h +include/srchilite/langmap.h +include/srchilite/languageinfer.h +include/srchilite/linebuffer.h +include/srchilite/linenumgenerator.h +include/srchilite/lineranges.h +include/srchilite/matchingparameters.h +include/srchilite/namedsubexpslangelem.h +include/srchilite/outlangdefparser.h +include/srchilite/outlangdefparserfun.h +include/srchilite/outlangdefscanner.h +include/srchilite/parserexception.h +include/srchilite/parserinfo.h +include/srchilite/parsestruct.h +include/srchilite/parsestyles.h +include/srchilite/preformatter.h +include/srchilite/readtags.h +include/srchilite/refposition.h +include/srchilite/regexhighlightrule.h +include/srchilite/regexpreprocessor.h +include/srchilite/regexranges.h +include/srchilite/regexrulefactory.h +include/srchilite/settings.h +include/srchilite/sourcefilehighlighter.h +include/srchilite/sourcehighlight.h +include/srchilite/sourcehighlighter.h +include/srchilite/sourcehighlightutils.h +include/srchilite/srcuntabifier.h +include/srchilite/statelangelem.h +include/srchilite/statestartlangelem.h +include/srchilite/stopwatch.h +include/srchilite/stringdef.h +include/srchilite/stringlistlangelem.h +include/srchilite/stringtable.h +include/srchilite/stylecssparser.h +include/srchilite/stylefileparser.h +include/srchilite/stylekey.h +include/srchilite/styleparser.h +include/srchilite/substfun.h +include/srchilite/textstyle.h +include/srchilite/textstylebuilder.h +include/srchilite/textstyleformatter.h +include/srchilite/textstyleformattercollection.h +include/srchilite/textstyleformatterfactory.h +include/srchilite/textstyles.h +include/srchilite/tostringcollection.h +include/srchilite/utils.h +include/srchilite/vardefinitions.h +include/srchilite/verbosity.h +include/srchilite/versions.h +include/srchilite/wordtokenizer.h +info/source-highlight-lib.info info/source-highlight.info +lib/libsource-highlight.la +lib/pkgconfig/source-highlight.pc +man/man1/check-regexp.1 +man/man1/source-highlight-settings.1 man/man1/source-highlight.1 +share/aclocal/ax_boost_base.m4 +share/aclocal/ax_boost_regex.m4 share/doc/source-highlight/COPYING share/doc/source-highlight/CREDITS share/doc/source-highlight/ChangeLog @@ -39,8 +134,16 @@ share/doc/source-highlight/c.lang.html share/doc/source-highlight/cmdline.h.html share/doc/source-highlight/colors.html share/doc/source-highlight/cpp2html.css +share/doc/source-highlight/default.css share/doc/source-highlight/default.style.html share/doc/source-highlight/error.log.html +share/doc/source-highlight/examples.html +share/doc/source-highlight/examples/infoformatter-main.cpp +share/doc/source-highlight/examples/infoformatter.h +share/doc/source-highlight/examples/source-highlight-console-main.cpp +share/doc/source-highlight/examples/styleformatter-main.cpp +share/doc/source-highlight/examples/styleformatter.h +share/doc/source-highlight/examples/styleformatterfactory.h share/doc/source-highlight/flex_scanner.ll.html share/doc/source-highlight/footer.html share/doc/source-highlight/header.html @@ -88,12 +191,13 @@ share/doc/source-highlight/sh_vim.css share/doc/source-highlight/sh_whatis.css share/doc/source-highlight/sh_whitengrey.css share/doc/source-highlight/sh_zellner.css +share/doc/source-highlight/source-highlight.cc.html share/doc/source-highlight/source-highlight.html -share/doc/source-highlight/startapp.cc.html share/doc/source-highlight/style_examples.html share/doc/source-highlight/syslog.log.html share/doc/source-highlight/syslog.style.html share/doc/source-highlight/test.htm.html +share/doc/source-highlight/test.java.html share/doc/source-highlight/test.java.tex.html share/doc/source-highlight/test.js.html share/doc/source-highlight/test.log.html @@ -105,9 +209,18 @@ share/doc/source-highlight/test.pm.html share/doc/source-highlight/test.py.html share/doc/source-highlight/test.rb.html share/doc/source-highlight/test.sml.html +share/doc/source-highlight/test_linerange_sep.html share/doc/source-highlight/test_refs.cpp.html share/doc/source-highlight/test_refs.h.html +share/doc/source-highlight/test_regexrange4.html share/doc/source-highlight/xhtml.css +share/source-highlight/Hello.css +share/source-highlight/Hello2.css +share/source-highlight/ada.lang +share/source-highlight/applescript.lang +share/source-highlight/asm.lang +share/source-highlight/awk.lang +share/source-highlight/bat.lang share/source-highlight/bib.lang share/source-highlight/bison.lang share/source-highlight/c.lang @@ -115,34 +228,46 @@ share/source-highlight/c_comment.lang share/source-highlight/c_string.lang share/source-highlight/caml.lang share/source-highlight/changelog.lang +share/source-highlight/clike_vardeclaration.lang +share/source-highlight/clipper.lang +share/source-highlight/cobol.lang +share/source-highlight/conf.lang share/source-highlight/cpp.lang +share/source-highlight/cpp2html.css share/source-highlight/csharp.lang share/source-highlight/css.lang share/source-highlight/css_common.outlang +share/source-highlight/d.lang share/source-highlight/default.css share/source-highlight/default.lang share/source-highlight/default.style share/source-highlight/desktop.lang share/source-highlight/diff.lang share/source-highlight/docbook.outlang -share/source-highlight/docbookdoc.outlang +share/source-highlight/erlang.lang +share/source-highlight/errors.lang share/source-highlight/esc.outlang share/source-highlight/esc.style share/source-highlight/extreme_comment.lang share/source-highlight/extreme_comment2.lang share/source-highlight/extreme_comment3.lang +share/source-highlight/fixed-fortran.lang share/source-highlight/flex.lang share/source-highlight/fortran.lang share/source-highlight/function.lang +share/source-highlight/glsl.lang +share/source-highlight/haskell.lang +share/source-highlight/haskell_literate.lang share/source-highlight/haxe.lang share/source-highlight/html.lang share/source-highlight/html.outlang share/source-highlight/html_common.outlang share/source-highlight/html_notfixed.outlang share/source-highlight/html_ref.outlang +share/source-highlight/html_simple.lang share/source-highlight/htmlcss.outlang -share/source-highlight/htmldoc.outlang share/source-highlight/htmltable.outlang +share/source-highlight/htmltablelinenum.outlang share/source-highlight/java.lang share/source-highlight/javadoc.outlang share/source-highlight/javascript.lang @@ -152,28 +277,74 @@ share/source-highlight/langdef.lang share/source-highlight/latex.lang share/source-highlight/latex.outlang share/source-highlight/latexcolor.outlang -share/source-highlight/latexcolordoc.outlang -share/source-highlight/latexdoc.outlang +share/source-highlight/ldap.lang +share/source-highlight/lisp.lang share/source-highlight/log.lang share/source-highlight/logtalk.lang share/source-highlight/lsm.lang share/source-highlight/lua.lang share/source-highlight/m4.lang share/source-highlight/makefile.lang +share/source-highlight/manifest.lang +share/source-highlight/mono-alt.css +share/source-highlight/mono.css share/source-highlight/nohilite.lang share/source-highlight/number.lang share/source-highlight/outlang.lang share/source-highlight/outlang.map +share/source-highlight/oz.lang share/source-highlight/pascal.lang +share/source-highlight/pc.lang share/source-highlight/perl.lang share/source-highlight/php.lang share/source-highlight/postscript.lang share/source-highlight/prolog.lang share/source-highlight/properties.lang +share/source-highlight/proto.lang share/source-highlight/python.lang share/source-highlight/ruby.lang +share/source-highlight/scala.lang share/source-highlight/script_comment.lang share/source-highlight/sh.lang +share/source-highlight/sh_acid.css +share/source-highlight/sh_berries-dark.css +share/source-highlight/sh_berries-light.css +share/source-highlight/sh_bipolar.css +share/source-highlight/sh_blacknblue.css +share/source-highlight/sh_bright.css +share/source-highlight/sh_contrast.css +share/source-highlight/sh_darkblue.css +share/source-highlight/sh_darkness.css +share/source-highlight/sh_desert.css +share/source-highlight/sh_dull.css +share/source-highlight/sh_easter.css +share/source-highlight/sh_emacs.css +share/source-highlight/sh_golden.css +share/source-highlight/sh_greenlcd.css +share/source-highlight/sh_ide-anjuta.css +share/source-highlight/sh_ide-codewarrior.css +share/source-highlight/sh_ide-devcpp.css +share/source-highlight/sh_ide-eclipse.css +share/source-highlight/sh_ide-kdev.css +share/source-highlight/sh_ide-msvcpp.css +share/source-highlight/sh_kwrite.css +share/source-highlight/sh_matlab.css +share/source-highlight/sh_navy.css +share/source-highlight/sh_nedit.css +share/source-highlight/sh_neon.css +share/source-highlight/sh_night.css +share/source-highlight/sh_pablo.css +share/source-highlight/sh_peachpuff.css +share/source-highlight/sh_print.css +share/source-highlight/sh_rand01.css +share/source-highlight/sh_the.css +share/source-highlight/sh_typical.css +share/source-highlight/sh_vampire.css +share/source-highlight/sh_vim-dark.css +share/source-highlight/sh_vim.css +share/source-highlight/sh_whatis.css +share/source-highlight/sh_whitengrey.css +share/source-highlight/sh_zellner.css share/source-highlight/slang.lang share/source-highlight/sml.lang share/source-highlight/spec.lang @@ -184,13 +355,18 @@ share/source-highlight/style2.style share/source-highlight/style3.style share/source-highlight/symbols.lang share/source-highlight/tcl.lang +share/source-highlight/texinfo.lang share/source-highlight/texinfo.outlang share/source-highlight/texinfo.style +share/source-highlight/todo.lang share/source-highlight/url.lang +share/source-highlight/vala.lang +share/source-highlight/vbscript.lang +share/source-highlight/xhtml.css share/source-highlight/xhtml.outlang share/source-highlight/xhtml_common.outlang share/source-highlight/xhtml_notfixed.outlang share/source-highlight/xhtmlcss.outlang -share/source-highlight/xhtmldoc.outlang share/source-highlight/xhtmltable.outlang share/source-highlight/xml.lang +share/source-highlight/xorg.lang diff --git a/textproc/source-highlight/distinfo b/textproc/source-highlight/distinfo index e47353d1c8f..078c9b9100f 100644 --- a/textproc/source-highlight/distinfo +++ b/textproc/source-highlight/distinfo @@ -1,5 +1,6 @@ -$NetBSD: distinfo,v 1.19 2008/03/13 16:45:33 wiz Exp $ +$NetBSD: distinfo,v 1.20 2010/12/02 18:00:14 adam Exp $ -SHA1 (source-highlight-2.9.tar.gz) = 641266525eccb985ced8c820a1c64ef88853cc70 -RMD160 (source-highlight-2.9.tar.gz) = 6611fc22dfcead5157517eb6c321aaa2be5fbe1b -Size (source-highlight-2.9.tar.gz) = 1106407 bytes +SHA1 (source-highlight-3.1.4.tar.gz) = a9398f59200223058560f3b6b560b2ad58956e0e +RMD160 (source-highlight-3.1.4.tar.gz) = 36be866d1fe97af2867562ba48256a36e1b18619 +Size (source-highlight-3.1.4.tar.gz) = 1520307 bytes +SHA1 (patch-aa) = fb405b541c5a00454089258e3f80ae3595ce5ffd diff --git a/textproc/source-highlight/patches/patch-aa b/textproc/source-highlight/patches/patch-aa new file mode 100644 index 00000000000..8931f49d552 --- /dev/null +++ b/textproc/source-highlight/patches/patch-aa @@ -0,0 +1,48 @@ +$NetBSD: patch-aa,v 1.6 2010/12/02 18:02:21 adam Exp $ + +Switch to C compiler before checking for _Bool. + +--- configure.orig 2010-05-04 20:07:33.000000000 +0000 ++++ configure +@@ -17621,6 +17621,11 @@ $as_echo "#define AA_APPLE_UNIVERSAL_BUI + fi + + ++ac_ext=c ++ac_cpp='$CPP $CPPFLAGS' ++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ++ac_compiler_gnu=$ac_cv_c_compiler_gnu + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for stdbool.h that conforms to C99" >&5 + $as_echo_n "checking for stdbool.h that conforms to C99... " >&6; } + if test "${ac_cv_header_stdbool_h+set}" = set; then : +@@ -17704,7 +17709,7 @@ main () + return 0; + } + _ACEOF +-if ac_fn_cxx_try_compile "$LINENO"; then : ++if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_header_stdbool_h=yes + else + ac_cv_header_stdbool_h=no +@@ -17713,7 +17718,7 @@ rm -f core conftest.err conftest.$ac_obj + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdbool_h" >&5 + $as_echo "$ac_cv_header_stdbool_h" >&6; } +- ac_fn_cxx_check_type "$LINENO" "_Bool" "ac_cv_type__Bool" "$ac_includes_default" ++ ac_fn_c_check_type "$LINENO" "_Bool" "ac_cv_type__Bool" "$ac_includes_default" + if test "x$ac_cv_type__Bool" = x""yes; then : + + cat >>confdefs.h <<_ACEOF +@@ -17729,6 +17734,11 @@ $as_echo "#define HAVE_STDBOOL_H 1" >>co + + fi + ++ac_ext=cpp ++ac_cpp='$CXXCPP $CPPFLAGS' ++ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ++ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ++ac_compiler_gnu=$ac_cv_cxx_compiler_gnu + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for long long int" >&5 + $as_echo_n "checking for long long int... " >&6; } + if test "${ac_cv_type_long_long_int+set}" = set; then : |