Update to version 2.13 from maintainer Benoit Lecocq

with tweaks by me.
"looks ok" steven@
This commit is contained in:
giovanni 2009-10-14 15:04:06 +00:00
parent 822cfcc79a
commit 380884b789
5 changed files with 39 additions and 20 deletions

View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.5 2009/09/19 15:26:30 benoit Exp $
# $OpenBSD: Makefile,v 1.6 2009/10/14 15:04:06 giovanni Exp $
COMMENT = convert source code to markup formats
DISTNAME = highlight-2.12
DISTNAME = highlight-2.13
CATEGORIES = textproc converters
HOMEPAGE = http://www.andre-simon.de/
@ -33,9 +33,7 @@ post-extract:
gunzip ${WRKSRC}/man/highlight.1.gz
do-configure:
@perl -pi -e 's,!!SYSCONFDIR!!,${SYSCONFDIR},' ${WRKSRC}/makefile \
${WRKSRC}/man/highlight.1
@perl -pi -e 's,!!PREFIX!!,${PREFIX},' ${WRKSRC}/man/highlight.1
${SUBST_CMD} ${WRKSRC}/makefile ${WRKSRC}/man/highlight.1
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/src/highlight ${PREFIX}/bin

View File

@ -1,5 +1,5 @@
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
MD5 (highlight-2.13.tar.bz2) = H10yXiTyXX0X0iPIqzonhQ==
RMD160 (highlight-2.13.tar.bz2) = kh6BrMERPa8HmkU4BFS+ZSpFfHQ=
SHA1 (highlight-2.13.tar.bz2) = /2fKCVPxBkM/GlleL6MNLc650OA=
SHA256 (highlight-2.13.tar.bz2) = WHv6jpNbWGySCcfKgnJMul4biRYSeklaPlVXNawYKq8=
SIZE (highlight-2.13.tar.bz2) = 526906

View File

@ -1,5 +1,5 @@
--- makefile.orig Wed Sep 2 00:11:16 2009
+++ makefile Thu Sep 10 11:40:18 2009
+++ makefile Wed Oct 14 16:05:52 2009
@@ -8,7 +8,6 @@
DESTDIR =
@ -8,3 +8,21 @@
# Location of the highlight data files:
data_dir = ${PREFIX}/share/highlight/
@@ -17,7 +16,7 @@ data_dir = ${PREFIX}/share/highlight/
bin_dir = ${PREFIX}/bin/
# Location of the highlight man page:
-man_dir = ${PREFIX}/share/man/man1/
+man_dir = ${PREFIX}/man/man1/
# Location of the highlight documentation:
doc_dir = ${PREFIX}/share/doc/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,19 +1,22 @@
$OpenBSD: patch-man_highlight_1,v 1.3 2009/09/19 15:26:32 benoit Exp $
$OpenBSD: patch-man_highlight_1,v 1.4 2009/10/14 15:04:06 giovanni 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
+++ man/highlight.1 Wed Oct 14 16:03:37 2009
@@ -209,15 +209,15 @@ 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 /usr/local/share/highlight/langDefs/.
+.I ${PREFIX}/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 /usr/local/share/doc/highlight/
+.I ${PREFIX}/share/doc/highlight/
, configuration files in
.I /etc/highlight/.
-.I /etc/highlight/.
+.I ${SYSCONFDIR}/highlight/.
.SH Examples
Single file conversion:

View File

@ -1,5 +1,5 @@
--- src/makefile.orig Thu Sep 10 11:36:52 2009
+++ src/makefile Thu Sep 10 11:37:14 2009
--- src/makefile.orig Fri Oct 2 18:41:17 2009
+++ src/makefile Wed Oct 14 16:02:47 2009
@@ -15,9 +15,9 @@
# See src/gui-qt/highlight.pro for the Qt GUI compilation options
@ -11,4 +11,4 @@
+#CFLAGS:=-O2 ${CFLAGS}
#CFLAGS:=-ggdb ${CFLAGS}
SO_VERSION=2.12
SO_VERSION=2.13