Hi, This diff updates highlight to the latest release 2.12. Tested on amd64/sparc64.
Comments ? OK ? Cheers, benoit
Index: Makefile =================================================================== RCS file: /cvs/openbsd/ports/textproc/highlight/Makefile,v retrieving revision 1.3 diff -u -r1.3 Makefile --- Makefile 7 Sep 2009 10:15:04 -0000 1.3 +++ Makefile 10 Sep 2009 09:44:41 -0000 @@ -2,7 +2,7 @@ COMMENT = convert source code to markup formats -DISTNAME = highlight-2.11 +DISTNAME = highlight-2.12 CATEGORIES = textproc converters HOMEPAGE = http://www.andre-simon.de/ Index: distinfo =================================================================== RCS file: /cvs/openbsd/ports/textproc/highlight/distinfo,v retrieving revision 1.3 diff -u -r1.3 distinfo --- distinfo 7 Sep 2009 10:15:04 -0000 1.3 +++ distinfo 10 Sep 2009 09:44:41 -0000 @@ -1,5 +1,5 @@ -MD5 (highlight-2.11.tar.bz2) = wPnUsrXRVX8hjYWSkkTwNg== -RMD160 (highlight-2.11.tar.bz2) = K8WneEcqq8m79f2a2abxZAyLc/E= -SHA1 (highlight-2.11.tar.bz2) = ce3lJ9A0q/UvjXYQ3RGsBD5oiiw= -SHA256 (highlight-2.11.tar.bz2) = MgzmEcNV90Huxq9NMzBKD+zZsFg78Ng7tf/Dg+xG6+Y= -SIZE (highlight-2.11.tar.bz2) = 639688 +MD5 (highlight-2.12.tar.bz2) = DGltb8Pw8aN2azJfJF+Ukw== +RMD160 (highlight-2.12.tar.bz2) = R8OdQUAzmgQ/cHHbGceDUHxXfCM= +SHA1 (highlight-2.12.tar.bz2) = mnJHR3BHqfxUL25HLQGvSnqx4Zk= +SHA256 (highlight-2.12.tar.bz2) = +9expJ/W5D7a2yOFhsbHDTmuiLQWJfH6m4Mk7JCekCU= +SIZE (highlight-2.12.tar.bz2) = 387735 Index: patches/patch-makefile =================================================================== RCS file: /cvs/openbsd/ports/textproc/highlight/patches/patch-makefile,v retrieving revision 1.2 diff -u -r1.2 patch-makefile --- patches/patch-makefile 20 May 2009 11:35:30 -0000 1.2 +++ patches/patch-makefile 10 Sep 2009 09:44:41 -0000 @@ -1,5 +1,5 @@ ---- makefile.orig Thu Apr 23 05:29:22 2009 -+++ makefile Wed May 20 10:12:35 2009 +--- makefile.orig Wed Sep 2 00:11:16 2009 ++++ makefile Thu Sep 10 11:40:18 2009 @@ -8,7 +8,6 @@ DESTDIR = @@ -8,12 +8,3 @@ # Location of the highlight data files: data_dir = ${PREFIX}/share/highlight/ -@@ -26,7 +25,7 @@ doc_dir = ${PREFIX}/share/doc/highlight/ - examples_dir = ${doc_dir}/examples/ - - # Location of the highlight config files: --conf_dir = /etc/highlight/ -+conf_dir = !!SYSCONFDIR!!/highlight/ - #conf_dir = ${PREFIX}/etc/highlight/ - - # Location of additional gui files Index: patches/patch-man_highlight_1 =================================================================== RCS file: /cvs/openbsd/ports/textproc/highlight/patches/patch-man_highlight_1,v retrieving revision 1.2 diff -u -r1.2 patch-man_highlight_1 --- patches/patch-man_highlight_1 20 May 2009 11:35:30 -0000 1.2 +++ patches/patch-man_highlight_1 10 Sep 2009 09:44:41 -0000 @@ -1,22 +1,19 @@ $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 +--- man/highlight.1.orig Wed Sep 2 22:25:25 2009 ++++ man/highlight.1 Thu Sep 10 11:40:18 2009 +@@ -209,13 +209,13 @@ Reformatting code will only work with C, C++, C# and J 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/. -+.I !!PREFIX!!/share/highlight/langDefs/. ++.I /usr/local/share/highlight/langDefs/. You may enhance .B highlight's parsing capabilities by adding more *.lang - files to this directory. You can also define other directories with -D, or add search paths with -E. Documentation files are stored in -.I /usr/share/doc/highlight/ -+.I !!PREFIX!!/share/doc/highlight/ ++.I /usr/local/share/doc/highlight/ , configuration files in --.I /etc/highlight/. -+.I !!SYSCONFDIR!!/highlight/. + .I /etc/highlight/. - .SH Examples - Single file conversion: Index: patches/patch-src_makefile =================================================================== RCS file: /cvs/openbsd/ports/textproc/highlight/patches/patch-src_makefile,v retrieving revision 1.2 diff -u -r1.2 patch-src_makefile --- patches/patch-src_makefile 20 May 2009 11:35:30 -0000 1.2 +++ patches/patch-src_makefile 10 Sep 2009 09:44:41 -0000 @@ -1,13 +1,14 @@ ---- src/makefile.orig Thu Apr 23 05:32:21 2009 -+++ src/makefile Wed May 20 10:12:35 2009 -@@ -15,10 +15,6 @@ +--- src/makefile.orig Thu Sep 10 11:36:52 2009 ++++ src/makefile Thu Sep 10 11:37:14 2009 +@@ -15,9 +15,9 @@ # See src/gui-qt/highlight.pro for the Qt GUI compilation options -CXX=c++ -- ++#CXX=c++ + -CFLAGS:=-O2 ${CFLAGS} -- - # Source paths - CORE_DIR=./core/ - CLI_DIR=./cli/ ++#CFLAGS:=-O2 ${CFLAGS} + #CFLAGS:=-ggdb ${CFLAGS} + + SO_VERSION=2.12 Index: pkg/PLIST =================================================================== RCS file: /cvs/openbsd/ports/textproc/highlight/pkg/PLIST,v retrieving revision 1.3 diff -u -r1.3 PLIST --- pkg/PLIST 7 Sep 2009 10:15:07 -0000 1.3 +++ pkg/PLIST 10 Sep 2009 09:44:41 -0000 @@ -54,13 +54,17 @@ share/highlight/langDefs/f90.lang share/highlight/langDefs/flx.lang share/highlight/langDefs/frink.lang +share/highlight/langDefs/fs.lang share/highlight/langDefs/haskell.lang share/highlight/langDefs/hcl.lang +share/highlight/langDefs/html.lang share/highlight/langDefs/httpd.lang +share/highlight/langDefs/hx.lang share/highlight/langDefs/icn.lang share/highlight/langDefs/idl.lang share/highlight/langDefs/idlang.lang share/highlight/langDefs/ili.lang +share/highlight/langDefs/inc_luatex.lang share/highlight/langDefs/ini.lang share/highlight/langDefs/inp.lang share/highlight/langDefs/io.lang
