Update to 3.18.

Use @sample for config file.
Take maintainership.

2 files changed, 73 insertions, 0 deletions

diff --git a/textproc/highlight/files/patch-makefile b/textproc/highlight/files/patch-makefile
new file mode 100644
index 000000000000..be3e9c3541cc
--- /dev/null
+++ b/textproc/highlight/files/patch-makefile
@@ -0,0 +1,35 @@
+--- makefile.orig	2014-04-25 16:45:48.000000000 +0200
++++ makefile	2014-04-25 16:46:45.000000000 +0200
+@@ -4,10 +4,10 @@
+ # Installation directories:
+ 
+ # Destination directory for installation (intended for packagers)
+-DESTDIR =
++DESTDIR ?=
+ 
+ # Root directory for final installation
+-PREFIX = /usr
++PREFIX ?= /usr
+ 
+ # Location of the highlight data files:
+ data_dir = ${PREFIX}/share/highlight/
+@@ -16,7 +16,7 @@
+ 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/
+@@ -25,8 +25,8 @@
+ examples_dir = ${doc_dir}examples/
+ 
+ # Location of the highlight config files:
+-conf_dir = /etc/highlight/
+-#conf_dir = ${PREFIX}/etc/highlight/
++#conf_dir = /etc/highlight/
++conf_dir = ${PREFIX}/etc/highlight/
+ 
+ # Location of additional gui files
+ desktop_apps = ${PREFIX}/share/applications/
diff --git a/textproc/highlight/files/patch-src_makefile b/textproc/highlight/files/patch-src_makefile
new file mode 100644
index 000000000000..494cf4532305
--- /dev/null
+++ b/textproc/highlight/files/patch-src_makefile
@@ -0,0 +1,38 @@
+--- src/makefile.orig	2014-04-04 19:26:25.000000000 +0200
++++ src/makefile	2014-04-29 16:12:06.000000000 +0200
+@@ -12,7 +12,7 @@
+ 
+ # See src/gui-qt/highlight.pro for the Qt GUI compilation options
+ 
+-CXX=c++
++CXX?=c++
+ 
+ # Added -qt4 because of Arch Linux Qt5 migration
+ QMAKE=qmake-qt4
+@@ -33,15 +33,14 @@
+ # Include path
+ INCLUDE_DIR=./include/
+ 
+-
+ # If Lua 5.2 is not default on your system yet you have to:
+ # - remove -DUSE_LUA52
+ # - use lua5.1 in the pkg-config calls
+ 
+-LUA_CFLAGS=$(shell pkg-config --cflags lua) -DUSE_LUA52
++LUA_CFLAGS=$(shell pkg-config --cflags lua-5.2) -DUSE_LUA52
+ 
+ # default lua lib
+-LUA_LIBS=$(shell pkg-config --libs lua)
++LUA_LIBS=$(shell pkg-config --libs lua-5.2)
+ 
+ # luajit lib
+ # LUA_LIBS=$(shell pkg-config --libs luajit)
+@@ -68,7 +67,7 @@
+ #LDFLAGS = ${LDFLAGS} -s
+ #LDFLAGS= -Wl,--as-needed
+ 
+-CXX_COMPILE=${CXX} ${CFLAGS} -c -I ${INCLUDE_DIR} ${LUA_CFLAGS}
++CXX_COMPILE=${CXX} ${CFLAGS} -c -I ${INCLUDE_DIR} -I%%LOCALBASE%%/include ${LUA_CFLAGS}
+ 
+ # Data directories (data dir, configuration file dir)
+ CXX_DIR=-DHL_DATA_DIR=\"${HL_DATA_DIR}\" -DHL_CONFIG_DIR=\"${HL_CONFIG_DIR}\"