Mon Mar 2 22:10:27 2009 UTC ()
Update highlight to 2.7.  Changes include tons of language updates, new
languages, and bug fixes.  A detailed list of changes can be found at:
http://www.andre-simon.de/doku/highlight/highlight_changelog.html


(rh)
diff -r1.3 -r1.4 pkgsrc/textproc/highlight/Makefile
diff -r1.2 -r1.3 pkgsrc/textproc/highlight/PLIST
diff -r1.2 -r1.3 pkgsrc/textproc/highlight/distinfo
diff -r1.2 -r1.3 pkgsrc/textproc/highlight/patches/patch-aa
diff -r1.2 -r1.3 pkgsrc/textproc/highlight/patches/patch-ab
cvs diff -r1.3 -r1.4 pkgsrc/textproc/highlight/Makefile (expand / switch to unified diff)

--- pkgsrc/textproc/highlight/Makefile 2008/11/07 21:12:12 1.3
+++ pkgsrc/textproc/highlight/Makefile 2009/03/02 22:10:26 1.4
@@ -1,28 +1,28 @@ @@ -1,28 +1,28 @@
1# $NetBSD: Makefile,v 1.3 2008/11/07 21:12:12 snj Exp $ 1# $NetBSD: Makefile,v 1.4 2009/03/02 22:10:26 rh Exp $
2 2
3DISTNAME= highlight-2.6.14 3DISTNAME= highlight-2.7
4CATEGORIES= textproc 4CATEGORIES= textproc
5MASTER_SITES= http://www.andre-simon.de/zip/ 5MASTER_SITES= http://www.andre-simon.de/zip/
6EXTRACT_SUFX= .tar.bz2 6EXTRACT_SUFX= .tar.bz2
7 7
8MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= http://www.andre-simon.de/ 9HOMEPAGE= http://www.andre-simon.de/
10COMMENT= Converts source code to formatted text with syntax highlighting 10COMMENT= Converts source code to formatted text with syntax highlighting
11 11
12PKG_DESTDIR_SUPPORT= user-destdir 12PKG_DESTDIR_SUPPORT= user-destdir
13 13
14USE_TOOLS+= gmake 14USE_TOOLS+= gmake
15USE_LANGUAGES= c++ 15USE_LANGUAGES= c c++
16MANCOMPRESSED= yes 16MANCOMPRESSED= yes
17 17
18MAKE_FILE= makefile 18MAKE_FILE= makefile
19 19
20PKG_SYSCONFSUBDIR= highlight 20PKG_SYSCONFSUBDIR= highlight
21 21
22EGDIR= ${PREFIX}/share/examples/highlight 22EGDIR= ${PREFIX}/share/examples/highlight
23CONF_FILES= ${EGDIR}/filetypes.conf \ 23CONF_FILES= ${EGDIR}/filetypes.conf \
24 ${PKG_SYSCONFDIR}/filetypes.conf 24 ${PKG_SYSCONFDIR}/filetypes.conf
25 25
26SUBST_CLASSES+= etc 26SUBST_CLASSES+= etc
27SUBST_MESSAGE.etc= Fixing hardcoded paths. 27SUBST_MESSAGE.etc= Fixing hardcoded paths.
28SUBST_STAGE.etc= post-patch 28SUBST_STAGE.etc= post-patch
cvs diff -r1.2 -r1.3 pkgsrc/textproc/highlight/PLIST (expand / switch to unified diff)

