CVS commit: pkgsrc/sysutils/salt-docs

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Thu Oct 25 09:09:35 UTC 2018

Modified Files:
        pkgsrc/sysutils/salt-docs: Makefile
Added Files:
        pkgsrc/sysutils/salt-docs/patches: patch-doc___ext_saltdomain.py

Log Message:
salt-docs: added patches


To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 pkgsrc/sysutils/salt-docs/Makefile
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/sysutils/salt-docs/patches/patch-doc___ext_saltdomain.py

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/sysutils/salt-docs/Makefile
diff -u pkgsrc/sysutils/salt-docs/Makefile:1.19 pkgsrc/sysutils/salt-docs/Makefile:1.20
--- pkgsrc/sysutils/salt-docs/Makefile:1.19     Thu Oct 25 09:08:37 2018
+++ pkgsrc/sysutils/salt-docs/Makefile  Thu Oct 25 09:09:35 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2018/10/25 09:08:37 adam Exp $
+# $NetBSD: Makefile,v 1.20 2018/10/25 09:09:35 adam Exp $
 
 DISTNAME=      salt-2018.3.3
 PKGNAME=       ${DISTNAME:S/-/-docs-/}
@@ -28,7 +28,7 @@ INSTALLATION_DIRS=    ${HTMLDIR}
 PYTHON_VERSIONS_ACCEPTED=      27
 
 do-install:
-       cd ${WRKSRC}/doc/_build/html && pax -rw -pe . ${DESTDIR}${PREFIX}/${HTMLDIR}
+       cd ${WRKSRC}/doc/_build/html && pax -rw -pp . ${DESTDIR}${PREFIX}/${HTMLDIR}
        cd ${DESTDIR}${PREFIX} && ${FIND} ${HTMLDIR} -type f -print >>${PLIST_SRC}
 
 .include "../../lang/python/pyversion.mk"

Added files:

Index: pkgsrc/sysutils/salt-docs/patches/patch-doc___ext_saltdomain.py
diff -u /dev/null pkgsrc/sysutils/salt-docs/patches/patch-doc___ext_saltdomain.py:1.1
--- /dev/null   Thu Oct 25 09:09:35 2018
+++ pkgsrc/sysutils/salt-docs/patches/patch-doc___ext_saltdomain.py     Thu Oct 25 09:09:35 2018
@@ -0,0 +1,15 @@
+$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_, _