Update to highlight-3.48.

---------------------------------------------------------------------- CVS:
Enter Log.  Lines beginning with `CVS:' are removed automatically CVS: CVS:
Committing in .  CVS: CVS: Modified Files: CVS: Makefile distinfo
patches/patch-src_makefile CVS:
----------------------------------------------------------------------
This commit is contained in:
benoit 2018-12-19 07:30:24 +00:00
parent 57fcd0ad81
commit 62a6f033c4
3 changed files with 14 additions and 17 deletions

View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.59 2018/10/17 14:43:35 benoit Exp $
# $OpenBSD: Makefile,v 1.60 2018/12/19 07:30:24 benoit Exp $
COMMENT = convert source code to markup formats
DISTNAME = highlight-3.47
DISTNAME = highlight-3.48
CATEGORIES = textproc converters
HOMEPAGE = http://www.andre-simon.de/
@ -21,7 +21,7 @@ USE_GMAKE = Yes
MODULES = lang/lua
MODLUA_SA = Yes
MODLUA_VERSION = 5.2
MODLUA_VERSION = 5.3
BUILD_DEPENDS = devel/boost
LIB_DEPENDS = ${MODLUA_LIB_DEPENDS}

View File

@ -1,2 +1,2 @@
SHA256 (highlight-3.47.tar.bz2) = zsRA1KXlbTcQCcRbrrGcqpBAyXtSkWt6Kd3SUg5yLXY=
SIZE (highlight-3.47.tar.bz2) = 1360358
SHA256 (highlight-3.48.tar.bz2) = /cXSDk1PPzxosEt7l5WVpF4AXnxrs79FwhUxBlGPoAg=
SIZE (highlight-3.48.tar.bz2) = 1360467

View File

@ -1,7 +1,6 @@
$OpenBSD: patch-src_makefile,v 1.20 2018/05/04 20:00:34 benoit Exp $
Index: src/makefile
--- src/makefile.orig
+++ src/makefile
$OpenBSD: patch-src_makefile,v 1.21 2018/12/19 07:30:24 benoit Exp $
--- src/makefile.orig Fri Dec 14 11:49:21 2018
+++ src/makefile Mon Dec 17 11:43:13 2018
@@ -13,13 +13,13 @@
# See src/gui-qt/highlight.pro for the Qt GUI compilation options
@ -18,20 +17,18 @@ Index: src/makefile
#CFLAGS:=-ggdb ${CFLAGS} -std=c++11
CFLAGS_DILU=-fno-strict-aliasing
@@ -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
@@ -42,8 +42,8 @@
LUA_PKG_NAME=lua
endif
-LUA_CFLAGS=$(shell pkg-config --cflags lua)
-LUA_CFLAGS=$(shell pkg-config --cflags ${LUA_PKG_NAME})
-LUA_LIBS=$(shell pkg-config --libs ${LUA_PKG_NAME})
+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)
@@ -53,13 +53,13 @@ REGEX_DIR=${CORE_DIR}re/
@@ -54,13 +54,13 @@
DILU_DIR=${CORE_DIR}Diluculum/
ifndef HL_CONFIG_DIR