* Make it build on DragonFly.

* Remove rgbimg module from PLIST, it's removed.
* Bump PKGREVISION.

5 files changed, 48 insertions, 18 deletions

diff --git a/lang/python26/Makefile b/lang/python26/Makefile
index 6137d4c98fb..da9be602d1e 100644
--- a/lang/python26/Makefile
+++ b/lang/python26/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2009/04/19 14:42:48 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2009/04/24 01:32:50 hasso Exp $
 
 DISTNAME=	Python-2.6.2
 PKGNAME=	python26-2.6.2
+PKGREVISION=	1
 CATEGORIES=	lang python
 MASTER_SITES=	ftp://ftp.python.org/pub/python/2.6.2/ \
 		http://www.python.org/ftp/python/2.6.2/
diff --git a/lang/python26/PLIST.common b/lang/python26/PLIST.common
index 9d4ae1450c4..bc7439179de 100644
--- a/lang/python26/PLIST.common
+++ b/lang/python26/PLIST.common
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.common,v 1.1.1.1 2009/04/19 14:42:50 wiz Exp $
+@comment $NetBSD: PLIST.common,v 1.2 2009/04/24 01:32:50 hasso Exp $
 bin/2to3
 bin/idle
 bin/pydoc${PY_VER_SUFFIX}
@@ -1726,7 +1726,6 @@ ${PLIST.oss}lib/python${PY_VER_SUFFIX}/lib-dynload/ossaudiodev.so
 lib/python${PY_VER_SUFFIX}/lib-dynload/parser.so
 lib/python${PY_VER_SUFFIX}/lib-dynload/pyexpat.so
 lib/python${PY_VER_SUFFIX}/lib-dynload/resource.so
-${PLIST.extra-so}lib/python${PY_VER_SUFFIX}/lib-dynload/rgbimg.so
 lib/python${PY_VER_SUFFIX}/lib-dynload/select.so
 lib/python${PY_VER_SUFFIX}/lib-dynload/strop.so
 lib/python${PY_VER_SUFFIX}/lib-dynload/syslog.so
diff --git a/lang/python26/distinfo b/lang/python26/distinfo
index 72dec7f4335..969ea91fbf8 100644
--- a/lang/python26/distinfo
+++ b/lang/python26/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.2 2009/04/19 15:20:00 snj Exp $
+$NetBSD: distinfo,v 1.3 2009/04/24 01:32:50 hasso Exp $
 
 SHA1 (Python-2.6.2.tar.bz2) = 125d4ed90f82de1d44f288150bbbda23a6cd27a4
 RMD160 (Python-2.6.2.tar.bz2) = 85fa3540cbacf4d0547d2381eb3aa76bef35c2e1
@@ -13,10 +13,10 @@ SHA1 (patch-ai) = 53815e5cd82bf889ec3130b31f8f6ac202dd0948
 SHA1 (patch-aj) = a75d680a6b8b1ad3c9222dcb841f4fb10db6d16d
 SHA1 (patch-ak) = 948362c15ad59abeef46971f9b870b70655a62c7
 SHA1 (patch-al) = c39144cfa4a540900fac879b5faa990628fcee3e
-SHA1 (patch-am) = 2af42cd2b89ceec61a957cae48924dd3c09aa702
+SHA1 (patch-am) = 34d6dac6eee3cc946e74f15d2acc9fe9c592a9be
 SHA1 (patch-an) = 17b4e17b3b562c29a050e9bb20447084ce82b8ab
 SHA1 (patch-ao) = 9bbd5561c010e0a1ab8e0a70d27a5f77fd2089d2
-SHA1 (patch-ap) = ad1b43a149438d9060263acd0cca92fd4d26148c
+SHA1 (patch-ap) = 39d81b01fa9e1b894be9ae0922881337bb4d17da
 SHA1 (patch-ar) = 2a0c3f9a798afdfda7af4823e67579b2e000c072
 SHA1 (patch-at) = 04d5a5ab691587d750b3d0a4053555e846074b98
 SHA1 (patch-au) = cf68c1975f60d18bf37262fa41cbfef1585aeb55
diff --git a/lang/python26/patches/patch-am b/lang/python26/patches/patch-am
index 1316dd41d77..401627cf539 100644
--- a/lang/python26/patches/patch-am
+++ b/lang/python26/patches/patch-am
@@ -1,7 +1,7 @@
-$NetBSD: patch-am,v 1.1.1.1 2009/04/19 14:42:50 wiz Exp $
+$NetBSD: patch-am,v 1.2 2009/04/24 01:32:50 hasso Exp $
 
---- setup.py.orig	2009-03-31 18:20:48.000000000 +0000
-+++ setup.py
+--- setup.py.orig	2009-03-31 21:20:48 +0300
++++ setup.py	2009-04-20 16:30:08 +0300
 @@ -17,7 +17,7 @@ from distutils.command.install import in
  from distutils.command.install_lib import install_lib
  
@@ -41,7 +41,22 @@ $NetBSD: patch-am,v 1.1.1.1 2009/04/19 14:42:50 wiz Exp $
  
          if (ssl_incs is not None and
              ssl_libs is not None):
