Update to highlight-3.31.

This commit is contained in:
benoit 2016-08-03 07:33:31 +00:00
parent 6c08dd1836
commit 38032c62f5
4 changed files with 26 additions and 18 deletions

View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.36 2016/03/07 09:06:18 benoit Exp $ # $OpenBSD: Makefile,v 1.37 2016/08/03 07:33:31 benoit Exp $
COMMENT = convert source code to markup formats COMMENT = convert source code to markup formats
DISTNAME = highlight-3.28 DISTNAME = highlight-3.31
CATEGORIES = textproc converters CATEGORIES = textproc converters
HOMEPAGE = http://www.andre-simon.de/ HOMEPAGE = http://www.andre-simon.de/
@ -26,10 +26,15 @@ MODLUA_VERSION = 5.2
BUILD_DEPENDS = devel/boost BUILD_DEPENDS = devel/boost
LIB_DEPENDS = ${MODLUA_LIB_DEPENDS} LIB_DEPENDS = ${MODLUA_LIB_DEPENDS}
# c++11
MODULES += gcc4
MODGCC4_ARCHS = *
MODGCC4_LANGS = c++
MAKE_FILE = makefile MAKE_FILE = makefile
MAKE_FLAGS = CXX=${CXX} \ MAKE_FLAGS = CXX=${CXX} \
LDFLAGS="-L${LOCALBASE}/lib" \ LDFLAGS="-L${LOCALBASE}/lib" \
CFLAGS+="`pkg-config --cflags ${MODLUA_DEP}`" \ CFLAGS+="`pkg-config --cflags ${MODLUA_DEP}` -std=c++11 " \
LUA_LIBS="`pkg-config --libs ${MODLUA_DEP}`" LUA_LIBS="`pkg-config --libs ${MODLUA_DEP}`"
NO_TEST = Yes NO_TEST = Yes

View File

@ -1,2 +1,2 @@
SHA256 (highlight-3.28.tar.bz2) = NjZLbZBhSNrARCagyJL+I0Pl4sdSMWZmWJ+N/3Qc580= SHA256 (highlight-3.31.tar.bz2) = jchS3HERLEZluaJ5o30mNtbpzAnqWBpMSVXIvIVrwjk=
SIZE (highlight-3.28.tar.bz2) = 622161 SIZE (highlight-3.31.tar.bz2) = 629989

View File

@ -1,22 +1,23 @@
$OpenBSD: patch-src_makefile,v 1.14 2015/12/23 10:56:48 benoit Exp $ $OpenBSD: patch-src_makefile,v 1.15 2016/08/03 07:33:31 benoit Exp $
--- src/makefile.orig Mon Dec 21 19:31:57 2015 --- src/makefile.orig Mon Aug 1 10:10:51 2016
+++ src/makefile Wed Dec 23 11:24:06 2015 +++ src/makefile Wed Aug 3 08:47:22 2016
@@ -12,12 +12,12 @@ @@ -12,13 +12,13 @@
# See src/gui-qt/highlight.pro for the Qt GUI compilation options # See src/gui-qt/highlight.pro for the Qt GUI compilation options
-CXX=c++ -CXX=g++
+#CXX=c++ +#CXX=g++
# Added -qt4 because of Arch Linux Qt5 migration # was: qmake-qt5
QMAKE=qmake-qt5 QMAKE=qmake
-CFLAGS:=-Wall -O2 ${CFLAGS} -DNDEBUG # Added -std=c++11 because of auto_ptr to unique_ptr transition
+#CFLAGS:=-Wall -O2 ${CFLAGS} -DNDEBUG -CFLAGS:=-Wall -O2 ${CFLAGS} -DNDEBUG -std=c++11
+#CFLAGS:=-Wall -O2 ${CFLAGS} -DNDEBUG -std=c++11
#CFLAGS:=-ggdb ${CFLAGS} #CFLAGS:=-ggdb ${CFLAGS}
CFLAGS_DILU=-fno-strict-aliasing CFLAGS_DILU=-fno-strict-aliasing
@@ -37,10 +37,10 @@ @@ -38,10 +38,10 @@
# If Lua 5.2 is not default on your system yet you have to # If Lua 5.2 is not default on your system yet you have to
# use lua5.1 in the pkg-config calls # use lua5.1 in the pkg-config calls
@ -29,7 +30,7 @@ $OpenBSD: patch-src_makefile,v 1.14 2015/12/23 10:56:48 benoit Exp $
# luajit lib # luajit lib
# LUA_LIBS=$(shell pkg-config --libs luajit) # LUA_LIBS=$(shell pkg-config --libs luajit)
@@ -51,13 +51,13 @@ @@ -52,13 +52,13 @@
DILU_DIR=${CORE_DIR}Diluculum/ DILU_DIR=${CORE_DIR}Diluculum/
ifndef HL_CONFIG_DIR ifndef HL_CONFIG_DIR

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.21 2016/03/07 09:06:18 benoit Exp $ @comment $OpenBSD: PLIST,v 1.22 2016/08/03 07:33:31 benoit Exp $
@bin bin/highlight @bin bin/highlight
@man man/man1/highlight.1 @man man/man1/highlight.1
share/doc/highlight/ share/doc/highlight/
@ -45,6 +45,7 @@ share/highlight/langDefs/c.lang
share/highlight/langDefs/ceylon.lang share/highlight/langDefs/ceylon.lang
share/highlight/langDefs/charmm.lang share/highlight/langDefs/charmm.lang
share/highlight/langDefs/chill.lang share/highlight/langDefs/chill.lang
share/highlight/langDefs/chpl.lang
share/highlight/langDefs/clean.lang share/highlight/langDefs/clean.lang
share/highlight/langDefs/clearbasic.lang share/highlight/langDefs/clearbasic.lang
share/highlight/langDefs/clipper.lang share/highlight/langDefs/clipper.lang
@ -207,6 +208,7 @@ share/highlight/langDefs/vhd.lang
share/highlight/langDefs/xml.lang share/highlight/langDefs/xml.lang
share/highlight/langDefs/xpp.lang share/highlight/langDefs/xpp.lang
share/highlight/langDefs/yaiff.lang share/highlight/langDefs/yaiff.lang
share/highlight/langDefs/yaml.lang
share/highlight/langDefs/yang.lang share/highlight/langDefs/yang.lang
share/highlight/langDefs/znn.lang share/highlight/langDefs/znn.lang
share/highlight/themes/ share/highlight/themes/