Index: branches/2019Q3/sysutils/conky/Makefile =================================================================== --- branches/2019Q3/sysutils/conky/Makefile (revision 510764) +++ branches/2019Q3/sysutils/conky/Makefile (revision 510765) @@ -1,145 +1,146 @@ # Created by: Roman Bogorodskiy # $FreeBSD$ PORTNAME= conky PORTVERSION= 1.11.4 DISTVERSIONPREFIX= v +PORTREVISION= 1 CATEGORIES= sysutils MAINTAINER= madpilot@FreeBSD.org COMMENT?= Advanced, highly configurable system monitor for X11 LIB_DEPENDS= libinotify.so:devel/libinotify BUILD_DEPENDS= db2x_xsltproc:textproc/docbook2X \ docbook-xsl>=0:textproc/docbook-xsl \ xsltproc:textproc/libxslt USES= cpe cmake:noninja compiler:c++11-lib gettext-runtime iconv \ localbase lua:52 pkgconfig tar:bzip2 -CMAKE_ARGS+= -DBUILD_PORT_MONITORS:BOOL=false \ +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 CONFLICTS?= conky-awesome-[0-9]* SLAVEDIRS= sysutils/conky-awesome PLIST_FILES= bin/conky man/man1/conky.1.gz PORTEXAMPLES= conky.conf conky_no_x11.conf convert.lua PORTDOCS= html/config_settings.html html/docs.html html/lua.html html/variables.html USE_GITHUB= yes GH_ACCOUNT= brndnmtthws OPTIONS_DEFINE= APCUPSD CURL DOCS EXAMPLES IPV6 METAR MOC MPD NCURSES RSS \ X11 XMMS2 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 APCUPSD_DESC= Monitor APCUPSD APCUPSD_CMAKE_BOOL= BUILD_APCUPSD ARGB_DESC= Use an ARGB visual to draw on X11 ARGB_CMAKE_BOOL= BUILD_ARGB ARGB_IMPLIES= X11 CURL_CMAKE_BOOL= BUILD_CURL CURL_LIB_DEPENDS= libcurl.so:ftp/curl DOUBLE_BUFFER_DESC= X11 double buffering DOUBLE_BUFFER_CMAKE_BOOL=BUILD_XDBE DOUBLE_BUFFER_IMPLIES= X11 IMLIB2_CMAKE_BOOL= BUILD_IMLIB2 IMLIB2_LIB_DEPENDS= libImlib2.so:graphics/imlib2 IMLIB2_IMPLIES= X11 IPV6_CMAKE_BOOL= BUILD_IPV6 LUA_CAIRO_DESC= Lua-Cairo binding LUA_CAIRO_CMAKE_BOOL= BUILD_LUA_CAIRO LUA_CAIRO_USE= gnome=cairo LUA_CAIRO_PLIST_FILES= lib/conky/libcairo.so LUA_CAIRO_IMPLIES= X11 LUA_IMLIB2_DESC= Lua-Imlib2 binding LUA_IMLIB2_CMAKE_BOOL= BUILD_LUA_IMLIB2 LUA_IMLIB2_PLIST_FILES= lib/conky/libimlib2.so LUA_IMLIB2_IMPLIES= IMLIB2 X11 LUA_RSVG_DESC= Lua-rsvg binding LUA_RSVG_CMAKE_BOOL= BUILD_LUA_RSVG LUA_RSVG_USE= gnome=librsvg2 LUA_RSVG_PLIST_FILES= lib/conky/librsvg.so LUA_RSVG_IMPLIES= X11 METAR_DESC= Display METAR weather reports METAR_CMAKE_BOOL= BUILD_WEATHER_METAR METAR_IMPLIES= CURL MOC_DESC= Control MOC (Music On Console) MOC_CMAKE_BOOL= BUILD_MOC MPD_DESC= Control MPD (Music Player Daemon) MPD_CMAKE_BOOL= BUILD_MPD NCURSES_DESC= Use ncurses to draw on terminals NCURSES_CMAKE_BOOL= BUILD_NCURSES NCURSES_USES= ncurses:port RSS_DESC= Display RSS feeds RSS_CMAKE_BOOL= BUILD_RSS RSS_USE= gnome=glib20,libxml2 RSS_IMPLIES= CURL X11_USE= xorg=x11,xext,xdamage,xfixes X11_CMAKE_BOOL= BUILD_X11 OWN_WINDOW X11_VARS= EXAMPLE_CONF_FILE=${WRKSRC}/data/conky.conf X11_VARS_OFF= EXAMPLE_CONF_FILE=${WRKSRC}/data/conky_no_x11.conf XFT_CMAKE_BOOL= BUILD_XFT XFT_USE= xorg=xft XFT_IMPLIES= X11 XINERAMA_CMAKE_BOOL= BUILD_XINERAMA XINERAMA_USE= xorg=xinerama XINERAMA_IMPLIES= X11 XMMS2_DESC= Control XMMS2 media player XMMS2_CMAKE_BOOL= BUILD_XMMS2 XMMS2_LIB_DEPENDS= libxmmsclient.so:audio/xmms2 XOAP_DESC= Display XOAP weather reports XOAP_CMAKE_BOOL= BUILD_WEATHER_XOAP XOAP_IMPLIES= CURL METAR XOAP_USE= gnome=libxml2 .include .if ${PORT_OPTIONS:MLUA_CAIRO} && ${PORT_OPTIONS:MLUA_IMLIB2} PLIST_FILES+= lib/conky/libcairo_imlib2_helper.so .endif # disable apm on non-x86 archs .if ${ARCH} != amd64 && ${ARCH} != i386 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/' \ ${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 @${REINPLACE_CMD} -e 's,LOCALBASE,${LOCALBASE},' \ ${WRKSRC}/doc/docgen.sh post-build: (cd ${WRKSRC}/doc && ${SH} docgen.sh) .include Index: branches/2019Q3/sysutils/conky/files/patch-doc_docgen.sh =================================================================== --- branches/2019Q3/sysutils/conky/files/patch-doc_docgen.sh (revision 510764) +++ branches/2019Q3/sysutils/conky/files/patch-doc_docgen.sh (revision 510765) @@ -1,16 +1,13 @@ ---- doc/docgen.sh.orig 2016-07-20 16:53:48 UTC +--- doc/docgen.sh.orig 2019-08-12 21:53:54 UTC +++ doc/docgen.sh -@@ -1,8 +1,11 @@ +@@ -1,6 +1,9 @@ #!/bin/sh -xsltproc http://docbook.sourceforge.net/release/xsl/current/html/docbook.xsl docs.xml > docs.html && \ -+xsltproc LOCALBASE/share/xsl/docbook/manpages/docbook.xsl docs.xml > docs.html && \ -+xsltproc LOCALBASE/share/xsl/docbook/manpages/docbook.xsl variables.xml > variables.html && \ -+xsltproc LOCALBASE/share/xsl/docbook/manpages/docbook.xsl config_settings.xml > config_settings.html && \ -+xsltproc LOCALBASE/share/xsl/docbook/manpages/docbook.xsl lua.xml > lua.html && \ ++xsltproc LOCALBASE/share/xsl/docbook/html/docbook.xsl docs.xml > docs.html && \ ++xsltproc LOCALBASE/share/xsl/docbook/html/docbook.xsl variables.xml > variables.html && \ ++xsltproc LOCALBASE/share/xsl/docbook/html/docbook.xsl config_settings.xml > config_settings.html && \ ++xsltproc LOCALBASE/share/xsl/docbook/html/docbook.xsl lua.xml > lua.html && \ db2x_xsltproc -s man docs.xml -o docs.mxml && \ --db2x_manxml docs.mxml && \ -+db2x_manxml docs.mxml + db2x_manxml docs.mxml && \ { echo ".TH CONKY 1 \"August 2005\" \"conky compiled August 2005\" \"User Commands\""; sed 1d < conky.1; } > conky.2 && \ - mv conky.2 conky.1 && \ - man ./conky.1 | col -b > README && \ Index: branches/2019Q3 =================================================================== --- branches/2019Q3 (revision 510764) +++ branches/2019Q3 (revision 510765) Property changes on: branches/2019Q3 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head:r510734