Attachment #169596 for bug #208486

Lines 2-8 Link Here

(-)lang/python27/Makefile (-1 / +1 lines)
2		2
3	PORTNAME= python27	3	PORTNAME= python27
4	PORTVERSION= ${PYTHON_PORTVERSION}	4	PORTVERSION= ${PYTHON_PORTVERSION}
5	PORTREVISION= 1	5	PORTREVISION= 2
6	CATEGORIES= lang python ipv6	6	CATEGORIES= lang python ipv6
7	MASTER_SITES= PYTHON/ftp/python/${PORTVERSION}	7	MASTER_SITES= PYTHON/ftp/python/${PORTVERSION}
8	DISTNAME= Python-${PORTVERSION}	8	DISTNAME= Python-${PORTVERSION}




--- Include/pyport.h.orig	2015-12-05 20:46:54.000000000 +0100
+++ Include/pyport.h	2016-04-03 17:14:53.047412000 +0200
@@ -702,7 +702,9 @@
 
 #ifdef __FreeBSD__
 #include <osreldate.h>
-#if __FreeBSD_version > 500039
+#if (__FreeBSD_version >= 500040 && __FreeBSD_version < 602113) || \
+    (__FreeBSD_version >= 700000 && __FreeBSD_version < 700054) || \
+    (__FreeBSD_version >= 800000 && __FreeBSD_version < 800001)
 # define _PY_PORT_CTYPE_UTF8_ISSUE
 #endif
 #endif

Lines 2-8 Link Here

(-)lang/python33/Makefile (-1 / +1 lines)
2		2
3	PORTNAME= python33	3	PORTNAME= python33
4	PORTVERSION= ${PYTHON_PORTVERSION}	4	PORTVERSION= ${PYTHON_PORTVERSION}
5	PORTREVISION= 3	5	PORTREVISION= 4
6	CATEGORIES= lang python ipv6	6	CATEGORIES= lang python ipv6
7	MASTER_SITES= PYTHON/ftp/python/${PORTVERSION}	7	MASTER_SITES= PYTHON/ftp/python/${PORTVERSION}
8	DISTNAME= Python-${PORTVERSION}	8	DISTNAME= Python-${PORTVERSION}




--- Include/pyport.h.orig	2014-10-12 09:03:52.000000000 +0200
+++ Include/pyport.h	2016-04-03 19:26:20.938539000 +0200
@@ -686,7 +686,9 @@
 
 #ifdef __FreeBSD__
 #include <osreldate.h>
-#if __FreeBSD_version > 500039
+#if (__FreeBSD_version >= 500040 && __FreeBSD_version < 602113) || \
+    (__FreeBSD_version >= 700000 && __FreeBSD_version < 700054) || \
+    (__FreeBSD_version >= 800000 && __FreeBSD_version < 800001)
 # define _PY_PORT_CTYPE_UTF8_ISSUE
 #endif
 #endif

Lines 3-9 Link Here

(-)lang/python34/Makefile (-1 / +1 lines)
3		3
4	PORTNAME= python34	4	PORTNAME= python34
5	PORTVERSION= ${PYTHON_PORTVERSION}	5	PORTVERSION= ${PYTHON_PORTVERSION}
6	PORTREVISION= 1	6	PORTREVISION= 2
7	CATEGORIES= lang python ipv6	7	CATEGORIES= lang python ipv6
8	MASTER_SITES= PYTHON/ftp/python/${PORTVERSION}	8	MASTER_SITES= PYTHON/ftp/python/${PORTVERSION}
9	DISTNAME= Python-${PORTVERSION}	9	DISTNAME= Python-${PORTVERSION}




--- Include/pyport.h.orig	2015-12-21 07:00:57.000000000 +0100
+++ Include/pyport.h	2016-04-03 19:29:17.797369000 +0200
@@ -680,7 +680,9 @@
 
 #ifdef __FreeBSD__
 #include <osreldate.h>
-#if __FreeBSD_version > 500039
+#if (__FreeBSD_version >= 500040 && __FreeBSD_version < 602113) || \
+    (__FreeBSD_version >= 700000 && __FreeBSD_version < 700054) || \
+    (__FreeBSD_version >= 800000 && __FreeBSD_version < 800001)
 # define _PY_PORT_CTYPE_UTF8_ISSUE
 #endif
 #endif

Lines 3-9 Link Here

