diff options
author | Hye-Shik Chang <perky@FreeBSD.org> | 2006-10-09 15:51:28 +0000 |
---|---|---|
committer | Hye-Shik Chang <perky@FreeBSD.org> | 2006-10-09 15:51:28 +0000 |
commit | 2af3fdd8cfcae0118d8b24935f168996aa3e2997 (patch) | |
tree | dd8faa25a86ae5a1629e81294c26c5a777fd5c72 | |
parent | - Update MASTER_SITES list (diff) |
- Restrict a dependency to the real interpreter to _RUN only. This
allows portupgrade to upgrade lang/python from 2.4 flawlessly.
- So remove obsolete instruction.
Notes
Notes:
svn path=/head/; revision=175103
-rw-r--r-- | UPDATING | 3 | ||||
-rw-r--r-- | lang/python/Makefile | 2 | ||||
-rw-r--r-- | lang/python25/Makefile | 7 | ||||
-rw-r--r-- | lang/python26/Makefile | 7 | ||||
-rw-r--r-- | lang/python27/Makefile | 7 | ||||
-rw-r--r-- | lang/python30/Makefile | 7 | ||||
-rw-r--r-- | lang/python31/Makefile | 7 | ||||
-rw-r--r-- | lang/python32/Makefile | 7 |
8 files changed, 1 insertions, 46 deletions
@@ -10,9 +10,6 @@ upgrades. AFFECTS: users of any ports using Python AUTHOR: perky@FreeBSD.org - When you upgrade lang/python, you need to use this command: - portupgrade -o lang/python25 python-2.4.x (your current version) - After upgrading of lang/python, you must rebuild all its consumer ports to make them get ready to Python 2.5. diff --git a/lang/python/Makefile b/lang/python/Makefile index 118bdf78ead2..853ba7705af1 100644 --- a/lang/python/Makefile +++ b/lang/python/Makefile @@ -15,7 +15,7 @@ EXTRACT_ONLY= # empty MAINTAINER= python@FreeBSD.org COMMENT= The "meta-port" for the stable version of Python interpreter -USE_PYTHON= yes +USE_PYTHON_RUN= yes PYTHON_VERSION= python2.5 NO_BUILD= yes diff --git a/lang/python25/Makefile b/lang/python25/Makefile index 706e204e5f2d..8831de95431e 100644 --- a/lang/python25/Makefile +++ b/lang/python25/Makefile @@ -179,13 +179,6 @@ pre-su-install: .endfor pre-install: - @if [ -f ${PREFIX}/bin/python ]; then \ - ${ECHO_CMD} "=============================="; \ - ${ECHO_CMD} "If you're upgrading it using portupgrade, try portupgrade -o lang/python25 python-2.4.x"; \ - ${ECHO_CMD} "=============================="; \ - ${FALSE}; \ - fi - ${EGREP} -v ${PLIST_EXCLUDE} ${PLIST_TEMPLATE} | \ ${AWK} '{ print $$0; } \ /LIBDIR.*\.py$$/ && !/\/bad/ { print $$0 "o"; print $$0 "c"; }' > ${PLIST} diff --git a/lang/python26/Makefile b/lang/python26/Makefile index 706e204e5f2d..8831de95431e 100644 --- a/lang/python26/Makefile +++ b/lang/python26/Makefile @@ -179,13 +179,6 @@ pre-su-install: .endfor pre-install: - @if [ -f ${PREFIX}/bin/python ]; then \ - ${ECHO_CMD} "=============================="; \ - ${ECHO_CMD} "If you're upgrading it using portupgrade, try portupgrade -o lang/python25 python-2.4.x"; \ - ${ECHO_CMD} "=============================="; \ - ${FALSE}; \ - fi - ${EGREP} -v ${PLIST_EXCLUDE} ${PLIST_TEMPLATE} | \ ${AWK} '{ print $$0; } \ /LIBDIR.*\.py$$/ && !/\/bad/ { print $$0 "o"; print $$0 "c"; }' > ${PLIST} diff --git a/lang/python27/Makefile b/lang/python27/Makefile index 706e204e5f2d..8831de95431e 100644 --- a/lang/python27/Makefile +++ b/lang/python27/Makefile @@ -179,13 +179,6 @@ pre-su-install: .endfor pre-install: - @if [ -f ${PREFIX}/bin/python ]; then \ - ${ECHO_CMD} "=============================="; \ - ${ECHO_CMD} "If you're upgrading it using portupgrade, try portupgrade -o lang/python25 python-2.4.x"; \ - ${ECHO_CMD} "=============================="; \ - ${FALSE}; \ - fi - ${EGREP} -v ${PLIST_EXCLUDE} ${PLIST_TEMPLATE} | \ ${AWK} '{ print $$0; } \ /LIBDIR.*\.py$$/ && !/\/bad/ { print $$0 "o"; print $$0 "c"; }' > ${PLIST} diff --git a/lang/python30/Makefile b/lang/python30/Makefile index 706e204e5f2d..8831de95431e 100644 --- a/lang/python30/Makefile +++ b/lang/python30/Makefile @@ -179,13 +179,6 @@ pre-su-install: .endfor pre-install: - @if [ -f ${PREFIX}/bin/python ]; then \ - ${ECHO_CMD} "=============================="; \ - ${ECHO_CMD} "If you're upgrading it using portupgrade, try portupgrade -o lang/python25 python-2.4.x"; \ - ${ECHO_CMD} "=============================="; \ - ${FALSE}; \ - fi - ${EGREP} -v ${PLIST_EXCLUDE} ${PLIST_TEMPLATE} | \ ${AWK} '{ print $$0; } \ /LIBDIR.*\.py$$/ && !/\/bad/ { print $$0 "o"; print $$0 "c"; }' > ${PLIST} diff --git a/lang/python31/Makefile b/lang/python31/Makefile index 706e204e5f2d..8831de95431e 100644 --- a/lang/python31/Makefile +++ b/lang/python31/Makefile @@ -179,13 +179,6 @@ pre-su-install: .endfor pre-install: - @if [ -f ${PREFIX}/bin/python ]; then \ - ${ECHO_CMD} "=============================="; \ - ${ECHO_CMD} "If you're upgrading it using portupgrade, try portupgrade -o lang/python25 python-2.4.x"; \ - ${ECHO_CMD} "=============================="; \ - ${FALSE}; \ - fi - ${EGREP} -v ${PLIST_EXCLUDE} ${PLIST_TEMPLATE} | \ ${AWK} '{ print $$0; } \ /LIBDIR.*\.py$$/ && !/\/bad/ { print $$0 "o"; print $$0 "c"; }' > ${PLIST} diff --git a/lang/python32/Makefile b/lang/python32/Makefile index 706e204e5f2d..8831de95431e 100644 --- a/lang/python32/Makefile +++ b/lang/python32/Makefile @@ -179,13 +179,6 @@ pre-su-install: .endfor pre-install: - @if [ -f ${PREFIX}/bin/python ]; then \ - ${ECHO_CMD} "=============================="; \ - ${ECHO_CMD} "If you're upgrading it using portupgrade, try portupgrade -o lang/python25 python-2.4.x"; \ - ${ECHO_CMD} "=============================="; \ - ${FALSE}; \ - fi - ${EGREP} -v ${PLIST_EXCLUDE} ${PLIST_TEMPLATE} | \ ${AWK} '{ print $$0; } \ /LIBDIR.*\.py$$/ && !/\/bad/ { print $$0 "o"; print $$0 "c"; }' > ${PLIST} |