[pkgsrc/trunk]: pkgsrc/lang avoid conflicting declaration of gethostname on S...

[richard <richard%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/97f98c3f13bb
branches:  trunk
changeset: 635788:97f98c3f13bb
user:      richard <richard%pkgsrc.org@localhost>
date:      Wed Jun 11 05:55:58 2014 +0000

description:
avoid conflicting declaration of gethostname on SunOS

diffstat:

 lang/python27/Makefile                       |   4 ++--
 lang/python27/distinfo                       |   3 ++-
 lang/python27/patches/patch-Include_pyport.h |  18 ++++++++++++++++++
 lang/python33/Makefile                       |   4 ++--
 lang/python33/distinfo                       |   3 ++-
 lang/python33/patches/patch-Include_pyport.h |  18 ++++++++++++++++++
 6 files changed, 44 insertions(+), 6 deletions(-)

diffs (104 lines):

diff -r c79b8d9f8d8d -r 97f98c3f13bb lang/python27/Makefile
--- a/lang/python27/Makefile    Wed Jun 11 02:42:16 2014 +0000
+++ b/lang/python27/Makefile    Wed Jun 11 05:55:58 2014 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.42 2014/06/09 17:58:31 he Exp $
+# $NetBSD: Makefile,v 1.43 2014/06/11 05:55:58 richard Exp $
 
 .include "dist.mk"
 
 PKGNAME=       python27-${PY_DISTVERSION}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    lang python
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
diff -r c79b8d9f8d8d -r 97f98c3f13bb lang/python27/distinfo
--- a/lang/python27/distinfo    Wed Jun 11 02:42:16 2014 +0000
+++ b/lang/python27/distinfo    Wed Jun 11 05:55:58 2014 +0000
@@ -1,10 +1,11 @@
-$NetBSD: distinfo,v 1.41 2014/06/09 17:58:31 he Exp $
+$NetBSD: distinfo,v 1.42 2014/06/11 05:55:58 richard Exp $
 
 SHA1 (Python-2.7.7.tar.xz) = 5f82557cac5abf18d1df6f8bb2029aa335b321f4
 RMD160 (Python-2.7.7.tar.xz) = 988da9490e8d66a2456accdce5dbe9ba875d5a18
 Size (Python-2.7.7.tar.xz) = 10496500 bytes
 SHA1 (patch-Include_node.h) = 673d148b625711ac47e4bfeb0f5b0d5b31f94d7e
 SHA1 (patch-Include_pyerrors.h) = 3eba043c83b1d1df4918524f7b53047a6ed372ae
+SHA1 (patch-Include_pyport.h) = 3f21c910cf7f002184d2b054a1a362e4a98a218f
 SHA1 (patch-Lib_distutils_unixccompiler.py) = 39b967dc2ae648143d5841f22602a21063b4d5ea
 SHA1 (patch-Lib_poplib.py) = 5d7f64b028abd2fd43651f27a7f2ce7efe5b0859
 SHA1 (patch-Lib_smtplib.py) = f1118bbc53b4e292eb9a28ef3ef10eb4aa553bc3
diff -r c79b8d9f8d8d -r 97f98c3f13bb lang/python27/patches/patch-Include_pyport.h
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/lang/python27/patches/patch-Include_pyport.h      Wed Jun 11 05:55:58 2014 +0000
@@ -0,0 +1,18 @@
+$NetBSD: patch-Include_pyport.h,v 1.1 2014/06/11 05:55:58 richard Exp $
+SunOS defines gethostname in <unistd.h>
+http://bugs.python.org/issue19561
+
+--- Include/pyport.h.orig      2014-05-31 18:58:38.000000000 +0000
++++ Include/pyport.h
+@@ -640,11 +640,6 @@ Please be conservative with adding new o
+ in platform-specific #ifdefs.
+ **************************************************************************/
+ 
+-#ifdef SOLARIS
+-/* Unchecked */
+-extern int gethostname(char *, int);
+-#endif
+-
+ #ifdef __BEOS__
+ /* Unchecked */
+ /* It's in the libs, but not the headers... - [cjh] */
diff -r c79b8d9f8d8d -r 97f98c3f13bb lang/python33/Makefile
--- a/lang/python33/Makefile    Wed Jun 11 02:42:16 2014 +0000
+++ b/lang/python33/Makefile    Wed Jun 11 05:55:58 2014 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.24 2014/05/15 12:33:10 wiz Exp $
+# $NetBSD: Makefile,v 1.25 2014/06/11 06:03:10 richard Exp $
 
 .include "dist.mk"
 
 PKGNAME=       python33-${PY_DISTVERSION}
-PKGREVISION=   2
+PKGREVISION=   3
 CATEGORIES=    lang python
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
diff -r c79b8d9f8d8d -r 97f98c3f13bb lang/python33/distinfo
--- a/lang/python33/distinfo    Wed Jun 11 02:42:16 2014 +0000
+++ b/lang/python33/distinfo    Wed Jun 11 05:55:58 2014 +0000
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.16 2014/05/31 12:46:28 ryoon Exp $
+$NetBSD: distinfo,v 1.17 2014/06/11 06:03:10 richard Exp $
 
 SHA1 (Python-3.3.5.tar.xz) = 6683b26dd2cfd23af852abfcf1aedf25bbd44839
 RMD160 (Python-3.3.5.tar.xz) = 77398ecd76824983ad92c859f633e26675bacb4b
 Size (Python-3.3.5.tar.xz) = 12116308 bytes
+SHA1 (patch-Include_pyport.h) = 73bdd4bd4a4bfb11b163c3ccb3bb70bde4decc04
 SHA1 (patch-Lib_distutils_unixccompiler.py) = 39cb8d1e1e3e76e2b6b5dbc1a6b5e0815300b2ce
 SHA1 (patch-Lib_os.py) = 6e6024a8451158f571e97cb3f2b515e315720a33
 SHA1 (patch-aa) = 99ebcbbfc53b855a32b424dec27012e1e969c3d0
diff -r c79b8d9f8d8d -r 97f98c3f13bb lang/python33/patches/patch-Include_pyport.h
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/lang/python33/patches/patch-Include_pyport.h      Wed Jun 11 05:55:58 2014 +0000
@@ -0,0 +1,18 @@
+$NetBSD: patch-Include_pyport.h,v 1.1 2014/06/11 06:03:10 richard Exp $
+SunOS defines gethostname in <unistd.h>
+http://bugs.python.org/issue19561
+
+--- Include/pyport.h.orig      2013-05-15 16:32:54.000000000 +0000
++++ Include/pyport.h
+@@ -649,11 +649,6 @@ Please be conservative with adding new o
+ in platform-specific #ifdefs.
+ **************************************************************************/
+ 
+-#ifdef SOLARIS
+-/* Unchecked */
+-extern int gethostname(char *, int);
+-#endif
+-
+ #ifdef HAVE__GETPTY
+ #include <sys/types.h>          /* we need to import mode_t */
+ extern char * _getpty(int *, int, mode_t, int);