aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Mk/bsd.python.mk8
-rw-r--r--lang/python-doc-html/distinfo32
-rw-r--r--lang/python32/Makefile2
-rw-r--r--lang/python32/distinfo4
-rw-r--r--lang/python32/pkg-plist1
-rw-r--r--lang/python33/Makefile2
-rw-r--r--lang/python33/distinfo4
-rw-r--r--lang/python33/files/patch-Modules-_ctypes-libffi-configure18
-rw-r--r--lang/python33/pkg-plist6
9 files changed, 34 insertions, 43 deletions
diff --git a/Mk/bsd.python.mk b/Mk/bsd.python.mk
index 855ea017ea45..757b6c50430f 100644
--- a/Mk/bsd.python.mk
+++ b/Mk/bsd.python.mk
@@ -375,9 +375,9 @@ PYTHON_PORTVERSION= ${PYTHON_DEFAULT_PORTVERSION}
# Python-3.3
.if ${PYTHON_VERSION} == "python3.3"
-PYTHON_PORTVERSION?= 3.3.1
+PYTHON_PORTVERSION?= 3.3.2
PYTHON_PORTSDIR= ${PORTSDIR}/lang/python33
-PYTHON_REL= 331
+PYTHON_REL= 332
PYTHON_SUFFIX= 33
PYTHON_VER= 3.3
.if exists(${PYTHON_CMD}-config)
@@ -386,9 +386,9 @@ PYTHON_ABIVER!= ${PYTHON_CMD}-config --abiflags
# Python-3.2
.elif ${PYTHON_VERSION} == "python3.2"
-PYTHON_PORTVERSION?= 3.2.4
+PYTHON_PORTVERSION?= 3.2.5
PYTHON_PORTSDIR= ${PORTSDIR}/lang/python32
-PYTHON_REL= 324
+PYTHON_REL= 325
PYTHON_SUFFIX= 32
PYTHON_VER= 3.2
.if exists(${PYTHON_CMD}-config)
diff --git a/lang/python-doc-html/distinfo b/lang/python-doc-html/distinfo
index 66363498adf3..ae7320c70011 100644
--- a/lang/python-doc-html/distinfo
+++ b/lang/python-doc-html/distinfo
@@ -22,19 +22,19 @@ SHA256 (python/python-3.1.5-docs-pdf-letter.tar.bz2) = 1198c59df9c3cc2ff9a34f588
SIZE (python/python-3.1.5-docs-pdf-letter.tar.bz2) = 9598827
SHA256 (python/python-3.1.5-docs-text.tar.bz2) = 2bd95a2b9d62e78e3ecfce6b0421c4e3b1cc5fd1facc06e9a02286d89e7b4ecb
SIZE (python/python-3.1.5-docs-text.tar.bz2) = 1334753
-SHA256 (python/python-3.2.4-docs-html.tar.bz2) = db225109e55e47d23c8bae8887bf807eb598421346cbfb784514f60f45c9796b
-SIZE (python/python-3.2.4-docs-html.tar.bz2) = 4435421
-SHA256 (python/python-3.2.4-docs-pdf-a4.tar.bz2) = 7753b186dbe9cd08060fad4a5073de5c2fdff46106e6215d6b70ac6d173fe580
-SIZE (python/python-3.2.4-docs-pdf-a4.tar.bz2) = 10378339
-SHA256 (python/python-3.2.4-docs-pdf-letter.tar.bz2) = c85c8252820004cf0caf7232602879055bb463c2c6ad2ea7d2636e6969b11af8
-SIZE (python/python-3.2.4-docs-pdf-letter.tar.bz2) = 10427691
-SHA256 (python/python-3.2.4-docs-text.tar.bz2) = bfe9b534e314be5b63aa442460d53c939b72b7a2021d67583078e9f8b5c18432
-SIZE (python/python-3.2.4-docs-text.tar.bz2) = 1570492
-SHA256 (python/python-3.3.1-docs-html.tar.bz2) = 77789f20d526800a53f7c3d238089de8a20a894927a10a36ca4aeb2e36d877bf
-SIZE (python/python-3.3.1-docs-html.tar.bz2) = 4899323
-SHA256 (python/python-3.3.1-docs-pdf-a4.tar.bz2) = 394d1d07a87c461193118f50db4905807efd54c733aec1df7464b1688ffa1a4f
-SIZE (python/python-3.3.1-docs-pdf-a4.tar.bz2) = 11162619
-SHA256 (python/python-3.3.1-docs-pdf-letter.tar.bz2) = 3ee448bf4778ba61f89484e08d28cd5b501d2a9c4dd8b3eb47d6a31ffb0c7997
-SIZE (python/python-3.3.1-docs-pdf-letter.tar.bz2) = 11213346
-SHA256 (python/python-3.3.1-docs-text.tar.bz2) = 36505cde176105bf1b7cbab54090d97d7d3be0d3e9f4f20be23f639ef7fd6887
-SIZE (python/python-3.3.1-docs-text.tar.bz2) = 1782542
+SHA256 (python/python-3.2.5-docs-html.tar.bz2) = 5a7f7f79d58cf87511aae66784ae71e3e108ca8185bd40706c4bb43e5e0348bc
+SIZE (python/python-3.2.5-docs-html.tar.bz2) = 4435429
+SHA256 (python/python-3.2.5-docs-pdf-a4.tar.bz2) = bfa07657b5d3810fa3cc16cd210459457cfaedff0887e2617b2deabd21e432e3
+SIZE (python/python-3.2.5-docs-pdf-a4.tar.bz2) = 10380500
+SHA256 (python/python-3.2.5-docs-pdf-letter.tar.bz2) = 55327e6e05c5c1f6669512e40835ce39649145eec56f7dee38ec4528ebe06060
+SIZE (python/python-3.2.5-docs-pdf-letter.tar.bz2) = 10429112
+SHA256 (python/python-3.2.5-docs-text.tar.bz2) = 8940c6bb7c93ffdb5be2573ff236ac06b6082132dd97a404be8400033d805523
+SIZE (python/python-3.2.5-docs-text.tar.bz2) = 1569706
+SHA256 (python/python-3.3.2-docs-html.tar.bz2) = 7434bbb654c45ccc29825f15df2137944c53c5b737a94eadbcbb006dd2848cd4
+SIZE (python/python-3.3.2-docs-html.tar.bz2) = 4907895
+SHA256 (python/python-3.3.2-docs-pdf-a4.tar.bz2) = 8037b8adafb6eb5d0596eaca25dd4ac18a6dd1545064254dd9aac38d89b04024
+SIZE (python/python-3.3.2-docs-pdf-a4.tar.bz2) = 11096627
+SHA256 (python/python-3.3.2-docs-pdf-letter.tar.bz2) = 978dfb0466524635dcc5541030a8b42446e4979f5e1ff5402b459587520f3729
+SIZE (python/python-3.3.2-docs-pdf-letter.tar.bz2) = 11148806
+SHA256 (python/python-3.3.2-docs-text.tar.bz2) = a96a427bf3aa8db126a3c4c42c8123bd1910143a232fe01a8623feb940dfcaa5
+SIZE (python/python-3.3.2-docs-text.tar.bz2) = 1781230
diff --git a/lang/python32/Makefile b/lang/python32/Makefile
index 0b50aca18c5f..ece165c57513 100644
--- a/lang/python32/Makefile
+++ b/lang/python32/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= python32
-PORTVERSION= 3.2.4
+PORTVERSION= 3.2.5
CATEGORIES= lang python ipv6
MASTER_SITES= PYTHON
MASTER_SITE_SUBDIR= ${PYTHON_MASTER_SITE_SUBDIR}
diff --git a/lang/python32/distinfo b/lang/python32/distinfo
index e3678bd2d39b..14a5f80a62ac 100644
--- a/lang/python32/distinfo
+++ b/lang/python32/distinfo
@@ -1,2 +1,2 @@
-SHA256 (python/Python-3.2.4.tar.xz) = 0949d92d04f001e51cc0daa4c0e9861f65af94e378ff0e664c239cc78c206ef4
-SIZE (python/Python-3.2.4.tar.xz) = 9223024
+SHA256 (python/Python-3.2.5.tar.xz) = 8ccb9645b9779fc4550055b2ebb21a724ab7a63dee45643286eb4f79b2f84116
+SIZE (python/Python-3.2.5.tar.xz) = 9221624
diff --git a/lang/python32/pkg-plist b/lang/python32/pkg-plist
index 5f61780fb49b..36777cbb5b05 100644
--- a/lang/python32/pkg-plist
+++ b/lang/python32/pkg-plist
@@ -3897,7 +3897,6 @@ libdata/pkgconfig/python-3.2.pc
%%PYTHON_LIBDIR%%/test/test_zipimport.py
%%PYTHON_LIBDIR%%/test/test_zipimport_support.py
%%PYTHON_LIBDIR%%/test/test_zlib.py
-%%PYTHON_LIBDIR%%/test/testbz2_bigmem.bz2
%%PYTHON_LIBDIR%%/test/testcodec.py
%%PYTHON_LIBDIR%%/test/testtar.tar
%%PYTHON_LIBDIR%%/test/tf_inherit_check.py
diff --git a/lang/python33/Makefile b/lang/python33/Makefile
index 8cf4230b02a7..7b1c1e45a0d0 100644
--- a/lang/python33/Makefile
+++ b/lang/python33/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= python33
-PORTVERSION= 3.3.1
+PORTVERSION= 3.3.2
CATEGORIES= lang python ipv6
MASTER_SITES= PYTHON
MASTER_SITE_SUBDIR= ${PYTHON_MASTER_SITE_SUBDIR}
diff --git a/lang/python33/distinfo b/lang/python33/distinfo
index 8a49599ad629..bc83ffff8270 100644
--- a/lang/python33/distinfo
+++ b/lang/python33/distinfo
@@ -1,2 +1,2 @@
-SHA256 (python/Python-3.3.1.tar.xz) = f8a7f0117c9a8263a52991cb86a55082888850b196d9dfad6d84bb0549e7c76a
-SIZE (python/Python-3.3.1.tar.xz) = 11852964
+SHA256 (python/Python-3.3.2.tar.xz) = 745b32c4b810e36fa66346198dbc2e313524fd68888922b85005656825e64b43
+SIZE (python/Python-3.3.2.tar.xz) = 11847676
diff --git a/lang/python33/files/patch-Modules-_ctypes-libffi-configure b/lang/python33/files/patch-Modules-_ctypes-libffi-configure
index 5f24678ab3cb..8228ccc55eb0 100644
--- a/lang/python33/files/patch-Modules-_ctypes-libffi-configure
+++ b/lang/python33/files/patch-Modules-_ctypes-libffi-configure
@@ -1,5 +1,5 @@
---- ./Modules/_ctypes/libffi/configure.orig 2013-04-06 11:41:49.000000000 +0400
-+++ ./Modules/_ctypes/libffi/configure 2013-04-08 12:50:54.000000000 +0400
+--- ./Modules/_ctypes/libffi/configure.orig 2013-05-15 20:32:57.000000000 +0400
++++ ./Modules/_ctypes/libffi/configure 2013-05-18 10:56:03.000000000 +0400
@@ -6889,7 +6889,7 @@
rm -rf conftest*
;;
@@ -9,17 +9,3 @@
s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
# Find out which ABI we are using.
echo 'int i;' > conftest.$ac_ext
-@@ -14505,10 +14505,10 @@
- $as_echo_n "(cached) " >&6
- else
-
-- libffi_cv_as_x86_pcrel=yes
-+ libffi_cv_as_x86_pcrel=no
- echo '.text; foo: nop; .data; .long foo-.; .text' > conftest.s
-- if $CC $CFLAGS -c conftest.s 2>&1 | grep -i warning > /dev/null; then
-- libffi_cv_as_x86_pcrel=no
-+ if $CC $CFLAGS -c conftest.s > /dev/null; then
-+ libffi_cv_as_x86_pcrel=yes
- fi
-
- fi
diff --git a/lang/python33/pkg-plist b/lang/python33/pkg-plist
index c37e955938c2..240b24851fb2 100644
--- a/lang/python33/pkg-plist
+++ b/lang/python33/pkg-plist
@@ -634,6 +634,8 @@ libdata/pkgconfig/python-%%PYVER%%.pc
%%PYTHON_LIBDIR%%/ctypes/test/__pycache__/test_values.cpython-33.pyo
%%PYTHON_LIBDIR%%/ctypes/test/__pycache__/test_varsize_struct.cpython-33.pyc
%%PYTHON_LIBDIR%%/ctypes/test/__pycache__/test_varsize_struct.cpython-33.pyo
+%%PYTHON_LIBDIR%%/ctypes/test/__pycache__/test_wintypes.cpython-33.pyc
+%%PYTHON_LIBDIR%%/ctypes/test/__pycache__/test_wintypes.cpython-33.pyo
%%PYTHON_LIBDIR%%/ctypes/test/__pycache__/test_win32.cpython-33.pyc
%%PYTHON_LIBDIR%%/ctypes/test/__pycache__/test_win32.cpython-33.pyo
%%PYTHON_LIBDIR%%/ctypes/test/runtests.py
@@ -688,6 +690,7 @@ libdata/pkgconfig/python-%%PYVER%%.pc
%%PYTHON_LIBDIR%%/ctypes/test/test_unicode.py
%%PYTHON_LIBDIR%%/ctypes/test/test_values.py
%%PYTHON_LIBDIR%%/ctypes/test/test_varsize_struct.py
+%%PYTHON_LIBDIR%%/ctypes/test/test_wintypes.py
%%PYTHON_LIBDIR%%/ctypes/test/test_win32.py
%%PYTHON_LIBDIR%%/ctypes/util.py
%%PYTHON_LIBDIR%%/ctypes/wintypes.py
@@ -3069,6 +3072,8 @@ libdata/pkgconfig/python-%%PYVER%%.pc
%%PYTHON_LIBDIR%%/test/__pycache__/test_xml_etree.cpython-33.pyo
%%PYTHON_LIBDIR%%/test/__pycache__/test_xml_etree_c.cpython-33.pyc
%%PYTHON_LIBDIR%%/test/__pycache__/test_xml_etree_c.cpython-33.pyo
+%%PYTHON_LIBDIR%%/test/__pycache__/test_xml_dom_minicompat.cpython-33.pyc
+%%PYTHON_LIBDIR%%/test/__pycache__/test_xml_dom_minicompat.cpython-33.pyo
%%PYTHON_LIBDIR%%/test/__pycache__/test_xmlrpc.cpython-33.pyc
%%PYTHON_LIBDIR%%/test/__pycache__/test_xmlrpc.cpython-33.pyo
%%PYTHON_LIBDIR%%/test/__pycache__/test_xmlrpc_net.cpython-33.pyc
@@ -4060,6 +4065,7 @@ libdata/pkgconfig/python-%%PYVER%%.pc
%%PYTHON_LIBDIR%%/test/test_xdrlib.py
%%PYTHON_LIBDIR%%/test/test_xml_etree.py
%%PYTHON_LIBDIR%%/test/test_xml_etree_c.py
+%%PYTHON_LIBDIR%%/test/test_xml_dom_minicompat.py
%%PYTHON_LIBDIR%%/test/test_xmlrpc.py
%%PYTHON_LIBDIR%%/test/test_xmlrpc_net.py
%%PYTHON_LIBDIR%%/test/test_webbrowser.py