Received: by mail.netbsd.org (Postfix, from userid 605) id ECF9A84DBE; Mon, 9 Apr 2018 20:17:48 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id E49B584DBD for ; Mon, 9 Apr 2018 20:17:47 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id AhQ8nBU3KC_n for ; Mon, 9 Apr 2018 20:17:47 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id DBBDE84DA0 for ; Mon, 9 Apr 2018 20:17:46 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id D90CEFBEC; Mon, 9 Apr 2018 20:17:46 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1523305066108740" MIME-Version: 1.0 Date: Mon, 9 Apr 2018 20:17:46 +0000 From: "Amitai Schleier" Subject: CVS commit: pkgsrc/textproc/highlight To: pkgsrc-changes@NetBSD.org Reply-To: schmonz@netbsd.org X-Mailer: log_accum Message-Id: <20180409201746.D90CEFBEC@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1523305066108740 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: schmonz Date: Mon Apr 9 20:17:46 UTC 2018 Modified Files: pkgsrc/textproc/highlight: Makefile PLIST distinfo pkgsrc/textproc/highlight/patches: patch-src_makefile Added Files: pkgsrc/textproc/highlight: options.mk Log Message: Add 'x11' option. Bump PKGREVISION. To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 pkgsrc/textproc/highlight/Makefile cvs rdiff -u -r1.6 -r1.7 pkgsrc/textproc/highlight/PLIST cvs rdiff -u -r1.11 -r1.12 pkgsrc/textproc/highlight/distinfo cvs rdiff -u -r0 -r1.1 pkgsrc/textproc/highlight/options.mk cvs rdiff -u -r1.2 -r1.3 pkgsrc/textproc/highlight/patches/patch-src_makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1523305066108740 Content-Disposition: inline Content-Length: 4805 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/textproc/highlight/Makefile diff -u pkgsrc/textproc/highlight/Makefile:1.10 pkgsrc/textproc/highlight/Makefile:1.11 --- pkgsrc/textproc/highlight/Makefile:1.10 Sun Apr 8 19:40:29 2018 +++ pkgsrc/textproc/highlight/Makefile Mon Apr 9 20:17:46 2018 @@ -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" Index: pkgsrc/textproc/highlight/PLIST diff -u pkgsrc/textproc/highlight/PLIST:1.6 pkgsrc/textproc/highlight/PLIST:1.7 --- pkgsrc/textproc/highlight/PLIST:1.6 Sun Apr 8 19:40:29 2018 +++ pkgsrc/textproc/highlight/PLIST Mon Apr 9 20:17:46 2018 @@ -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 Index: pkgsrc/textproc/highlight/distinfo diff -u pkgsrc/textproc/highlight/distinfo:1.11 pkgsrc/textproc/highlight/distinfo:1.12 --- pkgsrc/textproc/highlight/distinfo:1.11 Sun Apr 8 19:40:29 2018 +++ pkgsrc/textproc/highlight/distinfo Mon Apr 9 20:17:46 2018 @@ -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 b 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 Index: pkgsrc/textproc/highlight/patches/patch-src_makefile diff -u pkgsrc/textproc/highlight/patches/patch-src_makefile:1.2 pkgsrc/textproc/highlight/patches/patch-src_makefile:1.3 --- pkgsrc/textproc/highlight/patches/patch-src_makefile:1.2 Sun Apr 8 19:40:29 2018 +++ pkgsrc/textproc/highlight/patches/patch-src_makefile Mon Apr 9 20:17:46 2018 @@ -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 Added files: Index: pkgsrc/textproc/highlight/options.mk diff -u /dev/null pkgsrc/textproc/highlight/options.mk:1.1 --- /dev/null Mon Apr 9 20:17:46 2018 +++ pkgsrc/textproc/highlight/options.mk Mon Apr 9 20:17:46 2018 @@ -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 --_----------=_1523305066108740--