From nobody Fri Oct 14 20:26:40 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4MpybP0js4z4fF1m; Fri, 14 Oct 2022 20:26:41 +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 4MpybN6z8hz3Y0m; Fri, 14 Oct 2022 20:26:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1665779201; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=l8s8MoMC8S62x9R5D0oh4A+ESD7H0pg1R3DdjP3Om08=; b=SkxMCCq6bMZhMUWDlRo9oCuwvqn08VJWCQ8DCKyVGghf9AxKeme77BmRLQ3X3348EemnJJ 1KtnTpg2Cr6MHP/jnryydaaar/gsYor4ARugl2Q7ZmS7rAg1Lb0TIAUki1lkiL7ddlChEA vgOpDP+6YXMt3dY7FZkm2vqKQAVIyrdoW+dkmXIdKKMZo7ZgNZo/blTHyJuwteNgRa0+Ur iYjxttE0C1ZIu8WEAQo8Y+mXB0d/uLJAui06cOQtR8MzVkmqhmTiuplal/CmgT8ZtZBOg8 +3iPdvs/1sHtlycb9Dt/JGC0hVEEnzXcxMbreUtR97iRW3ngy8kMem9kVWQ9rg== 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 4MpybN5snFztH1; Fri, 14 Oct 2022 20:26:40 +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 29EKQecg063514; Fri, 14 Oct 2022 20:26:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 29EKQewL063513; Fri, 14 Oct 2022 20:26:40 GMT (envelope-from git) Date: Fri, 14 Oct 2022 20:26:40 GMT Message-Id: <202210142026.29EKQewL063513@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Guido Falsi Subject: git: e880a19f95c7 - main - sysutils/conky: Add MANPAGES option (on by default) List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: madpilot X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e880a19f95c7aee0a0eedf26006208f52eb8ada3 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1665779201; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=l8s8MoMC8S62x9R5D0oh4A+ESD7H0pg1R3DdjP3Om08=; b=nuH5k91Koja6ljhoFlTO0YONJ1QNHZVljDLsFTYLCkZazkSCi/NUu+DQJFA8YqEUzsgfjk b9m/05Pwh/pnCm1xBKZcx4TpIXSAwfeT91U3WSwljYphB6ydR5CVkzY6gKDbuQ8Gw+gF4T UxX6gpff57Q9BBl6hVpro8+mliK8zX3vGVvow4QN6YAfOarTqzT+z2byUfN3Hk6Z3bV7Os sQXz3NjxC6F4Xt5bNL4i30NCuiJhI4SoO1nzyxFOdu8l9FQZtfnIHeLF0tpLUmD1ljZxGn 7BDa3PUN7i6+dDIAOqy2+nfQbvjKtD2A7AoInW+1BEvUZeTiguvkUBjWnwpboQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1665779201; a=rsa-sha256; cv=none; b=Z7S3JqFhYK78XQ2zUCeaXPUZRMNolRgL7+VBJvitL7+GTc0ENRtqg9JsCC/sk+oao2b6HZ uxxhDElu/TwLlYkpoXSyEYbqaPsMtdFB5MgwTL8RHLpGMZUYDP2un/FfrLtU3AWy5QpTfp g6+dpp8GteMkbPocirU6cx6CxkaGLFberLVSHEu0Pk4LMd7EsgfXMQ38CZCmihONHRjfT7 G3YYesHYndlqBeeTn6MjjiqskzhiLl/MouJ024cQtF6bNU/oFgK5ZhRilXf3Ex3oBYWmAx DMmeaDWNx3oJXSaGs9EjdYMzReXav/z8IUxowNiXuZvPsWZerqqjdZbt+ahMbg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by madpilot: URL: https://cgit.FreeBSD.org/ports/commit/?id=e880a19f95c7aee0a0eedf26006208f52eb8ada3 commit e880a19f95c7aee0a0eedf26006208f52eb8ada3 Author: Guido Falsi AuthorDate: 2022-10-14 20:25:20 +0000 Commit: Guido Falsi CommitDate: 2022-10-14 20:26:35 +0000 sysutils/conky: Add MANPAGES option (on by default) Since 1.14.0 conky uses python and pandoc to generate its man page. These make building the whole bunch quite expensive, so add a MANPAGE option to allow disabling building the man page and wrap in it the heavy dependencies. While here: - Remove some old unneeded reinplace expressions - Fix one reinplace expression which was not doing what it was meant to Suggested by: dmgk --- sysutils/conky/Makefile | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/sysutils/conky/Makefile b/sysutils/conky/Makefile index 74c9a4df4102..051ed6e1f437 100644 --- a/sysutils/conky/Makefile +++ b/sysutils/conky/Makefile @@ -8,37 +8,33 @@ COMMENT?= Advanced, highly configurable system monitor for X11 WWW= https://github.com/brndnmtthws/conky LIB_DEPENDS= libinotify.so:devel/libinotify -BUILD_DEPENDS= gsed:textproc/gsed \ - pandoc:textproc/hs-pandoc \ - ${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}Jinja2>=0:devel/py-Jinja2@${PY_FLAVOR} +BUILD_DEPENDS= gsed:textproc/gsed USES= cpe cmake:noninja compiler:c++11-lib gettext-runtime iconv \ - localbase lua:52-53 pkgconfig python:3.7+,build tar:bzip2 + localbase lua:52-53 pkgconfig tar:bzip2 CMAKE_ARGS= -DBUILD_PORT_MONITORS:BOOL=false \ -DBUILD_IBM:BOOL=false \ -DBUILD_HDDTEMP:BOOL=false \ -DBUILD_IOSTATS:BOOL=false \ -DBUILD_AUDACIOUS:BOOL=false \ - -DBUILD_DOCS:BOOL=true \ -DAPP_SED=${LOCALBASE}/bin/gsed CONFLICTS?= conky-awesome SLAVEDIRS= sysutils/conky-awesome -PLIST_FILES= bin/conky man/man1/conky.1.gz +PLIST_FILES= bin/conky PORTEXAMPLES= conky.conf conky_no_x11.conf convert.lua PORTDOCS= config_settings.yaml variables.yaml lua.yaml USE_GITHUB= yes GH_ACCOUNT= brndnmtthws -OPTIONS_DEFINE= APCUPSD CURL DOCS EXAMPLES IPV6 METAR MOC MPD NCURSES RSS \ - X11 XOAP +OPTIONS_DEFINE= APCUPSD CURL DOCS EXAMPLES IPV6 MANPAGES METAR MOC MPD \ + NCURSES RSS X11 XOAP OPTIONS_GROUP?= X11 OPTIONS_GROUP_X11= ARGB DOUBLE_BUFFER IMLIB2 XFT XINERAMA LUA_CAIRO LUA_IMLIB2 LUA_RSVG -OPTIONS_DEFAULT?= X11 ARGB DOUBLE_BUFFER XFT LUA_CAIRO +OPTIONS_DEFAULT?= X11 ARGB DOUBLE_BUFFER MANPAGES XFT LUA_CAIRO APCUPSD_DESC= Monitor APCUPSD APCUPSD_CMAKE_BOOL= BUILD_APCUPSD @@ -90,6 +86,13 @@ MOC_CMAKE_BOOL= BUILD_MOC MPD_DESC= Control MPD (Music Player Daemon) MPD_CMAKE_BOOL= BUILD_MPD +MANPAGES_BUILD_DEPENDS= pandoc:textproc/hs-pandoc \ + ${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Jinja2>=0:devel/py-Jinja2@${PY_FLAVOR} +MANPAGES_USES= python:3.7+,build +MANPAGES_CMAKE_BOOL= BUILD_DOCS +MANPAGES_PLIST_FILES= man/man1/conky.1.gz + NCURSES_DESC= Use ncurses to draw on terminals NCURSES_CMAKE_BOOL= BUILD_NCURSES NCURSES_USES= ncurses:port @@ -132,11 +135,9 @@ EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-src_CMakeLists.txt .endif post-patch: - @${REINPLACE_CMD} -e 's/^#\(set(RELEASE true\)/\1/' \ - -e 's/-D_POSIX_C_SOURCE=200809L/& -D__BSD_VISIBLE=1 -D_XOPEN_SOURCE=700/' \ + @${REINPLACE_CMD} -e 's/^# \(set(RELEASE true\)/\1/' \ ${WRKSRC}/cmake/Conky.cmake @${REINPLACE_CMD} -e 's,^set(INCLUDE_SEARCH_PATH \(.*\)),set(INCLUDE_SEARCH_PATH \1 ${LUA_INCDIR}),' \ - -e 's/ -lbsd/ -lintl -linotify/' \ ${WRKSRC}/cmake/ConkyPlatformChecks.cmake .if ${LUA_DEFAULT} == 5.2 # Force using lua 5.2