svn commit: r510765 - in branches/2019Q3/sysutils/conky: . files

[Guido Falsi]

Author: madpilot
Date: Mon Sep  2 07:10:32 2019
New Revision: 510765
URL: https://svnweb.freebsd.org/changeset/ports/510765

Log:
  MFH: r510734
  
  Fix document generation.
  
  PR:		240244
  Submitted by:	James Stark <james.e.stark at gmail.com>
  
  Approved by:	ports-secteam (joneum)

Modified:
  branches/2019Q3/sysutils/conky/Makefile
  branches/2019Q3/sysutils/conky/files/patch-doc_docgen.sh
Directory Properties:
  branches/2019Q3/   (props changed)

Modified: branches/2019Q3/sysutils/conky/Makefile
==============================================================================
--- branches/2019Q3/sysutils/conky/Makefile	Mon Sep  2 07:08:55 2019	(r510764)
+++ branches/2019Q3/sysutils/conky/Makefile	Mon Sep  2 07:10:32 2019	(r510765)
@@ -4,6 +4,7 @@
 PORTNAME=	conky
 PORTVERSION=	1.11.4
 DISTVERSIONPREFIX=	v
+PORTREVISION=	1
 CATEGORIES=	sysutils
 
 MAINTAINER=	madpilot at FreeBSD.org
@@ -17,7 +18,7 @@ BUILD_DEPENDS=	db2x_xsltproc:textproc/docbook2X \
 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 \

Modified: branches/2019Q3/sysutils/conky/files/patch-doc_docgen.sh
==============================================================================
--- branches/2019Q3/sysutils/conky/files/patch-doc_docgen.sh	Mon Sep  2 07:08:55 2019	(r510764)
+++ branches/2019Q3/sysutils/conky/files/patch-doc_docgen.sh	Mon Sep  2 07:10:32 2019	(r510765)
@@ -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 && \