diff options
| -rw-r--r-- | textproc/highlight/Makefile | 20 | ||||
| -rw-r--r-- | textproc/highlight/PLIST | 316 | ||||
| -rw-r--r-- | textproc/highlight/distinfo | 12 | ||||
| -rw-r--r-- | textproc/highlight/patches/patch-aa | 44 | ||||
| -rw-r--r-- | textproc/highlight/patches/patch-ab | 23 |
5 files changed, 268 insertions, 147 deletions
diff --git a/textproc/highlight/Makefile b/textproc/highlight/Makefile index ab28d0ace39..ff0c7a7721f 100644 --- a/textproc/highlight/Makefile +++ b/textproc/highlight/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.5 2012/10/25 06:55:53 asau Exp $ +# $NetBSD: Makefile,v 1.6 2014/08/09 16:55:03 schmonz Exp $ -DISTNAME= highlight-2.7 +DISTNAME= highlight-3.18 CATEGORIES= textproc MASTER_SITES= http://www.andre-simon.de/zip/ EXTRACT_SUFX= .tar.bz2 @@ -8,12 +8,14 @@ EXTRACT_SUFX= .tar.bz2 MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://www.andre-simon.de/ COMMENT= Converts source code to formatted text with syntax highlighting +LICENSE= gnu-gpl-v3 USE_TOOLS+= gmake USE_LANGUAGES= c c++ MANCOMPRESSED= yes MAKE_FILE= makefile +BUILD_TARGET= cli PKG_SYSCONFSUBDIR= highlight @@ -21,11 +23,15 @@ EGDIR= ${PREFIX}/share/examples/highlight CONF_FILES= ${EGDIR}/filetypes.conf \ ${PKG_SYSCONFDIR}/filetypes.conf -SUBST_CLASSES+= etc -SUBST_MESSAGE.etc= Fixing hardcoded paths. -SUBST_STAGE.etc= post-patch -SUBST_FILES.etc= src/datadir.cpp -SUBST_SED.etc= -e 's,/etc/highlight,${PKG_SYSCONFDIR},g' +SUBST_CLASSES+= paths +SUBST_MESSAGE.paths= Fixing hardcoded paths. +SUBST_STAGE.paths= do-configure +SUBST_FILES.paths= src/core/datadir.cpp +SUBST_SED.paths= -e 's,/etc/highlight,${PKG_SYSCONFDIR},g' +SUBST_SED.paths+= -e 's,/usr/share,${PREFIX}/share,g' +.include "../../devel/boost-headers/buildlink3.mk" .include "../../devel/libgetopt/buildlink3.mk" +.include "../../lang/lua/buildlink3.mk" +.include "../../lang/perl5/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/textproc/highlight/PLIST b/textproc/highlight/PLIST index 4e9308ded82..d9de4b327f7 100644 --- a/textproc/highlight/PLIST +++ b/textproc/highlight/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.4 2009/06/14 18:17:17 joerg Exp $ +@comment $NetBSD: PLIST,v 1.5 2014/08/09 16:55:03 schmonz Exp $ bin/highlight man/man1/highlight.1 share/doc/highlight/AUTHORS @@ -7,205 +7,309 @@ share/doc/highlight/ChangeLog share/doc/highlight/INSTALL share/doc/highlight/README share/doc/highlight/README_DE -share/doc/highlight/README_INDENT share/doc/highlight/README_LANGLIST share/doc/highlight/README_REGEX share/doc/highlight/README_SWIG share/doc/highlight/examples/highlight_pipe.php share/doc/highlight/examples/highlight_pipe.pm share/doc/highlight/examples/highlight_pipe.py -share/doc/highlight/examples/plugins/dokuwiki/syntax.php -share/doc/highlight/examples/plugins/movabletype/README -share/doc/highlight/examples/plugins/movabletype/highlight.pl -share/doc/highlight/examples/plugins/wordpress/README -share/doc/highlight/examples/plugins/wordpress/highlight.php share/doc/highlight/examples/swig/highlight.i share/doc/highlight/examples/swig/makefile share/doc/highlight/examples/swig/testmod.pl share/doc/highlight/examples/swig/testmod.py +share/doc/highlight/examples/web_plugins/dokuwiki/syntax.php +share/doc/highlight/examples/web_plugins/movabletype/README +share/doc/highlight/examples/web_plugins/movabletype/highlight.pl +share/doc/highlight/examples/web_plugins/wordpress/README +share/doc/highlight/examples/web_plugins/wordpress/highlight.php share/examples/highlight/filetypes.conf -share/highlight/helpmsg/br.help -share/highlight/helpmsg/cs.help -share/highlight/helpmsg/de.help -share/highlight/helpmsg/en.help -share/highlight/helpmsg/es.help -share/highlight/helpmsg/fr.help -share/highlight/helpmsg/ja.help -share/highlight/indentSchemes/acid.indent -share/highlight/indentSchemes/ansi.indent -share/highlight/indentSchemes/gnu.indent -share/highlight/indentSchemes/java.indent -share/highlight/indentSchemes/kr.indent -share/highlight/indentSchemes/linux.indent -share/highlight/langDefs/4gl.lang -share/highlight/langDefs/a4c.lang -share/highlight/langDefs/abp.lang +share/highlight/langDefs/abap4.lang +share/highlight/langDefs/abc.lang +share/highlight/langDefs/abnf.lang +share/highlight/langDefs/actionscript.lang share/highlight/langDefs/ada.lang share/highlight/langDefs/agda.lang +share/highlight/langDefs/algol.lang share/highlight/langDefs/ampl.lang share/highlight/langDefs/amtrix.lang share/highlight/langDefs/applescript.lang share/highlight/langDefs/arc.lang share/highlight/langDefs/arm.lang -share/highlight/langDefs/as.lang -share/highlight/langDefs/asm.lang +share/highlight/langDefs/as400cl.lang +share/highlight/langDefs/ascend.lang share/highlight/langDefs/asp.lang share/highlight/langDefs/aspect.lang -share/highlight/langDefs/au3.lang +share/highlight/langDefs/assembler.lang +share/highlight/langDefs/ats.lang +share/highlight/langDefs/autohotkey.lang +share/highlight/langDefs/autoit.lang share/highlight/langDefs/avenue.lang share/highlight/langDefs/awk.lang share/highlight/langDefs/bat.lang -share/highlight/langDefs/bb.lang -share/highlight/langDefs/bib.lang +share/highlight/langDefs/bbcode.lang +share/highlight/langDefs/bcpl.lang +share/highlight/langDefs/bibtex.lang +share/highlight/langDefs/biferno.lang +share/highlight/langDefs/bison.lang +share/highlight/langDefs/blitzbasic.lang share/highlight/langDefs/bms.lang +share/highlight/langDefs/bnf.lang share/highlight/langDefs/boo.lang share/highlight/langDefs/c.lang -share/highlight/langDefs/cb.lang -share/highlight/langDefs/cfc.lang +share/highlight/langDefs/ceylon.lang +share/highlight/langDefs/charmm.lang +share/highlight/langDefs/chill.lang +share/highlight/langDefs/clean.lang +share/highlight/langDefs/clearbasic.lang share/highlight/langDefs/clipper.lang share/highlight/langDefs/clojure.lang share/highlight/langDefs/clp.lang -share/highlight/langDefs/cob.lang -share/highlight/langDefs/cs.lang +share/highlight/langDefs/cobol.lang +share/highlight/langDefs/coldfusion.lang +share/highlight/langDefs/crk.lang +share/highlight/langDefs/csharp.lang share/highlight/langDefs/css.lang share/highlight/langDefs/d.lang +share/highlight/langDefs/dart.lang share/highlight/langDefs/diff.lang -share/highlight/langDefs/dot.lang share/highlight/langDefs/dylan.lang -share/highlight/langDefs/e.lang -share/highlight/langDefs/erl.lang +share/highlight/langDefs/ebnf.lang +share/highlight/langDefs/eiffel.lang +share/highlight/langDefs/erlang.lang share/highlight/langDefs/euphoria.lang -share/highlight/langDefs/exp.lang -share/highlight/langDefs/f77.lang -share/highlight/langDefs/f90.lang -share/highlight/langDefs/flx.lang +share/highlight/langDefs/express.lang +share/highlight/langDefs/fame.lang +share/highlight/langDefs/felix.lang +share/highlight/langDefs/fortran77.lang +share/highlight/langDefs/fortran90.lang share/highlight/langDefs/frink.lang +share/highlight/langDefs/fsharp.lang +share/highlight/langDefs/fx.lang +share/highlight/langDefs/gambas.lang +share/highlight/langDefs/gdb.lang +share/highlight/langDefs/go.lang +share/highlight/langDefs/graphviz.lang share/highlight/langDefs/haskell.lang +share/highlight/langDefs/haxe.lang share/highlight/langDefs/hcl.lang +share/highlight/langDefs/html.lang share/highlight/langDefs/httpd.lang -share/highlight/langDefs/icn.lang +share/highlight/langDefs/icon.lang share/highlight/langDefs/idl.lang +share/highlight/langDefs/idlang.lang +share/highlight/langDefs/inc_luatex.lang +share/highlight/langDefs/informix.lang share/highlight/langDefs/ini.lang -share/highlight/langDefs/inp.lang +share/highlight/langDefs/innosetup.lang +share/highlight/langDefs/interlis.lang share/highlight/langDefs/io.lang -share/highlight/langDefs/j.lang +share/highlight/langDefs/jasmin.lang share/highlight/langDefs/java.lang share/highlight/langDefs/js.lang share/highlight/langDefs/jsp.lang -share/highlight/langDefs/lbn.lang share/highlight/langDefs/ldif.lang -share/highlight/langDefs/lgt.lang share/highlight/langDefs/lhs.lang +share/highlight/langDefs/lilypond.lang +share/highlight/langDefs/limbo.lang +share/highlight/langDefs/lindenscript.lang share/highlight/langDefs/lisp.lang +share/highlight/langDefs/logtalk.lang share/highlight/langDefs/lotos.lang -share/highlight/langDefs/ls.lang -share/highlight/langDefs/lsl.lang +share/highlight/langDefs/lotus.lang share/highlight/langDefs/lua.lang -share/highlight/langDefs/ly.lang -share/highlight/langDefs/m.lang +share/highlight/langDefs/luban.lang share/highlight/langDefs/make.lang -share/highlight/langDefs/mel.lang -share/highlight/langDefs/mib.lang +share/highlight/langDefs/maple.lang +share/highlight/langDefs/matlab.lang +share/highlight/langDefs/maya.lang +share/highlight/langDefs/mercury.lang share/highlight/langDefs/miranda.lang -share/highlight/langDefs/ml.lang -share/highlight/langDefs/mo.lang +share/highlight/langDefs/mod2.lang share/highlight/langDefs/mod3.lang -share/highlight/langDefs/mpl.lang +share/highlight/langDefs/modelica.lang +share/highlight/langDefs/moon.lang share/highlight/langDefs/ms.lang share/highlight/langDefs/mssql.lang -share/highlight/langDefs/n.lang -share/highlight/langDefs/nas.lang +share/highlight/langDefs/mxml.lang +share/highlight/langDefs/n3.lang +share/highlight/langDefs/nasal.lang +share/highlight/langDefs/nbc.lang +share/highlight/langDefs/nemerle.lang +share/highlight/langDefs/netrexx.lang share/highlight/langDefs/nice.lang -share/highlight/langDefs/nsi.lang -share/highlight/langDefs/nut.lang +share/highlight/langDefs/nsis.lang +share/highlight/langDefs/nxc.lang share/highlight/langDefs/oberon.lang share/highlight/langDefs/objc.lang +share/highlight/langDefs/ocaml.lang share/highlight/langDefs/octave.lang share/highlight/langDefs/oorexx.lang share/highlight/langDefs/os.lang +share/highlight/langDefs/oz.lang +share/highlight/langDefs/paradox.lang share/highlight/langDefs/pas.lang +share/highlight/langDefs/pdf.lang +share/highlight/langDefs/perl.lang share/highlight/langDefs/php.lang share/highlight/langDefs/pike.lang -share/highlight/langDefs/pl.lang share/highlight/langDefs/pl1.lang +share/highlight/langDefs/plperl.lang +share/highlight/langDefs/plpython.lang +share/highlight/langDefs/pltcl.lang share/highlight/langDefs/pov.lang share/highlight/langDefs/pro.lang share/highlight/langDefs/progress.lang share/highlight/langDefs/ps.lang share/highlight/langDefs/ps1.lang share/highlight/langDefs/psl.lang -share/highlight/langDefs/py.lang -share/highlight/langDefs/pyx.lang +share/highlight/langDefs/pure.lang +share/highlight/langDefs/pyrex.lang +share/highlight/langDefs/python.lang share/highlight/langDefs/q.lang +share/highlight/langDefs/qmake.lang share/highlight/langDefs/qu.lang share/highlight/langDefs/r.lang -share/highlight/langDefs/rb.lang +share/highlight/langDefs/rebol.lang share/highlight/langDefs/rexx.lang share/highlight/langDefs/rnc.lang +share/highlight/langDefs/rpg.lang +share/highlight/langDefs/rpl.lang +share/highlight/langDefs/ruby.lang share/highlight/langDefs/s.lang share/highlight/langDefs/sas.lang -share/highlight/langDefs/sc.lang share/highlight/langDefs/scala.lang share/highlight/langDefs/scilab.lang share/highlight/langDefs/sh.lang -share/highlight/langDefs/sma.lang +share/highlight/langDefs/small.lang share/highlight/langDefs/smalltalk.lang share/highlight/langDefs/sml.lang -share/highlight/langDefs/sno.lang +share/highlight/langDefs/snmp.lang +share/highlight/langDefs/snobol.lang share/highlight/langDefs/spec.lang share/highlight/langDefs/spn.lang share/highlight/langDefs/sql.lang +share/highlight/langDefs/squirrel.lang share/highlight/langDefs/sybase.lang share/highlight/langDefs/tcl.lang share/highlight/langDefs/tcsh.lang -share/highlight/langDefs/test_re.lang share/highlight/langDefs/tex.lang +share/highlight/langDefs/ts.lang +share/highlight/langDefs/tsql.lang share/highlight/langDefs/ttcn3.lang share/highlight/langDefs/txt.lang +share/highlight/langDefs/upc.lang share/highlight/langDefs/vala.lang share/highlight/langDefs/vb.lang share/highlight/langDefs/verilog.lang share/highlight/langDefs/vhd.lang share/highlight/langDefs/xml.lang share/highlight/langDefs/xpp.lang -share/highlight/langDefs/y.lang -share/highlight/themes/acid.style -share/highlight/themes/bipolar.style -share/highlight/themes/blacknblue.style -share/highlight/themes/bright.style -share/highlight/themes/contrast.style -share/highlight/themes/darkblue.style -share/highlight/themes/darkness.style -share/highlight/themes/desert.style -share/highlight/themes/easter.style -share/highlight/themes/emacs.style -share/highlight/themes/golden.style -share/highlight/themes/greenlcd.style -share/highlight/themes/ide-anjuta.style -share/highlight/themes/ide-codewarrior.style -share/highlight/themes/ide-devcpp.style -share/highlight/themes/ide-eclipse.style -share/highlight/themes/ide-kdev.style -share/highlight/themes/ide-msvcpp.style -share/highlight/themes/ide-xcode.style -share/highlight/themes/kwrite.style -share/highlight/themes/lucretia.style -share/highlight/themes/matlab.style -share/highlight/themes/moe.style -share/highlight/themes/navy.style -share/highlight/themes/nedit.style -share/highlight/themes/neon.style -share/highlight/themes/night.style -share/highlight/themes/orion.style -share/highlight/themes/pablo.style -share/highlight/themes/peachpuff.style -share/highlight/themes/print.style -share/highlight/themes/rand01.style -share/highlight/themes/seashell.style -share/highlight/themes/the.style -share/highlight/themes/typical.style -share/highlight/themes/vampire.style -share/highlight/themes/vim-dark.style -share/highlight/themes/vim.style -share/highlight/themes/whitengrey.style -share/highlight/themes/zellner.style +share/highlight/langDefs/yaiff.lang +share/highlight/langDefs/yang.lang +share/highlight/langDefs/znn.lang +share/highlight/plugins/asciidoc_html_add_links.lua +share/highlight/plugins/bash_functions.lua +share/highlight/plugins/bash_ref_linuxmanpages_com.lua +share/highlight/plugins/cpp_qt.lua +share/highlight/plugins/cpp_ref_cplusplus_com.lua +share/highlight/plugins/cpp_ref_gtk_gnome_org.lua +share/highlight/plugins/cpp_ref_local_includes.lua +share/highlight/plugins/cpp_ref_qtproject_org.lua +share/highlight/plugins/cpp_ref_wxwidgets_org.lua +share/highlight/plugins/cpp_syslog.lua +share/highlight/plugins/cpp_wx.lua +share/highlight/plugins/ctags_html_tooltips.lua +share/highlight/plugins/java_library.lua +share/highlight/plugins/keywords_capitalize.lua +share/highlight/plugins/keywords_lowercase.lua +share/highlight/plugins/keywords_uppercase.lua +share/highlight/plugins/outhtml_curly_brackets_matcher.lua +share/highlight/plugins/outhtml_keyword_matcher.lua +share/highlight/plugins/outhtml_parantheses_matcher.lua +share/highlight/plugins/perl_ref_perl_org.lua +share/highlight/plugins/python_ref_python_org.lua +share/highlight/plugins/scala_ref_scala_lang_org.lua +share/highlight/plugins/theme_invert.lua +share/highlight/plugins/token_add_state_ids.lua +share/highlight/themes/acid.theme +share/highlight/themes/aiseered.theme +share/highlight/themes/andes.theme +share/highlight/themes/anotherdark.theme +share/highlight/themes/autumn.theme +share/highlight/themes/baycomb.theme +share/highlight/themes/bclear.theme +share/highlight/themes/biogoo.theme +share/highlight/themes/bipolar.theme +share/highlight/themes/blacknblue.theme +share/highlight/themes/bluegreen.theme +share/highlight/themes/breeze.theme +share/highlight/themes/bright.theme +share/highlight/themes/camo.theme +share/highlight/themes/candy.theme +share/highlight/themes/clarity.theme +share/highlight/themes/dante.theme +share/highlight/themes/darkblue.theme +share/highlight/themes/darkbone.theme +share/highlight/themes/darkness.theme +share/highlight/themes/darkslategray.theme +share/highlight/themes/darkspectrum.theme +share/highlight/themes/denim.theme +share/highlight/themes/dusk.theme +share/highlight/themes/earendel.theme +share/highlight/themes/easter.theme +share/highlight/themes/edit-anjuta.theme +share/highlight/themes/edit-eclipse.theme +share/highlight/themes/edit-emacs.theme +share/highlight/themes/edit-flashdevelop.theme +share/highlight/themes/edit-gedit.theme +share/highlight/themes/edit-jedit.theme +share/highlight/themes/edit-kwrite.theme +share/highlight/themes/edit-matlab.theme +share/highlight/themes/edit-msvs2008.theme +share/highlight/themes/edit-nedit.theme +share/highlight/themes/edit-vim-dark.theme +share/highlight/themes/edit-vim.theme +share/highlight/themes/edit-xcode.theme +share/highlight/themes/ekvoli.theme +share/highlight/themes/fine_blue.theme +share/highlight/themes/freya.theme +share/highlight/themes/fruit.theme +share/highlight/themes/golden.theme +share/highlight/themes/greenlcd.theme +share/highlight/themes/kellys.theme +share/highlight/themes/leo.theme +share/highlight/themes/lucretia.theme +share/highlight/themes/manxome.theme +share/highlight/themes/maroloccio.theme +share/highlight/themes/matrix.theme +share/highlight/themes/moe.theme +share/highlight/themes/molokai.theme +share/highlight/themes/moria.theme +share/highlight/themes/navajo-night.theme +share/highlight/themes/navy.theme +share/highlight/themes/neon.theme +share/highlight/themes/night.theme +share/highlight/themes/nightshimmer.theme +share/highlight/themes/nuvola.theme +share/highlight/themes/olive.theme +share/highlight/themes/orion.theme +share/highlight/themes/oxygenated.theme +share/highlight/themes/pablo.theme +share/highlight/themes/peaksea.theme +share/highlight/themes/print.theme +share/highlight/themes/rand01.theme +share/highlight/themes/rdark.theme +share/highlight/themes/relaxedgreen.theme +share/highlight/themes/rootwater.theme +share/highlight/themes/seashell.theme +share/highlight/themes/solarized-dark.theme +share/highlight/themes/solarized-light.theme +share/highlight/themes/tabula.theme +share/highlight/themes/tcsoft.theme +share/highlight/themes/the.theme +share/highlight/themes/vampire.theme +share/highlight/themes/whitengrey.theme +share/highlight/themes/xoria256.theme +share/highlight/themes/zellner.theme +share/highlight/themes/zenburn.theme +share/highlight/themes/zmrok.theme diff --git a/textproc/highlight/distinfo b/textproc/highlight/distinfo index b98e1f6abd6..d1f29058490 100644 --- a/textproc/highlight/distinfo +++ b/textproc/highlight/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.3 2009/03/02 22:10:26 rh Exp $ +$NetBSD: distinfo,v 1.4 2014/08/09 16:55:03 schmonz Exp $ -SHA1 (highlight-2.7.tar.bz2) = ea970d9ab8dada5fd459b8b11194b29d3fea582e -RMD160 (highlight-2.7.tar.bz2) = d9971172f735e8233c89654bae9947171be3bfac -Size (highlight-2.7.tar.bz2) = 393248 bytes -SHA1 (patch-aa) = 3495170dcae12b1a9c783def838b15b159f34227 -SHA1 (patch-ab) = 9eda27f2f3a0b627bab76fcb951066951ff97c78 +SHA1 (highlight-3.18.tar.bz2) = 985d0a3c707e3251fe50ffff66e11a8563777202 +RMD160 (highlight-3.18.tar.bz2) = 960b2a9ed6071b0f48ef45da2d006f5f00d9b578 +Size (highlight-3.18.tar.bz2) = 619669 bytes +SHA1 (patch-aa) = 1cf4c6225b36e822a40ec10917384367914ecb0f +SHA1 (patch-ab) = e2a466e3817359e050dab2fc1862d7a1e15b740f diff --git a/textproc/highlight/patches/patch-aa b/textproc/highlight/patches/patch-aa index 61cb1c0838b..965fd46131f 100644 --- a/textproc/highlight/patches/patch-aa +++ b/textproc/highlight/patches/patch-aa @@ -1,16 +1,19 @@ -$NetBSD: patch-aa,v 1.3 2009/03/02 22:10:27 rh Exp $ +$NetBSD: patch-aa,v 1.4 2014/08/09 16:55:03 schmonz Exp $ ---- makefile.orig 2009-01-06 12:34:10.000000000 +1000 +Use pkgsrc-provided paths and tools. + +--- makefile.orig 2013-06-27 20:36:48.000000000 +0000 +++ makefile -@@ -8,7 +8,6 @@ +@@ -7,7 +7,7 @@ DESTDIR = # Root directory for final installation -PREFIX = /usr ++#PREFIX = /usr # Location of the highlight data files: data_dir = ${PREFIX}/share/highlight/ -@@ -17,7 +16,7 @@ data_dir = ${PREFIX}/share/highlight/ +@@ -16,7 +16,7 @@ data_dir = ${PREFIX}/share/highlight/ bin_dir = ${PREFIX}/bin/ # Location of the highlight man page: @@ -19,15 +22,17 @@ $NetBSD: patch-aa,v 1.3 2009/03/02 22:10:27 rh Exp $ # Location of the highlight documentation: doc_dir = ${PREFIX}/share/doc/highlight/ -@@ -26,17 +25,17 @@ doc_dir = ${PREFIX}/share/doc/highlight/ - examples_dir = ${PREFIX}/share/doc/highlight/examples/ +@@ -25,7 +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 = /etc/highlight/ +conf_dir = ${PREFIX}/share/examples/highlight/ #conf_dir = ${PREFIX}/etc/highlight/ - desktop_apps = ${PREFIX}/share/applications/ + # Location of additional gui files +@@ -33,10 +34,10 @@ desktop_apps = ${PREFIX}/share/applicati desktop_pixmaps = ${PREFIX}/share/pixmaps/ # Commands: @@ -42,30 +47,29 @@ $NetBSD: patch-aa,v 1.3 2009/03/02 22:10:27 rh Exp $ all cli: ${MAKE} -C ./src -f ./makefile HL_DATA_DIR=${data_dir} HL_CONFIG_DIR=${conf_dir} -@@ -72,7 +71,7 @@ install: +@@ -75,14 +76,14 @@ install: + ${DESTDIR}${data_dir}themes \ ${DESTDIR}${data_dir}langDefs \ - ${DESTDIR}${data_dir}indentSchemes \ - ${DESTDIR}${data_dir}helpmsg + ${DESTDIR}${data_dir}plugins - ${MKDIR} ${DESTDIR}${man_dir} + ${BSD_INSTALL_MAN_DIR} ${DESTDIR}${man_dir} ${MKDIR} ${DESTDIR}${bin_dir} ${INSTALL_DATA} ./langDefs/*.lang ${DESTDIR}${data_dir}langDefs/ -@@ -80,7 +79,7 @@ install: - ${INSTALL_DATA} ./themes/*.style ${DESTDIR}${data_dir}themes/ - ${INSTALL_DATA} ./indentSchemes/*.indent ${DESTDIR}${data_dir}indentSchemes/ - ${INSTALL_DATA} ./helpmsg/*.help ${DESTDIR}${data_dir}helpmsg/ + ${INSTALL_DATA} ./*.conf ${DESTDIR}${conf_dir} + ${INSTALL_DATA} ./themes/*.theme ${DESTDIR}${data_dir}themes/ + ${INSTALL_DATA} ./plugins/*.lua ${DESTDIR}${data_dir}plugins/ - ${INSTALL_DATA} ./man/highlight.1.gz ${DESTDIR}${man_dir} + ${BSD_INSTALL_MAN} ./man/highlight.1.gz ${DESTDIR}${man_dir} ${INSTALL_DATA} ./AUTHORS ${DESTDIR}${doc_dir} ${INSTALL_DATA} ./README ${DESTDIR}${doc_dir} ${INSTALL_DATA} ./README_DE ${DESTDIR}${doc_dir} -@@ -127,7 +126,7 @@ uninstall: +@@ -129,7 +130,7 @@ uninstall: ${RMDIR} ${DESTDIR}${doc_dir} ${RMDIR} ${DESTDIR}${conf_dir} ${RMDIR} ${DESTDIR}${examples_dir} -- rm ${DESTDIR}${man_dir}highlight.1.gz -+ rm ${DESTDIR}${man_dir}highlight.1* - rm ${DESTDIR}${bin_dir}highlight - rm ${DESTDIR}${bin_dir}highlight-gui - rm ${DESTDIR}${desktop_apps}highlight.desktop +- rm -rf ${DESTDIR}${man_dir}highlight.1.gz ++ rm -rf ${DESTDIR}${man_dir}highlight.1* + rm -rf ${DESTDIR}${bin_dir}highlight + rm -rf ${DESTDIR}${bin_dir}highlight-gui + rm -rf ${DESTDIR}${desktop_apps}highlight.desktop diff --git a/textproc/highlight/patches/patch-ab b/textproc/highlight/patches/patch-ab index 9d50030b397..0d8d97ddd39 100644 --- a/textproc/highlight/patches/patch-ab +++ b/textproc/highlight/patches/patch-ab @@ -1,14 +1,21 @@ -$NetBSD: patch-ab,v 1.3 2009/03/02 22:10:27 rh Exp $ +$NetBSD: patch-ab,v 1.4 2014/08/09 16:55:03 schmonz Exp $ ---- src/makefile.orig 2009-01-06 12:17:29.000000000 +1000 +Use pkgsrc-specified compiler and flags. + +--- src/makefile.orig 2014-04-04 17:26:25.000000000 +0000 +++ src/makefile -@@ -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) +@@ -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:=-O2 ${CFLAGS} +-CFLAGS:=-Wall -O2 ${CFLAGS} -DNDEBUG ++#CFLAGS:=-Wall -O2 ${CFLAGS} -DNDEBUG + #CFLAGS:=-ggdb ${CFLAGS} - # Source paths - CORE_DIR=./core/ + CFLAGS_DILU=-fno-strict-aliasing |