(-)lang/python35/Makefile (-1 / +1 lines)
3		3
4	PORTNAME= python	4	PORTNAME= python
5	DISTVERSION= ${PYTHON_PORTVERSION}	5	DISTVERSION= ${PYTHON_PORTVERSION}
6	PORTREVISION= 1	6	PORTREVISION= 2
7	CATEGORIES= lang python ipv6	7	CATEGORIES= lang python ipv6
8	MASTER_SITES= PYTHON/ftp/python/${PYTHON_PORTVERSION}	8	MASTER_SITES= PYTHON/ftp/python/${PYTHON_PORTVERSION}
9	PKGNAMESUFFIX= ${PYTHON_SUFFIX}	9	PKGNAMESUFFIX= ${PYTHON_SUFFIX}




--- Include/pyport.h.orig	2015-12-07 02:39:07.000000000 +0100
+++ Include/pyport.h	2016-04-03 19:31:36.801717000 +0200
@@ -677,7 +677,9 @@
 
 #ifdef __FreeBSD__
 #include <osreldate.h>
-#if __FreeBSD_version > 500039
+#if (__FreeBSD_version >= 500040 && __FreeBSD_version < 602113) || \
+    (__FreeBSD_version >= 700000 && __FreeBSD_version < 700054) || \
+    (__FreeBSD_version >= 800000 && __FreeBSD_version < 800001)
 # define _PY_PORT_CTYPE_UTF8_ISSUE
 #endif
 #endif

Return to bug 208486

Line 0 Link Here

(-)lang/python27/files/patch-Include__pyport.h (+13 lines)
	1	--- Include/pyport.h.orig 2015-12-05 20:46:54.000000000 +0100
	2	+++ Include/pyport.h 2016-04-03 17:14:53.047412000 +0200
	3	@@ -702,7 +702,9 @@
	4
	5	#ifdef __FreeBSD__
	6	#include <osreldate.h>
	7	-#if __FreeBSD_version > 500039
	8	+#if (__FreeBSD_version >= 500040 && __FreeBSD_version < 602113) \|\| \
	9	+ (__FreeBSD_version >= 700000 && __FreeBSD_version < 700054) \|\| \
	10	+ (__FreeBSD_version >= 800000 && __FreeBSD_version < 800001)
	11	# define _PY_PORT_CTYPE_UTF8_ISSUE
	12	#endif
	13	#endif

Line 0 Link Here

(-)lang/python33/files/patch-Include__pyport.h (+13 lines)
	1	--- Include/pyport.h.orig 2014-10-12 09:03:52.000000000 +0200
	2	+++ Include/pyport.h 2016-04-03 19:26:20.938539000 +0200
	3	@@ -686,7 +686,9 @@
	4
	5	#ifdef __FreeBSD__
	6	#include <osreldate.h>
	7	-#if __FreeBSD_version > 500039
	8	+#if (__FreeBSD_version >= 500040 && __FreeBSD_version < 602113) \|\| \
	9	+ (__FreeBSD_version >= 700000 && __FreeBSD_version < 700054) \|\| \
	10	+ (__FreeBSD_version >= 800000 && __FreeBSD_version < 800001)
	11	# define _PY_PORT_CTYPE_UTF8_ISSUE
	12	#endif
	13	#endif

Line 0 Link Here

(-)lang/python34/files/patch-Include__pyport.h (+13 lines)
	1	--- Include/pyport.h.orig 2015-12-21 07:00:57.000000000 +0100
	2	+++ Include/pyport.h 2016-04-03 19:29:17.797369000 +0200
	3	@@ -680,7 +680,9 @@
	4
	5	#ifdef __FreeBSD__
	6	#include <osreldate.h>
	7	-#if __FreeBSD_version > 500039
	8	+#if (__FreeBSD_version >= 500040 && __FreeBSD_version < 602113) \|\| \
	9	+ (__FreeBSD_version >= 700000 && __FreeBSD_version < 700054) \|\| \
	10	+ (__FreeBSD_version >= 800000 && __FreeBSD_version < 800001)
	11	# define _PY_PORT_CTYPE_UTF8_ISSUE
	12	#endif
	13	#endif

Line 0 Link Here

(-)lang/python35/files/patch-Include__pyport.h (+13 lines)
	1	--- Include/pyport.h.orig 2015-12-07 02:39:07.000000000 +0100
	2	+++ Include/pyport.h 2016-04-03 19:31:36.801717000 +0200
	3	@@ -677,7 +677,9 @@
	4
	5	#ifdef __FreeBSD__
	6	#include <osreldate.h>
	7	-#if __FreeBSD_version > 500039
	8	+#if (__FreeBSD_version >= 500040 && __FreeBSD_version < 602113) \|\| \
	9	+ (__FreeBSD_version >= 700000 && __FreeBSD_version < 700054) \|\| \
	10	+ (__FreeBSD_version >= 800000 && __FreeBSD_version < 800001)
	11	# define _PY_PORT_CTYPE_UTF8_ISSUE
	12	#endif
	13	#endif