Hi,
This diff updates highlight to the latest release 3.6.
Tested on amd64.
Comments ? OK ?
Cheers,
benoit
Index: Makefile
===================================================================
RCS file: /cvs/ports/textproc/highlight/Makefile,v
retrieving revision 1.12
diff -u -r1.12 Makefile
--- Makefile 15 Jul 2011 09:47:50 -0000 1.12
+++ Makefile 27 Nov 2011 10:18:57 -0000
@@ -2,7 +2,7 @@
COMMENT = convert source code to markup formats
-DISTNAME = highlight-3.5
+DISTNAME = highlight-3.6
CATEGORIES = textproc converters
HOMEPAGE = http://www.andre-simon.de/
Index: distinfo
===================================================================
RCS file: /cvs/ports/textproc/highlight/distinfo,v
retrieving revision 1.9
diff -u -r1.9 distinfo
--- distinfo 15 Jul 2011 09:47:50 -0000 1.9
+++ distinfo 27 Nov 2011 10:18:57 -0000
@@ -1,5 +1,5 @@
-MD5 (highlight-3.5.tar.bz2) = C7jO8jIJu28xpYHLbnv/dw==
-RMD160 (highlight-3.5.tar.bz2) = JX7UmSMR6KlQls1Kwp7ntADwhq0=
-SHA1 (highlight-3.5.tar.bz2) = Dle0UQO29HGpb5h/mNxeCf7ROLU=
-SHA256 (highlight-3.5.tar.bz2) = SFwa1AunreT0L/FAVcEzF+PqNh4FVvlfXrVY7kRr8Uo=
-SIZE (highlight-3.5.tar.bz2) = 756541
+MD5 (highlight-3.6.tar.bz2) = sjCT26fESnYo7lyX5oyZQQ==
+RMD160 (highlight-3.6.tar.bz2) = C056klPrupsPLIR1Qif3+MXxoSo=
+SHA1 (highlight-3.6.tar.bz2) = /z1fXRft/tSIHTTvhH5jv4AKM+I=
+SHA256 (highlight-3.6.tar.bz2) = x52VI00f0yqZinQU0FY99fy1d2ofku04iTiU7eV/qL0=
+SIZE (highlight-3.6.tar.bz2) = 650790
Index: patches/patch-makefile
===================================================================
RCS file: /cvs/ports/textproc/highlight/patches/patch-makefile,v
retrieving revision 1.4
diff -u -r1.4 patch-makefile
--- patches/patch-makefile 14 Oct 2009 15:04:06 -0000 1.4
+++ patches/patch-makefile 27 Nov 2011 10:18:57 -0000
@@ -1,28 +0,0 @@
---- makefile.orig Wed Sep 2 00:11:16 2009
-+++ makefile Wed Oct 14 16:05:52 2009
-@@ -8,7 +8,6 @@
- DESTDIR =
-
- # Root directory for final installation
--PREFIX = /usr
-
- # 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
Index: patches/patch-src_makefile
===================================================================
RCS file: /cvs/ports/textproc/highlight/patches/patch-src_makefile,v
retrieving revision 1.7
diff -u -r1.7 patch-src_makefile
--- patches/patch-src_makefile 9 Apr 2011 08:02:37 -0000 1.7
+++ patches/patch-src_makefile 27 Nov 2011 10:18:57 -0000
@@ -1,6 +1,5 @@
-$OpenBSD: patch-src_makefile,v 1.7 2011/04/09 08:02:37 benoit Exp $
---- src/makefile.orig Wed Feb 9 22:56:23 2011
-+++ src/makefile Sun Apr 3 11:14:04 2011
+--- src/makefile Wed Oct 5 22:14:22 2011
++++ src/makefile.new Sun Oct 23 12:58:49 2011
@@ -12,11 +12,11 @@
# See src/gui-qt/highlight.pro for the Qt GUI compilation options
@@ -12,10 +11,10 @@
-CFLAGS:=-Wall -O2 ${CFLAGS} -DNDEBUG
+#CFLAGS:=-Wall -O2 ${CFLAGS} -DNDEBUG
- #CFLAGS:=-ggdb ${CFLAGS} -DNDEBUG
- CFLAGS_DILU=-fno-strict-aliasing
+ #CFLAGS:=-ggdb ${CFLAGS}
-@@ -32,7 +32,7 @@
+ CFLAGS_DILU=-fno-strict-aliasing
+@@ -33,7 +33,7 @@
INCLUDE_DIR=./include/
# Lua paths
@@ -24,3 +23,16 @@
LUA_LIBS=-llua
#LUA_CFLAGS=$(shell pkg-config --cflags lua5.1)
#LUA_LIBS=$(shell pkg-config --libs lua5.1)
+@@ -45,10 +45,10 @@
+ DILU_DIR=${CORE_DIR}Diluculum/
+
+ ifndef HL_CONFIG_DIR
+- HL_CONFIG_DIR = /etc/highlight/
++ HL_CONFIG_DIR = ${SYSCONFDIR}/highlight/
+ endif
+ ifndef HL_DATA_DIR
+- HL_DATA_DIR = /usr/share/highlight/
++ HL_DATA_DIR = ${PREFIX}/share/highlight/
+ endif
+ ifdef PIC
+ CFLAGS+=-fPIC
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/textproc/highlight/pkg/PLIST,v
retrieving revision 1.7
diff -u -r1.7 PLIST
--- pkg/PLIST 9 Apr 2011 08:02:39 -0000 1.7
+++ pkg/PLIST 27 Nov 2011 10:18:57 -0000
@@ -108,9 +108,11 @@
share/highlight/langDefs/mod2.lang
share/highlight/langDefs/mod3.lang
share/highlight/langDefs/modelica.lang
+share/highlight/langDefs/moon.lang
share/highlight/langDefs/ms.lang
share/highlight/langDefs/mssql.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
@@ -174,6 +176,7 @@
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
@@ -206,7 +209,6 @@
share/highlight/themes/darkslategray.theme
share/highlight/themes/darkspectrum.theme
share/highlight/themes/denim.theme
-share/highlight/themes/desertEx.theme
share/highlight/themes/dusk.theme
share/highlight/themes/earendel.theme
share/highlight/themes/easter.theme
@@ -254,7 +256,8 @@
share/highlight/themes/relaxedgreen.theme
share/highlight/themes/rootwater.theme
share/highlight/themes/seashell.theme
-share/highlight/themes/sienna.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/vampire.theme
