Fix _multiprocessing import under DragonFly/amd64, fix packaging

3 files changed, 7 insertions, 25 deletions

diff --git a/lang/python33/distinfo b/lang/python33/distinfo
index 0bc62ab52f6..ad77ff61db8 100644
--- a/lang/python33/distinfo
+++ b/lang/python33/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.15 2014/05/15 12:33:10 wiz Exp $
+$NetBSD: distinfo,v 1.16 2014/05/31 12:46:28 ryoon Exp $
 
 SHA1 (Python-3.3.5.tar.xz) = 6683b26dd2cfd23af852abfcf1aedf25bbd44839
 RMD160 (Python-3.3.5.tar.xz) = 77398ecd76824983ad92c859f633e26675bacb4b
@@ -9,9 +9,8 @@ SHA1 (patch-aa) = 99ebcbbfc53b855a32b424dec27012e1e969c3d0
 SHA1 (patch-ab) = 1c0a25bf7ec6ee76e84c799619ec7cd8910f16e1
 SHA1 (patch-ah) = bb43aaab260935a5a0d5e7ce1ccc30f4832cab1d
 SHA1 (patch-al) = e5438d1bbc20cc85521b3570710846cf4a070ae1
-SHA1 (patch-am) = fa84fd7eddd61dca4805325576c713c1bccd27f5
+SHA1 (patch-am) = ae28f14398c08f114c6b11f528a9e5eda90f003b
 SHA1 (patch-an) = 933acde107b735931d26ace4eef251000b9f07ba
-SHA1 (patch-ao) = dc524b08634c23c25227bd03e221dab0ff2a03f3
 SHA1 (patch-au) = c892f1004eb32e9608f93c08ec6f94e16bdca182
 SHA1 (patch-av) = 9b44f339f65f029b7f17dbc654739a7ae3c12780
 SHA1 (patch-aw) = 598e4710c426110012048946786a6d72f050e0fc
diff --git a/lang/python33/patches/patch-am b/lang/python33/patches/patch-am
index 13f3ad872b4..282d75b342f 100644
--- a/lang/python33/patches/patch-am
+++ b/lang/python33/patches/patch-am
@@ -1,4 +1,4 @@
-$NetBSD: patch-am,v 1.8 2014/05/10 04:32:36 obache Exp $
+$NetBSD: patch-am,v 1.9 2014/05/31 12:46:28 ryoon Exp $
 
 --- setup.py.orig	2014-03-09 08:40:35.000000000 +0000
 +++ setup.py
@@ -107,22 +107,18 @@ $NetBSD: patch-am,v 1.8 2014/05/10 04:32:36 obache Exp $
                          # Some systems have -lndbm, others have -lgdbm_compat,
                          # others don't have either
                          if self.compiler.find_library_file(lib_dirs,
-@@ -1477,6 +1499,14 @@ class PyBuildExt(build_ext):
+@@ -1477,6 +1499,10 @@ class PyBuildExt(build_ext):
              macros = dict()
              libraries = []
  
 +        elif host_platform.startswith('dragonfly'):
-+            macros = dict(
-+                HAVE_SEM_OPEN=0,
-+                HAVE_SEM_TIMEDWAIT=0,
-+                HAVE_FD_TRANSFER=1,
-+                )
++            macros = dict()
 +            libraries = []
 +
          else:                                   # Linux and other unices
              macros = dict()
              libraries = ['rt']
-@@ -1950,10 +1980,7 @@ class PyBuildExt(build_ext):
+@@ -1950,10 +1976,7 @@ class PyBuildExt(build_ext):
              depends = ['_decimal/docstrings.h']
          else:
              srcdir = sysconfig.get_config_var('srcdir')
@@ -134,7 +130,7 @@ $NetBSD: patch-am,v 1.8 2014/05/10 04:32:36 obache Exp $
              libraries = []
              sources = [
                '_decimal/_decimal.c',
-@@ -2199,7 +2226,7 @@ def main():
+@@ -2199,7 +2222,7 @@ def main():
            # If you change the scripts installed here, you also need to
            # check the PyBuildScripts command above, and change the links
            # created by the bininstall target in Makefile.pre.in
diff --git a/lang/python33/patches/patch-ao b/lang/python33/patches/patch-ao
deleted file mode 100644
index 9131a78e524..00000000000
--- a/lang/python33/patches/patch-ao
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ao,v 1.1 2012/12/10 03:15:49 tsarna Exp $
-
---- Lib/distutils/util.py.orig	2012-09-29 04:00:28.000000000 -0400
-+++ Lib/distutils/util.py	2012-12-09 18:34:56.000000000 -0500
-@@ -102,6 +102,8 @@
-         osname, release, machine = _osx_support.get_platform_osx(
-                                         distutils.sysconfig.get_config_vars(),
-                                         osname, release, machine)
-+    elif osname[:9] == "dragonfly":
-+        release = str.split(release, "-")[0]
- 
-     return "%s-%s-%s" % (osname, release, machine)
-