--- pkgsrc/textproc/highlight/PLIST 2008/11/07 21:12:12 1.2
+++ pkgsrc/textproc/highlight/PLIST 2009/03/02 22:10:26 1.3
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.2 2008/11/07 21:12:12 snj Exp $ 1@comment $NetBSD: PLIST,v 1.3 2009/03/02 22:10:26 rh Exp $
2bin/highlight 2bin/highlight
3man/man1/highlight.1 3man/man1/highlight.1
4share/doc/highlight/AUTHORS 4share/doc/highlight/AUTHORS
5share/doc/highlight/COPYING 5share/doc/highlight/COPYING
6share/doc/highlight/ChangeLog 6share/doc/highlight/ChangeLog
7share/doc/highlight/INSTALL 7share/doc/highlight/INSTALL
8share/doc/highlight/README 8share/doc/highlight/README
9share/doc/highlight/README_DE 9share/doc/highlight/README_DE
10share/doc/highlight/README_INDENT 10share/doc/highlight/README_INDENT
11share/doc/highlight/README_LANGLIST 11share/doc/highlight/README_LANGLIST
12share/doc/highlight/README_REGEX 12share/doc/highlight/README_REGEX
13share/doc/highlight/README_SWIG 13share/doc/highlight/README_SWIG
14share/doc/highlight/examples/highlight_pipe.php 14share/doc/highlight/examples/highlight_pipe.php
@@ -53,26 +53,27 @@ share/highlight/langDefs/asp.lang @@ -53,26 +53,27 @@ share/highlight/langDefs/asp.lang
53share/highlight/langDefs/aspect.lang 53share/highlight/langDefs/aspect.lang
54share/highlight/langDefs/au3.lang 54share/highlight/langDefs/au3.lang
55share/highlight/langDefs/avenue.lang 55share/highlight/langDefs/avenue.lang
56share/highlight/langDefs/awk.lang 56share/highlight/langDefs/awk.lang
57share/highlight/langDefs/bat.lang 57share/highlight/langDefs/bat.lang
58share/highlight/langDefs/bb.lang 58share/highlight/langDefs/bb.lang
59share/highlight/langDefs/bib.lang 59share/highlight/langDefs/bib.lang
60share/highlight/langDefs/bms.lang 60share/highlight/langDefs/bms.lang
61share/highlight/langDefs/boo.lang 61share/highlight/langDefs/boo.lang
62share/highlight/langDefs/c.lang 62share/highlight/langDefs/c.lang
63share/highlight/langDefs/cb.lang 63share/highlight/langDefs/cb.lang
64share/highlight/langDefs/cfc.lang 64share/highlight/langDefs/cfc.lang
65share/highlight/langDefs/clipper.lang 65share/highlight/langDefs/clipper.lang
 66share/highlight/langDefs/clojure.lang
66share/highlight/langDefs/clp.lang 67share/highlight/langDefs/clp.lang
67share/highlight/langDefs/cob.lang 68share/highlight/langDefs/cob.lang
68share/highlight/langDefs/cs.lang 69share/highlight/langDefs/cs.lang
69share/highlight/langDefs/css.lang 70share/highlight/langDefs/css.lang
70share/highlight/langDefs/d.lang 71share/highlight/langDefs/d.lang
71share/highlight/langDefs/diff.lang 72share/highlight/langDefs/diff.lang
72share/highlight/langDefs/dot.lang 73share/highlight/langDefs/dot.lang
73share/highlight/langDefs/dylan.lang 74share/highlight/langDefs/dylan.lang
74share/highlight/langDefs/e.lang 75share/highlight/langDefs/e.lang
75share/highlight/langDefs/erl.lang 76share/highlight/langDefs/erl.lang
76share/highlight/langDefs/euphoria.lang 77share/highlight/langDefs/euphoria.lang
77share/highlight/langDefs/exp.lang 78share/highlight/langDefs/exp.lang
78share/highlight/langDefs/f77.lang 79share/highlight/langDefs/f77.lang
cvs diff -r1.2 -r1.3 pkgsrc/textproc/highlight/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/textproc/highlight/Attic/distinfo 2008/11/07 21:12:12 1.2
+++ pkgsrc/textproc/highlight/Attic/distinfo 2009/03/02 22:10:26 1.3
@@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
1$NetBSD: distinfo,v 1.2 2008/11/07 21:12:12 snj Exp $ 1$NetBSD: distinfo,v 1.3 2009/03/02 22:10:26 rh Exp $
2 2
3SHA1 (highlight-2.6.14.tar.bz2) = 9e0890ef3042b6ed5b1249a8cc074822fa4dc141 3SHA1 (highlight-2.7.tar.bz2) = ea970d9ab8dada5fd459b8b11194b29d3fea582e
4RMD160 (highlight-2.6.14.tar.bz2) = fe01d991906c13203923215cbb3e846ff59d7500 4RMD160 (highlight-2.7.tar.bz2) = d9971172f735e8233c89654bae9947171be3bfac
5Size (highlight-2.6.14.tar.bz2) = 393390 bytes 5Size (highlight-2.7.tar.bz2) = 393248 bytes
6SHA1 (patch-aa) = 6c082bf2fb07a5a8859da2717bef799389e7831d 6SHA1 (patch-aa) = 3495170dcae12b1a9c783def838b15b159f34227
7SHA1 (patch-ab) = a117fb98e2e4bfdb3e2c56e10092fbe17a2b4d4e 7SHA1 (patch-ab) = 9eda27f2f3a0b627bab76fcb951066951ff97c78
cvs diff -r1.2 -r1.3 pkgsrc/textproc/highlight/patches/Attic/patch-aa (expand / switch to unified diff)

