Thu Oct 25 09:09:35 2018 UTC ()
salt-docs: added patches


(adam)
diff -r1.19 -r1.20 pkgsrc/sysutils/salt-docs/Makefile
diff -r0 -r1.1 pkgsrc/sysutils/salt-docs/patches/patch-doc___ext_saltdomain.py
cvs diff -r1.19 -r1.20 pkgsrc/sysutils/salt-docs/Makefile (expand / switch to unified diff)

--- pkgsrc/sysutils/salt-docs/Makefile 2018/10/25 09:08:37 1.19
+++ pkgsrc/sysutils/salt-docs/Makefile 2018/10/25 09:09:35 1.20
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.19 2018/10/25 09:08:37 adam Exp $ 1# $NetBSD: Makefile,v 1.20 2018/10/25 09:09:35 adam Exp $
2 2
3DISTNAME= salt-2018.3.3 3DISTNAME= salt-2018.3.3
4PKGNAME= ${DISTNAME:S/-/-docs-/} 4PKGNAME= ${DISTNAME:S/-/-docs-/}
5CATEGORIES= sysutils python 5CATEGORIES= sysutils python
6MASTER_SITES= ${MASTER_SITE_PYPI:=s/salt/} 6MASTER_SITES= ${MASTER_SITE_PYPI:=s/salt/}
7 7
8MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= http://saltstack.org/ 9HOMEPAGE= http://saltstack.org/
10COMMENT= Documentation for salt 10COMMENT= Documentation for salt
11LICENSE= apache-2.0 11LICENSE= apache-2.0
12 12
13USE_TOOLS+= gmake pax 13USE_TOOLS+= gmake pax
14 14
@@ -18,18 +18,18 @@ NO_CONFIGURE= yes @@ -18,18 +18,18 @@ NO_CONFIGURE= yes
18BUILD_DIRS= doc 18BUILD_DIRS= doc
19BUILD_TARGET= html 19BUILD_TARGET= html
20 20
21MAKE_FLAGS+= SPHINXBUILD=${PREFIX}/bin/sphinx-build${PYVERSSUFFIX} 21MAKE_FLAGS+= SPHINXBUILD=${PREFIX}/bin/sphinx-build${PYVERSSUFFIX}
22 22
23HTMLDIR= share/doc/salt 23HTMLDIR= share/doc/salt
24PLIST_SRC= ${WRKDIR}/.PLIST_SRC 24PLIST_SRC= ${WRKDIR}/.PLIST_SRC
25 25
26INSTALLATION_DIRS= ${HTMLDIR} 26INSTALLATION_DIRS= ${HTMLDIR}
27 27
28PYTHON_VERSIONS_ACCEPTED= 27 28PYTHON_VERSIONS_ACCEPTED= 27
29 29
30do-install: 30do-install:
31 cd ${WRKSRC}/doc/_build/html && pax -rw -pe . ${DESTDIR}${PREFIX}/${HTMLDIR} 31 cd ${WRKSRC}/doc/_build/html && pax -rw -pp . ${DESTDIR}${PREFIX}/${HTMLDIR}
32 cd ${DESTDIR}${PREFIX} && ${FIND} ${HTMLDIR} -type f -print >>${PLIST_SRC} 32 cd ${DESTDIR}${PREFIX} && ${FIND} ${HTMLDIR} -type f -print >>${PLIST_SRC}
33 33
34.include "../../lang/python/pyversion.mk" 34.include "../../lang/python/pyversion.mk"
35.include "../../mk/bsd.pkg.mk" 35.include "../../mk/bsd.pkg.mk"
File Added: pkgsrc/sysutils/salt-docs/patches/Attic/patch-doc___ext_saltdomain.py
$NetBSD: patch-doc___ext_saltdomain.py,v 1.1 2018/10/25 09:09:35 adam Exp $

Do not import Directive twice.

--- doc/_ext/saltdomain.py.orig	2018-10-25 07:52:41.000000000 +0000
+++ doc/_ext/saltdomain.py
@@ -7,7 +7,7 @@ from docutils.parsers.rst import Directi
 
 from docutils.statemachine import ViewList
 from sphinx import addnodes
-from sphinx.directives import ObjectDescription, Directive
+from sphinx.directives import ObjectDescription
 from sphinx.domains import Domain, ObjType
 from sphinx.domains.python import PyObject
 from sphinx.locale import l_, _