cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to highlight-3.22.

Browse Source
This commit is contained in:
benoit 2015-03-16 08:25:05 +00:00
parent f8631a8610
commit db8338899d
3 changed files with 45 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
textproc/highlight/Makefile
View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.29 2015/02/03 13:26:21 benoit Exp $
# $OpenBSD: Makefile,v 1.30 2015/03/16 08:25:05 benoit Exp $
COMMENT = convert source code to markup formats
DISTNAME = highlight-3.21
DISTNAME = highlight-3.22
CATEGORIES = textproc converters
HOMEPAGE = http://www.andre-simon.de/

4
textproc/highlight/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (highlight-3.21.tar.bz2) = Dk6ApWcJumOXsw76SSPE7D+7cA6e4H2mdJSWXxE1G/A=
SIZE (highlight-3.21.tar.bz2) = 623319
SHA256 (highlight-3.22.tar.bz2) = R3bOQwXm+S2Kn69dCu/9VvQTrVflUwPnoqY1c4fsBW8=
SIZE (highlight-3.22.tar.bz2) = 624023

82
textproc/highlight/patches/patch-src_makefile
View File

@ -1,44 +1,44 @@
$OpenBSD: patch-src_makefile,v 1.12 2015/02/03 13:26:21 benoit Exp $
--- src/makefile.orig Thu Jan 29 21:35:04 2015
+++ src/makefile Tue Feb 3 10:44:16 2015
$OpenBSD: patch-src_makefile,v 1.13 2015/03/16 08:25:05 benoit Exp $
--- src/makefile.orig Thu Feb 19 20:49:03 2015
+++ src/makefile Mon Mar 16 08:48:34 2015
@@ -12,12 +12,12 @@
# 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
-CFLAGS:=-Wall -O2 ${CFLAGS} -DNDEBUG
+#CFLAGS:=-Wall -O2 ${CFLAGS} -DNDEBUG
#CFLAGS:=-ggdb ${CFLAGS}
CFLAGS_DILU=-fno-strict-aliasing
# 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
-CFLAGS:=-Wall -O2 ${CFLAGS} -DNDEBUG
+#CFLAGS:=-Wall -O2 ${CFLAGS} -DNDEBUG
#CFLAGS:=-ggdb ${CFLAGS}
CFLAGS_DILU=-fno-strict-aliasing
@@ -37,10 +37,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)
@@ -51,10 +51,10 @@
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
ifdef PIC
CFLAGS+=-fPIC
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
ifdef PIC
CFLAGS+=-fPIC