-@@ -1891,9 +1902,9 @@ def main():
+@@ -1300,6 +1304,14 @@ class PyBuildExt(build_ext):
+                 )
+             libraries = []
+ 
++	elif platform.startswith('dragonfly'):
++	    macros = dict(
++		HAVE_SEM_OPEN=0,
++		HAVE_SEM_TIMEDWAIT=0,
++		HAVE_FD_TRANSFER=1,
++		)
++	    libraries = []
++
+         else:                                   # Linux and other unices
+             macros = dict(
+                 HAVE_SEM_OPEN=1,
+@@ -1891,9 +1903,9 @@ def main():
            ext_modules=[Extension('_struct', ['_struct.c'])],
  
            # Scripts to install
diff --git a/lang/python26/patches/patch-ap b/lang/python26/patches/patch-ap
index f5ffb86f2b9..3be7e8580e0 100644
--- a/lang/python26/patches/patch-ap
+++ b/lang/python26/patches/patch-ap
@@ -1,8 +1,23 @@
-$NetBSD: patch-ap,v 1.1.1.1 2009/04/19 14:42:50 wiz Exp $
+$NetBSD: patch-ap,v 1.2 2009/04/24 01:32:50 hasso Exp $
 
---- Modules/socketmodule.c.orig	2009-03-31 18:20:48.000000000 +0000
-+++ Modules/socketmodule.c
-@@ -398,6 +398,8 @@ const char *inet_ntop(int af, const void
+--- Modules/socketmodule.c.orig	2009-03-31 21:20:48 +0300
++++ Modules/socketmodule.c	2009-04-20 16:16:04 +0300
+@@ -379,7 +379,7 @@ const char *inet_ntop(int af, const void
+ #define SOCKETCLOSE close
+ #endif
+ 
+-#if defined(HAVE_BLUETOOTH_H) || defined(HAVE_BLUETOOTH_BLUETOOTH_H) &&  !defined(__NetBSD__)
++#if defined(HAVE_BLUETOOTH_H) || defined(HAVE_BLUETOOTH_BLUETOOTH_H) &&  !defined(__NetBSD__) && !defined(__DragonFly__)
+ #define USE_BLUETOOTH 1
+ #if defined(__FreeBSD__)
+ #define BTPROTO_L2CAP BLUETOOTH_PROTO_L2CAP
+@@ -393,11 +393,13 @@ const char *inet_ntop(int af, const void
+ #define _BT_L2_MEMB(sa, memb) ((sa)->l2cap_##memb)
+ #define _BT_RC_MEMB(sa, memb) ((sa)->rfcomm_##memb)
+ #define _BT_HCI_MEMB(sa, memb) ((sa)->hci_##memb)
+-#elif defined(__NetBSD__)
++#elif defined(__NetBSD__) || defined(__DragonFly__)
+ #define sockaddr_l2 sockaddr_bt
  #define sockaddr_rc sockaddr_bt
  #define sockaddr_hci sockaddr_bt
  #define sockaddr_sco sockaddr_bt
@@ -15,7 +30,7 @@ $NetBSD: patch-ap,v 1.1.1.1 2009/04/19 14:42:50 wiz Exp $
  		case BTPROTO_HCI:
  		{
  			struct sockaddr_hci *a = (struct sockaddr_hci *) addr;
-+#if defined(__NetBSD__)
++#if defined(__NetBSD__) || defined(__DragonFly__)
 +			return makebdaddr(&_BT_HCI_MEMB(a, bdaddr));
 +#else
  			PyObject *ret = NULL;
@@ -29,7 +44,7 @@ $NetBSD: patch-ap,v 1.1.1.1 2009/04/19 14:42:50 wiz Exp $
  		case BTPROTO_HCI:
  		{
  			struct sockaddr_hci *addr = (struct sockaddr_hci *)addr_ret;
-+#if defined(__NetBSD__)
++#if defined(__NetBSD__) || defined(__DragonFly__)
 +			char *straddr = PyString_AsString(args);
 +
 +			_BT_HCI_MEMB(addr, family) = AF_BLUETOOTH;
@@ -55,11 +70,11 @@ $NetBSD: patch-ap,v 1.1.1.1 2009/04/19 14:42:50 wiz Exp $
  	PyModule_AddIntConstant(m, "BTPROTO_L2CAP", BTPROTO_L2CAP);
  	PyModule_AddIntConstant(m, "BTPROTO_HCI", BTPROTO_HCI);
  	PyModule_AddIntConstant(m, "SOL_HCI", SOL_HCI);
-+#if !defined(__NetBSD__)
++#if !defined(__NetBSD__) && !defined(__DragonFly__)
  	PyModule_AddIntConstant(m, "HCI_FILTER", HCI_FILTER);
 +#endif
  #if !defined(__FreeBSD__)
-+#if !defined(__NetBSD__)
++#if !defined(__NetBSD__) && !defined(__DragonFly__)
  	PyModule_AddIntConstant(m, "HCI_TIME_STAMP", HCI_TIME_STAMP);
 +#endif
  	PyModule_AddIntConstant(m, "HCI_DATA_DIR", HCI_DATA_DIR);