Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 1 Sep 2019 19:23:54 +0000 (UTC)
From:      Guido Falsi <madpilot@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r510734 - in head/sysutils/conky: . files
Message-ID:  <201909011923.x81JNsIP014178@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: madpilot
Date: Sun Sep  1 19:23:53 2019
New Revision: 510734
URL: https://svnweb.freebsd.org/changeset/ports/510734

Log:
  Fix document generation.
  
  PR:		240244
  Submitted by:	James Stark <james.e.stark@gmail.com>
  MFH:		2019Q3

Modified:
  head/sysutils/conky/Makefile
  head/sysutils/conky/files/patch-doc_docgen.sh

Modified: head/sysutils/conky/Makefile
==============================================================================
--- head/sysutils/conky/Makefile	Sun Sep  1 19:22:53 2019	(r510733)
+++ head/sysutils/conky/Makefile	Sun Sep  1 19:23:53 2019	(r510734)
@@ -4,6 +4,7 @@
 PORTNAME=	conky
 PORTVERSION=	1.11.5
 DISTVERSIONPREFIX=	v
+PORTREVISION=	1
 CATEGORIES=	sysutils
 
 MAINTAINER=	madpilot@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: head/sysutils/conky/files/patch-doc_docgen.sh
==============================================================================
--- head/sysutils/conky/files/patch-doc_docgen.sh	Sun Sep  1 19:22:53 2019	(r510733)
+++ head/sysutils/conky/files/patch-doc_docgen.sh	Sun Sep  1 19:23:53 2019	(r510734)
@@ -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 && \



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201909011923.x81JNsIP014178>