ports/71340: Upgrade lang/python-devel to 2.4.a3
Marcus Grando
marcus at corp.grupos.com.br
Fri Sep 3 14:20:23 UTC 2004
>Number: 71340
>Category: ports
>Synopsis: Upgrade lang/python-devel to 2.4.a3
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Fri Sep 03 14:20:22 GMT 2004
>Closed-Date:
>Last-Modified:
>Originator: Marcus Grando
>Release: FreeBSD 4.10-RELEASE i386
>Organization:
Grupos Internet S/A
>Environment:
System: FreeBSD out01.grupos.com.br 4.10-RELEASE FreeBSD 4.10-RELEASE #7: Thu May 27 15:00:45 BRT 2004
root at out01.grupos.com.br:/usr/obj/usr/src/sys/OUT01 i386
>Description:
Upgrade lang/python-devel to 2.4.a3
>How-To-Repeat:
>Fix:
After patch remove lang/python-devel/files/patch-Modules::cjkcodecs::_codecs_iso2022.c
--update /Mk/bsd.python.mk--
--- bsd.python.mk.old Fri Sep 3 10:37:40 2004
+++ bsd.python.mk Fri Sep 3 10:37:51 2004
@@ -202,7 +202,7 @@
# Python-2.4
.if ${PYTHON_VERSION} == "python2.4"
-PYTHON_PORTVERSION?=2.4.a2
+PYTHON_PORTVERSION?=2.4.a3
PYTHON_PORTSDIR= ${PORTSDIR}/lang/python-devel
PYTHON_REL= 240
PYTHON_SUFFIX= 24
----
--update lang/python-devel--
diff -ruN python-devel.old/Makefile python-devel/Makefile
--- python-devel.old/Makefile Sat Aug 21 01:02:51 2004
+++ python-devel/Makefile Fri Sep 3 10:35:28 2004
@@ -5,7 +5,7 @@
# $FreeBSD: ports/lang/python-devel/Makefile,v 1.120 2004/08/21 01:02:12 perky Exp $
PORTNAME= python
-PORTVERSION= 2.4.a2
+PORTVERSION= 2.4.a3
PORTREVISION= 1
CATEGORIES= lang python ipv6
MASTER_SITES= ${PYTHON_MASTER_SITES}
diff -ruN python-devel.old/distinfo python-devel/distinfo
--- python-devel.old/distinfo Sun Aug 8 01:02:32 2004
+++ python-devel/distinfo Fri Sep 3 10:40:09 2004
@@ -1,2 +1,2 @@
-MD5 (python/Python-2.4a2.tgz) = 6cface6d1d6d01c16c7ce0cba31fc860
-SIZE (python/Python-2.4a2.tgz) = 8999009
+MD5 (python/Python-2.4a3.tgz) = 3030cb6bc7da261a8874c7f23226de7d
+SIZE (python/Python-2.4a3.tgz) = 9114590
diff -ruN python-devel.old/files/patch-Modules::cjkcodecs::_codecs_iso2022.c
python-devel/files/patch-Modules::cjkcodecs::_codecs_iso2022.c
--- python-devel.old/files/patch-Modules::cjkcodecs::_codecs_iso2022.c Fri Aug 20 22:02:12 2004
+++ python-devel/files/patch-Modules::cjkcodecs::_codecs_iso2022.c Wed Dec 31 21:00:00 1969
@@ -1,123 +0,0 @@
---- Modules/cjkcodecs/_codecs_iso2022.c.orig Sun Jul 18 13:34:33 2004
-+++ Modules/cjkcodecs/_codecs_iso2022.c Sat Aug 21 09:07:17 2004
-@@ -2,7 +2,7 @@
- * _codecs_iso2022.c: Codecs collection for ISO-2022 encodings.
- *
- * Written by Hye-Shik Chang <perky at FreeBSD.org>
-- * $CJKCodecs: _codecs_iso2022.c,v 1.18 2004/07/07 18:30:17 perky Exp $
-+ * $CJKCodecs: _codecs_iso2022.c,v 1.22 2004/08/19 17:08:13 perky Exp $
- */
-
- #define USING_IMPORTED_MAPS
-@@ -117,7 +117,7 @@
-
- struct iso2022_config {
- int flags;
-- const struct iso2022_designation designations[]; /* non-ascii desigs */
-+ const struct iso2022_designation *designations; /* non-ascii desigs */
- };
-
- /*-*- iso-2022 codec implementation -*-*/
-@@ -197,7 +197,9 @@
- length = 2;
- #if Py_UNICODE_SIZE == 2
- if (length == 2) {
-- ucs4_t u4in[2] = {IN1, IN2};
-+ ucs4_t u4in[2];
-+ u4in[0] = (ucs4_t)IN1;
-+ u4in[1] = (ucs4_t)IN2;
- encoded = dsg->encoder(u4in, &length);
- } else
- encoded = dsg->encoder(&c, &length);
-@@ -420,7 +422,7 @@
- DECODER(iso2022)
- {
- const struct iso2022_designation *dsgcache = NULL;
--
-+
- while (inleft > 0) {
- unsigned char c = IN1;
- int err;
-@@ -1047,50 +1049,52 @@
- #define REGISTRY_ISO8859_7 { CHARSET_ISO8859_7, 2, 1, \
- NULL, dummy_decoder, dummy_encoder }
- #define REGISTRY_SENTINEL { 0, }
-+#define CONFIGDEF(var, attrs) \
-+ static const struct iso2022_config iso2022_##var##_config = { \
-+ attrs, iso2022_##var##_designations \
-+ };
-
--static const struct iso2022_config iso2022_kr_config = {
-- 0,
-- { REGISTRY_KSX1001, REGISTRY_SENTINEL },
-+static const struct iso2022_designation iso2022_kr_designations[] = {
-+ REGISTRY_KSX1001, REGISTRY_SENTINEL
- };
-+CONFIGDEF(kr, 0)
-
--static const struct iso2022_config iso2022_jp_config = {
-- NO_SHIFT | USE_JISX0208_EXT,
-- { REGISTRY_JISX0208, REGISTRY_JISX0201_R, REGISTRY_JISX0208_O,
-- REGISTRY_SENTINEL },
-+static const struct iso2022_designation iso2022_jp_designations[] = {
-+ REGISTRY_JISX0208, REGISTRY_JISX0201_R, REGISTRY_JISX0208_O,
-+ REGISTRY_SENTINEL
- };
-+CONFIGDEF(jp, NO_SHIFT | USE_JISX0208_EXT)
-
--static const struct iso2022_config iso2022_jp_1_config = {
-- NO_SHIFT | USE_JISX0208_EXT,
-- { REGISTRY_JISX0208, REGISTRY_JISX0212, REGISTRY_JISX0201_R,
-- REGISTRY_JISX0208_O, REGISTRY_SENTINEL },
-+static const struct iso2022_designation iso2022_jp_1_designations[] = {
-+ REGISTRY_JISX0208, REGISTRY_JISX0212, REGISTRY_JISX0201_R,
-+ REGISTRY_JISX0208_O, REGISTRY_SENTINEL
- };
-+CONFIGDEF(jp_1, NO_SHIFT | USE_JISX0208_EXT)
-
--static const struct iso2022_config iso2022_jp_2_config = {
-- NO_SHIFT | USE_G2 | USE_JISX0208_EXT,
-- { REGISTRY_JISX0208, REGISTRY_JISX0212, REGISTRY_KSX1001,
-- REGISTRY_GB2312, REGISTRY_JISX0201_R, REGISTRY_JISX0208_O,
-- REGISTRY_ISO8859_1, REGISTRY_ISO8859_7, REGISTRY_SENTINEL },
-+static const struct iso2022_designation iso2022_jp_2_designations[] = {
-+ REGISTRY_JISX0208, REGISTRY_JISX0212, REGISTRY_KSX1001,
-+ REGISTRY_GB2312, REGISTRY_JISX0201_R, REGISTRY_JISX0208_O,
-+ REGISTRY_ISO8859_1, REGISTRY_ISO8859_7, REGISTRY_SENTINEL
- };
-+CONFIGDEF(jp_2, NO_SHIFT | USE_G2 | USE_JISX0208_EXT)
-
--static const struct iso2022_config iso2022_jp_2004_config = {
-- NO_SHIFT | USE_G2 | USE_JISX0208_EXT,
-- { REGISTRY_JISX0213_2004_1_PAIRONLY, REGISTRY_JISX0208,
-- REGISTRY_JISX0213_2004_1, REGISTRY_JISX0213_2004_2,
-- REGISTRY_SENTINEL },
-+static const struct iso2022_designation iso2022_jp_2004_designations[] = {
-+ REGISTRY_JISX0213_2004_1_PAIRONLY, REGISTRY_JISX0208,
-+ REGISTRY_JISX0213_2004_1, REGISTRY_JISX0213_2004_2, REGISTRY_SENTINEL
- };
-+CONFIGDEF(jp_2004, NO_SHIFT | USE_JISX0208_EXT)
-
--static const struct iso2022_config iso2022_jp_3_config = {
-- NO_SHIFT | USE_JISX0208_EXT,
-- { REGISTRY_JISX0213_2000_1_PAIRONLY, REGISTRY_JISX0208,
-- REGISTRY_JISX0213_2000_1, REGISTRY_JISX0213_2000_2,
-- REGISTRY_SENTINEL },
-+static const struct iso2022_designation iso2022_jp_3_designations[] = {
-+ REGISTRY_JISX0213_2000_1_PAIRONLY, REGISTRY_JISX0208,
-+ REGISTRY_JISX0213_2000_1, REGISTRY_JISX0213_2000_2, REGISTRY_SENTINEL
- };
-+CONFIGDEF(jp_3, NO_SHIFT | USE_JISX0208_EXT)
-
--static const struct iso2022_config iso2022_jp_ext_config = {
-- NO_SHIFT | USE_JISX0208_EXT,
-- { REGISTRY_JISX0208, REGISTRY_JISX0212, REGISTRY_JISX0201_R,
-- REGISTRY_JISX0201_K, REGISTRY_JISX0208_O, REGISTRY_SENTINEL },
-+static const struct iso2022_designation iso2022_jp_ext_designations[] = {
-+ REGISTRY_JISX0208, REGISTRY_JISX0212, REGISTRY_JISX0201_R,
-+ REGISTRY_JISX0201_K, REGISTRY_JISX0208_O, REGISTRY_SENTINEL
- };
-+CONFIGDEF(jp_ext, NO_SHIFT | USE_JISX0208_EXT)
-
-
- BEGIN_MAPPINGS_LIST
diff -ruN python-devel.old/files/patch-configure python-devel/files/patch-configure
--- python-devel.old/files/patch-configure Thu Oct 30 01:03:53 2003
+++ python-devel/files/patch-configure Fri Sep 3 10:46:11 2004
@@ -1,7 +1,7 @@
---- configure.orig Sat Oct 4 13:27:50 2003
-+++ configure Sat Oct 4 13:29:05 2003
-@@ -1321,7 +1321,7 @@
- VERSION=2.3
+--- configure.orig Wed Aug 25 20:59:39 2004
++++ configure Fri Sep 3 10:42:41 2004
+@@ -1352,7 +1352,7 @@
+ VERSION=2.4
-SOVERSION=1.0
@@ -9,7 +9,7 @@
# The later defininition of _XOPEN_SOURCE disables certain features
# on Linux, so we need _GNU_SOURCE to re-enable them (makedev, tm_zone).
-@@ -3594,6 +3594,12 @@
+@@ -3396,6 +3396,12 @@
LDLIBRARY='libpython$(VERSION).so'
BLDLIBRARY='-L. -lpython$(VERSION)'
RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH}
diff -ruN python-devel.old/files/patch-setup.py python-devel/files/patch-setup.py
--- python-devel.old/files/patch-setup.py Sat Aug 21 01:02:51 2004
+++ python-devel/files/patch-setup.py Fri Sep 3 10:44:30 2004
@@ -1,5 +1,5 @@
---- setup.py.orig Fri Jul 23 11:50:10 2004
-+++ setup.py Sat Aug 21 09:04:58 2004
+--- setup.py.orig Tue Aug 31 10:37:25 2004
++++ setup.py Fri Sep 3 10:42:53 2004
@@ -15,7 +15,7 @@
from distutils.command.install_lib import install_lib
@@ -9,16 +9,7 @@
def add_dir_to_list(dirlist, dir):
"""Add the directory 'dir' to the list 'dirlist' (at the front) if
-@@ -782,7 +782,7 @@
- # Linux-specific modules
- exts.append( Extension('linuxaudiodev', ['linuxaudiodev.c']) )
-
-- if platform in ('linux2', 'freebsd4', 'freebsd5'):
-+ if platform in ('linux2', 'freebsd4', 'freebsd5', 'freebsd6'):
- exts.append( Extension('ossaudiodev', ['ossaudiodev.c']) )
-
- if platform == 'sunos5':
-@@ -1164,8 +1164,7 @@
+@@ -1144,8 +1144,7 @@
ext_modules=[Extension('struct', ['structmodule.c'])],
# Scripts to install
----
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list