>Number:         23800
>Category:       pkg
>Synopsis:       Wrong PLIST for py23{,pth}-docutils
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    pkg-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Fri Dec 19 16:37:00 UTC 2003
>Closed-Date:
>Last-Modified:
>Originator:     Min Sik Kim
>Release:        NetBSD 1.6ZG
>Organization:
>Environment:
System: NetBSD sulley.infnis.com 1.6ZG NetBSD 1.6ZG (SULLEY) #1: Tue Dec 16 01:53:13 CST 2003 root@sulley.infnis.com:/usr/obj/sys/arch/i386/compile/SULLEY i386
Architecture: i386
Machine: i386
>Description:
py-docutils installs optparse and textwrap modules if python doesn't
have them.  Because those modules are included in python 2.3, PLIST
should exclude them for py23{,pth}-docutils.
>How-To-Repeat:
make install in textproc/py-docutils.
>Fix:

Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/textproc/py-docutils/Makefile,v
retrieving revision 1.6
diff -u -r1.6 Makefile
--- Makefile	2003/09/18 02:28:08	1.6
+++ Makefile	2003/12/19 16:26:36
@@ -15,4 +15,11 @@
 PYDISTUTILSPKG=	# defined
 
 .include "../../lang/python/extension.mk"
+
+.if !empty(PYVERSSUFFIX:M2*[12])
+PLIST_SUBST+=	PYSTDMODULE=""
+.else
+PLIST_SUBST+=	PYSTDMODULE="@comment "
+.endif
+
 .include "../../mk/bsd.pkg.mk"
Index: PLIST
===================================================================
RCS file: /cvsroot/pkgsrc/textproc/py-docutils/PLIST,v
retrieving revision 1.3
diff -u -r1.3 PLIST
--- PLIST	2003/09/18 02:41:05	1.3
+++ PLIST	2003/12/19 16:26:37
@@ -167,12 +167,12 @@
 ${PYSITELIB}/roman.py
 ${PYSITELIB}/roman.pyc
 ${PYSITELIB}/roman.pyo
-${PYSITELIB}/optparse.py
-${PYSITELIB}/optparse.pyc
-${PYSITELIB}/optparse.pyo
-${PYSITELIB}/textwrap.py
-${PYSITELIB}/textwrap.pyc
-${PYSITELIB}/textwrap.pyo
+${PYSTDMODULE}${PYSITELIB}/optparse.py
+${PYSTDMODULE}${PYSITELIB}/optparse.pyc
+${PYSTDMODULE}${PYSITELIB}/optparse.pyo
+${PYSTDMODULE}${PYSITELIB}/textwrap.py
+${PYSTDMODULE}${PYSITELIB}/textwrap.pyc
+${PYSTDMODULE}${PYSITELIB}/textwrap.pyo
 @dirrm ${PYSITELIB}/docutils/writers
 @dirrm ${PYSITELIB}/docutils/transforms
 @dirrm ${PYSITELIB}/docutils/readers/python
>Release-Note:
>Audit-Trail:
>Unformatted: