Attachment #46476 for bug #71340

View | Details | Raw Unified | Return to bug 71340
Collapse All | Expand All

Lines 202-208 Link Here

(-)bsd.python.mk Fri Sep 3 10:37:51 2004 (-3 / +1 lines)
202		202
203	# Python-2.4	203	# Python-2.4
204	.if ${PYTHON_VERSION} == "python2.4"	204	.if ${PYTHON_VERSION} == "python2.4"
205	PYTHON_PORTVERSION?=2.4.a2	205	PYTHON_PORTVERSION?=2.4.a3
206	PYTHON_PORTSDIR= ${PORTSDIR}/lang/python-devel	206	PYTHON_PORTSDIR= ${PORTSDIR}/lang/python-devel
207	PYTHON_REL= 240	207	PYTHON_REL= 240
208	PYTHON_SUFFIX= 24	208	PYTHON_SUFFIX= 24
209	---
210		209
211	-update lang/python-devel--

Lines 5-11 Link Here

(-)python-devel/Makefile Fri Sep 3 10:35:28 2004 (-1 / +1 lines)
5	# $FreeBSD: ports/lang/python-devel/Makefile,v 1.120 2004/08/21 01:02:12 perky Exp $	5	# $FreeBSD: ports/lang/python-devel/Makefile,v 1.120 2004/08/21 01:02:12 perky Exp $
6		6
7	PORTNAME= python	7	PORTNAME= python
8	PORTVERSION= 2.4.a2	8	PORTVERSION= 2.4.a3
9	PORTREVISION= 1	9	PORTREVISION= 1
10	CATEGORIES= lang python ipv6	10	CATEGORIES= lang python ipv6
11	MASTER_SITES= ${PYTHON_MASTER_SITES}	11	MASTER_SITES= ${PYTHON_MASTER_SITES}

Lines 1-2 Link Here

(-)python-devel/distinfo Fri Sep 3 10:40:09 2004 (-2 / +2 lines)
1	MD5 (python/Python-2.4a2.tgz) = 6cface6d1d6d01c16c7ce0cba31fc860	1	MD5 (python/Python-2.4a3.tgz) = 3030cb6bc7da261a8874c7f23226de7d
2	SIZE (python/Python-2.4a2.tgz) = 8999009	2	SIZE (python/Python-2.4a3.tgz) = 9114590




--- 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@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

Lines 1-7 Link Here

(-)python-devel/files/patch-configure Fri Sep 3 10:46:11 2004 (-5 / +5 lines)
1	--- configure.orig Sat Oct 4 13:27:50 2003	1	--- configure.orig Wed Aug 25 20:59:39 2004
2	+++ configure Sat Oct 4 13:29:05 2003	2	+++ configure Fri Sep 3 10:42:41 2004
3	@@ -1321,7 +1321,7 @@	3	@@ -1352,7 +1352,7 @@
4	VERSION=2.3	4	VERSION=2.4
5		5
6		6
7	-SOVERSION=1.0	7	-SOVERSION=1.0
Lines 9-15 Link Here
9		9
10	# The later defininition of _XOPEN_SOURCE disables certain features	10	# The later defininition of _XOPEN_SOURCE disables certain features
11	# on Linux, so we need _GNU_SOURCE to re-enable them (makedev, tm_zone).	11	# on Linux, so we need _GNU_SOURCE to re-enable them (makedev, tm_zone).
12	@@ -3594,6 +3594,12 @@	12	@@ -3396,6 +3396,12 @@
13	LDLIBRARY='libpython$(VERSION).so'	13	LDLIBRARY='libpython$(VERSION).so'
14	BLDLIBRARY='-L. -lpython$(VERSION)'	14	BLDLIBRARY='-L. -lpython$(VERSION)'
15	RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH}	15	RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH}




