From b47080dcbdbe3db18e4ba8a9192d4ecd49d97a37 Mon Sep 17 00:00:00 2001 From: adam Date: Fri, 9 May 2014 16:33:29 +0000 Subject: Fix building on OS X --- lang/python34/PLIST.Darwin | 3 +-- lang/python34/distinfo | 4 ++-- lang/python34/patches/patch-am | 11 +---------- 3 files changed, 4 insertions(+), 14 deletions(-) (limited to 'lang/python34') diff --git a/lang/python34/PLIST.Darwin b/lang/python34/PLIST.Darwin index e88e8608232..3bce5e48c96 100644 --- a/lang/python34/PLIST.Darwin +++ b/lang/python34/PLIST.Darwin @@ -1,3 +1,2 @@ -@comment $NetBSD: PLIST.Darwin,v 1.1 2014/05/09 02:27:14 wen Exp $ -lib/python${PY_VER_SUFFIX}/lib-dynload/_gestalt.so +@comment $NetBSD: PLIST.Darwin,v 1.2 2014/05/09 16:33:56 adam Exp $ lib/python${PY_VER_SUFFIX}/lib-dynload/_scproxy.so diff --git a/lang/python34/distinfo b/lang/python34/distinfo index 0de7d73da95..a18d73d770e 100644 --- a/lang/python34/distinfo +++ b/lang/python34/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.3 2014/05/09 09:19:06 wiz Exp $ +$NetBSD: distinfo,v 1.4 2014/05/09 16:33:56 adam Exp $ SHA1 (Python-3.4.0.tar.xz) = f54d7cf6af5dbd9bddbe31cf4772f39711381dbe RMD160 (Python-3.4.0.tar.xz) = f6b4664a4333a2010f8e168e252de7c22013e4a8 @@ -7,7 +7,7 @@ SHA1 (patch-Lib_distutils_unixccompiler.py) = 39cb8d1e1e3e76e2b6b5dbc1a6b5e08153 SHA1 (patch-aa) = 14359f8d0527eff08073c0aea60dfe8961d9255d SHA1 (patch-ah) = b3a1363f6d210f855f3769650e3891b0df5c531d SHA1 (patch-al) = 0944fb5b807985723070ac44358505c3053f9997 -SHA1 (patch-am) = 9ac74eed5a01b2c8f959f0f32131ae763ae3f2e1 +SHA1 (patch-am) = 93bc44af2ae5a477c73adc49600280fd07014bd8 SHA1 (patch-an) = c9b571eb54fdf0b1e93524a6de6780e8c4119221 SHA1 (patch-ao) = bc7bb76ca7b3b8302dd966fad85171236c1f06e6 SHA1 (patch-au) = 6e10e6fc484317447bdeaa833db5df073df98c5b diff --git a/lang/python34/patches/patch-am b/lang/python34/patches/patch-am index 9e3c4804517..1c34da64483 100644 --- a/lang/python34/patches/patch-am +++ b/lang/python34/patches/patch-am @@ -1,4 +1,4 @@ -$NetBSD: patch-am,v 1.2 2014/05/09 05:59:09 obache Exp $ +$NetBSD: patch-am,v 1.3 2014/05/09 16:33:56 adam Exp $ --- setup.py.orig 2014-03-17 02:31:31.000000000 +0000 +++ setup.py @@ -58,15 +58,6 @@ $NetBSD: patch-am,v 1.2 2014/05/09 05:59:09 obache Exp $ if (ssl_incs is not None and ssl_libs is not None): -@@ -784,7 +782,7 @@ class PyBuildExt(build_ext): - - # look for the openssl version header on the compiler search path. - opensslv_h = find_file('openssl/opensslv.h', [], -- inc_dirs + search_for_ssl_incs_in) -+ search_for_ssl_incs_in) - if opensslv_h: - name = os.path.join(opensslv_h[0], 'openssl/opensslv.h') - if host_platform == 'darwin' and is_macosx_sdk_path(name): @@ -1148,6 +1146,30 @@ class PyBuildExt(build_ext): dbm_order = ['gdbm'] # The standard Unix dbm module: -- cgit v1.2.3