CVS commit: pkgsrc/textproc/py-docutils

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

Module Name:    pkgsrc
Committed By:   adam
Date:           Tue May  9 10:14:27 UTC 2023

Modified Files:
        pkgsrc/textproc/py-docutils: ALTERNATIVES Makefile PLIST

Log Message:
py-docutils: avoid self-conflict


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 pkgsrc/textproc/py-docutils/ALTERNATIVES
cvs rdiff -u -r1.59 -r1.60 pkgsrc/textproc/py-docutils/Makefile
cvs rdiff -u -r1.28 -r1.29 pkgsrc/textproc/py-docutils/PLIST

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

Modified files:

Index: pkgsrc/textproc/py-docutils/ALTERNATIVES
diff -u pkgsrc/textproc/py-docutils/ALTERNATIVES:1.3 pkgsrc/textproc/py-docutils/ALTERNATIVES:1.4
--- pkgsrc/textproc/py-docutils/ALTERNATIVES:1.3        Tue Aug 13 12:35:12 2019
+++ pkgsrc/textproc/py-docutils/ALTERNATIVES    Tue May  9 10:14:27 2023
@@ -1,3 +1,4 @@
+bin/docutils @PREFIX@/bin/docutils-@PYVERSSUFFIX@
 bin/rst2html.py @PREFIX@/bin/rst2html-@PYVERSSUFFIX@
 bin/rst2latex.py @PREFIX@/bin/rst2latex-@PYVERSSUFFIX@
 bin/rst2man.py @PREFIX@/bin/rst2man-@PYVERSSUFFIX@

Index: pkgsrc/textproc/py-docutils/Makefile
diff -u pkgsrc/textproc/py-docutils/Makefile:1.59 pkgsrc/textproc/py-docutils/Makefile:1.60
--- pkgsrc/textproc/py-docutils/Makefile:1.59   Wed May  3 19:07:52 2023
+++ pkgsrc/textproc/py-docutils/Makefile        Tue May  9 10:14:27 2023
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.59 2023/05/03 19:07:52 wiz Exp $
+# $NetBSD: Makefile,v 1.60 2023/05/09 10:14:27 adam Exp $
 
 DISTNAME=      docutils-0.19
+PKGREVISION=   1
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=    textproc python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=d/docutils/}
@@ -14,10 +15,10 @@ DEPENDS+=   ${PYPKGPREFIX}-expat>=0:../../
 DEPENDS+=      ${PYPKGPREFIX}-roman>=1.4:../../math/py-roman
 DEPENDS+=      ${PYPKGPREFIX}-pygments>=0:../../textproc/py-pygments
 
-PYTHON_VERSIONS_INCOMPATIBLE=  27
-
 USE_LANGUAGES= # none
 
+PYTHON_VERSIONS_INCOMPATIBLE=  27
+
 REPLACE_PYTHON+=       docutils/utils/code_analyzer.py
 REPLACE_PYTHON+=       docutils/utils/error_reporting.py
 REPLACE_PYTHON+=       docutils/utils/math/latex2mathml.py
@@ -27,6 +28,8 @@ REPLACE_PYTHON+=      docutils/utils/smartquo
 REPLACE_PYTHON+=       docutils/writers/xetex/__init__.py
 
 post-install:
+       cd ${DESTDIR}${PREFIX}/bin && \
+       ${MV} docutils docutils-${PYVERSSUFFIX} || ${TRUE}
 .for bin in rst2html rst2html4 rst2html5 rst2latex rst2man rst2odt \
        rst2odt_prepstyles rst2pseudoxml rst2s5 rst2xetex rst2xml rstpep2html
        cd ${DESTDIR}${PREFIX}/bin && \

Index: pkgsrc/textproc/py-docutils/PLIST
diff -u pkgsrc/textproc/py-docutils/PLIST:1.28 pkgsrc/textproc/py-docutils/PLIST:1.29
--- pkgsrc/textproc/py-docutils/PLIST:1.28      Wed May  3 19:07:52 2023
+++ pkgsrc/textproc/py-docutils/PLIST   Tue May  9 10:14:27 2023
@@ -1,5 +1,5 @@
-@comment $NetBSD: PLIST,v 1.28 2023/05/03 19:07:52 wiz Exp $
-bin/docutils
+@comment $NetBSD: PLIST,v 1.29 2023/05/09 10:14:27 adam Exp $
+bin/docutils-${PYVERSSUFFIX}
 bin/rst2html-${PYVERSSUFFIX}
 bin/rst2html4-${PYVERSSUFFIX}
 bin/rst2html5-${PYVERSSUFFIX}