* change ALTERNATIVES for pydoc3.1 to pydoc3, match to original name.

* also rename idle3 with version suffix to avoid conflict with future python3.
* stop to rename smtpd.py, it will not be installed as script in python3.

Bump PKGREVISION.

5 files changed, 14 insertions, 13 deletions

diff --git a/lang/python31/ALTERNATIVES b/lang/python31/ALTERNATIVES
index 3932524b34a..20d6f307e88 100644
--- a/lang/python31/ALTERNATIVES
+++ b/lang/python31/ALTERNATIVES
@@ -1,3 +1,4 @@
 bin/2to3 @PREFIX@/bin/2to3-3.1
-bin/pydoc @PREFIX@/bin/pydoc3.1
+bin/idle3 @PREFIX@/bin/idle3.1
+bin/pydoc3 @PREFIX@/bin/pydoc3.1
 bin/python @PREFIX@/bin/python3.1
diff --git a/lang/python31/Makefile b/lang/python31/Makefile
index 7b22bdc0cc3..1d9f646620e 100644
--- a/lang/python31/Makefile
+++ b/lang/python31/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.6 2012/02/15 16:08:26 drochner Exp $
+# $NetBSD: Makefile,v 1.7 2012/03/04 08:11:51 obache Exp $
 
 .include "dist.mk"
 
 PKGNAME=	python31-${PY_DISTVERSION}
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	lang python
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
@@ -156,7 +156,7 @@ SUBST_FILES.findlib=	Lib/distutils/unixccompiler.py
 SUBST_SED.findlib=	-e 's,/usr/local,${PREFIX},'
 
 post-extract:
-	${MV} ${WRKSRC}/Lib/smtpd.py ${WRKSRC}/Lib/smtpd${PY_VER_SUFFIX}.py
+	${MV} ${WRKSRC}/Tools/scripts/idle3 ${WRKSRC}/Tools/scripts/idle${PY_VER_SUFFIX}
 	${MV} ${WRKSRC}/Tools/scripts/pydoc3 ${WRKSRC}/Tools/scripts/pydoc${PY_VER_SUFFIX}
 	${MV} ${WRKSRC}/Tools/scripts/2to3 ${WRKSRC}/Tools/scripts/2to3-${PY_VER_SUFFIX}
 
diff --git a/lang/python31/PLIST.common b/lang/python31/PLIST.common
index 31be9b09195..1cbde542e20 100644
--- a/lang/python31/PLIST.common
+++ b/lang/python31/PLIST.common
@@ -1,6 +1,6 @@
-@comment $NetBSD: PLIST.common,v 1.3 2011/09/10 11:23:12 obache Exp $
+@comment $NetBSD: PLIST.common,v 1.4 2012/03/04 08:11:51 obache Exp $
 bin/2to3-${PY_VER_SUFFIX}
-bin/idle3
+bin/idle${PY_VER_SUFFIX}
 bin/pydoc${PY_VER_SUFFIX}
 bin/python${PY_VER_SUFFIX}
 bin/python${PY_VER_SUFFIX}-config
@@ -2177,9 +2177,9 @@ lib/python${PY_VER_SUFFIX}/site-packages/README
 lib/python${PY_VER_SUFFIX}/site.py
 lib/python${PY_VER_SUFFIX}/site.pyc
 lib/python${PY_VER_SUFFIX}/site.pyo
-lib/python${PY_VER_SUFFIX}/smtpd${PY_VER_SUFFIX}.py
-lib/python${PY_VER_SUFFIX}/smtpd${PY_VER_SUFFIX}.pyc
-lib/python${PY_VER_SUFFIX}/smtpd${PY_VER_SUFFIX}.pyo
+lib/python${PY_VER_SUFFIX}/smtpd.py
+lib/python${PY_VER_SUFFIX}/smtpd.pyc
+lib/python${PY_VER_SUFFIX}/smtpd.pyo
 lib/python${PY_VER_SUFFIX}/smtplib.py
 lib/python${PY_VER_SUFFIX}/smtplib.pyc
 lib/python${PY_VER_SUFFIX}/smtplib.pyo
diff --git a/lang/python31/distinfo b/lang/python31/distinfo
index cf7430a3c70..13f9e6d91f7 100644
--- a/lang/python31/distinfo
+++ b/lang/python31/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.8 2012/02/15 16:08:26 drochner Exp $
+$NetBSD: distinfo,v 1.9 2012/03/04 08:11:51 obache Exp $
 
 SHA1 (Python-3.1.4.tar.bz2) = 043d0240247f289205deeb0e620d799005202b3c
 RMD160 (Python-3.1.4.tar.bz2) = d537706808b00989a636418b6b6a06357b6bb94b
@@ -8,7 +8,7 @@ SHA1 (patch-aa) = ae156c486007cfd14d378dd211108d3af4b841b1
 SHA1 (patch-ab) = 7d4d6aa9239f53f1ce9ecd377890d71557c58ca4
 SHA1 (patch-ah) = f93c0aab7b0d5e8e9f80433dda5ed5a22861f6b9
 SHA1 (patch-al) = 48e348c64cf54756cf5b10254661ac089bec3e0a
-SHA1 (patch-am) = 8ae86a7715ad30f30c0d600088e08341ae42d421
+SHA1 (patch-am) = 0a1744c21fdcb9d9535b9f76c05fe5576158c877
 SHA1 (patch-an) = 933acde107b735931d26ace4eef251000b9f07ba
 SHA1 (patch-ao) = dca396744edc5c0f86c8912bf54347a630cd865b
 SHA1 (patch-au) = a2cefb240d91121315d02104416324c971af6a20
diff --git a/lang/python31/patches/patch-am b/lang/python31/patches/patch-am
index 42d185de8ff..9a7fbae4d5d 100644
--- a/lang/python31/patches/patch-am
+++ b/lang/python31/patches/patch-am
@@ -1,4 +1,4 @@
-$NetBSD: patch-am,v 1.5 2011/11/08 07:30:09 sbd Exp $
+$NetBSD: patch-am,v 1.6 2012/03/04 08:11:51 obache Exp $
 
 --- setup.py.orig	2011-06-11 15:48:52.000000000 +0000
 +++ setup.py
@@ -102,7 +102,7 @@ $NetBSD: patch-am,v 1.5 2011/11/08 07:30:09 sbd Exp $
  
 -          scripts = ["Tools/scripts/pydoc3", "Tools/scripts/idle3",
 -                     "Tools/scripts/2to3"]
-+          scripts = ["Tools/scripts/pydoc3.1", "Tools/scripts/idle3",
++          scripts = ["Tools/scripts/pydoc3.1", "Tools/scripts/idle3.1",
 +                     "Tools/scripts/2to3-3.1"]
          )