- update highlight to 2.12

- regen patches & PLIST

ok ajacoutot@
This commit is contained in:
benoit 2009-09-19 15:26:30 +00:00
parent be9361ce01
commit e53d16d1c4
6 changed files with 30 additions and 38 deletions

View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.4 2009/09/12 15:08:41 naddy Exp $
# $OpenBSD: Makefile,v 1.5 2009/09/19 15:26:30 benoit Exp $
COMMENT = convert source code to markup formats
DISTNAME = highlight-2.11
DISTNAME = highlight-2.12
CATEGORIES = textproc converters
HOMEPAGE = http://www.andre-simon.de/
@ -30,7 +30,6 @@ NO_REGRESS = Yes
SHARE_DIRS = langDefs themes
post-extract:
rm ${WRKSRC}/src/libhighlight.so.1.0
gunzip ${WRKSRC}/man/highlight.1.gz
do-configure:

View File

@ -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

View File

@ -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

View File

@ -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
$OpenBSD: patch-man_highlight_1,v 1.3 2009/09/19 15:26:32 benoit Exp $
--- 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:

View File

@ -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

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.3 2009/09/07 10:15:07 benoit Exp $
@comment $OpenBSD: PLIST,v 1.4 2009/09/19 15:26:35 benoit Exp $
@bin bin/highlight
@man man/man1/highlight.1
share/doc/highlight/
@ -54,13 +54,17 @@ share/highlight/langDefs/f77.lang
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