--- pkgsrc/textproc/highlight/patches/Attic/patch-aa 2008/11/07 21:12:12 1.2
+++ pkgsrc/textproc/highlight/patches/Attic/patch-aa 2009/03/02 22:10:27 1.3
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1$NetBSD: patch-aa,v 1.2 2008/11/07 21:12:12 snj Exp $ 1$NetBSD: patch-aa,v 1.3 2009/03/02 22:10:27 rh Exp $
2 2
3--- makefile.orig 2008-10-28 21:53:41.000000000 -0700 3--- makefile.orig 2009-01-06 12:34:10.000000000 +1000
4+++ makefile 2008-11-07 11:55:20.000000000 -0800 4+++ makefile
5@@ -8,7 +8,6 @@ 5@@ -8,7 +8,6 @@
6 DESTDIR = 6 DESTDIR =
7  7
8 # Root directory for final installation 8 # Root directory for final installation
9-PREFIX = /usr 9-PREFIX = /usr
10  10
11 # Location of the highlight data files: 11 # Location of the highlight data files:
12 data_dir = ${PREFIX}/share/highlight/ 12 data_dir = ${PREFIX}/share/highlight/
13@@ -17,7 +16,7 @@ data_dir = ${PREFIX}/share/highlight/ 13@@ -17,7 +16,7 @@ data_dir = ${PREFIX}/share/highlight/
14 bin_dir = ${PREFIX}/bin/ 14 bin_dir = ${PREFIX}/bin/
15  15
16 # Location of the highlight man page: 16 # Location of the highlight man page:
17-man_dir = ${PREFIX}/share/man/man1/ 17-man_dir = ${PREFIX}/share/man/man1/
@@ -30,42 +30,42 @@ $NetBSD: patch-aa,v 1.2 2008/11/07 21:12 @@ -30,42 +30,42 @@ $NetBSD: patch-aa,v 1.2 2008/11/07 21:12
30 desktop_apps = ${PREFIX}/share/applications/ 30 desktop_apps = ${PREFIX}/share/applications/
31 desktop_pixmaps = ${PREFIX}/share/pixmaps/ 31 desktop_pixmaps = ${PREFIX}/share/pixmaps/
32  32
33 # Commands: 33 # Commands:
34-INSTALL_DATA=install -m644 34-INSTALL_DATA=install -m644
35-INSTALL_PROGRAM=install -m755 35-INSTALL_PROGRAM=install -m755
36-MKDIR=mkdir -p -m 755 36-MKDIR=mkdir -p -m 755
37-RMDIR=rm -r -f 37-RMDIR=rm -r -f
38+INSTALL_DATA=${BSD_INSTALL_DATA} 38+INSTALL_DATA=${BSD_INSTALL_DATA}
39+INSTALL_PROGRAM=${BSD_INSTALL_PROGRAM} 39+INSTALL_PROGRAM=${BSD_INSTALL_PROGRAM}
40+MKDIR=${BSD_INSTALL_DATA_DIR} 40+MKDIR=${BSD_INSTALL_DATA_DIR}
41+RMDIR=${RM} -r -f 41+RMDIR=${RM} -r -f
42  42
43 all: 43 all cli:
44 ${MAKE} -C ./src -f ./makefile HL_DATA_DIR=${data_dir} HL_CONFIG_DIR=${conf_dir} 44 ${MAKE} -C ./src -f ./makefile HL_DATA_DIR=${data_dir} HL_CONFIG_DIR=${conf_dir}
45@@ -77,7 +76,7 @@ install: 45@@ -72,7 +71,7 @@ install:
46 ${DESTDIR}${data_dir}langDefs \ 46 ${DESTDIR}${data_dir}langDefs \
47 ${DESTDIR}${data_dir}indentSchemes \ 47 ${DESTDIR}${data_dir}indentSchemes \
48 ${DESTDIR}${data_dir}helpmsg 48 ${DESTDIR}${data_dir}helpmsg
49- ${MKDIR} ${DESTDIR}${man_dir} 49- ${MKDIR} ${DESTDIR}${man_dir}
50+ ${BSD_INSTALL_MAN_DIR} ${DESTDIR}${man_dir} 50+ ${BSD_INSTALL_MAN_DIR} ${DESTDIR}${man_dir}
51 ${MKDIR} ${DESTDIR}${bin_dir} 51 ${MKDIR} ${DESTDIR}${bin_dir}
52  52
53 ${INSTALL_DATA} ./langDefs/*.lang ${DESTDIR}${data_dir}langDefs/ 53 ${INSTALL_DATA} ./langDefs/*.lang ${DESTDIR}${data_dir}langDefs/
54@@ -85,7 +84,7 @@ install: 54@@ -80,7 +79,7 @@ install:
55 ${INSTALL_DATA} ./themes/*.style ${DESTDIR}${data_dir}themes/ 55 ${INSTALL_DATA} ./themes/*.style ${DESTDIR}${data_dir}themes/
56 ${INSTALL_DATA} ./indentSchemes/*.indent ${DESTDIR}${data_dir}indentSchemes/ 56 ${INSTALL_DATA} ./indentSchemes/*.indent ${DESTDIR}${data_dir}indentSchemes/
57 ${INSTALL_DATA} ./helpmsg/*.help ${DESTDIR}${data_dir}helpmsg/ 57 ${INSTALL_DATA} ./helpmsg/*.help ${DESTDIR}${data_dir}helpmsg/
58- ${INSTALL_DATA} ./man/highlight.1.gz ${DESTDIR}${man_dir} 58- ${INSTALL_DATA} ./man/highlight.1.gz ${DESTDIR}${man_dir}
59+ ${BSD_INSTALL_MAN} ./man/highlight.1.gz ${DESTDIR}${man_dir} 59+ ${BSD_INSTALL_MAN} ./man/highlight.1.gz ${DESTDIR}${man_dir}
60 ${INSTALL_DATA} ./AUTHORS ${DESTDIR}${doc_dir} 60 ${INSTALL_DATA} ./AUTHORS ${DESTDIR}${doc_dir}
61 ${INSTALL_DATA} ./README ${DESTDIR}${doc_dir} 61 ${INSTALL_DATA} ./README ${DESTDIR}${doc_dir}
62 ${INSTALL_DATA} ./README_DE ${DESTDIR}${doc_dir} 62 ${INSTALL_DATA} ./README_DE ${DESTDIR}${doc_dir}
63@@ -132,7 +131,7 @@ uninstall: 63@@ -127,7 +126,7 @@ uninstall:
64 ${RMDIR} ${DESTDIR}${doc_dir} 64 ${RMDIR} ${DESTDIR}${doc_dir}
65 ${RMDIR} ${DESTDIR}${conf_dir} 65 ${RMDIR} ${DESTDIR}${conf_dir}
66 ${RMDIR} ${DESTDIR}${examples_dir} 66 ${RMDIR} ${DESTDIR}${examples_dir}
67- rm ${DESTDIR}${man_dir}highlight.1.gz 67- rm ${DESTDIR}${man_dir}highlight.1.gz
68+ rm ${DESTDIR}${man_dir}highlight.1* 68+ rm ${DESTDIR}${man_dir}highlight.1*
69 rm ${DESTDIR}${bin_dir}highlight 69 rm ${DESTDIR}${bin_dir}highlight
70 rm ${DESTDIR}${bin_dir}highlight-gui 70 rm ${DESTDIR}${bin_dir}highlight-gui
71 rm ${DESTDIR}${desktop_apps}highlight.desktop 71 rm ${DESTDIR}${desktop_apps}highlight.desktop
cvs diff -r1.2 -r1.3 pkgsrc/textproc/highlight/patches/Attic/patch-ab (expand / switch to unified diff)

--- pkgsrc/textproc/highlight/patches/Attic/patch-ab 2008/11/07 21:12:12 1.2
+++ pkgsrc/textproc/highlight/patches/Attic/patch-ab 2009/03/02 22:10:27 1.3
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: patch-ab,v 1.2 2008/11/07 21:12:12 snj Exp $ 1$NetBSD: patch-ab,v 1.3 2009/03/02 22:10:27 rh Exp $
2 2
3--- src/makefile.orig 2008-10-23 19:08:29.000000000 -0700 3--- src/makefile.orig 2009-01-06 12:17:29.000000000 +1000
4+++ src/makefile 2008-11-07 11:56:04.000000000 -0800 4+++ src/makefile
5@@ -10,9 +10,7 @@ 5@@ -10,9 +10,7 @@
6 # Add -DCONFIG_FILE_PATH=\"/your/path/.highlightrc\" if you want to define a 6 # Add -DCONFIG_FILE_PATH=\"/your/path/.highlightrc\" if you want to define a
7 # custom path to the highlight configuration file (default: $HOME/.highlightrc) 7 # custom path to the highlight configuration file (default: $HOME/.highlightrc)
8  8
9-CXX=c++ 9-CXX=c++
10  10
11-CFLAGS:=-O2 ${CFLAGS} 11-CFLAGS:=-O2 ${CFLAGS}
12  12
13 # Do not strip by default (Mac OS X lazy pointer issues) 13 # Source paths
14 # Add -static to avoid linking with shared libs (can cause trouble when highlight 14 CORE_DIR=./core/