diff options
| author | perky <perky@FreeBSD.org> | 2003-11-05 02:00:37 +0800 |
|---|---|---|
| committer | perky <perky@FreeBSD.org> | 2003-11-05 02:00:37 +0800 |
| commit | 0223d7cce347c990eb0499217aa63c6600a210fa (patch) | |
| tree | e854f4c2fd1fc47948758243541933cddd382875 /lang | |
| parent | da6894490212796fa4cfcf9bdb14fe105a903538 (diff) | |
| download | freebsd-ports-gnome-0223d7cce347c990eb0499217aa63c6600a210fa.tar.gz freebsd-ports-gnome-0223d7cce347c990eb0499217aa63c6600a210fa.tar.zst freebsd-ports-gnome-0223d7cce347c990eb0499217aa63c6600a210fa.zip | |
- Include pyexpat module in python base ports because python incorporated
expat 1.95.6 in its distribution from Python-2.3.
- Bump PORTREVISION subsequently.
Requested by: Mike Brown <mike@skew.org>
Jeremy Kloth <jeremy.kloth@fourthought.com>
Diffstat (limited to 'lang')
33 files changed, 36 insertions, 31 deletions
diff --git a/lang/python-devel/Makefile b/lang/python-devel/Makefile index 8fe819da604f..9ffe07820c1d 100644 --- a/lang/python-devel/Makefile +++ b/lang/python-devel/Makefile @@ -6,6 +6,7 @@ PORTNAME= python PORTVERSION= 2.4.a0.20031022 +PORTREVISION= 1 CATEGORIES= lang python ipv6 MASTER_SITES= ${PYTHON_MASTER_SITES} MASTER_SITE_SUBDIR= ${PYTHON_MASTER_SITE_SUBDIR} diff --git a/lang/python-devel/files/patch-setup.py b/lang/python-devel/files/patch-setup.py index d83025329ce0..acf4e60dc734 100644 --- a/lang/python-devel/files/patch-setup.py +++ b/lang/python-devel/files/patch-setup.py @@ -5,7 +5,7 @@ # This global variable is used to hold the list of modules to be disabled. -disabled_module_list = [] -+disabled_module_list = ["_bsddb", "_tkinter", "gdbm", "mpz", "pyexpat"] ++disabled_module_list = ["_bsddb", "_tkinter", "gdbm", "mpz"] def add_dir_to_list(dirlist, dir): """Add the directory 'dir' to the list 'dirlist' (at the front) if diff --git a/lang/python-devel/pkg-plist b/lang/python-devel/pkg-plist index 6d00ab24f61c..813b3c0a5d8e 100644 --- a/lang/python-devel/pkg-plist +++ b/lang/python-devel/pkg-plist @@ -1152,6 +1152,7 @@ lib/%%PYTHON_VERSION%%/lib-dynload/operator.so lib/%%PYTHON_VERSION%%/lib-dynload/parser.so lib/%%PYTHON_VERSION%%/lib-dynload/pcre.so lib/%%PYTHON_VERSION%%/lib-dynload/pwd.so +lib/%%PYTHON_VERSION%%/lib-dynload/pyexpat.so lib/%%PYTHON_VERSION%%/lib-dynload/readline.so lib/%%PYTHON_VERSION%%/lib-dynload/regex.so lib/%%PYTHON_VERSION%%/lib-dynload/resource.so diff --git a/lang/python/Makefile b/lang/python/Makefile index c97da86f9ad7..e612224ec57e 100644 --- a/lang/python/Makefile +++ b/lang/python/Makefile @@ -7,7 +7,7 @@ PORTNAME= python PORTVERSION= 2.3.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= lang python ipv6 MASTER_SITES= ${PYTHON_MASTER_SITES} MASTER_SITE_SUBDIR= ${PYTHON_MASTER_SITE_SUBDIR} diff --git a/lang/python/files/patch-setup.py b/lang/python/files/patch-setup.py index 4ed24bdb54d5..41434bc89896 100644 --- a/lang/python/files/patch-setup.py +++ b/lang/python/files/patch-setup.py @@ -1,14 +1,11 @@ - -$FreeBSD$ - ---- setup.py.orig Mon Sep 22 04:19:45 2003 -+++ setup.py Wed Oct 29 22:47:51 2003 +--- setup.py.orig Mon Sep 22 10:19:45 2003 ++++ setup.py Tue Nov 4 05:22:59 2003 @@ -15,7 +15,7 @@ from distutils.command.install_lib import install_lib # This global variable is used to hold the list of modules to be disabled. -disabled_module_list = [] -+disabled_module_list = ["_bsddb", "_tkinter", "gdbm", "mpz", "pyexpat"] ++disabled_module_list = ["_bsddb", "_tkinter", "gdbm", "mpz"] def add_dir_to_list(dirlist, dir): """Add the directory 'dir' to the list 'dirlist' (at the front) if diff --git a/lang/python/pkg-message b/lang/python/pkg-message index a75f7501aa54..207bb19452c6 100644 --- a/lang/python/pkg-message +++ b/lang/python/pkg-message @@ -5,7 +5,6 @@ ports since they require extra dependencies: bsddb databases/py-bsddb gdbm databases/py-gdbm mpz math/py-mpz -pyexpat textproc/py-expat tkinter x11-toolkits/py-tkinter Install them as occasion demands. diff --git a/lang/python/pkg-plist b/lang/python/pkg-plist index c4ba04eae369..b8b65cfee54a 100644 --- a/lang/python/pkg-plist +++ b/lang/python/pkg-plist @@ -1153,6 +1153,7 @@ lib/%%PYTHON_VERSION%%/lib-dynload/operator.so lib/%%PYTHON_VERSION%%/lib-dynload/parser.so lib/%%PYTHON_VERSION%%/lib-dynload/pcre.so lib/%%PYTHON_VERSION%%/lib-dynload/pwd.so +lib/%%PYTHON_VERSION%%/lib-dynload/pyexpat.so lib/%%PYTHON_VERSION%%/lib-dynload/readline.so lib/%%PYTHON_VERSION%%/lib-dynload/regex.so lib/%%PYTHON_VERSION%%/lib-dynload/resource.so diff --git a/lang/python23/Makefile b/lang/python23/Makefile index c97da86f9ad7..e612224ec57e 100644 --- a/lang/python23/Makefile +++ b/lang/python23/Makefile @@ -7,7 +7,7 @@ PORTNAME= python PORTVERSION= 2.3.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= lang python ipv6 MASTER_SITES= ${PYTHON_MASTER_SITES} MASTER_SITE_SUBDIR= ${PYTHON_MASTER_SITE_SUBDIR} diff --git a/lang/python23/files/patch-setup.py b/lang/python23/files/patch-setup.py index 4ed24bdb54d5..41434bc89896 100644 --- a/lang/python23/files/patch-setup.py +++ b/lang/python23/files/patch-setup.py @@ -1,14 +1,11 @@ - -$FreeBSD$ - ---- setup.py.orig Mon Sep 22 04:19:45 2003 -+++ setup.py Wed Oct 29 22:47:51 2003 +--- setup.py.orig Mon Sep 22 10:19:45 2003 ++++ setup.py Tue Nov 4 05:22:59 2003 @@ -15,7 +15,7 @@ from distutils.command.install_lib import install_lib # This global variable is used to hold the list of modules to be disabled. -disabled_module_list = [] -+disabled_module_list = ["_bsddb", "_tkinter", "gdbm", "mpz", "pyexpat"] ++disabled_module_list = ["_bsddb", "_tkinter", "gdbm", "mpz"] def add_dir_to_list(dirlist, dir): """Add the directory 'dir' to the list 'dirlist' (at the front) if diff --git a/lang/python23/pkg-message b/lang/python23/pkg-message index a75f7501aa54..207bb19452c6 100644 --- a/lang/python23/pkg-message +++ b/lang/python23/pkg-message @@ -5,7 +5,6 @@ ports since they require extra dependencies: bsddb databases/py-bsddb gdbm databases/py-gdbm mpz math/py-mpz -pyexpat textproc/py-expat tkinter x11-toolkits/py-tkinter Install them as occasion demands. diff --git a/lang/python23/pkg-plist b/lang/python23/pkg-plist index c4ba04eae369..b8b65cfee54a 100644 --- a/lang/python23/pkg-plist +++ b/lang/python23/pkg-plist @@ -1153,6 +1153,7 @@ lib/%%PYTHON_VERSION%%/lib-dynload/operator.so lib/%%PYTHON_VERSION%%/lib-dynload/parser.so lib/%%PYTHON_VERSION%%/lib-dynload/pcre.so lib/%%PYTHON_VERSION%%/lib-dynload/pwd.so +lib/%%PYTHON_VERSION%%/lib-dynload/pyexpat.so lib/%%PYTHON_VERSION%%/lib-dynload/readline.so lib/%%PYTHON_VERSION%%/lib-dynload/regex.so lib/%%PYTHON_VERSION%%/lib-dynload/resource.so diff --git a/lang/python24/Makefile b/lang/python24/Makefile index c97da86f9ad7..e612224ec57e 100644 --- a/lang/python24/Makefile +++ b/lang/python24/Makefile @@ -7,7 +7,7 @@ PORTNAME= python PORTVERSION= 2.3.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= lang python ipv6 MASTER_SITES= ${PYTHON_MASTER_SITES} MASTER_SITE_SUBDIR= ${PYTHON_MASTER_SITE_SUBDIR} diff --git a/lang/python24/files/patch-setup.py b/lang/python24/files/patch-setup.py index 4ed24bdb54d5..41434bc89896 100644 --- a/lang/python24/files/patch-setup.py +++ b/lang/python24/files/patch-setup.py @@ -1,14 +1,11 @@ - -$FreeBSD$ - ---- setup.py.orig Mon Sep 22 04:19:45 2003 -+++ setup.py Wed Oct 29 22:47:51 2003 +--- setup.py.orig Mon Sep 22 10:19:45 2003 ++++ setup.py Tue Nov 4 05:22:59 2003 @@ -15,7 +15,7 @@ from distutils.command.install_lib import install_lib # This global variable is used to hold the list of modules to be disabled. -disabled_module_list = [] -+disabled_module_list = ["_bsddb", "_tkinter", "gdbm", "mpz", "pyexpat"] ++disabled_module_list = ["_bsddb", "_tkinter", "gdbm", "mpz"] def add_dir_to_list(dirlist, dir): """Add the directory 'dir' to the list 'dirlist' (at the front) if diff --git a/lang/python24/pkg-message b/lang/python24/pkg-message index a75f7501aa54..207bb19452c6 100644 --- a/lang/python24/pkg-message +++ b/lang/python24/pkg-message @@ -5,7 +5,6 @@ ports since they require extra dependencies: bsddb databases/py-bsddb gdbm databases/py-gdbm mpz math/py-mpz -pyexpat textproc/py-expat tkinter x11-toolkits/py-tkinter Install them as occasion demands. diff --git a/lang/python24/pkg-plist b/lang/python24/pkg-plist index c4ba04eae369..b8b65cfee54a 100644 --- a/lang/python24/pkg-plist +++ b/lang/python24/pkg-plist @@ -1153,6 +1153,7 @@ lib/%%PYTHON_VERSION%%/lib-dynload/operator.so lib/%%PYTHON_VERSION%%/lib-dynload/parser.so lib/%%PYTHON_VERSION%%/lib-dynload/pcre.so lib/%%PYTHON_VERSION%%/lib-dynload/pwd.so +lib/%%PYTHON_VERSION%%/lib-dynload/pyexpat.so lib/%%PYTHON_VERSION%%/lib-dynload/readline.so lib/%%PYTHON_VERSION%%/lib-dynload/regex.so lib/%%PYTHON_VERSION%%/lib-dynload/resource.so diff --git a/lang/python25/Makefile b/lang/python25/Makefile index 8fe819da604f..9ffe07820c1d 100644 --- a/lang/python25/Makefile +++ b/lang/python25/Makefile @@ -6,6 +6,7 @@ PORTNAME= python PORTVERSION= 2.4.a0.20031022 +PORTREVISION= 1 CATEGORIES= lang python ipv6 MASTER_SITES= ${PYTHON_MASTER_SITES} MASTER_SITE_SUBDIR= ${PYTHON_MASTER_SITE_SUBDIR} diff --git a/lang/python25/files/patch-setup.py b/lang/python25/files/patch-setup.py index d83025329ce0..acf4e60dc734 100644 --- a/lang/python25/files/patch-setup.py +++ b/lang/python25/files/patch-setup.py @@ -5,7 +5,7 @@ # This global variable is used to hold the list of modules to be disabled. -disabled_module_list = [] -+disabled_module_list = ["_bsddb", "_tkinter", "gdbm", "mpz", "pyexpat"] ++disabled_module_list = ["_bsddb", "_tkinter", "gdbm", "mpz"] def add_dir_to_list(dirlist, dir): """Add the directory 'dir' to the list 'dirlist' (at the front) if diff --git a/lang/python25/pkg-plist b/lang/python25/pkg-plist index 6d00ab24f61c..813b3c0a5d8e 100644 --- a/lang/python25/pkg-plist +++ b/lang/python25/pkg-plist @@ -1152,6 +1152,7 @@ lib/%%PYTHON_VERSION%%/lib-dynload/operator.so lib/%%PYTHON_VERSION%%/lib-dynload/parser.so lib/%%PYTHON_VERSION%%/lib-dynload/pcre.so lib/%%PYTHON_VERSION%%/lib-dynload/pwd.so +lib/%%PYTHON_VERSION%%/lib-dynload/pyexpat.so lib/%%PYTHON_VERSION%%/lib-dynload/readline.so lib/%%PYTHON_VERSION%%/lib-dynload/regex.so lib/%%PYTHON_VERSION%%/lib-dynload/resource.so diff --git a/lang/python26/Makefile b/lang/python26/Makefile index 8fe819da604f..9ffe07820c1d 100644 --- a/lang/python26/Makefile +++ b/lang/python26/Makefile @@ -6,6 +6,7 @@ PORTNAME= python PORTVERSION= 2.4.a0.20031022 +PORTREVISION= 1 CATEGORIES= lang python ipv6 MASTER_SITES= ${PYTHON_MASTER_SITES} MASTER_SITE_SUBDIR= ${PYTHON_MASTER_SITE_SUBDIR} diff --git a/lang/python26/files/patch-setup.py b/lang/python26/files/patch-setup.py index d83025329ce0..acf4e60dc734 100644 --- a/lang/python26/files/patch-setup.py +++ b/lang/python26/files/patch-setup.py @@ -5,7 +5,7 @@ # This global variable is used to hold the list of modules to be disabled. -disabled_module_list = [] -+disabled_module_list = ["_bsddb", "_tkinter", "gdbm", "mpz", "pyexpat"] ++disabled_module_list = ["_bsddb", "_tkinter", "gdbm", "mpz"] def add_dir_to_list(dirlist, dir): """Add the directory 'dir' to the list 'dirlist' (at the front) if diff --git a/lang/python26/pkg-plist b/lang/python26/pkg-plist index 6d00ab24f61c..813b3c0a5d8e 100644 --- a/lang/python26/pkg-plist +++ b/lang/python26/pkg-plist @@ -1152,6 +1152,7 @@ lib/%%PYTHON_VERSION%%/lib-dynload/operator.so lib/%%PYTHON_VERSION%%/lib-dynload/parser.so lib/%%PYTHON_VERSION%%/lib-dynload/pcre.so lib/%%PYTHON_VERSION%%/lib-dynload/pwd.so +lib/%%PYTHON_VERSION%%/lib-dynload/pyexpat.so lib/%%PYTHON_VERSION%%/lib-dynload/readline.so lib/%%PYTHON_VERSION%%/lib-dynload/regex.so lib/%%PYTHON_VERSION%%/lib-dynload/resource.so diff --git a/lang/python27/Makefile b/lang/python27/Makefile index 8fe819da604f..9ffe07820c1d 100644 --- a/lang/python27/Makefile +++ b/lang/python27/Makefile @@ -6,6 +6,7 @@ PORTNAME= python PORTVERSION= 2.4.a0.20031022 +PORTREVISION= 1 CATEGORIES= lang python ipv6 MASTER_SITES= ${PYTHON_MASTER_SITES} MASTER_SITE_SUBDIR= ${PYTHON_MASTER_SITE_SUBDIR} diff --git a/lang/python27/files/patch-setup.py b/lang/python27/files/patch-setup.py index d83025329ce0..acf4e60dc734 100644 --- a/lang/python27/files/patch-setup.py +++ b/lang/python27/files/patch-setup.py @@ -5,7 +5,7 @@ # This global variable is used to hold the list of modules to be disabled. -disabled_module_list = [] -+disabled_module_list = ["_bsddb", "_tkinter", "gdbm", "mpz", "pyexpat"] ++disabled_module_list = ["_bsddb", "_tkinter", "gdbm", "mpz"] def add_dir_to_list(dirlist, dir): """Add the directory 'dir' to the list 'dirlist' (at the front) if diff --git a/lang/python27/pkg-plist b/lang/python27/pkg-plist index 6d00ab24f61c..813b3c0a5d8e 100644 --- a/lang/python27/pkg-plist +++ b/lang/python27/pkg-plist @@ -1152,6 +1152,7 @@ lib/%%PYTHON_VERSION%%/lib-dynload/operator.so lib/%%PYTHON_VERSION%%/lib-dynload/parser.so lib/%%PYTHON_VERSION%%/lib-dynload/pcre.so lib/%%PYTHON_VERSION%%/lib-dynload/pwd.so +lib/%%PYTHON_VERSION%%/lib-dynload/pyexpat.so lib/%%PYTHON_VERSION%%/lib-dynload/readline.so lib/%%PYTHON_VERSION%%/lib-dynload/regex.so lib/%%PYTHON_VERSION%%/lib-dynload/resource.so diff --git a/lang/python30/Makefile b/lang/python30/Makefile index 8fe819da604f..9ffe07820c1d 100644 --- a/lang/python30/Makefile +++ b/lang/python30/Makefile @@ -6,6 +6,7 @@ PORTNAME= python PORTVERSION= 2.4.a0.20031022 +PORTREVISION= 1 CATEGORIES= lang python ipv6 MASTER_SITES= ${PYTHON_MASTER_SITES} MASTER_SITE_SUBDIR= ${PYTHON_MASTER_SITE_SUBDIR} diff --git a/lang/python30/files/patch-setup.py b/lang/python30/files/patch-setup.py index d83025329ce0..acf4e60dc734 100644 --- a/lang/python30/files/patch-setup.py +++ b/lang/python30/files/patch-setup.py @@ -5,7 +5,7 @@ # This global variable is used to hold the list of modules to be disabled. -disabled_module_list = [] -+disabled_module_list = ["_bsddb", "_tkinter", "gdbm", "mpz", "pyexpat"] ++disabled_module_list = ["_bsddb", "_tkinter", "gdbm", "mpz"] def add_dir_to_list(dirlist, dir): """Add the directory 'dir' to the list 'dirlist' (at the front) if diff --git a/lang/python30/pkg-plist b/lang/python30/pkg-plist index 6d00ab24f61c..813b3c0a5d8e 100644 --- a/lang/python30/pkg-plist +++ b/lang/python30/pkg-plist @@ -1152,6 +1152,7 @@ lib/%%PYTHON_VERSION%%/lib-dynload/operator.so lib/%%PYTHON_VERSION%%/lib-dynload/parser.so lib/%%PYTHON_VERSION%%/lib-dynload/pcre.so lib/%%PYTHON_VERSION%%/lib-dynload/pwd.so +lib/%%PYTHON_VERSION%%/lib-dynload/pyexpat.so lib/%%PYTHON_VERSION%%/lib-dynload/readline.so lib/%%PYTHON_VERSION%%/lib-dynload/regex.so lib/%%PYTHON_VERSION%%/lib-dynload/resource.so diff --git a/lang/python31/Makefile b/lang/python31/Makefile index 8fe819da604f..9ffe07820c1d 100644 --- a/lang/python31/Makefile +++ b/lang/python31/Makefile @@ -6,6 +6,7 @@ PORTNAME= python PORTVERSION= 2.4.a0.20031022 +PORTREVISION= 1 CATEGORIES= lang python ipv6 MASTER_SITES= ${PYTHON_MASTER_SITES} MASTER_SITE_SUBDIR= ${PYTHON_MASTER_SITE_SUBDIR} diff --git a/lang/python31/files/patch-setup.py b/lang/python31/files/patch-setup.py index d83025329ce0..acf4e60dc734 100644 --- a/lang/python31/files/patch-setup.py +++ b/lang/python31/files/patch-setup.py @@ -5,7 +5,7 @@ # This global variable is used to hold the list of modules to be disabled. -disabled_module_list = [] -+disabled_module_list = ["_bsddb", "_tkinter", "gdbm", "mpz", "pyexpat"] ++disabled_module_list = ["_bsddb", "_tkinter", "gdbm", "mpz"] def add_dir_to_list(dirlist, dir): """Add the directory 'dir' to the list 'dirlist' (at the front) if diff --git a/lang/python31/pkg-plist b/lang/python31/pkg-plist index 6d00ab24f61c..813b3c0a5d8e 100644 --- a/lang/python31/pkg-plist +++ b/lang/python31/pkg-plist @@ -1152,6 +1152,7 @@ lib/%%PYTHON_VERSION%%/lib-dynload/operator.so lib/%%PYTHON_VERSION%%/lib-dynload/parser.so lib/%%PYTHON_VERSION%%/lib-dynload/pcre.so lib/%%PYTHON_VERSION%%/lib-dynload/pwd.so +lib/%%PYTHON_VERSION%%/lib-dynload/pyexpat.so lib/%%PYTHON_VERSION%%/lib-dynload/readline.so lib/%%PYTHON_VERSION%%/lib-dynload/regex.so lib/%%PYTHON_VERSION%%/lib-dynload/resource.so diff --git a/lang/python32/Makefile b/lang/python32/Makefile index 8fe819da604f..9ffe07820c1d 100644 --- a/lang/python32/Makefile +++ b/lang/python32/Makefile @@ -6,6 +6,7 @@ PORTNAME= python PORTVERSION= 2.4.a0.20031022 +PORTREVISION= 1 CATEGORIES= lang python ipv6 MASTER_SITES= ${PYTHON_MASTER_SITES} MASTER_SITE_SUBDIR= ${PYTHON_MASTER_SITE_SUBDIR} diff --git a/lang/python32/files/patch-setup.py b/lang/python32/files/patch-setup.py index d83025329ce0..acf4e60dc734 100644 --- a/lang/python32/files/patch-setup.py +++ b/lang/python32/files/patch-setup.py @@ -5,7 +5,7 @@ # This global variable is used to hold the list of modules to be disabled. -disabled_module_list = [] -+disabled_module_list = ["_bsddb", "_tkinter", "gdbm", "mpz", "pyexpat"] ++disabled_module_list = ["_bsddb", "_tkinter", "gdbm", "mpz"] def add_dir_to_list(dirlist, dir): """Add the directory 'dir' to the list 'dirlist' (at the front) if diff --git a/lang/python32/pkg-plist b/lang/python32/pkg-plist index 6d00ab24f61c..813b3c0a5d8e 100644 --- a/lang/python32/pkg-plist +++ b/lang/python32/pkg-plist @@ -1152,6 +1152,7 @@ lib/%%PYTHON_VERSION%%/lib-dynload/operator.so lib/%%PYTHON_VERSION%%/lib-dynload/parser.so lib/%%PYTHON_VERSION%%/lib-dynload/pcre.so lib/%%PYTHON_VERSION%%/lib-dynload/pwd.so +lib/%%PYTHON_VERSION%%/lib-dynload/pyexpat.so lib/%%PYTHON_VERSION%%/lib-dynload/readline.so lib/%%PYTHON_VERSION%%/lib-dynload/regex.so lib/%%PYTHON_VERSION%%/lib-dynload/resource.so |