@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.3 2008/11/07 21:12:12 snj Exp $
+# $NetBSD: Makefile,v 1.4 2009/03/02 22:10:26 rh Exp $
-DISTNAME= highlight-2.6.14
+DISTNAME= highlight-2.7
CATEGORIES= textproc
MASTER_SITES= http://www.andre-simon.de/zip/
EXTRACT_SUFX= .tar.bz2
@@ -12,7 +12,7 @@
PKG_DESTDIR_SUPPORT= user-destdir
USE_TOOLS+= gmake
-USE_LANGUAGES= c++
+USE_LANGUAGES= c c++
MANCOMPRESSED= yes
MAKE_FILE= makefile
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2008/11/07 21:12:12 snj Exp $
+@comment $NetBSD: PLIST,v 1.3 2009/03/02 22:10:26 rh Exp $
bin/highlight
man/man1/highlight.1
share/doc/highlight/AUTHORS
@@ -63,6 +63,7 @@
share/highlight/langDefs/cb.lang
share/highlight/langDefs/cfc.lang
share/highlight/langDefs/clipper.lang
+share/highlight/langDefs/clojure.lang
share/highlight/langDefs/clp.lang
share/highlight/langDefs/cob.lang
share/highlight/langDefs/cs.lang
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.2 2008/11/07 21:12:12 snj Exp $
+$NetBSD: distinfo,v 1.3 2009/03/02 22:10:26 rh Exp $
-SHA1 (highlight-2.6.14.tar.bz2) = 9e0890ef3042b6ed5b1249a8cc074822fa4dc141
+SHA1 (highlight-2.7.tar.bz2) = ea970d9ab8dada5fd459b8b11194b29d3fea582e
-RMD160 (highlight-2.6.14.tar.bz2) = fe01d991906c13203923215cbb3e846ff59d7500
+RMD160 (highlight-2.7.tar.bz2) = d9971172f735e8233c89654bae9947171be3bfac
-Size (highlight-2.6.14.tar.bz2) = 393390 bytes
+Size (highlight-2.7.tar.bz2) = 393248 bytes
-SHA1 (patch-aa) = 6c082bf2fb07a5a8859da2717bef799389e7831d
+SHA1 (patch-aa) = 3495170dcae12b1a9c783def838b15b159f34227
-SHA1 (patch-ab) = a117fb98e2e4bfdb3e2c56e10092fbe17a2b4d4e
+SHA1 (patch-ab) = 9eda27f2f3a0b627bab76fcb951066951ff97c78
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.2 2008/11/07 21:12:12 snj Exp $
+$NetBSD: patch-aa,v 1.3 2009/03/02 22:10:27 rh Exp $
---- makefile.orig 2008-10-28 21:53:41.000000000 -0700
-+++ makefile 2008-11-07 11:55:20.000000000 -0800
+--- makefile.orig 2009-01-06 12:34:10.000000000 +1000
++++ makefile
@@ -8,7 +8,6 @@
DESTDIR =
@@ -40,9 +40,9 @@
+MKDIR=${BSD_INSTALL_DATA_DIR}
+RMDIR=${RM} -r -f
- all:
+ all cli:
${MAKE} -C ./src -f ./makefile HL_DATA_DIR=${data_dir} HL_CONFIG_DIR=${conf_dir}
-@@ -77,7 +76,7 @@ install:
+@@ -72,7 +71,7 @@ install:
${DESTDIR}${data_dir}langDefs \
${DESTDIR}${data_dir}indentSchemes \
${DESTDIR}${data_dir}helpmsg
@@ -51,7 +51,7 @@
${MKDIR} ${DESTDIR}${bin_dir}
${INSTALL_DATA} ./langDefs/*.lang ${DESTDIR}${data_dir}langDefs/
-@@ -85,7 +84,7 @@ install:
+@@ -80,7 +79,7 @@ install:
${INSTALL_DATA} ./themes/*.style ${DESTDIR}${data_dir}themes/
${INSTALL_DATA} ./indentSchemes/*.indent ${DESTDIR}${data_dir}indentSchemes/
${INSTALL_DATA} ./helpmsg/*.help ${DESTDIR}${data_dir}helpmsg/
@@ -60,7 +60,7 @@
${INSTALL_DATA} ./AUTHORS ${DESTDIR}${doc_dir}
${INSTALL_DATA} ./README ${DESTDIR}${doc_dir}
${INSTALL_DATA} ./README_DE ${DESTDIR}${doc_dir}
-@@ -132,7 +131,7 @@ uninstall:
+@@ -127,7 +126,7 @@ uninstall:
${RMDIR} ${DESTDIR}${doc_dir}
${RMDIR} ${DESTDIR}${conf_dir}
${RMDIR} ${DESTDIR}${examples_dir}
@@ -1,7 +1,7 @@
-$NetBSD: patch-ab,v 1.2 2008/11/07 21:12:12 snj Exp $
+$NetBSD: patch-ab,v 1.3 2009/03/02 22:10:27 rh Exp $
---- src/makefile.orig 2008-10-23 19:08:29.000000000 -0700
-+++ src/makefile 2008-11-07 11:56:04.000000000 -0800
+--- src/makefile.orig 2009-01-06 12:17:29.000000000 +1000
++++ src/makefile
@@ -10,9 +10,7 @@
# Add -DCONFIG_FILE_PATH=\"/your/path/.highlightrc\" if you want to define a
# custom path to the highlight configuration file (default: $HOME/.highlightrc)
@@ -10,5 +10,5 @@
-CFLAGS:=-O2 ${CFLAGS}
- # Do not strip by default (Mac OS X lazy pointer issues)
+ # Source paths
- # Add -static to avoid linking with shared libs (can cause trouble when highlight
+ CORE_DIR=./core/