diff options
| -rw-r--r-- | lang/python26/ALTERNATIVES | 1 | ||||
| -rw-r--r-- | lang/python26/MESSAGE.SunOS | 8 | ||||
| -rw-r--r-- | lang/python26/Makefile | 5 | ||||
| -rw-r--r-- | lang/python26/PLIST.common | 4 | ||||
| -rw-r--r-- | lang/python26/distinfo | 4 | ||||
| -rw-r--r-- | lang/python26/patches/patch-am | 9 |
6 files changed, 13 insertions, 18 deletions
diff --git a/lang/python26/ALTERNATIVES b/lang/python26/ALTERNATIVES index 158009388da..0ff8f52530b 100644 --- a/lang/python26/ALTERNATIVES +++ b/lang/python26/ALTERNATIVES @@ -1,2 +1,3 @@ +bin/2to3 @PREFIX@/bin/2to3-2.6 bin/pydoc @PREFIX@/bin/pydoc2.6 bin/python @PREFIX@/bin/python2.6 diff --git a/lang/python26/MESSAGE.SunOS b/lang/python26/MESSAGE.SunOS deleted file mode 100644 index 05e09707831..00000000000 --- a/lang/python26/MESSAGE.SunOS +++ /dev/null @@ -1,8 +0,0 @@ -=========================================================================== -$NetBSD: MESSAGE.SunOS,v 1.1.1.1 2009/04/19 14:42:48 wiz Exp $ - -In order for the Python installation to successfuly compile the -"sunaudiodev" module you must install the SUNWaudh package to have -the necessary headers installed. - -=========================================================================== diff --git a/lang/python26/Makefile b/lang/python26/Makefile index 95e8b952efe..b68f3f2a8d0 100644 --- a/lang/python26/Makefile +++ b/lang/python26/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.27 2010/09/07 16:33:23 drochner Exp $ +# $NetBSD: Makefile,v 1.28 2010/09/16 11:09:50 obache Exp $ DISTNAME= Python-2.6.6 PKGNAME= ${DISTNAME:S/Python/python26/} -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= lang python MASTER_SITES= http://www.python.org/ftp/python/${PKGVERSION_NOREV}/ EXTRACT_SUFX= .tar.bz2 @@ -152,6 +152,7 @@ REPLACE_FILES.py26+= Lib/test/test_largefile.py Lib/test/test_optparse.py post-extract: ${MV} ${WRKSRC}/Lib/smtpd.py ${WRKSRC}/Lib/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} .if ${OPSYS} == "HPUX" post-install: diff --git a/lang/python26/PLIST.common b/lang/python26/PLIST.common index 4e50179a505..0caba8a4292 100644 --- a/lang/python26/PLIST.common +++ b/lang/python26/PLIST.common @@ -1,5 +1,5 @@ -@comment $NetBSD: PLIST.common,v 1.12 2010/09/06 17:33:57 drochner Exp $ -bin/2to3 +@comment $NetBSD: PLIST.common,v 1.13 2010/09/16 11:09:50 obache Exp $ +bin/2to3-${PY_VER_SUFFIX} bin/pydoc${PY_VER_SUFFIX} bin/python${PY_VER_SUFFIX} bin/python${PY_VER_SUFFIX}-config diff --git a/lang/python26/distinfo b/lang/python26/distinfo index e9c913aef28..ff28e1004ee 100644 --- a/lang/python26/distinfo +++ b/lang/python26/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.24 2010/09/06 17:33:57 drochner Exp $ +$NetBSD: distinfo,v 1.25 2010/09/16 11:09:50 obache Exp $ SHA1 (Python-2.6.6.tar.bz2) = a1daf2c2c7cffe0939c015260447572fe75c7e50 RMD160 (Python-2.6.6.tar.bz2) = 2d63f4f0ad3c124a8e62215ca94bd0231350e912 @@ -10,7 +10,7 @@ SHA1 (patch-ad) = a997e39d16a8f0023125362b180d19ee97ab519b SHA1 (patch-ae) = a6d578b5f12eb42fbbcc11791576d2686a4807d9 SHA1 (patch-ah) = 501d220b41e578402f3400fe88e582aa2408a147 SHA1 (patch-al) = e5bf2a7f50534a18bb18f7111b3c5d097b528778 -SHA1 (patch-am) = dba7ed14af2676c8563068c9b053e26a56f312d1 +SHA1 (patch-am) = 1126b66de413c102e93240ec64a6fa6f96aac54d SHA1 (patch-an) = 17b4e17b3b562c29a050e9bb20447084ce82b8ab SHA1 (patch-ao) = 8c6a156b0f0c2a6d319658477fff348e6a0c3603 SHA1 (patch-ap) = d23a869a449ab9dc166cfa149913b20c9acad9cb diff --git a/lang/python26/patches/patch-am b/lang/python26/patches/patch-am index e4ca6b40dfe..a00ebbf4dc6 100644 --- a/lang/python26/patches/patch-am +++ b/lang/python26/patches/patch-am @@ -1,4 +1,4 @@ -$NetBSD: patch-am,v 1.13 2010/09/06 17:33:57 drochner Exp $ +$NetBSD: patch-am,v 1.14 2010/09/16 11:09:51 obache Exp $ Disabled modules for normal build: bsdddb @@ -11,7 +11,7 @@ gdbm pyexpat readline {linux,oss,sun}audiodev -spwb +spwd Those have separate packages where needed. Only check the BUILDLINK_DIR for libraries etc, do not pick up random @@ -316,9 +316,10 @@ Build the 1.85 compat module all the time against the BDB version of choice. # Scripts to install - scripts = ['Tools/scripts/pydoc', 'Tools/scripts/idle', -+ scripts = ['Tools/scripts/pydoc2.6', - 'Tools/scripts/2to3', +- 'Tools/scripts/2to3', - 'Lib/smtpd.py'] ++ scripts = ['Tools/scripts/pydoc2.6', ++ 'Tools/scripts/2to3-2.6', + 'Lib/smtpd2.6.py'] ) |