diff options
| -rw-r--r-- | textproc/highlight/Makefile | 6 | ||||
| -rw-r--r-- | textproc/highlight/PLIST | 10 | ||||
| -rw-r--r-- | textproc/highlight/distinfo | 4 | ||||
| -rw-r--r-- | textproc/highlight/options.mk | 15 | ||||
| -rw-r--r-- | textproc/highlight/patches/patch-src_makefile | 12 |
5 files changed, 39 insertions, 8 deletions
diff --git a/textproc/highlight/Makefile b/textproc/highlight/Makefile index 13c79ed52ae..ed1cdf23e32 100644 --- a/textproc/highlight/Makefile +++ b/textproc/highlight/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.10 2018/04/08 19:40:29 schmonz Exp $ +# $NetBSD: Makefile,v 1.11 2018/04/09 20:17:46 schmonz Exp $ -PKGREVISION= 1 +PKGREVISION= 2 .include "../../textproc/highlight/Makefile.common" MANCOMPRESSED= yes @@ -8,6 +8,8 @@ MANCOMPRESSED= yes BUILD_TARGET= cli INSTALL_TARGET= install-cli +.include "options.mk" + .include "../../devel/libgetopt/buildlink3.mk" .include "../../textproc/libhighlight/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/textproc/highlight/PLIST b/textproc/highlight/PLIST index 6b735670409..d8c5faea8b7 100644 --- a/textproc/highlight/PLIST +++ b/textproc/highlight/PLIST @@ -1,3 +1,11 @@ -@comment $NetBSD: PLIST,v 1.6 2018/04/08 19:40:29 schmonz Exp $ +@comment $NetBSD: PLIST,v 1.7 2018/04/09 20:17:46 schmonz Exp $ bin/highlight +${PLIST.x11}bin/highlight-gui man/man1/highlight.1 +${PLIST.x11}share/applications/highlight.desktop +${PLIST.x11}share/highlight/gui_files/ext/fileopenfilter.conf +${PLIST.x11}share/highlight/gui_files/l10n/highlight_cs_CZ.qm +${PLIST.x11}share/highlight/gui_files/l10n/highlight_de_DE.qm +${PLIST.x11}share/highlight/gui_files/l10n/highlight_es_ES.qm +${PLIST.x11}share/highlight/gui_files/l10n/highlight_zh_CN.qm +${PLIST.x11}share/pixmaps/highlight.xpm diff --git a/textproc/highlight/distinfo b/textproc/highlight/distinfo index 289ded1a2c8..3cfafd07948 100644 --- a/textproc/highlight/distinfo +++ b/textproc/highlight/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.11 2018/04/08 19:40:29 schmonz Exp $ +$NetBSD: distinfo,v 1.12 2018/04/09 20:17:46 schmonz Exp $ SHA1 (highlight-3.18.tar.bz2) = 985d0a3c707e3251fe50ffff66e11a8563777202 RMD160 (highlight-3.18.tar.bz2) = 960b2a9ed6071b0f48ef45da2d006f5f00d9b578 @@ -7,4 +7,4 @@ Size (highlight-3.18.tar.bz2) = 619669 bytes SHA1 (patch-examples_swig_makefile) = 5b53c835e51ecbd6b0fb4865fa33b7702d47bdb1 SHA1 (patch-makefile) = edfe212807ceba6d10873b9d75fff9570280a447 SHA1 (patch-src_core_platform__fs.cpp) = ae4f901da24307b2b7699809ea959976fd95f16f -SHA1 (patch-src_makefile) = e1c922af02516661a167d3d5a43e194fe1e97c60 +SHA1 (patch-src_makefile) = c81216c8e00d382a7d91a6ed62e5e61be055951f diff --git a/textproc/highlight/options.mk b/textproc/highlight/options.mk new file mode 100644 index 00000000000..5dc5fa70ed4 --- /dev/null +++ b/textproc/highlight/options.mk @@ -0,0 +1,15 @@ +# $NetBSD: options.mk,v 1.1 2018/04/09 20:17:46 schmonz Exp $ + +PKG_OPTIONS_VAR= PKG_OPTIONS.highlight +PKG_SUPPORTED_OPTIONS= x11 + +.include "../../mk/bsd.options.mk" + +PLIST_VARS+= x11 +.if !empty(PKG_OPTIONS:Mx11) +.include "../../x11/qt4-libs/buildlink3.mk" +.include "../../x11/qt4-tools/buildlink3.mk" +BUILD_TARGET+= gui +INSTALL_TARGET+= install-gui +PLIST.x11= yes +.endif diff --git a/textproc/highlight/patches/patch-src_makefile b/textproc/highlight/patches/patch-src_makefile index 512991b7740..b8d85dfef2b 100644 --- a/textproc/highlight/patches/patch-src_makefile +++ b/textproc/highlight/patches/patch-src_makefile @@ -1,4 +1,4 @@ -$NetBSD: patch-src_makefile,v 1.2 2018/04/08 19:40:29 schmonz Exp $ +$NetBSD: patch-src_makefile,v 1.3 2018/04/09 20:17:46 schmonz Exp $ Use pkgsrc-specified compiler and flags. @@ -12,7 +12,8 @@ Use pkgsrc-specified compiler and flags. +#CXX=c++ # Added -qt4 because of Arch Linux Qt5 migration - QMAKE=qmake-qt4 +-QMAKE=qmake-qt4 ++#QMAKE=qmake-qt4 -CFLAGS:=-Wall -O2 ${CFLAGS} -DNDEBUG +#CFLAGS:=-Wall -O2 ${CFLAGS} -DNDEBUG @@ -45,7 +46,7 @@ Use pkgsrc-specified compiler and flags. # Data directories (data dir, configuration file dir) CXX_DIR=-DHL_DATA_DIR=\"${HL_DATA_DIR}\" -DHL_CONFIG_DIR=\"${HL_CONFIG_DIR}\" -@@ -96,14 +98,14 @@ GUI_OBJECTS:=${GUI_QT_DIR}main.cpp ${GUI +@@ -96,18 +98,18 @@ GUI_OBJECTS:=${GUI_QT_DIR}main.cpp ${GUI ${GUI_QT_DIR}showtextfile.cpp @@ -63,6 +64,11 @@ Use pkgsrc-specified compiler and flags. gui-qt: highlight-gui +-highlight-gui: libhighlight.a ${GUI_OBJECTS} ++highlight-gui: ${GUI_OBJECTS} + cd gui-qt && \ + ${QMAKE} 'DEFINES+=DATA_DIR=\\\"${HL_DATA_DIR}\\\" CONFIG_DIR=\\\"${HL_CONFIG_DIR}\\\" DOC_DIR=\\\"${HL_DOC_DIR}\\\" ' && \ + $(MAKE) @@ -116,7 +118,7 @@ $(OBJECTFILES) : makefile |