Date: Fri, 14 Oct 2022 20:26:40 GMT From: Guido Falsi <madpilot@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: e880a19f95c7 - main - sysutils/conky: Add MANPAGES option (on by default) Message-ID: <202210142026.29EKQewL063513@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by madpilot: URL: https://cgit.FreeBSD.org/ports/commit/?id=e880a19f95c7aee0a0eedf26006208f52eb8ada3 commit e880a19f95c7aee0a0eedf26006208f52eb8ada3 Author: Guido Falsi <madpilot@FreeBSD.org> AuthorDate: 2022-10-14 20:25:20 +0000 Commit: Guido Falsi <madpilot@FreeBSD.org> 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202210142026.29EKQewL063513>