Update to highlight-3.32.

textproc/highlight/Makefile

@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.37 2016/08/03 07:33:31 benoit Exp $
+# $OpenBSD: Makefile,v 1.38 2016/09/26 07:44:02 benoit Exp $
 
 COMMENT =		convert source code to markup formats
 
-DISTNAME =		highlight-3.31
+DISTNAME =		highlight-3.32
 CATEGORIES =		textproc converters
 
 HOMEPAGE =		http://www.andre-simon.de/

textproc/highlight/distinfo

@@ -1,2 +1,2 @@
-SHA256 (highlight-3.31.tar.bz2) = jchS3HERLEZluaJ5o30mNtbpzAnqWBpMSVXIvIVrwjk=
-SIZE (highlight-3.31.tar.bz2) = 629989
+SHA256 (highlight-3.32.tar.bz2) = xU5JUxm1sHgaZyYVdjl41TALMGX6TgLsnGmwyv6TDJ0=
+SIZE (highlight-3.32.tar.bz2) = 622414

textproc/highlight/patches/patch-src_makefile

@@ -1,49 +1,49 @@
-$OpenBSD: patch-src_makefile,v 1.15 2016/08/03 07:33:31 benoit Exp $
---- src/makefile.orig	Mon Aug  1 10:10:51 2016
-+++ src/makefile	Wed Aug  3 08:47:22 2016
+$OpenBSD: patch-src_makefile,v 1.16 2016/09/26 07:44:02 benoit Exp $
+--- src/makefile.orig	Mon Aug  8 21:28:29 2016
++++ src/makefile	Mon Sep 26 09:13:41 2016
 @@ -12,13 +12,13 @@
- 
- # See src/gui-qt/highlight.pro for the Qt GUI compilation options
- 
--CXX=g++
-+#CXX=g++
- 
- # was: qmake-qt5
- QMAKE=qmake
- 
- # Added -std=c++11 because of auto_ptr to unique_ptr transition
--CFLAGS:=-Wall -O2 ${CFLAGS} -DNDEBUG -std=c++11
-+#CFLAGS:=-Wall -O2 ${CFLAGS} -DNDEBUG -std=c++11
- #CFLAGS:=-ggdb ${CFLAGS}
- 
- CFLAGS_DILU=-fno-strict-aliasing
+ 
+ # See src/gui-qt/highlight.pro for the Qt GUI compilation options
+ 
+-CXX=g++
++#CXX=g++
+ 
+ # was: qmake-qt5
+ QMAKE=qmake
+ 
+ # Added -std=c++11 because of auto_ptr to unique_ptr transition
+-CFLAGS:=-Wall -O2 ${CFLAGS} -DNDEBUG -std=c++11
++#CFLAGS:=-Wall -O2 ${CFLAGS} -DNDEBUG -std=c++11
+ #CFLAGS:=-ggdb ${CFLAGS}
+ 
+ CFLAGS_DILU=-fno-strict-aliasing
 @@ -38,10 +38,10 @@
- # If Lua 5.2 is not default on your system yet you have to
- # use lua5.1 in the pkg-config calls
- 
--LUA_CFLAGS=$(shell pkg-config --cflags lua)
-+LUA_CFLAGS=-I${LOCALBASE}/include
- 
- # default lua lib
--LUA_LIBS=$(shell pkg-config --libs lua)
-+LUA_LIBS=-llua
- 
- # luajit lib
- # LUA_LIBS=$(shell pkg-config --libs luajit)
+ # If Lua 5.2 is not default on your system yet you have to
+ # use lua5.1 in the pkg-config calls
+ 
+-LUA_CFLAGS=$(shell pkg-config --cflags lua)
++LUA_CFLAGS=-I${LOCALBASE}/include
+ 
+ # default lua lib
+-LUA_LIBS=$(shell pkg-config --libs lua)
++LUA_LIBS=-llua
+ 
+ # luajit lib
+ # LUA_LIBS=$(shell pkg-config --libs luajit)
 @@ -52,13 +52,13 @@
- 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
- ifndef HL_DOC_DIR
--	HL_DOC_DIR = /usr/share/doc/highlight/
-+	HL_DOC_DIR = ${PREFIX}/share/doc/highlight/
- endif
- 
- ifdef PIC
+ 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
+ ifndef HL_DOC_DIR
+-	HL_DOC_DIR = /usr/share/doc/highlight/
++	HL_DOC_DIR = ${PREFIX}/share/doc/highlight/
+ endif
+ 
+ ifdef PIC

textproc/highlight/pkg/PLIST

@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.22 2016/08/03 07:33:31 benoit Exp $
+@comment $OpenBSD: PLIST,v 1.23 2016/09/26 07:44:02 benoit Exp $
 @bin bin/highlight
 @man man/man1/highlight.1
 share/doc/highlight/
@@ -153,6 +153,7 @@ share/highlight/langDefs/pl1.lang
 share/highlight/langDefs/plperl.lang
 share/highlight/langDefs/plpython.lang
 share/highlight/langDefs/pltcl.lang
+share/highlight/langDefs/pony.lang
 share/highlight/langDefs/pov.lang
 share/highlight/langDefs/pro.lang
 share/highlight/langDefs/progress.lang
@@ -205,6 +206,7 @@ share/highlight/langDefs/vala.lang
 share/highlight/langDefs/vb.lang
 share/highlight/langDefs/verilog.lang
 share/highlight/langDefs/vhd.lang
+share/highlight/langDefs/whiley.lang
 share/highlight/langDefs/xml.lang
 share/highlight/langDefs/xpp.lang
 share/highlight/langDefs/yaiff.lang