--- 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
   

   
 def add_dir_to_list(dirlist, dir):
     """Add the directory 'dir' to the list 'dirlist' (at the front) if
@@ -1144,8 +1144,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 @@
           ext_modules=[Extension('struct', ['structmodule.c'])],
   
           # Scripts to install
---

Return to bug 71340

Lines 1-123 Link Here

(-)python-devel/files/patch-Modules::cjkcodecs::_codecs_iso2022.c Wed Dec 31 21:00:00 1969 (-123 lines)
1	--- Modules/cjkcodecs/_codecs_iso2022.c.orig Sun Jul 18 13:34:33 2004
2	+++ Modules/cjkcodecs/_codecs_iso2022.c Sat Aug 21 09:07:17 2004
3	@@ -2,7 +2,7 @@
4	* _codecs_iso2022.c: Codecs collection for ISO-2022 encodings.
5	*
6	* Written by Hye-Shik Chang <perky@FreeBSD.org>
7	- * $CJKCodecs: _codecs_iso2022.c,v 1.18 2004/07/07 18:30:17 perky Exp $
8	+ * $CJKCodecs: _codecs_iso2022.c,v 1.22 2004/08/19 17:08:13 perky Exp $
9	*/
10
11	#define USING_IMPORTED_MAPS
12	@@ -117,7 +117,7 @@
13
14	struct iso2022_config {
15	int flags;
16	- const struct iso2022_designation designations[]; /* non-ascii desigs */
17	+ const struct iso2022_designation designations; / non-ascii desigs */
18	};
19
20	/-- iso-2022 codec implementation --/
21	@@ -197,7 +197,9 @@
22	length = 2;
23	#if Py_UNICODE_SIZE == 2
24	if (length == 2) {
25	- ucs4_t u4in[2] = {IN1, IN2};
26	+ ucs4_t u4in[2];
27	+ u4in[0] = (ucs4_t)IN1;
28	+ u4in[1] = (ucs4_t)IN2;
29	encoded = dsg->encoder(u4in, &length);
30	} else
31	encoded = dsg->encoder(&c, &length);
32	@@ -420,7 +422,7 @@
33	DECODER(iso2022)
34	{
35	const struct iso2022_designation *dsgcache = NULL;
36	-
37	+
38	while (inleft > 0) {
39	unsigned char c = IN1;
40	int err;
41	@@ -1047,50 +1049,52 @@
42	#define REGISTRY_ISO8859_7 { CHARSET_ISO8859_7, 2, 1, \
43	NULL, dummy_decoder, dummy_encoder }
44	#define REGISTRY_SENTINEL { 0, }
45	+#define CONFIGDEF(var, attrs) \
46	+ static const struct iso2022_config iso2022_##var##_config = { \
47	+ attrs, iso2022_##var##_designations \
48	+ };
49
50	-static const struct iso2022_config iso2022_kr_config = {
51	- 0,
52	- { REGISTRY_KSX1001, REGISTRY_SENTINEL },
53	+static const struct iso2022_designation iso2022_kr_designations[] = {
54	+ REGISTRY_KSX1001, REGISTRY_SENTINEL
55	};
56	+CONFIGDEF(kr, 0)
57
58	-static const struct iso2022_config iso2022_jp_config = {
59	- NO_SHIFT \| USE_JISX0208_EXT,
60	- { REGISTRY_JISX0208, REGISTRY_JISX0201_R, REGISTRY_JISX0208_O,
61	- REGISTRY_SENTINEL },
62	+static const struct iso2022_designation iso2022_jp_designations[] = {
63	+ REGISTRY_JISX0208, REGISTRY_JISX0201_R, REGISTRY_JISX0208_O,
64	+ REGISTRY_SENTINEL
65	};
66	+CONFIGDEF(jp, NO_SHIFT \| USE_JISX0208_EXT)
67
68	-static const struct iso2022_config iso2022_jp_1_config = {
69	- NO_SHIFT \| USE_JISX0208_EXT,
70	- { REGISTRY_JISX0208, REGISTRY_JISX0212, REGISTRY_JISX0201_R,
71	- REGISTRY_JISX0208_O, REGISTRY_SENTINEL },
72	+static const struct iso2022_designation iso2022_jp_1_designations[] = {
73	+ REGISTRY_JISX0208, REGISTRY_JISX0212, REGISTRY_JISX0201_R,
74	+ REGISTRY_JISX0208_O, REGISTRY_SENTINEL
75	};
76	+CONFIGDEF(jp_1, NO_SHIFT \| USE_JISX0208_EXT)
77
78	-static const struct iso2022_config iso2022_jp_2_config = {
79	- NO_SHIFT \| USE_G2 \| USE_JISX0208_EXT,
80	- { REGISTRY_JISX0208, REGISTRY_JISX0212, REGISTRY_KSX1001,
81	- REGISTRY_GB2312, REGISTRY_JISX0201_R, REGISTRY_JISX0208_O,
82	- REGISTRY_ISO8859_1, REGISTRY_ISO8859_7, REGISTRY_SENTINEL },
83	+static const struct iso2022_designation iso2022_jp_2_designations[] = {
84	+ REGISTRY_JISX0208, REGISTRY_JISX0212, REGISTRY_KSX1001,
85	+ REGISTRY_GB2312, REGISTRY_JISX0201_R, REGISTRY_JISX0208_O,
86	+ REGISTRY_ISO8859_1, REGISTRY_ISO8859_7, REGISTRY_SENTINEL
87	};
88	+CONFIGDEF(jp_2, NO_SHIFT \| USE_G2 \| USE_JISX0208_EXT)
89
90	-static const struct iso2022_config iso2022_jp_2004_config = {
91	- NO_SHIFT \| USE_G2 \| USE_JISX0208_EXT,
92	- { REGISTRY_JISX0213_2004_1_PAIRONLY, REGISTRY_JISX0208,
93	- REGISTRY_JISX0213_2004_1, REGISTRY_JISX0213_2004_2,
94	- REGISTRY_SENTINEL },
95	+static const struct iso2022_designation iso2022_jp_2004_designations[] = {
96	+ REGISTRY_JISX0213_2004_1_PAIRONLY, REGISTRY_JISX0208,
97	+ REGISTRY_JISX0213_2004_1, REGISTRY_JISX0213_2004_2, REGISTRY_SENTINEL
98	};
99	+CONFIGDEF(jp_2004, NO_SHIFT \| USE_JISX0208_EXT)
100
101	-static const struct iso2022_config iso2022_jp_3_config = {
102	- NO_SHIFT \| USE_JISX0208_EXT,
103	- { REGISTRY_JISX0213_2000_1_PAIRONLY, REGISTRY_JISX0208,
104	- REGISTRY_JISX0213_2000_1, REGISTRY_JISX0213_2000_2,
105	- REGISTRY_SENTINEL },
106	+static const struct iso2022_designation iso2022_jp_3_designations[] = {
107	+ REGISTRY_JISX0213_2000_1_PAIRONLY, REGISTRY_JISX0208,
108	+ REGISTRY_JISX0213_2000_1, REGISTRY_JISX0213_2000_2, REGISTRY_SENTINEL
109	};
110	+CONFIGDEF(jp_3, NO_SHIFT \| USE_JISX0208_EXT)
111
112	-static const struct iso2022_config iso2022_jp_ext_config = {
113	- NO_SHIFT \| USE_JISX0208_EXT,
114	- { REGISTRY_JISX0208, REGISTRY_JISX0212, REGISTRY_JISX0201_R,
115	- REGISTRY_JISX0201_K, REGISTRY_JISX0208_O, REGISTRY_SENTINEL },
116	+static const struct iso2022_designation iso2022_jp_ext_designations[] = {
117	+ REGISTRY_JISX0208, REGISTRY_JISX0212, REGISTRY_JISX0201_R,
118	+ REGISTRY_JISX0201_K, REGISTRY_JISX0208_O, REGISTRY_SENTINEL
119	};
120	+CONFIGDEF(jp_ext, NO_SHIFT \| USE_JISX0208_EXT)
121
122
123	BEGIN_MAPPINGS_LIST

Lines 1-5 Link Here

(-)python-devel/files/patch-setup.py Fri Sep 3 10:44:30 2004 (-13 / +3 lines)
1	--- setup.py.orig Fri Jul 23 11:50:10 2004	1	--- setup.py.orig Tue Aug 31 10:37:25 2004
2	+++ setup.py Sat Aug 21 09:04:58 2004	2	+++ setup.py Fri Sep 3 10:42:53 2004
3	@@ -15,7 +15,7 @@	3	@@ -15,7 +15,7 @@
4	from distutils.command.install_lib import install_lib	4	from distutils.command.install_lib import install_lib
5		5
Lines 9-24 Link Here
9		9
10	def add_dir_to_list(dirlist, dir):	10	def add_dir_to_list(dirlist, dir):
11	"""Add the directory 'dir' to the list 'dirlist' (at the front) if	11	"""Add the directory 'dir' to the list 'dirlist' (at the front) if
12	@@ -782,7 +782,7 @@	12	@@ -1144,8 +1144,7 @@
13	# Linux-specific modules
14	exts.append( Extension('linuxaudiodev', ['linuxaudiodev.c']) )
15
16	- if platform in ('linux2', 'freebsd4', 'freebsd5'):
17	+ if platform in ('linux2', 'freebsd4', 'freebsd5', 'freebsd6'):
18	exts.append( Extension('ossaudiodev', ['ossaudiodev.c']) )
19
20	if platform == 'sunos5':
21	@@ -1164,8 +1164,7 @@
22	ext_modules=[Extension('struct', ['structmodule.c'])],	13	ext_modules=[Extension('struct', ['structmodule.c'])],
23		14
24	# Scripts to install	15	# Scripts to install
25	---