From ea6af11febcd70ed2c19cedb4ef2f57af6416b7e Mon Sep 17 00:00:00 2001 From: benoit Date: Wed, 20 May 2009 11:35:27 +0000 Subject: [PATCH] - update to highlight 2.9 - change maintainer ok ajacoutot@ --- textproc/highlight/Makefile | 8 ++++--- textproc/highlight/distinfo | 10 ++++----- textproc/highlight/patches/patch-makefile | 19 ++++++++-------- .../highlight/patches/patch-man_highlight_1 | 10 ++++----- textproc/highlight/patches/patch-src_makefile | 20 ++++++++--------- textproc/highlight/pkg/PLIST | 22 ++++++++++++++----- 6 files changed, 51 insertions(+), 38 deletions(-) diff --git a/textproc/highlight/Makefile b/textproc/highlight/Makefile index 46f54b9f3f4..b1497fe83f3 100644 --- a/textproc/highlight/Makefile +++ b/textproc/highlight/Makefile @@ -1,13 +1,15 @@ -# $OpenBSD: Makefile,v 1.1.1.1 2007/07/05 09:58:32 jasper Exp $ +# $OpenBSD: Makefile,v 1.2 2009/05/20 11:35:27 benoit Exp $ COMMENT= convert source code to markup formats -DISTNAME= highlight-2.6.1 +DISTNAME= highlight-2.9 CATEGORIES= textproc converters HOMEPAGE= http://www.andre-simon.de/ -# GPL +MAINTAINER= Benoit Lecocq + +# GPLv2 PERMIT_PACKAGE_CDROM= Yes PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes diff --git a/textproc/highlight/distinfo b/textproc/highlight/distinfo index 0e9b2a91675..5b9d13e4cd4 100644 --- a/textproc/highlight/distinfo +++ b/textproc/highlight/distinfo @@ -1,5 +1,5 @@ -MD5 (highlight-2.6.1.tar.bz2) = V8et/pU/DHs6FQbT3hUp5A== -RMD160 (highlight-2.6.1.tar.bz2) = q6pjEQKd8oWSg9WaJxZwDDaYclw= -SHA1 (highlight-2.6.1.tar.bz2) = PDn1HA7gmXSMukmC9g/iOiJsNhE= -SHA256 (highlight-2.6.1.tar.bz2) = zk2ZAZg83pX3s7ksI4tlzZrXfIa39a2TbOLDS3hl8Ww= -SIZE (highlight-2.6.1.tar.bz2) = 372725 +MD5 (highlight-2.9.tar.bz2) = jbgmQ4zEStZm6RQOjyyFyA== +RMD160 (highlight-2.9.tar.bz2) = sFh3Kq6yzIRMsK5iDChm0CiEtZs= +SHA1 (highlight-2.9.tar.bz2) = arQKWvi1Vk2Q6OuhxYsDSG6ORHE= +SHA256 (highlight-2.9.tar.bz2) = UgVJiGQowAr5dmfEWHoTqvmcyKWmn46FCrTFKUDa5B0= +SIZE (highlight-2.9.tar.bz2) = 378746 diff --git a/textproc/highlight/patches/patch-makefile b/textproc/highlight/patches/patch-makefile index 539215d5835..e78a2f54261 100644 --- a/textproc/highlight/patches/patch-makefile +++ b/textproc/highlight/patches/patch-makefile @@ -1,20 +1,19 @@ -$OpenBSD: patch-makefile,v 1.1.1.1 2007/07/05 09:58:32 jasper Exp $ ---- makefile.orig Tue Jul 3 23:14:38 2007 -+++ makefile Tue Jul 3 23:15:02 2007 -@@ -7,7 +7,6 @@ - DESTDIR = +--- makefile.orig Thu Apr 23 05:29:22 2009 ++++ makefile Wed May 20 10:12:35 2009 +@@ -8,7 +8,6 @@ + DESTDIR = # Root directory for final installation -PREFIX = /usr # Location of the highlight data files: data_dir = ${PREFIX}/share/highlight/ -@@ -25,7 +24,7 @@ doc_dir = ${PREFIX}/share/doc/highlight/ - examples_dir = ${PREFIX}/share/doc/highlight/examples/ +@@ -26,7 +25,7 @@ doc_dir = ${PREFIX}/share/doc/highlight/ + examples_dir = ${doc_dir}/examples/ # Location of the highlight config files: --conf_dir = ${PREFIX}/etc/highlight/ +-conf_dir = /etc/highlight/ +conf_dir = !!SYSCONFDIR!!/highlight/ + #conf_dir = ${PREFIX}/etc/highlight/ - # Commands: - INSTALL_DATA=install -m644 + # Location of additional gui files diff --git a/textproc/highlight/patches/patch-man_highlight_1 b/textproc/highlight/patches/patch-man_highlight_1 index a85ccb929a0..67046a8b391 100644 --- a/textproc/highlight/patches/patch-man_highlight_1 +++ b/textproc/highlight/patches/patch-man_highlight_1 @@ -1,8 +1,8 @@ -$OpenBSD: patch-man_highlight_1,v 1.1.1.1 2007/07/05 09:58:32 jasper Exp $ ---- man/highlight.1.orig Tue Jul 3 23:44:06 2007 -+++ man/highlight.1 Wed Jul 4 00:35:42 2007 -@@ -154,15 +154,15 @@ RTF output will ignore background colour information. - The wrapping options will cause faulty highlighting of long single line comments and directives. +$OpenBSD: patch-man_highlight_1,v 1.2 2009/05/20 11:35:30 benoit Exp $ +--- man/highlight.1.orig Sat Mar 7 05:38:01 2009 ++++ man/highlight.1 Wed May 20 10:12:35 2009 +@@ -216,15 +216,15 @@ The converter is not able to recognize mixed code like + The wrapping options might cause faulty highlighting of multi line comments. .SH FILES The parsing information of the programming languages is stored in -.I /usr/share/highlight/langDefs/. diff --git a/textproc/highlight/patches/patch-src_makefile b/textproc/highlight/patches/patch-src_makefile index 256a69f8f49..f0090f25fd0 100644 --- a/textproc/highlight/patches/patch-src_makefile +++ b/textproc/highlight/patches/patch-src_makefile @@ -1,13 +1,13 @@ -$OpenBSD: patch-src_makefile,v 1.1.1.1 2007/07/05 09:58:32 jasper Exp $ ---- src/makefile.orig Tue Jul 3 21:51:55 2007 -+++ src/makefile Tue Jul 3 21:52:08 2007 -@@ -13,9 +13,6 @@ - # Add -DUSE_FN_MATCH to enable better wildcard support with the --batch-recursive option. - # See "man 3 fnmatch" for details. +--- src/makefile.orig Thu Apr 23 05:32:21 2009 ++++ src/makefile Wed May 20 10:12:35 2009 +@@ -15,10 +15,6 @@ + + # See src/gui-qt/highlight.pro for the Qt GUI compilation options -CXX=c++ - --CFLAGS := -O2 - #CFLAGS := -Wall -DHL_DATA_DIR=\"${HL_DATA_DIR}\" -ggdb - - LDFLAGS = -s +-CFLAGS:=-O2 ${CFLAGS} +- + # Source paths + CORE_DIR=./core/ + CLI_DIR=./cli/ diff --git a/textproc/highlight/pkg/PLIST b/textproc/highlight/pkg/PLIST index 6399e104119..ca4ac020926 100644 --- a/textproc/highlight/pkg/PLIST +++ b/textproc/highlight/pkg/PLIST @@ -1,5 +1,5 @@ -@comment $OpenBSD: PLIST,v 1.1.1.1 2007/07/05 09:58:32 jasper Exp $ -bin/highlight +@comment $OpenBSD: PLIST,v 1.2 2009/05/20 11:35:32 benoit Exp $ +@bin bin/highlight @man man/man1/highlight.1 share/doc/highlight/ share/doc/highlight/README @@ -15,6 +15,7 @@ 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/ share/highlight/indentSchemes/acid.indent share/highlight/indentSchemes/ansi.indent @@ -31,6 +32,7 @@ share/highlight/langDefs/agda.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 @@ -48,11 +50,13 @@ share/highlight/langDefs/c.lang share/highlight/langDefs/cb.lang share/highlight/langDefs/cfc.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/css.lang share/highlight/langDefs/d.lang +share/highlight/langDefs/diff.lang share/highlight/langDefs/dot.lang share/highlight/langDefs/dylan.lang share/highlight/langDefs/e.lang @@ -77,11 +81,14 @@ 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/lisp.lang share/highlight/langDefs/lotos.lang share/highlight/langDefs/ls.lang share/highlight/langDefs/lsl.lang share/highlight/langDefs/lua.lang +share/highlight/langDefs/ly.lang share/highlight/langDefs/m.lang share/highlight/langDefs/make.lang share/highlight/langDefs/mel.lang @@ -101,6 +108,7 @@ share/highlight/langDefs/nut.lang share/highlight/langDefs/oberon.lang share/highlight/langDefs/objc.lang share/highlight/langDefs/octave.lang +share/highlight/langDefs/oorexx.lang share/highlight/langDefs/os.lang share/highlight/langDefs/pas.lang share/highlight/langDefs/php.lang @@ -116,6 +124,7 @@ share/highlight/langDefs/psl.lang share/highlight/langDefs/py.lang share/highlight/langDefs/pyx.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 @@ -128,8 +137,9 @@ share/highlight/langDefs/scala.lang share/highlight/langDefs/scilab.lang share/highlight/langDefs/sh.lang share/highlight/langDefs/sma.lang +share/highlight/langDefs/smalltalk.lang share/highlight/langDefs/sml.lang -share/highlight/langDefs/snobol.lang +share/highlight/langDefs/sno.lang share/highlight/langDefs/spec.lang share/highlight/langDefs/spn.lang share/highlight/langDefs/sql.lang @@ -140,6 +150,7 @@ share/highlight/langDefs/test_re.lang share/highlight/langDefs/tex.lang share/highlight/langDefs/ttcn3.lang share/highlight/langDefs/txt.lang +share/highlight/langDefs/vala.lang share/highlight/langDefs/vb.lang share/highlight/langDefs/verilog.lang share/highlight/langDefs/vhd.lang @@ -155,7 +166,6 @@ share/highlight/themes/contrast.style share/highlight/themes/darkblue.style share/highlight/themes/darkness.style share/highlight/themes/desert.style -share/highlight/themes/dull.style share/highlight/themes/easter.style share/highlight/themes/emacs.style share/highlight/themes/golden.style @@ -165,10 +175,12 @@ 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-msvs2008.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