For smtpd.py, only rename with ${PYVERSUFFIX} to be installed as a tool,

or rename of module name affect to other parts using this module.
Noticed by Benjamin Lorenz in tech-pkg@.

Additionally, set ALTERNATIVE for bin/smtpd.py.

5 files changed, 12 insertions, 11 deletions

diff --git a/lang/python27/ALTERNATIVES b/lang/python27/ALTERNATIVES
index 383e7f4b81c..2398e06366d 100644
--- a/lang/python27/ALTERNATIVES
+++ b/lang/python27/ALTERNATIVES
@@ -1,3 +1,4 @@
 bin/2to3 @PREFIX@/bin/2to3-2.7
 bin/pydoc @PREFIX@/bin/pydoc2.7
 bin/python @PREFIX@/bin/python2.7
+bin/smtpd.py @PREFIX@/bin/smtpd2.7.py
diff --git a/lang/python27/Makefile b/lang/python27/Makefile
index fe36aef8d7c..dfe815b1d90 100644
--- a/lang/python27/Makefile
+++ b/lang/python27/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.36 2014/02/12 23:28:17 tron Exp $
+# $NetBSD: Makefile,v 1.37 2014/03/12 12:40:57 obache Exp $
 
 .include "dist.mk"
 
 PKGNAME=	python27-${PY_DISTVERSION}
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	lang python
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
@@ -163,7 +163,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
+	${LN} -s ${WRKSRC}/Lib/smtpd.py ${WRKSRC}/Tools/scripts/smtpd${PY_VER_SUFFIX}.py
 	${MV} ${WRKSRC}/Tools/scripts/pydoc ${WRKSRC}/Tools/scripts/pydoc${PY_VER_SUFFIX}
 	${MV} ${WRKSRC}/Tools/scripts/2to3 ${WRKSRC}/Tools/scripts/2to3-${PY_VER_SUFFIX}
 
diff --git a/lang/python27/PLIST.common b/lang/python27/PLIST.common
index 9b5507d577f..77ea62672ed 100644
--- a/lang/python27/PLIST.common
+++ b/lang/python27/PLIST.common
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.common,v 1.8 2014/02/12 23:28:17 tron Exp $
+@comment $NetBSD: PLIST.common,v 1.9 2014/03/12 12:40:57 obache Exp $
 bin/2to3-${PY_VER_SUFFIX}
 bin/pydoc${PY_VER_SUFFIX}
 bin/python${PY_VER_SUFFIX}
@@ -2453,9 +2453,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/python27/distinfo b/lang/python27/distinfo
index 968dbae3d8a..f2ed53ece6c 100644
--- a/lang/python27/distinfo
+++ b/lang/python27/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.30 2014/02/09 09:02:50 tron Exp $
+$NetBSD: distinfo,v 1.31 2014/03/12 12:40:57 obache Exp $
 
 SHA1 (Python-2.7.6.tar.xz) = 8321636af2acbeaa68fc635d7dda7369ed446a80
 RMD160 (Python-2.7.6.tar.xz) = 8efc73a01a466d8fa16c5c1734c89be79c2c538a
@@ -15,7 +15,7 @@ SHA1 (patch-ad) = de730b9f5a5efb56afa8bed05824b5f6579242ec
 SHA1 (patch-ae) = ff6d8c6164fe3c6dc4fb33d88eb8a49d5c5442f6
 SHA1 (patch-ah) = ae3ce0656d890ca34292920bf0185f94ba847139
 SHA1 (patch-al) = dd8bed847f797b97df1a9ad7ffe17645b0f08925
-SHA1 (patch-am) = 80718042f67a22489b1ae0806e71f28c1515c28e
+SHA1 (patch-am) = e5d78bfd5b9e6339985ed4cb587897042b6b8590
 SHA1 (patch-an) = 6098fbf0fc31422196cc40d3a227934523db11ca
 SHA1 (patch-ao) = 3a1cd2b255340fd23fc1fce8680e692581ffcec1
 SHA1 (patch-au) = 2a2a988ac92553d17eb898870d1adb3c30a59b66
diff --git a/lang/python27/patches/patch-am b/lang/python27/patches/patch-am
index 6e820872d6c..da2bfd3b692 100644
--- a/lang/python27/patches/patch-am
+++ b/lang/python27/patches/patch-am
@@ -1,4 +1,4 @@
-$NetBSD: patch-am,v 1.11 2013/11/12 18:57:25 adam Exp $
+$NetBSD: patch-am,v 1.12 2014/03/12 12:40:57 obache Exp $
 
 Disabled modules for normal build:
 bsddb
@@ -357,7 +357,7 @@ cygwin 2.7.3-no-libm.patch
 -                     'Lib/smtpd.py']
 +          scripts = ['Tools/scripts/pydoc2.7',
 +                     'Tools/scripts/2to3-2.7',
-+                     'Lib/smtpd2.7.py']
++                     'Tools/scripts/smtpd2.7.py']
          )
  
  # --install-platlib