diff options
author | Alexander Botero-Lowry <alexbl@FreeBSD.org> | 2007-07-30 09:42:28 +0000 |
---|---|---|
committer | Alexander Botero-Lowry <alexbl@FreeBSD.org> | 2007-07-30 09:42:28 +0000 |
commit | 4942ce5a7d8a3d0cbebaf4d202011850d1f7569f (patch) | |
tree | db1f21912f461000d609ddcd5d130946bcfe9e09 /lang | |
parent | In ATLAS/INSTALL.txt it is said that gcc42 is superior to both gcc3 and gcc41 (diff) |
- Make Python 2.5.1 the default Python version
- Add significantly better support in bsd.python.mk for working with
Python Eggs and the easy_install system
Tested by: pointyhat runs
Approved by: pav (portmgr)
Most work by: perky
Thanks to: pav
Notes
Notes:
svn path=/head/; revision=196700
Diffstat (limited to 'lang')
29 files changed, 356 insertions, 121 deletions
diff --git a/lang/f2py/Makefile b/lang/f2py/Makefile index a956e60839b0..6bc0235daf0f 100644 --- a/lang/f2py/Makefile +++ b/lang/f2py/Makefile @@ -25,6 +25,8 @@ EXPIRATION_DATE= 2007-04-01 USE_PYTHON= yes USE_PYDISTUTILS= yes +PYDISTUTILS_PKGNAME= F2PY +PYDISTUTILS_PKGVERSION= 2.45.241_1926 PLIST_FILES= bin/f2py MAN1= f2py.1 diff --git a/lang/py-mx-base/Makefile b/lang/py-mx-base/Makefile index f68541f6b874..70140298a2eb 100644 --- a/lang/py-mx-base/Makefile +++ b/lang/py-mx-base/Makefile @@ -23,6 +23,8 @@ USE_PYDISTUTILS=yes USE_ZOPE= yes .endif +PYDISTUTILS_PKGNAME= egenix-mx-base + DOCDIR= ${PREFIX}/share/doc/py-mx MXHDRDIR= ${PYTHONPREFIX_SITELIBDIR}/mx/stdlib diff --git a/lang/py-prolog/Makefile b/lang/py-prolog/Makefile index c49bc40fdab1..d7cd7cc00131 100644 --- a/lang/py-prolog/Makefile +++ b/lang/py-prolog/Makefile @@ -21,6 +21,7 @@ RUN_DEPENDS= pl:${PORTSDIR}/lang/swi-pl USE_PYTHON= yes USE_PYDISTUTILS=yes +PYDISTUTILS_PKGNAME= PyProlog .include <bsd.port.pre.mk> diff --git a/lang/python-doc-html/distinfo b/lang/python-doc-html/distinfo index 70f26dae67fe..9eda45c96968 100644 --- a/lang/python-doc-html/distinfo +++ b/lang/python-doc-html/distinfo @@ -18,6 +18,7 @@ MD5 (python/html-2.4.2.tar.bz2) = 4e3f177f32e15713130d9d9cf35f991f MD5 (python/html-2.4.3.tar.bz2) = 86edf38b83fde1ff44d0725acf90c95c MD5 (python/html-2.4.4.tar.bz2) = 21259033b5663533ed64b4592c6925e2 MD5 (python/html-2.4.tar.bz2) = 10cca09fcdf1b5ad269bc9edb652d76f +MD5 (python/html-2.5.1.tar.bz2) = 74e14b4713a1a43adebdcfe0191c20c8 MD5 (python/html-2.5.tar.bz2) = 3badfa2d460f52b7f9face12abdb2e91 MD5 (python/pdf-a4-2.0.1.tar.bz2) = fec4b5bcc4161bc82d1a4564fe71409a MD5 (python/pdf-a4-2.0.tar.bz2) = f11c5347eed19ffd012fddf1faa9ab22 @@ -38,6 +39,7 @@ MD5 (python/pdf-a4-2.4.2.tar.bz2) = f9712931eb8dd460000596eec0694bfc MD5 (python/pdf-a4-2.4.3.tar.bz2) = 85f82cb2df6872e4d6ef3652be184b50 MD5 (python/pdf-a4-2.4.4.tar.bz2) = 2b43ac2c9948af26af61c792397bc3fb MD5 (python/pdf-a4-2.4.tar.bz2) = 8f6b0a891dbff04f3b6ab07d9f8f6df6 +MD5 (python/pdf-a4-2.5.1.tar.bz2) = ade64ff41d24983ad2ea837525f5399a MD5 (python/pdf-a4-2.5.tar.bz2) = 9cc4e5a2992fb7be2373c3e03c765536 MD5 (python/pdf-letter-2.0.1.tar.bz2) = c31282a516b5b49b83cb7df3d3f23cb7 MD5 (python/pdf-letter-2.0.tar.bz2) = a0ae00f0e995ad912714ce15ff0ff401 @@ -58,6 +60,7 @@ MD5 (python/pdf-letter-2.4.2.tar.bz2) = 82d1ae6045042c08a6a68f69fe2831c2 MD5 (python/pdf-letter-2.4.3.tar.bz2) = 2f503f360ecd06fde2efdc61b4f1e644 MD5 (python/pdf-letter-2.4.4.tar.bz2) = 80da7a7611b11f4ac059a84d63af3b0e MD5 (python/pdf-letter-2.4.tar.bz2) = 46e9741fa8d42c813d02f2d7c3342c55 +MD5 (python/pdf-letter-2.5.1.tar.bz2) = bb77cbbf217dfe93fcbecd7256be33a3 MD5 (python/pdf-letter-2.5.tar.bz2) = e58eef4dcf9384ef7ee105068f7bc26e MD5 (python/postscript-a4-2.0.1.tar.bz2) = ef7b98c07ed7da1e91f2963c38a03b5c MD5 (python/postscript-a4-2.0.tar.bz2) = f9c6d47319cd2bb87df678e9fa429d72 @@ -78,6 +81,7 @@ MD5 (python/postscript-a4-2.4.2.tar.bz2) = 2ef6f2128333042f82c365697ac8d5be MD5 (python/postscript-a4-2.4.3.tar.bz2) = f71f0b6d77778ba57a4d7b8cf918bab0 MD5 (python/postscript-a4-2.4.4.tar.bz2) = 8680d3d6043a0dd3d6683e2fb727c2ab MD5 (python/postscript-a4-2.4.tar.bz2) = 261da37a6faf721846e27e44f3c12f62 +MD5 (python/postscript-a4-2.5.1.tar.bz2) = a3385edf8ca8749959caea9d653bb5e7 MD5 (python/postscript-a4-2.5.tar.bz2) = 831964fa3d53b3afe973995d7fcc05b2 MD5 (python/postscript-letter-2.0.1.tar.bz2) = 13365181bab30ca27c9d7b69c60e0f03 MD5 (python/postscript-letter-2.0.tar.bz2) = 103f3f67b1f4b47aae90fe68bedbd5f7 @@ -98,6 +102,7 @@ MD5 (python/postscript-letter-2.4.2.tar.bz2) = 11d90c85951dc2439e0f32459380dbbd MD5 (python/postscript-letter-2.4.3.tar.bz2) = ca001fb091019aadb66a25226768c523 MD5 (python/postscript-letter-2.4.4.tar.bz2) = 3daa1afbaff58db82b22b45efc528ccd MD5 (python/postscript-letter-2.4.tar.bz2) = a54ca46c53f0ed8e2f47e94286c7a419 +MD5 (python/postscript-letter-2.5.1.tar.bz2) = c72bd8f549745e75bfdb00b40eb05285 MD5 (python/postscript-letter-2.5.tar.bz2) = 9f5aaba82f37fce8435c2bcc9886e2bf SHA256 (python/html-2.0.1.tar.bz2) = d42308dda686cc3a27f11d93bdb05c400f4754f51c8e9734435a3b600ea0689e SHA256 (python/html-2.0.tar.bz2) = 0462f3ba3cea3867be268232e974e2de3b641a6408045ee7bfe94b790c973e1b @@ -119,7 +124,9 @@ SHA256 (python/html-2.4.2.tar.bz2) = 963d98c8f9adc4a9301632efe27c3a505f72c447ee6 SHA256 (python/html-2.4.3.tar.bz2) = 6fe6d1c4ee6fed254be260d25f5c44f550d7d634970d33c77dec5a438b1720e9 SHA256 (python/html-2.4.4.tar.bz2) = 6b1a6f1be187b1d0cab69ab7c8c436409468232d376419c978cbb1d019c6f465 SHA256 (python/html-2.4.tar.bz2) = 667d51b683549e708e271573e825d09e6db6a0d4bd97d31ddcad23b52cf1ee36 +SHA256 (python/html-2.5.1.tar.bz2) = 359e820e3af09dc90adddd4b27e18da9664120610cac486681fbb3c8f8240b9c SHA256 (python/html-2.5.tar.bz2) = 52a473258528bec3617da8cfd9188e8b7b2833ade61d705058ee5b0adef64a5b +SHA256 (python/latex-2.5.1.tar.bz2) = 3f54572af0acd81d20cb9c2685592371b5fa5cc084f8202306dcac4134206e9a SHA256 (python/pdf-a4-2.0.1.tar.bz2) = a938337ae963e3b4bfe667380a67dbf50cc4d07701dfcb6fbf33a996f7d79c0e SHA256 (python/pdf-a4-2.0.tar.bz2) = 829f90149931b8f198378f2dc9df2a3e2bcd02f6a8a67a05add9bf1c5f7079a2 SHA256 (python/pdf-a4-2.1.1.tar.bz2) = 598849b9d3be9745b1092f585299fb814bace5bb5da2d841d6deb51b56df5033 @@ -139,6 +146,7 @@ SHA256 (python/pdf-a4-2.4.2.tar.bz2) = 38445bfc55be1bafb4136c3a2d999a468caf613d5 SHA256 (python/pdf-a4-2.4.3.tar.bz2) = b5d1d850ea60d7251d66e47a6918dc2852465a837ebf39588f561c9da9bd5b79 SHA256 (python/pdf-a4-2.4.4.tar.bz2) = d72bddbebc60430ee971d53e922cdf730c221b9aa610d4b52be3c3796fc8dc68 SHA256 (python/pdf-a4-2.4.tar.bz2) = 40d7fb2618d3a88cbe353fd9ce7ce04b30fc76c85da27c0e90b9f2c98f40a044 +SHA256 (python/pdf-a4-2.5.1.tar.bz2) = caddfc8988d837cdd58e519da5f8b0c29263e85554f6108d9fde1677612dcd22 SHA256 (python/pdf-a4-2.5.tar.bz2) = ac591b0d29276de9bf98c4d1240ac57c5ec55bb5e8bbf62b2888343a8eb1b111 SHA256 (python/pdf-letter-2.0.1.tar.bz2) = e29269a80b77fe8b65d759620dba3445bb67597ede477f6e5904062456a4baed SHA256 (python/pdf-letter-2.0.tar.bz2) = 278a6b52c7b970fe54eb47bc5bb2dd56ef86225aa5d0dcdc43c65a335c7e426e @@ -159,6 +167,7 @@ SHA256 (python/pdf-letter-2.4.2.tar.bz2) = 2f364e054c2d4e50197d84359ca1a92fe843d SHA256 (python/pdf-letter-2.4.3.tar.bz2) = a2aa3cf6334e64e3f025564a824017b7fb2f86344f00db21ea85cc06dafb80bd SHA256 (python/pdf-letter-2.4.4.tar.bz2) = 8ee0df31d5090b2c0a895854ec0700c49cc50f06dd8d3ff5f2151d7da23caada SHA256 (python/pdf-letter-2.4.tar.bz2) = e87c19834c20d8adb0b9ac90810d6c3d405e47bc075241fe17d19790c19de3aa +SHA256 (python/pdf-letter-2.5.1.tar.bz2) = 34cedf5ec3ca21b8e105adad07429e7c6dee49c4c17e7d1466655980b88ee906 SHA256 (python/pdf-letter-2.5.tar.bz2) = d7be3abd1ad5efc62ca0d7ace9165605e6f955b819d33082c73306871f3d8576 SHA256 (python/postscript-a4-2.0.1.tar.bz2) = 9a02e5812d81a9af10f159c463a55c36b2dea77808a5410859a33109dbea7da7 SHA256 (python/postscript-a4-2.0.tar.bz2) = 2d721139e00d745ffc373dbabd99c310d45945a043ccfff9abd38edcbcc7fd34 @@ -179,6 +188,7 @@ SHA256 (python/postscript-a4-2.4.2.tar.bz2) = 753c8af05ca26d3a064c337e79a1f7af26 SHA256 (python/postscript-a4-2.4.3.tar.bz2) = 7dd43824ee9e14db1c2ecb5f25ac6c0ad2618b2c8abd677a8f34f39b850b11c7 SHA256 (python/postscript-a4-2.4.4.tar.bz2) = ec1a4c256f733e0b5917bb5c951b042f39781afec5480b76c28f5a5544784b08 SHA256 (python/postscript-a4-2.4.tar.bz2) = 4530dee0c06486d6c13f19dbf05b8d01e7bb47faaf9855c44916d2e9e992e50f +SHA256 (python/postscript-a4-2.5.1.tar.bz2) = b00cad86c2da60c05866a23c60f071988ead370b416211c06d50f66b303a7787 SHA256 (python/postscript-a4-2.5.tar.bz2) = 6654fbce933aa2e47b94c5faf75e69036510a10f0e0fbd35108361a130103ab8 SHA256 (python/postscript-letter-2.0.1.tar.bz2) = 871bc7ed57b6dfb9b2f844fe6150204399dda73ebcafc47df4bbeb75b81fb9be SHA256 (python/postscript-letter-2.0.tar.bz2) = a5d46c151f2a299a208edb13ce362b4dd0f49af7e53beabe01167dcf97914c60 @@ -199,6 +209,7 @@ SHA256 (python/postscript-letter-2.4.2.tar.bz2) = 1ed9da9b4e0c4bd14cd72f477cbf8a SHA256 (python/postscript-letter-2.4.3.tar.bz2) = ed242d9f6e2ceef2e79c10419a1966add922de573240383cd869779f0ecc3ff0 SHA256 (python/postscript-letter-2.4.4.tar.bz2) = 3f93c91d217ac8d90d4873dd0a62c4a88115f81707582424ab4d102b39a87bc7 SHA256 (python/postscript-letter-2.4.tar.bz2) = d9e89330107bb77e29e9e938b71b8f1ec1ac7e73021c1d284a8def95acb5c7f3 +SHA256 (python/postscript-letter-2.5.1.tar.bz2) = 10f4f80dd2f3ca0844f62faa2eaba3aac02690382abbe9996f43b49c6c4e601f SHA256 (python/postscript-letter-2.5.tar.bz2) = c2be9ac9cca88cebb2f48b4cc467f6d46a10997b2ad651c2047bf7cccf2ff656 SIZE (python/html-2.0.1.tar.bz2) = 704567 SIZE (python/html-2.0.tar.bz2) = 699404 @@ -220,7 +231,9 @@ SIZE (python/html-2.4.2.tar.bz2) = 1395537 SIZE (python/html-2.4.3.tar.bz2) = 1397233 SIZE (python/html-2.4.4.tar.bz2) = 1398442 SIZE (python/html-2.4.tar.bz2) = 1390125 +SIZE (python/html-2.5.1.tar.bz2) = 1626532 SIZE (python/html-2.5.tar.bz2) = 1562256 +SIZE (python/latex-2.5.1.tar.bz2) = 1379960 SIZE (python/pdf-a4-2.0.1.tar.bz2) = 2297342 SIZE (python/pdf-a4-2.0.tar.bz2) = 2254712 SIZE (python/pdf-a4-2.1.1.tar.bz2) = 3557971 @@ -240,6 +253,7 @@ SIZE (python/pdf-a4-2.4.2.tar.bz2) = 4249646 SIZE (python/pdf-a4-2.4.3.tar.bz2) = 4258522 SIZE (python/pdf-a4-2.4.4.tar.bz2) = 5345687 SIZE (python/pdf-a4-2.4.tar.bz2) = 4203864 +SIZE (python/pdf-a4-2.5.1.tar.bz2) = 5578884 SIZE (python/pdf-a4-2.5.tar.bz2) = 5520351 SIZE (python/pdf-letter-2.0.1.tar.bz2) = 2182069 SIZE (python/pdf-letter-2.0.tar.bz2) = 2133980 @@ -260,6 +274,7 @@ SIZE (python/pdf-letter-2.4.2.tar.bz2) = 4273457 SIZE (python/pdf-letter-2.4.3.tar.bz2) = 4279762 SIZE (python/pdf-letter-2.4.4.tar.bz2) = 5368031 SIZE (python/pdf-letter-2.4.tar.bz2) = 4226357 +SIZE (python/pdf-letter-2.5.1.tar.bz2) = 5604432 SIZE (python/pdf-letter-2.5.tar.bz2) = 5547378 SIZE (python/postscript-a4-2.0.1.tar.bz2) = 994104 SIZE (python/postscript-a4-2.0.tar.bz2) = 977851 @@ -280,6 +295,7 @@ SIZE (python/postscript-a4-2.4.2.tar.bz2) = 1714155 SIZE (python/postscript-a4-2.4.3.tar.bz2) = 1716850 SIZE (python/postscript-a4-2.4.4.tar.bz2) = 1699663 SIZE (python/postscript-a4-2.4.tar.bz2) = 1699997 +SIZE (python/postscript-a4-2.5.1.tar.bz2) = 1845800 SIZE (python/postscript-a4-2.5.tar.bz2) = 1816570 SIZE (python/postscript-letter-2.0.1.tar.bz2) = 941017 SIZE (python/postscript-letter-2.0.tar.bz2) = 923261 @@ -300,4 +316,5 @@ SIZE (python/postscript-letter-2.4.2.tar.bz2) = 1709251 SIZE (python/postscript-letter-2.4.3.tar.bz2) = 1712719 SIZE (python/postscript-letter-2.4.4.tar.bz2) = 1695892 SIZE (python/postscript-letter-2.4.tar.bz2) = 1693474 +SIZE (python/postscript-letter-2.5.1.tar.bz2) = 1839274 SIZE (python/postscript-letter-2.5.tar.bz2) = 1813655 diff --git a/lang/python/Makefile b/lang/python/Makefile index fc1b1a72cc79..3b3a59fc5dd3 100644 --- a/lang/python/Makefile +++ b/lang/python/Makefile @@ -6,43 +6,44 @@ # PORTNAME= python -PORTVERSION= 2.4.4 -PORTEPOCH= 1 +PORTVERSION= ${PYTHON_VER} +PORTEPOCH= 2 CATEGORIES= lang python ipv6 MASTER_SITES= # empty DISTFILES= # empty EXTRACT_ONLY= # empty MAINTAINER= python@FreeBSD.org -COMMENT= The "meta-port" for the stable version of Python interpreter +COMMENT= The "meta-port" for the default version of Python interpreter USE_PYTHON_RUN= yes -PYTHON_VERSION= python2.4 +PYTHON_VERSION= ${PYTHON_DEFAULT_VERSION} NO_BUILD= yes -do-install: # empty +do-install: + @${DO_NADA} # Major upgrade support PORTUPGRADE?= ${LOCALBASE}/sbin/portupgrade PKG_WHICH?= ${LOCALBASE}/sbin/pkg_which upgrade-site-packages: - @if [ -x ${PORTUPGRADE} ]; then \ - for ver in 2.1 2.2 2.3 2.5; do \ - if [ -d ${PREFIX}/lib/python$$ver ]; then \ - UPD=`${FIND} ${PREFIX}/lib/python$$ver \ - -type f -print0 | \ - ${XARGS} -0 ${PKG_WHICH} | \ - ${GREP} -Fv '?' | \ - ${EGREP} -v '^python2?[0-5]?-2' | \ - ${SORT} -u`; \ - if [ "$$UPD" ]; then \ - ${PORTUPGRADE} -f $$UPD; \ - fi; \ - fi; \ - done; \ - else \ + @if [ ! -x ${PORTUPGRADE} ]; then \ ${ECHO_MSG} "Please install ports-mgmt/portupgrade."; \ ${FALSE}; \ fi + @for ver in `echo ${_PYTHON_ALLBRANCHES}|${SED} 's/${PYTHON_VER}//'`; do \ + if [ -d ${PREFIX}/lib/python$$ver ]; then \ + UPD=`${FIND} ${PREFIX}/lib/python$$ver \ + -type f -print0 | \ + ${XARGS} -0 ${PKG_WHICH} | \ + ${GREP} -Fv '?' | \ + ${EGREP} -v '^python2?[0-5]?-2' | \ + ${SORT} -u`; \ + if [ "$$UPD" ]; then \ + ${PORTUPGRADE} -f $$UPD; \ + fi; \ + fi; \ + done \ + .include <bsd.port.mk> diff --git a/lang/python/distinfo b/lang/python/distinfo index 054d4ecd5c4c..2f175c4a9f78 100644 --- a/lang/python/distinfo +++ b/lang/python/distinfo @@ -17,6 +17,7 @@ MD5 (python/Python-2.4.2.tgz) = 07cfc759546f6723bb367be5b1ce9875 MD5 (python/Python-2.4.3.tgz) = edf994473a8c1a963aaa71e442b285b7 MD5 (python/Python-2.4.4.tgz) = 82d000617baaef269ad5795c595fdc58 MD5 (python/Python-2.4.tgz) = 149ad508f936eccf669d52682cf8e606 +MD5 (python/Python-2.5.1.tgz) = cca695828df8adc3e69b637af07522e1 MD5 (python/Python-2.5.tgz) = bc1b74f90a472a6c0a85481aaeb43f95 SHA256 (python/Python-2.1.1.tgz) = 6a5455b2ab72642feffc060a04e8ea543de2d0671a3f9c335b52f2e1e41edc5f SHA256 (python/Python-2.1.2.tgz) = 389c7badc61f9bdc50788b54dd3ffeaa4b559baf6a4de1425bf90b9c6b4ac66e @@ -37,6 +38,7 @@ SHA256 (python/Python-2.4.2.tgz) = 2653e1846e87fd9b3ee287fefc965c80c54646548b491 SHA256 (python/Python-2.4.3.tgz) = 985a413932f5e31e6280b37da6b285a3a0b2748c6786643989ed9b23de97e2d5 SHA256 (python/Python-2.4.4.tgz) = 92be6e20cbc3111d9dd0c016d72ef7914c23b879dc52df7ba28df97afbf12e2e SHA256 (python/Python-2.4.tgz) = ff746de0fae8691c082414b42a2bb172da8797e6e8ff66c9a39d2e452f7034e9 +SHA256 (python/Python-2.5.1.tgz) = 1f5caee846049ca30d996f9403eefdb996295c4af664867e35dcc5eb36e4e7e8 SHA256 (python/Python-2.5.tgz) = d7bbf42e36003c6065cd19f3e67d283521858515ee923220f654131cebe1d8f2 SIZE (python/Python-2.1.1.tgz) = 6187808 SIZE (python/Python-2.1.2.tgz) = 6189889 @@ -57,4 +59,5 @@ SIZE (python/Python-2.4.2.tgz) = 9239975 SIZE (python/Python-2.4.3.tgz) = 9348239 SIZE (python/Python-2.4.4.tgz) = 9531474 SIZE (python/Python-2.4.tgz) = 9198035 +SIZE (python/Python-2.5.1.tgz) = 11060830 SIZE (python/Python-2.5.tgz) = 11019675 diff --git a/lang/python23/Makefile b/lang/python23/Makefile index 33d646e8aaad..fa4fe11865bb 100644 --- a/lang/python23/Makefile +++ b/lang/python23/Makefile @@ -7,7 +7,7 @@ PORTNAME= python23 PORTVERSION= 2.3.5 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= lang python ipv6 MASTER_SITES= ${PYTHON_MASTER_SITES} MASTER_SITE_SUBDIR= ${PYTHON_MASTER_SITE_SUBDIR} @@ -16,7 +16,6 @@ DISTFILES= ${PYTHON_DISTFILE} MAINTAINER= python@FreeBSD.org COMMENT?= An interpreted object-oriented programming language -CONFLICTS= stackless_python-* DIST_SUBDIR= python WRKSRC= ${PYTHON_WRKSRC} GNU_CONFIGURE= yes @@ -38,6 +37,9 @@ PLIST_SUB= PYVER=${PYTHON_VERSION:S/python//} DEMODIR= ${PREFIX}/share/examples/${PYTHON_VERSION} TOOLSDIR= ${PREFIX}/share/${PYTHON_VERSION} +BIN_SCRIPTS= idle pydoc python python-shared +BINLINKS_SUB= -e 's,(idle|pydoc|python-shared|python),\1${PYTHON_VER},' + OPTIONS= THREADS "Enable thread support" on \ HUGE_STACK_SIZE "Use a larger thread stack" off \ UCS4 "Use UCS4 for unicode support" on \ @@ -46,6 +48,13 @@ OPTIONS= THREADS "Enable thread support" on \ .include <bsd.port.pre.mk> +.if ${PYTHON_VERSION} == ${PYTHON_DEFAULT_VERSION} +MLINKS= ${PYTHON_VERSION}.1 python.1 +PLIST_SUB+= IF_DEFAULT="" +.else +PLIST_SUB+= IF_DEFAULT="@comment " +.endif + .if !defined(WITHOUT_THREADS) CONFIGURE_ARGS+= --with-threads CFLAGS+= ${PTHREAD_CFLAGS} @@ -171,6 +180,13 @@ post-install: ${INSTALL_SCRIPT} ${WRKDIR}/pydoc2.3 ${WRKDIR}/idle2.3 \ ${PREFIX}/bin +.if ${PYTHON_VERSION} == ${PYTHON_DEFAULT_VERSION} + for f in ${BIN_SCRIPTS}; do \ + TARGET=`${ECHO_CMD} $$f | ${SED} -E ${BINLINKS_SUB}`; \ + cd ${PREFIX}/bin && ${LN} -f $$TARGET $$f; \ + done +.endif + .if !defined(NOPORTDOCS) @${MKDIR} ${TOOLSDIR} @cd ${WRKSRC}; tar -c --exclude='*CVS*' -f - Tools | \ diff --git a/lang/python23/pkg-plist b/lang/python23/pkg-plist index d8b1b3638233..53fa3b4e59f3 100644 --- a/lang/python23/pkg-plist +++ b/lang/python23/pkg-plist @@ -1,6 +1,10 @@ +%%IF_DEFAULT%%bin/idle bin/idle%%PYVER%% +%%IF_DEFAULT%%bin/pydoc bin/pydoc%%PYVER%% +%%IF_DEFAULT%%bin/python bin/python%%PYVER%% +%%IF_DEFAULT%%bin/python-shared bin/python-shared%%PYVER%% include/%%PYTHON_VERSION%%/Python.h include/%%PYTHON_VERSION%%/abstract.h diff --git a/lang/python24/Makefile b/lang/python24/Makefile index f5090983280b..0b6d353a4355 100644 --- a/lang/python24/Makefile +++ b/lang/python24/Makefile @@ -7,12 +7,13 @@ PORTNAME= python24 PORTVERSION= 2.4.4 +PORTREVISION= 1 CATEGORIES= lang python ipv6 MASTER_SITES= ${PYTHON_MASTER_SITES} MASTER_SITE_SUBDIR= ${PYTHON_MASTER_SITE_SUBDIR} DISTFILES= ${PYTHON_DISTFILE} -MAINTAINER= perky@FreeBSD.org +MAINTAINER= python@FreeBSD.org COMMENT?= An interpreted object-oriented programming language DIST_SUBDIR= python @@ -22,8 +23,8 @@ CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= OPT="${CFLAGS}" MAKE_ENV= VPATH="${WRKSRC}" USE_LDCONFIG= yes -INSTALL_TARGET= install -MAN1= python.1 ${PYTHON_VERSION}.1 +INSTALL_TARGET= altinstall +MAN1= ${PYTHON_VERSION}.1 USE_PYTHON= yes PYTHON_VERSION= python2.4 @@ -35,11 +36,9 @@ PLIST_SUB= PYVER=${PYTHON_VERSION:S/python//} DEMODIR= ${PREFIX}/share/examples/${PYTHON_VERSION} TOOLSDIR= ${PREFIX}/share/${PYTHON_VERSION} -.if !exists(/usr/bin/ypcat) # the world with NO_NIS -PLISTCAT= ${GREP} -v 'nis.so$$' ${PKGDIR}/pkg-plist -.else -PLISTCAT= ${CAT} ${PKGDIR}/pkg-plist -.endif +BIN_SCRIPTS= idle pydoc python python-shared smtpd.py +BINLINKS_SUB= -e 's,smtpd,smtpd${PYTHON_VER},' \ + -e 's,(idle|pydoc|python-shared|python),\1${PYTHON_VER},' OPTIONS= THREADS "Enable thread support" on \ HUGE_STACK_SIZE "Use a larger thread stack" off \ @@ -50,6 +49,13 @@ OPTIONS= THREADS "Enable thread support" on \ .include <bsd.port.pre.mk> +.if ${PYTHON_VERSION} == ${PYTHON_DEFAULT_VERSION} +MLINKS= ${PYTHON_VERSION}.1 python.1 +PLIST_SUB+= IF_DEFAULT="" +.else +PLIST_SUB+= IF_DEFAULT="@comment " +.endif + # workaround for a bug in base curses.h. CFLAGS+= -D__wchar_t=wchar_t @@ -91,6 +97,12 @@ PLIST_SUB+= 32BIT_ONLY="" CFLAGS+= -DPYTHON_DEFAULT_RECURSION_LIMIT=900 .endif +.if !exists(/usr/bin/ypcat) # the world with NO_NIS +PLIST_SUB+= NO_NIS="@comment " +.else +PLIST_SUB+= NO_NIS="" +.endif + .if !defined(WITHOUT_IPV6) && ${OSVERSION} >= 400014 CONFIGURE_ARGS+= --enable-ipv6 .else @@ -166,9 +178,9 @@ pre-su-install: .endfor pre-install: - ${PLISTCAT} | ${AWK} '{ print $$0; } \ - /LIBDIR.*\.py$$/ && !/\/bad/ { print $$0 "o"; print $$0 "c"; }' \ - > ${PLIST} + ${AWK} '{ print $$0; } \ + /LIBDIR.*\.py$$/ && !/\/bad/ { print $$0 "o"; print $$0 "c"; }' \ + ${PKGDIR}/pkg-plist > ${PLIST} post-install: @# shared version of executable and library @@ -180,8 +192,6 @@ post-install: ${INSTALL_PROGRAM} \ ${SHARED_WRKSRC}/${PYTHON_VERSION:S/thon/thon-shared/} \ ${PREFIX}/bin - cd ${PREFIX}/bin; \ - ${LN} -f ${PYTHON_VERSION:S/thon/thon-shared/} python-shared @# additional files installing by ports @${MKDIR} ${MANPREFIX}/man/man1 @@ -190,6 +200,13 @@ post-install: ${INSTALL_SCRIPT} ${WRKDIR}/pydoc2.4 ${WRKDIR}/idle2.4 \ ${WRKDIR}/smtpd2.4.py ${PREFIX}/bin +.if ${PYTHON_VERSION} == ${PYTHON_DEFAULT_VERSION} + for f in ${BIN_SCRIPTS}; do \ + TARGET=`${ECHO_CMD} $$f | ${SED} -E ${BINLINKS_SUB}`; \ + cd ${PREFIX}/bin && ${LN} -f $$TARGET $$f; \ + done +.endif + .if !defined(NOPORTDOCS) @${MKDIR} ${TOOLSDIR} @cd ${WRKSRC}; tar -c --exclude='*CVS*' -f - Tools | \ diff --git a/lang/python24/files/patch-setup.py b/lang/python24/files/patch-setup.py index 167e803a1290..0b578c9ec329 100644 --- a/lang/python24/files/patch-setup.py +++ b/lang/python24/files/patch-setup.py @@ -1,5 +1,5 @@ ---- setup.py.orig Tue Feb 27 20:10:53 2007 -+++ setup.py Tue Feb 27 20:15:23 2007 +--- setup.py.orig Fri Mar 30 04:28:05 2007 ++++ setup.py Fri Mar 30 04:30:54 2007 @@ -15,7 +15,7 @@ from distutils.command.install_lib import install_lib @@ -52,3 +52,13 @@ libraries = [panel_library] + curses_libs) ) +@@ -1225,8 +1227,7 @@ + ext_modules=[Extension('struct', ['structmodule.c'])], + + # Scripts to install +- scripts = ['Tools/scripts/pydoc', 'Tools/scripts/idle', +- 'Lib/smtpd.py'] ++ scripts = [] + ) + + # --install-platlib diff --git a/lang/python24/pkg-plist b/lang/python24/pkg-plist index 437b6287fa0c..9c946a43e15f 100644 --- a/lang/python24/pkg-plist +++ b/lang/python24/pkg-plist @@ -1,13 +1,13 @@ -bin/idle +%%IF_DEFAULT%%bin/idle bin/idle%%PYVER%% -bin/pydoc +%%IF_DEFAULT%%bin/pydoc bin/pydoc%%PYVER%% -bin/python +%%IF_DEFAULT%%bin/python bin/python%%PYVER%% -bin/python-shared +%%IF_DEFAULT%%bin/python-shared bin/python-shared%%PYVER%% +%%IF_DEFAULT%%bin/smtpd.py bin/smtpd%%PYVER%%.py -bin/smtpd.py %%PYTHON_INCLUDEDIR%%/Python.h %%PYTHON_INCLUDEDIR%%/Python-ast.h %%PYTHON_INCLUDEDIR%%/abstract.h @@ -574,7 +574,7 @@ lib/lib%%PYTHON_VERSION%%.so.1 %%PYTHON_LIBDIR%%/lib-dynload/math.so %%PYTHON_LIBDIR%%/lib-dynload/md5.so %%PYTHON_LIBDIR%%/lib-dynload/mmap.so -%%PYTHON_LIBDIR%%/lib-dynload/nis.so +%%NO_NIS%%%%PYTHON_LIBDIR%%/lib-dynload/nis.so %%PYTHON_LIBDIR%%/lib-dynload/operator.so %%PYTHON_LIBDIR%%/lib-dynload/ossaudiodev.so %%PYTHON_LIBDIR%%/lib-dynload/parser.so diff --git a/lang/python25/Makefile b/lang/python25/Makefile index 33f5cff93183..a688a3c2f0b1 100644 --- a/lang/python25/Makefile +++ b/lang/python25/Makefile @@ -5,8 +5,7 @@ # $FreeBSD$ PORTNAME= python25 -PORTVERSION= 2.5 -PORTREVISION= 1 +PORTVERSION= 2.5.1 CATEGORIES= lang python ipv6 MASTER_SITES= ${PYTHON_MASTER_SITES} MASTER_SITE_SUBDIR= ${PYTHON_MASTER_SITE_SUBDIR} @@ -39,11 +38,10 @@ PLIST_SUB= PYVER=${PYTHON_VERSION:S/python//} \ DEMODIR= ${PREFIX}/share/examples/${PYTHON_VERSION} TOOLSDIR= ${PREFIX}/share/${PYTHON_VERSION} -.if !exists(/usr/bin/ypcat) # the world with NO_NIS -PLIST_EXCLUDE= 'nis.so$$' -.else -PLIST_EXCLUDE= '^$$' # nothing -.endif +BIN_SCRIPTS= idle pydoc python python-shared smtpd.py python-config \ + python-shared-config +BINLINKS_SUB= -e 's,smtpd,smtpd${PYTHON_VER},' \ + -e 's,(idle|pydoc|python-shared|python),\1${PYTHON_VER},' OPTIONS= THREADS "Enable thread support" on \ HUGE_STACK_SIZE "Use a larger thread stack" off \ @@ -54,6 +52,13 @@ OPTIONS= THREADS "Enable thread support" on \ .include <bsd.port.pre.mk> +.if ${PYTHON_VERSION} == ${PYTHON_DEFAULT_VERSION} +MLINKS= ${PYTHON_VERSION}.1 python.1 +PLIST_SUB+= IF_DEFAULT="" +.else +PLIST_SUB+= IF_DEFAULT="@comment " +.endif + # workaround for a bug in base curses.h. CFLAGS+= -D__wchar_t=wchar_t @@ -95,6 +100,12 @@ PLIST_SUB+= 32BIT_ONLY="" CFLAGS+= -DPYTHON_DEFAULT_RECURSION_LIMIT=900 .endif +.if !exists(/usr/bin/ypcat) # the world with NO_NIS +PLIST_SUB+= NO_NIS="@comment " +.else +PLIST_SUB+= NO_NIS="" +.endif + .if ${OSVERSION} < 400000 LIB_DEPENDS+= ncurses.5:${PORTSDIR}/devel/ncurses CFLAGS+= -I${LOCALBASE}/include/ncurses -I${LOCALBASE}/include @@ -180,8 +191,7 @@ pre-su-install: .endfor pre-install: - ${EGREP} -v ${PLIST_EXCLUDE} ${PLIST_TEMPLATE} | \ - ${AWK} '{ print $$0; } \ + ${CAT} ${PLIST_TEMPLATE} | ${AWK} '{ print $$0; } \ /LIBDIR.*\.py$$/ && !/\/bad/ { print $$0 "o"; print $$0 "c"; }' > ${PLIST} @# if openssl 0.9.8 is detected, _sha{256,512} module won't be installed @@ -211,6 +221,13 @@ post-install: ${INSTALL_MAN} ${PYTHON_WRKSRC}/Misc/python.man \ ${MANPREFIX}/man/man1/${PYTHON_VERSION}.1 +.if ${PYTHON_VERSION} == ${PYTHON_DEFAULT_VERSION} + for f in ${BIN_SCRIPTS}; do \ + TARGET=`${ECHO_CMD} $$f | ${SED} -E ${BINLINKS_SUB}`; \ + cd ${PREFIX}/bin && ${LN} -f $$TARGET $$f; \ + done +.endif + .if !defined(NOPORTDOCS) @${MKDIR} ${TOOLSDIR} @cd ${PYTHON_WRKSRC}; ${TAR} -cf - Tools | \ diff --git a/lang/python25/distinfo b/lang/python25/distinfo index 7f7cbdee8a65..9a63d62ef45b 100644 --- a/lang/python25/distinfo +++ b/lang/python25/distinfo @@ -1,3 +1,3 @@ -MD5 (python/Python-2.5.tgz) = bc1b74f90a472a6c0a85481aaeb43f95 -SHA256 (python/Python-2.5.tgz) = d7bbf42e36003c6065cd19f3e67d283521858515ee923220f654131cebe1d8f2 -SIZE (python/Python-2.5.tgz) = 11019675 +MD5 (python/Python-2.5.1.tgz) = cca695828df8adc3e69b637af07522e1 +SHA256 (python/Python-2.5.1.tgz) = 1f5caee846049ca30d996f9403eefdb996295c4af664867e35dcc5eb36e4e7e8 +SIZE (python/Python-2.5.1.tgz) = 11060830 diff --git a/lang/python25/pkg-plist b/lang/python25/pkg-plist index 6526f34bc484..3098736ca2c1 100644 --- a/lang/python25/pkg-plist +++ b/lang/python25/pkg-plist @@ -1,9 +1,16 @@ +%%IF_DEFAULT%%bin/idle bin/idle%%PYVER%% +%%IF_DEFAULT%%bin/pydoc bin/pydoc%%PYVER%% +%%IF_DEFAULT%%bin/python bin/python%%PYVER%% +%%IF_DEFAULT%%bin/python-config bin/python%%PYVER%%-config +%%IF_DEFAULT%%bin/python-shared bin/python-shared%%PYVER%% +%%IF_DEFAULT%%bin/python-shared-config bin/python-shared%%PYVER%%-config +%%IF_DEFAULT%%bin/smtpd.py bin/smtpd%%PYVER%%.py %%PYTHON_INCLUDEDIR%%/Python-ast.h %%PYTHON_INCLUDEDIR%%/Python.h @@ -670,7 +677,7 @@ lib/lib%%PYTHON_VERSION%%.so.1 %%PYTHON_LIBDIR%%/lib-dynload/itertools.so %%PYTHON_LIBDIR%%/lib-dynload/math.so %%PYTHON_LIBDIR%%/lib-dynload/mmap.so -%%PYTHON_LIBDIR%%/lib-dynload/nis.so +%%NO_NIS%%%%PYTHON_LIBDIR%%/lib-dynload/nis.so %%PYTHON_LIBDIR%%/lib-dynload/operator.so %%PYTHON_LIBDIR%%/lib-dynload/ossaudiodev.so %%PYTHON_LIBDIR%%/lib-dynload/parser.so @@ -860,6 +867,7 @@ lib/lib%%PYTHON_VERSION%%.so.1 %%PYTHON_LIBDIR%%/test/exception_hierarchy.txt %%PYTHON_LIBDIR%%/test/fork_wait.py %%PYTHON_LIBDIR%%/test/greyrgb.uue +%%PYTHON_LIBDIR%%/test/infinite_reload.py %%PYTHON_LIBDIR%%/test/inspect_fodder.py %%PYTHON_LIBDIR%%/test/inspect_fodder2.py %%PYTHON_LIBDIR%%/test/list_tests.py @@ -984,6 +992,7 @@ lib/lib%%PYTHON_VERSION%%.so.1 %%PYTHON_LIBDIR%%/test/test_compile.py %%PYTHON_LIBDIR%%/test/test_compiler.py %%PYTHON_LIBDIR%%/test/test_complex.py +%%PYTHON_LIBDIR%%/test/test_complex_args.py %%PYTHON_LIBDIR%%/test/test_contains.py %%PYTHON_LIBDIR%%/test/test_contextlib.py %%PYTHON_LIBDIR%%/test/test_cookie.py @@ -1183,6 +1192,7 @@ lib/lib%%PYTHON_VERSION%%.so.1 %%PYTHON_LIBDIR%%/test/test_strop.py %%PYTHON_LIBDIR%%/test/test_strptime.py %%PYTHON_LIBDIR%%/test/test_struct.py +%%PYTHON_LIBDIR%%/test/test_structmembers.py %%PYTHON_LIBDIR%%/test/test_structseq.py %%PYTHON_LIBDIR%%/test/test_subprocess.py %%PYTHON_LIBDIR%%/test/test_sunaudiodev.py diff --git a/lang/python26/Makefile b/lang/python26/Makefile index 33f5cff93183..a688a3c2f0b1 100644 --- a/lang/python26/Makefile +++ b/lang/python26/Makefile @@ -5,8 +5,7 @@ # $FreeBSD$ PORTNAME= python25 -PORTVERSION= 2.5 -PORTREVISION= 1 +PORTVERSION= 2.5.1 CATEGORIES= lang python ipv6 MASTER_SITES= ${PYTHON_MASTER_SITES} MASTER_SITE_SUBDIR= ${PYTHON_MASTER_SITE_SUBDIR} @@ -39,11 +38,10 @@ PLIST_SUB= PYVER=${PYTHON_VERSION:S/python//} \ DEMODIR= ${PREFIX}/share/examples/${PYTHON_VERSION} TOOLSDIR= ${PREFIX}/share/${PYTHON_VERSION} -.if !exists(/usr/bin/ypcat) # the world with NO_NIS -PLIST_EXCLUDE= 'nis.so$$' -.else -PLIST_EXCLUDE= '^$$' # nothing -.endif +BIN_SCRIPTS= idle pydoc python python-shared smtpd.py python-config \ + python-shared-config +BINLINKS_SUB= -e 's,smtpd,smtpd${PYTHON_VER},' \ + -e 's,(idle|pydoc|python-shared|python),\1${PYTHON_VER},' OPTIONS= THREADS "Enable thread support" on \ HUGE_STACK_SIZE "Use a larger thread stack" off \ @@ -54,6 +52,13 @@ OPTIONS= THREADS "Enable thread support" on \ .include <bsd.port.pre.mk> +.if ${PYTHON_VERSION} == ${PYTHON_DEFAULT_VERSION} +MLINKS= ${PYTHON_VERSION}.1 python.1 +PLIST_SUB+= IF_DEFAULT="" +.else +PLIST_SUB+= IF_DEFAULT="@comment " +.endif + # workaround for a bug in base curses.h. CFLAGS+= -D__wchar_t=wchar_t @@ -95,6 +100,12 @@ PLIST_SUB+= 32BIT_ONLY="" CFLAGS+= -DPYTHON_DEFAULT_RECURSION_LIMIT=900 .endif +.if !exists(/usr/bin/ypcat) # the world with NO_NIS +PLIST_SUB+= NO_NIS="@comment " +.else +PLIST_SUB+= NO_NIS="" +.endif + .if ${OSVERSION} < 400000 LIB_DEPENDS+= ncurses.5:${PORTSDIR}/devel/ncurses CFLAGS+= -I${LOCALBASE}/include/ncurses -I${LOCALBASE}/include @@ -180,8 +191,7 @@ pre-su-install: .endfor pre-install: - ${EGREP} -v ${PLIST_EXCLUDE} ${PLIST_TEMPLATE} | \ - ${AWK} '{ print $$0; } \ + ${CAT} ${PLIST_TEMPLATE} | ${AWK} '{ print $$0; } \ /LIBDIR.*\.py$$/ && !/\/bad/ { print $$0 "o"; print $$0 "c"; }' > ${PLIST} @# if openssl 0.9.8 is detected, _sha{256,512} module won't be installed @@ -211,6 +221,13 @@ post-install: ${INSTALL_MAN} ${PYTHON_WRKSRC}/Misc/python.man \ ${MANPREFIX}/man/man1/${PYTHON_VERSION}.1 +.if ${PYTHON_VERSION} == ${PYTHON_DEFAULT_VERSION} + for f in ${BIN_SCRIPTS}; do \ + TARGET=`${ECHO_CMD} $$f | ${SED} -E ${BINLINKS_SUB}`; \ + cd ${PREFIX}/bin && ${LN} -f $$TARGET $$f; \ + done +.endif + .if !defined(NOPORTDOCS) @${MKDIR} ${TOOLSDIR} @cd ${PYTHON_WRKSRC}; ${TAR} -cf - Tools | \ diff --git a/lang/python26/distinfo b/lang/python26/distinfo index 7f7cbdee8a65..9a63d62ef45b 100644 --- a/lang/python26/distinfo +++ b/lang/python26/distinfo @@ -1,3 +1,3 @@ -MD5 (python/Python-2.5.tgz) = bc1b74f90a472a6c0a85481aaeb43f95 -SHA256 (python/Python-2.5.tgz) = d7bbf42e36003c6065cd19f3e67d283521858515ee923220f654131cebe1d8f2 -SIZE (python/Python-2.5.tgz) = 11019675 +MD5 (python/Python-2.5.1.tgz) = cca695828df8adc3e69b637af07522e1 +SHA256 (python/Python-2.5.1.tgz) = 1f5caee846049ca30d996f9403eefdb996295c4af664867e35dcc5eb36e4e7e8 +SIZE (python/Python-2.5.1.tgz) = 11060830 diff --git a/lang/python26/pkg-plist b/lang/python26/pkg-plist index 6526f34bc484..3098736ca2c1 100644 --- a/lang/python26/pkg-plist +++ b/lang/python26/pkg-plist @@ -1,9 +1,16 @@ +%%IF_DEFAULT%%bin/idle bin/idle%%PYVER%% +%%IF_DEFAULT%%bin/pydoc bin/pydoc%%PYVER%% +%%IF_DEFAULT%%bin/python bin/python%%PYVER%% +%%IF_DEFAULT%%bin/python-config bin/python%%PYVER%%-config +%%IF_DEFAULT%%bin/python-shared bin/python-shared%%PYVER%% +%%IF_DEFAULT%%bin/python-shared-config bin/python-shared%%PYVER%%-config +%%IF_DEFAULT%%bin/smtpd.py bin/smtpd%%PYVER%%.py %%PYTHON_INCLUDEDIR%%/Python-ast.h %%PYTHON_INCLUDEDIR%%/Python.h @@ -670,7 +677,7 @@ lib/lib%%PYTHON_VERSION%%.so.1 %%PYTHON_LIBDIR%%/lib-dynload/itertools.so %%PYTHON_LIBDIR%%/lib-dynload/math.so %%PYTHON_LIBDIR%%/lib-dynload/mmap.so -%%PYTHON_LIBDIR%%/lib-dynload/nis.so +%%NO_NIS%%%%PYTHON_LIBDIR%%/lib-dynload/nis.so %%PYTHON_LIBDIR%%/lib-dynload/operator.so %%PYTHON_LIBDIR%%/lib-dynload/ossaudiodev.so %%PYTHON_LIBDIR%%/lib-dynload/parser.so @@ -860,6 +867,7 @@ lib/lib%%PYTHON_VERSION%%.so.1 %%PYTHON_LIBDIR%%/test/exception_hierarchy.txt %%PYTHON_LIBDIR%%/test/fork_wait.py %%PYTHON_LIBDIR%%/test/greyrgb.uue +%%PYTHON_LIBDIR%%/test/infinite_reload.py %%PYTHON_LIBDIR%%/test/inspect_fodder.py %%PYTHON_LIBDIR%%/test/inspect_fodder2.py %%PYTHON_LIBDIR%%/test/list_tests.py @@ -984,6 +992,7 @@ lib/lib%%PYTHON_VERSION%%.so.1 %%PYTHON_LIBDIR%%/test/test_compile.py %%PYTHON_LIBDIR%%/test/test_compiler.py %%PYTHON_LIBDIR%%/test/test_complex.py +%%PYTHON_LIBDIR%%/test/test_complex_args.py %%PYTHON_LIBDIR%%/test/test_contains.py %%PYTHON_LIBDIR%%/test/test_contextlib.py %%PYTHON_LIBDIR%%/test/test_cookie.py @@ -1183,6 +1192,7 @@ lib/lib%%PYTHON_VERSION%%.so.1 %%PYTHON_LIBDIR%%/test/test_strop.py %%PYTHON_LIBDIR%%/test/test_strptime.py %%PYTHON_LIBDIR%%/test/test_struct.py +%%PYTHON_LIBDIR%%/test/test_structmembers.py %%PYTHON_LIBDIR%%/test/test_structseq.py %%PYTHON_LIBDIR%%/test/test_subprocess.py %%PYTHON_LIBDIR%%/test/test_sunaudiodev.py diff --git a/lang/python27/Makefile b/lang/python27/Makefile index 33f5cff93183..a688a3c2f0b1 100644 --- a/lang/python27/Makefile +++ b/lang/python27/Makefile @@ -5,8 +5,7 @@ # $FreeBSD$ PORTNAME= python25 -PORTVERSION= 2.5 -PORTREVISION= 1 +PORTVERSION= 2.5.1 CATEGORIES= lang python ipv6 MASTER_SITES= ${PYTHON_MASTER_SITES} MASTER_SITE_SUBDIR= ${PYTHON_MASTER_SITE_SUBDIR} @@ -39,11 +38,10 @@ PLIST_SUB= PYVER=${PYTHON_VERSION:S/python//} \ DEMODIR= ${PREFIX}/share/examples/${PYTHON_VERSION} TOOLSDIR= ${PREFIX}/share/${PYTHON_VERSION} -.if !exists(/usr/bin/ypcat) # the world with NO_NIS -PLIST_EXCLUDE= 'nis.so$$' -.else -PLIST_EXCLUDE= '^$$' # nothing -.endif +BIN_SCRIPTS= idle pydoc python python-shared smtpd.py python-config \ + python-shared-config +BINLINKS_SUB= -e 's,smtpd,smtpd${PYTHON_VER},' \ + -e 's,(idle|pydoc|python-shared|python),\1${PYTHON_VER},' OPTIONS= THREADS "Enable thread support" on \ HUGE_STACK_SIZE "Use a larger thread stack" off \ @@ -54,6 +52,13 @@ OPTIONS= THREADS "Enable thread support" on \ .include <bsd.port.pre.mk> +.if ${PYTHON_VERSION} == ${PYTHON_DEFAULT_VERSION} +MLINKS= ${PYTHON_VERSION}.1 python.1 +PLIST_SUB+= IF_DEFAULT="" +.else +PLIST_SUB+= IF_DEFAULT="@comment " +.endif + # workaround for a bug in base curses.h. CFLAGS+= -D__wchar_t=wchar_t @@ -95,6 +100,12 @@ PLIST_SUB+= 32BIT_ONLY="" CFLAGS+= -DPYTHON_DEFAULT_RECURSION_LIMIT=900 .endif +.if !exists(/usr/bin/ypcat) # the world with NO_NIS +PLIST_SUB+= NO_NIS="@comment " +.else +PLIST_SUB+= NO_NIS="" +.endif + .if ${OSVERSION} < 400000 LIB_DEPENDS+= ncurses.5:${PORTSDIR}/devel/ncurses CFLAGS+= -I${LOCALBASE}/include/ncurses -I${LOCALBASE}/include @@ -180,8 +191,7 @@ pre-su-install: .endfor pre-install: - ${EGREP} -v ${PLIST_EXCLUDE} ${PLIST_TEMPLATE} | \ - ${AWK} '{ print $$0; } \ + ${CAT} ${PLIST_TEMPLATE} | ${AWK} '{ print $$0; } \ /LIBDIR.*\.py$$/ && !/\/bad/ { print $$0 "o"; print $$0 "c"; }' > ${PLIST} @# if openssl 0.9.8 is detected, _sha{256,512} module won't be installed @@ -211,6 +221,13 @@ post-install: ${INSTALL_MAN} ${PYTHON_WRKSRC}/Misc/python.man \ ${MANPREFIX}/man/man1/${PYTHON_VERSION}.1 +.if ${PYTHON_VERSION} == ${PYTHON_DEFAULT_VERSION} + for f in ${BIN_SCRIPTS}; do \ + TARGET=`${ECHO_CMD} $$f | ${SED} -E ${BINLINKS_SUB}`; \ + cd ${PREFIX}/bin && ${LN} -f $$TARGET $$f; \ + done +.endif + .if !defined(NOPORTDOCS) @${MKDIR} ${TOOLSDIR} @cd ${PYTHON_WRKSRC}; ${TAR} -cf - Tools | \ diff --git a/lang/python27/distinfo b/lang/python27/distinfo index 7f7cbdee8a65..9a63d62ef45b 100644 --- a/lang/python27/distinfo +++ b/lang/python27/distinfo @@ -1,3 +1,3 @@ -MD5 (python/Python-2.5.tgz) = bc1b74f90a472a6c0a85481aaeb43f95 -SHA256 (python/Python-2.5.tgz) = d7bbf42e36003c6065cd19f3e67d283521858515ee923220f654131cebe1d8f2 -SIZE (python/Python-2.5.tgz) = 11019675 +MD5 (python/Python-2.5.1.tgz) = cca695828df8adc3e69b637af07522e1 +SHA256 (python/Python-2.5.1.tgz) = 1f5caee846049ca30d996f9403eefdb996295c4af664867e35dcc5eb36e4e7e8 +SIZE (python/Python-2.5.1.tgz) = 11060830 diff --git a/lang/python27/pkg-plist b/lang/python27/pkg-plist index 6526f34bc484..3098736ca2c1 100644 --- a/lang/python27/pkg-plist +++ b/lang/python27/pkg-plist @@ -1,9 +1,16 @@ +%%IF_DEFAULT%%bin/idle bin/idle%%PYVER%% +%%IF_DEFAULT%%bin/pydoc bin/pydoc%%PYVER%% +%%IF_DEFAULT%%bin/python bin/python%%PYVER%% +%%IF_DEFAULT%%bin/python-config bin/python%%PYVER%%-config +%%IF_DEFAULT%%bin/python-shared bin/python-shared%%PYVER%% +%%IF_DEFAULT%%bin/python-shared-config bin/python-shared%%PYVER%%-config +%%IF_DEFAULT%%bin/smtpd.py bin/smtpd%%PYVER%%.py %%PYTHON_INCLUDEDIR%%/Python-ast.h %%PYTHON_INCLUDEDIR%%/Python.h @@ -670,7 +677,7 @@ lib/lib%%PYTHON_VERSION%%.so.1 %%PYTHON_LIBDIR%%/lib-dynload/itertools.so %%PYTHON_LIBDIR%%/lib-dynload/math.so %%PYTHON_LIBDIR%%/lib-dynload/mmap.so -%%PYTHON_LIBDIR%%/lib-dynload/nis.so +%%NO_NIS%%%%PYTHON_LIBDIR%%/lib-dynload/nis.so %%PYTHON_LIBDIR%%/lib-dynload/operator.so %%PYTHON_LIBDIR%%/lib-dynload/ossaudiodev.so %%PYTHON_LIBDIR%%/lib-dynload/parser.so @@ -860,6 +867,7 @@ lib/lib%%PYTHON_VERSION%%.so.1 %%PYTHON_LIBDIR%%/test/exception_hierarchy.txt %%PYTHON_LIBDIR%%/test/fork_wait.py %%PYTHON_LIBDIR%%/test/greyrgb.uue +%%PYTHON_LIBDIR%%/test/infinite_reload.py %%PYTHON_LIBDIR%%/test/inspect_fodder.py %%PYTHON_LIBDIR%%/test/inspect_fodder2.py %%PYTHON_LIBDIR%%/test/list_tests.py @@ -984,6 +992,7 @@ lib/lib%%PYTHON_VERSION%%.so.1 %%PYTHON_LIBDIR%%/test/test_compile.py %%PYTHON_LIBDIR%%/test/test_compiler.py %%PYTHON_LIBDIR%%/test/test_complex.py +%%PYTHON_LIBDIR%%/test/test_complex_args.py %%PYTHON_LIBDIR%%/test/test_contains.py %%PYTHON_LIBDIR%%/test/test_contextlib.py %%PYTHON_LIBDIR%%/test/test_cookie.py @@ -1183,6 +1192,7 @@ lib/lib%%PYTHON_VERSION%%.so.1 %%PYTHON_LIBDIR%%/test/test_strop.py %%PYTHON_LIBDIR%%/test/test_strptime.py %%PYTHON_LIBDIR%%/test/test_struct.py +%%PYTHON_LIBDIR%%/test/test_structmembers.py %%PYTHON_LIBDIR%%/test/test_structseq.py %%PYTHON_LIBDIR%%/test/test_subprocess.py %%PYTHON_LIBDIR%%/test/test_sunaudiodev.py diff --git a/lang/python30/Makefile b/lang/python30/Makefile index 33f5cff93183..a688a3c2f0b1 100644 --- a/lang/python30/Makefile +++ b/lang/python30/Makefile @@ -5,8 +5,7 @@ # $FreeBSD$ PORTNAME= python25 -PORTVERSION= 2.5 -PORTREVISION= 1 +PORTVERSION= 2.5.1 CATEGORIES= lang python ipv6 MASTER_SITES= ${PYTHON_MASTER_SITES} MASTER_SITE_SUBDIR= ${PYTHON_MASTER_SITE_SUBDIR} @@ -39,11 +38,10 @@ PLIST_SUB= PYVER=${PYTHON_VERSION:S/python//} \ DEMODIR= ${PREFIX}/share/examples/${PYTHON_VERSION} TOOLSDIR= ${PREFIX}/share/${PYTHON_VERSION} -.if !exists(/usr/bin/ypcat) # the world with NO_NIS -PLIST_EXCLUDE= 'nis.so$$' -.else -PLIST_EXCLUDE= '^$$' # nothing -.endif +BIN_SCRIPTS= idle pydoc python python-shared smtpd.py python-config \ + python-shared-config +BINLINKS_SUB= -e 's,smtpd,smtpd${PYTHON_VER},' \ + -e 's,(idle|pydoc|python-shared|python),\1${PYTHON_VER},' OPTIONS= THREADS "Enable thread support" on \ HUGE_STACK_SIZE "Use a larger thread stack" off \ @@ -54,6 +52,13 @@ OPTIONS= THREADS "Enable thread support" on \ .include <bsd.port.pre.mk> +.if ${PYTHON_VERSION} == ${PYTHON_DEFAULT_VERSION} +MLINKS= ${PYTHON_VERSION}.1 python.1 +PLIST_SUB+= IF_DEFAULT="" +.else +PLIST_SUB+= IF_DEFAULT="@comment " +.endif + # workaround for a bug in base curses.h. CFLAGS+= -D__wchar_t=wchar_t @@ -95,6 +100,12 @@ PLIST_SUB+= 32BIT_ONLY="" CFLAGS+= -DPYTHON_DEFAULT_RECURSION_LIMIT=900 .endif +.if !exists(/usr/bin/ypcat) # the world with NO_NIS +PLIST_SUB+= NO_NIS="@comment " +.else +PLIST_SUB+= NO_NIS="" +.endif + .if ${OSVERSION} < 400000 LIB_DEPENDS+= ncurses.5:${PORTSDIR}/devel/ncurses CFLAGS+= -I${LOCALBASE}/include/ncurses -I${LOCALBASE}/include @@ -180,8 +191,7 @@ pre-su-install: .endfor pre-install: - ${EGREP} -v ${PLIST_EXCLUDE} ${PLIST_TEMPLATE} | \ - ${AWK} '{ print $$0; } \ + ${CAT} ${PLIST_TEMPLATE} | ${AWK} '{ print $$0; } \ /LIBDIR.*\.py$$/ && !/\/bad/ { print $$0 "o"; print $$0 "c"; }' > ${PLIST} @# if openssl 0.9.8 is detected, _sha{256,512} module won't be installed @@ -211,6 +221,13 @@ post-install: ${INSTALL_MAN} ${PYTHON_WRKSRC}/Misc/python.man \ ${MANPREFIX}/man/man1/${PYTHON_VERSION}.1 +.if ${PYTHON_VERSION} == ${PYTHON_DEFAULT_VERSION} + for f in ${BIN_SCRIPTS}; do \ + TARGET=`${ECHO_CMD} $$f | ${SED} -E ${BINLINKS_SUB}`; \ + cd ${PREFIX}/bin && ${LN} -f $$TARGET $$f; \ + done +.endif + .if !defined(NOPORTDOCS) @${MKDIR} ${TOOLSDIR} @cd ${PYTHON_WRKSRC}; ${TAR} -cf - Tools | \ diff --git a/lang/python30/distinfo b/lang/python30/distinfo index 7f7cbdee8a65..9a63d62ef45b 100644 --- a/lang/python30/distinfo +++ b/lang/python30/distinfo @@ -1,3 +1,3 @@ -MD5 (python/Python-2.5.tgz) = bc1b74f90a472a6c0a85481aaeb43f95 -SHA256 (python/Python-2.5.tgz) = d7bbf42e36003c6065cd19f3e67d283521858515ee923220f654131cebe1d8f2 -SIZE (python/Python-2.5.tgz) = 11019675 +MD5 (python/Python-2.5.1.tgz) = cca695828df8adc3e69b637af07522e1 +SHA256 (python/Python-2.5.1.tgz) = 1f5caee846049ca30d996f9403eefdb996295c4af664867e35dcc5eb36e4e7e8 +SIZE (python/Python-2.5.1.tgz) = 11060830 diff --git a/lang/python30/pkg-plist b/lang/python30/pkg-plist index 6526f34bc484..3098736ca2c1 100644 --- a/lang/python30/pkg-plist +++ b/lang/python30/pkg-plist @@ -1,9 +1,16 @@ +%%IF_DEFAULT%%bin/idle bin/idle%%PYVER%% +%%IF_DEFAULT%%bin/pydoc bin/pydoc%%PYVER%% +%%IF_DEFAULT%%bin/python bin/python%%PYVER%% +%%IF_DEFAULT%%bin/python-config bin/python%%PYVER%%-config +%%IF_DEFAULT%%bin/python-shared bin/python-shared%%PYVER%% +%%IF_DEFAULT%%bin/python-shared-config bin/python-shared%%PYVER%%-config +%%IF_DEFAULT%%bin/smtpd.py bin/smtpd%%PYVER%%.py %%PYTHON_INCLUDEDIR%%/Python-ast.h %%PYTHON_INCLUDEDIR%%/Python.h @@ -670,7 +677,7 @@ lib/lib%%PYTHON_VERSION%%.so.1 %%PYTHON_LIBDIR%%/lib-dynload/itertools.so %%PYTHON_LIBDIR%%/lib-dynload/math.so %%PYTHON_LIBDIR%%/lib-dynload/mmap.so -%%PYTHON_LIBDIR%%/lib-dynload/nis.so +%%NO_NIS%%%%PYTHON_LIBDIR%%/lib-dynload/nis.so %%PYTHON_LIBDIR%%/lib-dynload/operator.so %%PYTHON_LIBDIR%%/lib-dynload/ossaudiodev.so %%PYTHON_LIBDIR%%/lib-dynload/parser.so @@ -860,6 +867,7 @@ lib/lib%%PYTHON_VERSION%%.so.1 %%PYTHON_LIBDIR%%/test/exception_hierarchy.txt %%PYTHON_LIBDIR%%/test/fork_wait.py %%PYTHON_LIBDIR%%/test/greyrgb.uue +%%PYTHON_LIBDIR%%/test/infinite_reload.py %%PYTHON_LIBDIR%%/test/inspect_fodder.py %%PYTHON_LIBDIR%%/test/inspect_fodder2.py %%PYTHON_LIBDIR%%/test/list_tests.py @@ -984,6 +992,7 @@ lib/lib%%PYTHON_VERSION%%.so.1 %%PYTHON_LIBDIR%%/test/test_compile.py %%PYTHON_LIBDIR%%/test/test_compiler.py %%PYTHON_LIBDIR%%/test/test_complex.py +%%PYTHON_LIBDIR%%/test/test_complex_args.py %%PYTHON_LIBDIR%%/test/test_contains.py %%PYTHON_LIBDIR%%/test/test_contextlib.py %%PYTHON_LIBDIR%%/test/test_cookie.py @@ -1183,6 +1192,7 @@ lib/lib%%PYTHON_VERSION%%.so.1 %%PYTHON_LIBDIR%%/test/test_strop.py %%PYTHON_LIBDIR%%/test/test_strptime.py %%PYTHON_LIBDIR%%/test/test_struct.py +%%PYTHON_LIBDIR%%/test/test_structmembers.py %%PYTHON_LIBDIR%%/test/test_structseq.py %%PYTHON_LIBDIR%%/test/test_subprocess.py %%PYTHON_LIBDIR%%/test/test_sunaudiodev.py diff --git a/lang/python31/Makefile b/lang/python31/Makefile index 33f5cff93183..a688a3c2f0b1 100644 --- a/lang/python31/Makefile +++ b/lang/python31/Makefile @@ -5,8 +5,7 @@ # $FreeBSD$ PORTNAME= python25 -PORTVERSION= 2.5 -PORTREVISION= 1 +PORTVERSION= 2.5.1 CATEGORIES= lang python ipv6 MASTER_SITES= ${PYTHON_MASTER_SITES} MASTER_SITE_SUBDIR= ${PYTHON_MASTER_SITE_SUBDIR} @@ -39,11 +38,10 @@ PLIST_SUB= PYVER=${PYTHON_VERSION:S/python//} \ DEMODIR= ${PREFIX}/share/examples/${PYTHON_VERSION} TOOLSDIR= ${PREFIX}/share/${PYTHON_VERSION} -.if !exists(/usr/bin/ypcat) # the world with NO_NIS -PLIST_EXCLUDE= 'nis.so$$' -.else -PLIST_EXCLUDE= '^$$' # nothing -.endif +BIN_SCRIPTS= idle pydoc python python-shared smtpd.py python-config \ + python-shared-config +BINLINKS_SUB= -e 's,smtpd,smtpd${PYTHON_VER},' \ + -e 's,(idle|pydoc|python-shared|python),\1${PYTHON_VER},' OPTIONS= THREADS "Enable thread support" on \ HUGE_STACK_SIZE "Use a larger thread stack" off \ @@ -54,6 +52,13 @@ OPTIONS= THREADS "Enable thread support" on \ .include <bsd.port.pre.mk> +.if ${PYTHON_VERSION} == ${PYTHON_DEFAULT_VERSION} +MLINKS= ${PYTHON_VERSION}.1 python.1 +PLIST_SUB+= IF_DEFAULT="" +.else +PLIST_SUB+= IF_DEFAULT="@comment " +.endif + # workaround for a bug in base curses.h. CFLAGS+= -D__wchar_t=wchar_t @@ -95,6 +100,12 @@ PLIST_SUB+= 32BIT_ONLY="" CFLAGS+= -DPYTHON_DEFAULT_RECURSION_LIMIT=900 .endif +.if !exists(/usr/bin/ypcat) # the world with NO_NIS +PLIST_SUB+= NO_NIS="@comment " +.else +PLIST_SUB+= NO_NIS="" +.endif + .if ${OSVERSION} < 400000 LIB_DEPENDS+= ncurses.5:${PORTSDIR}/devel/ncurses CFLAGS+= -I${LOCALBASE}/include/ncurses -I${LOCALBASE}/include @@ -180,8 +191,7 @@ pre-su-install: .endfor pre-install: - ${EGREP} -v ${PLIST_EXCLUDE} ${PLIST_TEMPLATE} | \ - ${AWK} '{ print $$0; } \ + ${CAT} ${PLIST_TEMPLATE} | ${AWK} '{ print $$0; } \ /LIBDIR.*\.py$$/ && !/\/bad/ { print $$0 "o"; print $$0 "c"; }' > ${PLIST} @# if openssl 0.9.8 is detected, _sha{256,512} module won't be installed @@ -211,6 +221,13 @@ post-install: ${INSTALL_MAN} ${PYTHON_WRKSRC}/Misc/python.man \ ${MANPREFIX}/man/man1/${PYTHON_VERSION}.1 +.if ${PYTHON_VERSION} == ${PYTHON_DEFAULT_VERSION} + for f in ${BIN_SCRIPTS}; do \ + TARGET=`${ECHO_CMD} $$f | ${SED} -E ${BINLINKS_SUB}`; \ + cd ${PREFIX}/bin && ${LN} -f $$TARGET $$f; \ + done +.endif + .if !defined(NOPORTDOCS) @${MKDIR} ${TOOLSDIR} @cd ${PYTHON_WRKSRC}; ${TAR} -cf - Tools | \ diff --git a/lang/python31/distinfo b/lang/python31/distinfo index 7f7cbdee8a65..9a63d62ef45b 100644 --- a/lang/python31/distinfo +++ b/lang/python31/distinfo @@ -1,3 +1,3 @@ -MD5 (python/Python-2.5.tgz) = bc1b74f90a472a6c0a85481aaeb43f95 -SHA256 (python/Python-2.5.tgz) = d7bbf42e36003c6065cd19f3e67d283521858515ee923220f654131cebe1d8f2 -SIZE (python/Python-2.5.tgz) = 11019675 +MD5 (python/Python-2.5.1.tgz) = cca695828df8adc3e69b637af07522e1 +SHA256 (python/Python-2.5.1.tgz) = 1f5caee846049ca30d996f9403eefdb996295c4af664867e35dcc5eb36e4e7e8 +SIZE (python/Python-2.5.1.tgz) = 11060830 diff --git a/lang/python31/pkg-plist b/lang/python31/pkg-plist index 6526f34bc484..3098736ca2c1 100644 --- a/lang/python31/pkg-plist +++ b/lang/python31/pkg-plist @@ -1,9 +1,16 @@ +%%IF_DEFAULT%%bin/idle bin/idle%%PYVER%% +%%IF_DEFAULT%%bin/pydoc bin/pydoc%%PYVER%% +%%IF_DEFAULT%%bin/python bin/python%%PYVER%% +%%IF_DEFAULT%%bin/python-config bin/python%%PYVER%%-config +%%IF_DEFAULT%%bin/python-shared bin/python-shared%%PYVER%% +%%IF_DEFAULT%%bin/python-shared-config bin/python-shared%%PYVER%%-config +%%IF_DEFAULT%%bin/smtpd.py bin/smtpd%%PYVER%%.py %%PYTHON_INCLUDEDIR%%/Python-ast.h %%PYTHON_INCLUDEDIR%%/Python.h @@ -670,7 +677,7 @@ lib/lib%%PYTHON_VERSION%%.so.1 %%PYTHON_LIBDIR%%/lib-dynload/itertools.so %%PYTHON_LIBDIR%%/lib-dynload/math.so %%PYTHON_LIBDIR%%/lib-dynload/mmap.so -%%PYTHON_LIBDIR%%/lib-dynload/nis.so +%%NO_NIS%%%%PYTHON_LIBDIR%%/lib-dynload/nis.so %%PYTHON_LIBDIR%%/lib-dynload/operator.so %%PYTHON_LIBDIR%%/lib-dynload/ossaudiodev.so %%PYTHON_LIBDIR%%/lib-dynload/parser.so @@ -860,6 +867,7 @@ lib/lib%%PYTHON_VERSION%%.so.1 %%PYTHON_LIBDIR%%/test/exception_hierarchy.txt %%PYTHON_LIBDIR%%/test/fork_wait.py %%PYTHON_LIBDIR%%/test/greyrgb.uue +%%PYTHON_LIBDIR%%/test/infinite_reload.py %%PYTHON_LIBDIR%%/test/inspect_fodder.py %%PYTHON_LIBDIR%%/test/inspect_fodder2.py %%PYTHON_LIBDIR%%/test/list_tests.py @@ -984,6 +992,7 @@ lib/lib%%PYTHON_VERSION%%.so.1 %%PYTHON_LIBDIR%%/test/test_compile.py %%PYTHON_LIBDIR%%/test/test_compiler.py %%PYTHON_LIBDIR%%/test/test_complex.py +%%PYTHON_LIBDIR%%/test/test_complex_args.py %%PYTHON_LIBDIR%%/test/test_contains.py %%PYTHON_LIBDIR%%/test/test_contextlib.py %%PYTHON_LIBDIR%%/test/test_cookie.py @@ -1183,6 +1192,7 @@ lib/lib%%PYTHON_VERSION%%.so.1 %%PYTHON_LIBDIR%%/test/test_strop.py %%PYTHON_LIBDIR%%/test/test_strptime.py %%PYTHON_LIBDIR%%/test/test_struct.py +%%PYTHON_LIBDIR%%/test/test_structmembers.py %%PYTHON_LIBDIR%%/test/test_structseq.py %%PYTHON_LIBDIR%%/test/test_subprocess.py %%PYTHON_LIBDIR%%/test/test_sunaudiodev.py diff --git a/lang/python32/Makefile b/lang/python32/Makefile index 33f5cff93183..a688a3c2f0b1 100644 --- a/lang/python32/Makefile +++ b/lang/python32/Makefile @@ -5,8 +5,7 @@ # $FreeBSD$ PORTNAME= python25 -PORTVERSION= 2.5 -PORTREVISION= 1 +PORTVERSION= 2.5.1 CATEGORIES= lang python ipv6 MASTER_SITES= ${PYTHON_MASTER_SITES} MASTER_SITE_SUBDIR= ${PYTHON_MASTER_SITE_SUBDIR} @@ -39,11 +38,10 @@ PLIST_SUB= PYVER=${PYTHON_VERSION:S/python//} \ DEMODIR= ${PREFIX}/share/examples/${PYTHON_VERSION} TOOLSDIR= ${PREFIX}/share/${PYTHON_VERSION} -.if !exists(/usr/bin/ypcat) # the world with NO_NIS -PLIST_EXCLUDE= 'nis.so$$' -.else -PLIST_EXCLUDE= '^$$' # nothing -.endif +BIN_SCRIPTS= idle pydoc python python-shared smtpd.py python-config \ + python-shared-config +BINLINKS_SUB= -e 's,smtpd,smtpd${PYTHON_VER},' \ + -e 's,(idle|pydoc|python-shared|python),\1${PYTHON_VER},' OPTIONS= THREADS "Enable thread support" on \ HUGE_STACK_SIZE "Use a larger thread stack" off \ @@ -54,6 +52,13 @@ OPTIONS= THREADS "Enable thread support" on \ .include <bsd.port.pre.mk> +.if ${PYTHON_VERSION} == ${PYTHON_DEFAULT_VERSION} +MLINKS= ${PYTHON_VERSION}.1 python.1 +PLIST_SUB+= IF_DEFAULT="" +.else +PLIST_SUB+= IF_DEFAULT="@comment " +.endif + # workaround for a bug in base curses.h. CFLAGS+= -D__wchar_t=wchar_t @@ -95,6 +100,12 @@ PLIST_SUB+= 32BIT_ONLY="" CFLAGS+= -DPYTHON_DEFAULT_RECURSION_LIMIT=900 .endif +.if !exists(/usr/bin/ypcat) # the world with NO_NIS +PLIST_SUB+= NO_NIS="@comment " +.else +PLIST_SUB+= NO_NIS="" +.endif + .if ${OSVERSION} < 400000 LIB_DEPENDS+= ncurses.5:${PORTSDIR}/devel/ncurses CFLAGS+= -I${LOCALBASE}/include/ncurses -I${LOCALBASE}/include @@ -180,8 +191,7 @@ pre-su-install: .endfor pre-install: - ${EGREP} -v ${PLIST_EXCLUDE} ${PLIST_TEMPLATE} | \ - ${AWK} '{ print $$0; } \ + ${CAT} ${PLIST_TEMPLATE} | ${AWK} '{ print $$0; } \ /LIBDIR.*\.py$$/ && !/\/bad/ { print $$0 "o"; print $$0 "c"; }' > ${PLIST} @# if openssl 0.9.8 is detected, _sha{256,512} module won't be installed @@ -211,6 +221,13 @@ post-install: ${INSTALL_MAN} ${PYTHON_WRKSRC}/Misc/python.man \ ${MANPREFIX}/man/man1/${PYTHON_VERSION}.1 +.if ${PYTHON_VERSION} == ${PYTHON_DEFAULT_VERSION} + for f in ${BIN_SCRIPTS}; do \ + TARGET=`${ECHO_CMD} $$f | ${SED} -E ${BINLINKS_SUB}`; \ + cd ${PREFIX}/bin && ${LN} -f $$TARGET $$f; \ + done +.endif + .if !defined(NOPORTDOCS) @${MKDIR} ${TOOLSDIR} @cd ${PYTHON_WRKSRC}; ${TAR} -cf - Tools | \ diff --git a/lang/python32/distinfo b/lang/python32/distinfo index 7f7cbdee8a65..9a63d62ef45b 100644 --- a/lang/python32/distinfo +++ b/lang/python32/distinfo @@ -1,3 +1,3 @@ -MD5 (python/Python-2.5.tgz) = bc1b74f90a472a6c0a85481aaeb43f95 -SHA256 (python/Python-2.5.tgz) = d7bbf42e36003c6065cd19f3e67d283521858515ee923220f654131cebe1d8f2 -SIZE (python/Python-2.5.tgz) = 11019675 +MD5 (python/Python-2.5.1.tgz) = cca695828df8adc3e69b637af07522e1 +SHA256 (python/Python-2.5.1.tgz) = 1f5caee846049ca30d996f9403eefdb996295c4af664867e35dcc5eb36e4e7e8 +SIZE (python/Python-2.5.1.tgz) = 11060830 diff --git a/lang/python32/pkg-plist b/lang/python32/pkg-plist index 6526f34bc484..3098736ca2c1 100644 --- a/lang/python32/pkg-plist +++ b/lang/python32/pkg-plist @@ -1,9 +1,16 @@ +%%IF_DEFAULT%%bin/idle bin/idle%%PYVER%% +%%IF_DEFAULT%%bin/pydoc bin/pydoc%%PYVER%% +%%IF_DEFAULT%%bin/python bin/python%%PYVER%% +%%IF_DEFAULT%%bin/python-config bin/python%%PYVER%%-config +%%IF_DEFAULT%%bin/python-shared bin/python-shared%%PYVER%% +%%IF_DEFAULT%%bin/python-shared-config bin/python-shared%%PYVER%%-config +%%IF_DEFAULT%%bin/smtpd.py bin/smtpd%%PYVER%%.py %%PYTHON_INCLUDEDIR%%/Python-ast.h %%PYTHON_INCLUDEDIR%%/Python.h @@ -670,7 +677,7 @@ lib/lib%%PYTHON_VERSION%%.so.1 %%PYTHON_LIBDIR%%/lib-dynload/itertools.so %%PYTHON_LIBDIR%%/lib-dynload/math.so %%PYTHON_LIBDIR%%/lib-dynload/mmap.so -%%PYTHON_LIBDIR%%/lib-dynload/nis.so +%%NO_NIS%%%%PYTHON_LIBDIR%%/lib-dynload/nis.so %%PYTHON_LIBDIR%%/lib-dynload/operator.so %%PYTHON_LIBDIR%%/lib-dynload/ossaudiodev.so %%PYTHON_LIBDIR%%/lib-dynload/parser.so @@ -860,6 +867,7 @@ lib/lib%%PYTHON_VERSION%%.so.1 %%PYTHON_LIBDIR%%/test/exception_hierarchy.txt %%PYTHON_LIBDIR%%/test/fork_wait.py %%PYTHON_LIBDIR%%/test/greyrgb.uue +%%PYTHON_LIBDIR%%/test/infinite_reload.py %%PYTHON_LIBDIR%%/test/inspect_fodder.py %%PYTHON_LIBDIR%%/test/inspect_fodder2.py %%PYTHON_LIBDIR%%/test/list_tests.py @@ -984,6 +992,7 @@ lib/lib%%PYTHON_VERSION%%.so.1 %%PYTHON_LIBDIR%%/test/test_compile.py %%PYTHON_LIBDIR%%/test/test_compiler.py %%PYTHON_LIBDIR%%/test/test_complex.py +%%PYTHON_LIBDIR%%/test/test_complex_args.py %%PYTHON_LIBDIR%%/test/test_contains.py %%PYTHON_LIBDIR%%/test/test_contextlib.py %%PYTHON_LIBDIR%%/test/test_cookie.py @@ -1183,6 +1192,7 @@ lib/lib%%PYTHON_VERSION%%.so.1 %%PYTHON_LIBDIR%%/test/test_strop.py %%PYTHON_LIBDIR%%/test/test_strptime.py %%PYTHON_LIBDIR%%/test/test_struct.py +%%PYTHON_LIBDIR%%/test/test_structmembers.py %%PYTHON_LIBDIR%%/test/test_structseq.py %%PYTHON_LIBDIR%%/test/test_subprocess.py %%PYTHON_LIBDIR%%/test/test_sunaudiodev.py |