From owner-dev-commits-ports-main@freebsd.org Thu Apr 8 09:56:28 2021 Return-Path: Delivered-To: dev-commits-ports-main@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id B91525D7084; Thu, 8 Apr 2021 09:56:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FGGqw4wNkz4gcp; Thu, 8 Apr 2021 09:56:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 9BBE72A7; Thu, 8 Apr 2021 09:56:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1389uSdr085347; Thu, 8 Apr 2021 09:56:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1389uSCU085346; Thu, 8 Apr 2021 09:56:28 GMT (envelope-from git) Date: Thu, 8 Apr 2021 09:56:28 GMT Message-Id: <202104080956.1389uSCU085346@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Alexey Dokuchaev Subject: git: 5d88e7c9a900 - main - - Allow to build `textproc/highlight' with optional GUI - Depend the particular Boost header file while I'm here MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: danfe X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5d88e7c9a90067a3a73c30314e125883d5a1d3c1 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the main branch of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 08 Apr 2021 09:56:28 -0000 The branch main has been updated by danfe: URL: https://cgit.FreeBSD.org/ports/commit/?id=5d88e7c9a90067a3a73c30314e125883d5a1d3c1 commit 5d88e7c9a90067a3a73c30314e125883d5a1d3c1 Author: Alexey Dokuchaev AuthorDate: 2021-04-08 09:55:01 +0000 Commit: Alexey Dokuchaev CommitDate: 2021-04-08 09:55:32 +0000 - Allow to build `textproc/highlight' with optional GUI - Depend the particular Boost header file while I'm here --- textproc/highlight/Makefile | 17 +++++++++++++++-- textproc/highlight/pkg-plist | 11 +++++++++++ 2 files changed, 26 insertions(+), 2 deletions(-) diff --git a/textproc/highlight/Makefile b/textproc/highlight/Makefile index 2734e5f60d66..2b1f9a9c39c3 100644 --- a/textproc/highlight/Makefile +++ b/textproc/highlight/Makefile @@ -12,7 +12,7 @@ COMMENT= Customizable syntax highlighter LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/COPYING -BUILD_DEPENDS= boost-libs>0:devel/boost-libs +BUILD_DEPENDS= ${LOCALBASE}/include/boost/scoped_array.hpp:devel/boost-libs USES= compiler:c++11-lib gmake lua pkgconfig tar:bzip2 USE_CXXSTD= c++11 @@ -20,10 +20,23 @@ MAKEFILE= makefile MAKE_ARGS= CXX="${CXX}" \ CFLAGS="${CXXFLAGS} ${CPPFLAGS} -DHAVE_DECL_GETOPT" \ LDFLAGS="${LDFLAGS}" +ALL_TARGET= all # cli +INSTALL_TARGET= install PORTDOCS= * -OPTIONS_DEFINE= DOCS +OPTIONS_DEFINE= DOCS GUI +OPTIONS_SUB= yes + +GUI_USES= qt:5 +GUI_USE= QT=buildtools_build,qmake_build,core,gui,widgets +GUI_ALL_TARGET= gui +GUI_INSTALL_TARGET= install-gui + +post-patch: + @${REINPLACE_CMD} -e '/PKGCONFIG/s,lua,&-${LUA_VER}, ; \ + /LIBS/s,-llua,&-${LUA_VER},' \ + ${WRKSRC}/src/gui-qt/highlight.pro post-install: .for cfg in filetypes lsp diff --git a/textproc/highlight/pkg-plist b/textproc/highlight/pkg-plist index d38c739fcb7e..da8fc244b505 100644 --- a/textproc/highlight/pkg-plist +++ b/textproc/highlight/pkg-plist @@ -1,8 +1,19 @@ bin/highlight +%%GUI%%bin/highlight-gui @sample %%ETCDIR%%/filetypes.conf.sample @sample %%ETCDIR%%/lsp.conf.sample man/man1/highlight.1.gz man/man5/filetypes.conf.5.gz +%%GUI%%share/applications/highlight.desktop +%%GUI%%share/icons/hicolor/256x256/apps/highlight.png +%%GUI%%%%DATADIR%%/gui_files/ext/fileopenfilter.conf +%%GUI%%%%DATADIR%%/gui_files/l10n/highlight_bg_BG.qm +%%GUI%%%%DATADIR%%/gui_files/l10n/highlight_cs_CZ.qm +%%GUI%%%%DATADIR%%/gui_files/l10n/highlight_de_DE.qm +%%GUI%%%%DATADIR%%/gui_files/l10n/highlight_es_ES.qm +%%GUI%%%%DATADIR%%/gui_files/l10n/highlight_fr_FR.qm +%%GUI%%%%DATADIR%%/gui_files/l10n/highlight_it_IT.qm +%%GUI%%%%DATADIR%%/gui_files/l10n/highlight_zh_CN.qm %%DATADIR%%/langDefs/abap.lang %%DATADIR%%/langDefs/abc.lang %%DATADIR%%/langDefs/abnf.lang