diff options
author | Koop Mast <kwm@FreeBSD.org> | 2017-05-23 08:29:17 +0000 |
---|---|---|
committer | Koop Mast <kwm@FreeBSD.org> | 2017-05-23 08:29:17 +0000 |
commit | 37acc1c372c998b010fde4c8875bd43a24a02bd4 (patch) | |
tree | 50dee1fe93d80cbaca2c602c902328bcbd950f58 /textproc/highlight/files | |
parent | 02a51beeba1f58e24d124899167711f2320b1743 (diff) | |
download | ports-37acc1c372c998b010fde4c8875bd43a24a02bd4.tar.gz ports-37acc1c372c998b010fde4c8875bd43a24a02bd4.zip |
Update highlight to 3.36.
Regen patches with make makepatch
Notes
Notes:
svn path=/head/; revision=441509
Diffstat (limited to 'textproc/highlight/files')
-rw-r--r-- | textproc/highlight/files/patch-makefile | 8 | ||||
-rw-r--r-- | textproc/highlight/files/patch-src_makefile | 18 |
2 files changed, 13 insertions, 13 deletions
diff --git a/textproc/highlight/files/patch-makefile b/textproc/highlight/files/patch-makefile index be3e9c3541cc..4f8f21d3d645 100644 --- a/textproc/highlight/files/patch-makefile +++ b/textproc/highlight/files/patch-makefile @@ -1,5 +1,5 @@ ---- makefile.orig 2014-04-25 16:45:48.000000000 +0200 -+++ makefile 2014-04-25 16:46:45.000000000 +0200 +--- makefile.orig 2017-03-30 18:12:23 UTC ++++ makefile @@ -4,10 +4,10 @@ # Installation directories: @@ -13,7 +13,7 @@ # Location of the highlight data files: data_dir = ${PREFIX}/share/highlight/ -@@ -16,7 +16,7 @@ +@@ -16,7 +16,7 @@ data_dir = ${PREFIX}/share/highlight/ bin_dir = ${PREFIX}/bin/ # Location of the highlight man page: @@ -22,7 +22,7 @@ # Location of the highlight documentation: doc_dir = ${PREFIX}/share/doc/highlight/ -@@ -25,8 +25,8 @@ +@@ -25,8 +25,8 @@ doc_dir = ${PREFIX}/share/doc/highlight/ examples_dir = ${doc_dir}examples/ # Location of the highlight config files: diff --git a/textproc/highlight/files/patch-src_makefile b/textproc/highlight/files/patch-src_makefile index 3e5e726211d9..5fb4ede3554d 100644 --- a/textproc/highlight/files/patch-src_makefile +++ b/textproc/highlight/files/patch-src_makefile @@ -1,15 +1,15 @@ ---- src/makefile.orig 2015-07-02 16:51:26.582456000 +0200 -+++ src/makefile 2015-07-02 16:51:53.706070000 +0200 -@@ -12,7 +12,7 @@ - +--- src/makefile.orig 2017-03-30 18:12:23 UTC ++++ src/makefile +@@ -13,7 +13,7 @@ # See src/gui-qt/highlight.pro for the Qt GUI compilation options --CXX=c++ + #CXX=clang++ +-CXX=g++ +CXX?=c++ - # Added -qt4 because of Arch Linux Qt5 migration - QMAKE=qmake-qt4 -@@ -37,10 +37,10 @@ + # was: qmake-qt5 + QMAKE=qmake +@@ -39,10 +39,10 @@ INCLUDE_DIR=./include/ # If Lua 5.2 is not default on your system yet you have to # use lua5.1 in the pkg-config calls @@ -22,7 +22,7 @@ # luajit lib # LUA_LIBS=$(shell pkg-config --libs luajit) -@@ -67,7 +67,7 @@ +@@ -73,7 +73,7 @@ LDFLAGS = -ldl #LDFLAGS = ${LDFLAGS} -s #LDFLAGS= -Wl,--as-needed |