 @@ -1,17 +1,18 @@
-# $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/
 EXTRACT_SUFX=	.tar.bz2
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.python.org/
 COMMENT=	Interpreted, interactive, object-oriented programming language
 PKG_DESTDIR_SUPPORT=	user-destdir
 # Remember to update pkgsrc/lang/python/srcdist.mk when version changes

 @@ -1,14 +1,14 @@
-@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}
 bin/python${PY_VER_SUFFIX}
 bin/python${PY_VER_SUFFIX}-config
 bin/smtpd${PY_VER_SUFFIX}.py
 include/python${PY_VER_SUFFIX}/Python-ast.h
 include/python${PY_VER_SUFFIX}/Python.h
 include/python${PY_VER_SUFFIX}/abstract.h
 include/python${PY_VER_SUFFIX}/asdl.h
 include/python${PY_VER_SUFFIX}/ast.h
 include/python${PY_VER_SUFFIX}/bitset.h
 include/python${PY_VER_SUFFIX}/boolobject.h
 @@ -1716,27 +1716,26 @@ lib/python${PY_VER_SUFFIX}/lib-dynload/f
 lib/python${PY_VER_SUFFIX}/lib-dynload/future_builtins.so
 lib/python${PY_VER_SUFFIX}/lib-dynload/grp.so
 ${PLIST.extra-so}lib/python${PY_VER_SUFFIX}/lib-dynload/imageop.so
 lib/python${PY_VER_SUFFIX}/lib-dynload/itertools.so
 lib/python${PY_VER_SUFFIX}/lib-dynload/math.so
 lib/python${PY_VER_SUFFIX}/lib-dynload/mmap.so
 ${PLIST.nis}lib/python${PY_VER_SUFFIX}/lib-dynload/nis.so
 ${PLIST.no-nis}lib/python${PY_VER_SUFFIX}/lib-dynload/nis_failed.so
 lib/python${PY_VER_SUFFIX}/lib-dynload/operator.so
 ${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
 lib/python${PY_VER_SUFFIX}/lib-dynload/termios.so
 lib/python${PY_VER_SUFFIX}/lib-dynload/time.so
 lib/python${PY_VER_SUFFIX}/lib-dynload/unicodedata.so
 lib/python${PY_VER_SUFFIX}/lib-dynload/zlib.so
 lib/python${PY_VER_SUFFIX}/lib-tk/Canvas.py
 lib/python${PY_VER_SUFFIX}/lib-tk/Canvas.pyc
 lib/python${PY_VER_SUFFIX}/lib-tk/Canvas.pyo
 lib/python${PY_VER_SUFFIX}/lib-tk/Dialog.py
 lib/python${PY_VER_SUFFIX}/lib-tk/Dialog.pyc
 lib/python${PY_VER_SUFFIX}/lib-tk/Dialog.pyo

 @@ -1,23 +1,23 @@
-$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
 Size (Python-2.6.2.tar.bz2) = 11156901 bytes
 SHA1 (patch-aa) = d44e67645dc86ff14f5daf5705de02c6f330cc48
 SHA1 (patch-ab) = d35025df83e70d129f9fbcd277652b0eea83b026
 SHA1 (patch-ac) = 858580a4e5c7474127eafb27bdfa96dc96cafad5
 SHA1 (patch-ae) = 5425515c6bf130eee204ca2749386f6447eaa35b
 SHA1 (patch-ag) = 95be54a4c8fe291cd7edd14a9180bbcb07bba2ce
 SHA1 (patch-ah) = 98e9fa55c2af38d8032398cae693492c199dc5fa
 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
 SHA1 (patch-av) = a1d41cb3a93879d54f0964ff84a63a297c333156

 @@ -1,17 +1,17 @@
-$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.orig	2009-03-31 21:20:48 +0300
-+++ setup.py
++++ 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
  # This global variable is used to hold the list of modules to be disabled.
 -disabled_module_list = []
 +disabled_module_list = ["_bsddb", "_curses", "_curses_panel", "_elementtree", "_sqlite", "_tkinter", "bsddb", "cjkcodecs" "gdbm", "mpz", "expat", "readline"]
  def add_dir_to_list(dirlist, dir):
      """Add the directory 'dir' to the list 'dirlist' (at the front) if
 @@ -309,9 +309,15 @@ class PyBuildExt(build_ext):
          return sys.platform
      def detect_modules(self):
 @@ -31,25 +31,40 @@ $NetBSD: patch-am,v 1.1.1.1 2009/04/19 1
          # Add paths specified in the environment variables LDFLAGS and
          # CPPFLAGS for header and library files.
 @@ -626,9 +632,7 @@ class PyBuildExt(build_ext):
              if krb5_h:
                  ssl_incs += krb5_h
          ssl_libs = find_library_file(self.compiler, 'ssl',lib_dirs,
 -                                     ['/usr/local/ssl/lib',
 -                                      '/usr/contrib/ssl/lib/'
 -                                     ] )
 +                                     [] )
          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
 -          scripts = ['Tools/scripts/pydoc', 'Tools/scripts/idle',
 +          scripts = ['Tools/scripts/pydoc2.6', 'Tools/scripts/idle',
                       'Tools/scripts/2to3',
 -                     'Lib/smtpd.py']
 +                     'Lib/smtpd2.6.py']
+         )
  # --install-platlib

 @@ -1,67 +1,82 @@
-$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.orig	2009-03-31 21:20:48 +0300
-+++ Modules/socketmodule.c
++++ Modules/socketmodule.c	2009-04-20 16:16:04 +0300
-@@ -398,6 +398,8 @@ const char *inet_ntop(int af, const void
+@@ -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
 +#define SOL_HCI BTPROTO_HCI
 +#define HCI_DATA_DIR SO_HCI_DIRECTION
  #define _BT_L2_MEMB(sa, memb) ((sa)->bt_##memb)
  #define _BT_RC_MEMB(sa, memb) ((sa)->bt_##memb)
  #define _BT_HCI_MEMB(sa, memb) ((sa)->bt_##memb)
 @@ -1076,9 +1078,13 @@ makesockaddr(int sockfd, struct sockaddr
  		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;
  			ret = Py_BuildValue("i", _BT_HCI_MEMB(a, dev));
  			return ret;
 +#endif
+ 		}
  #if !defined(__FreeBSD__)
 @@ -1345,12 +1351,25 @@ getsockaddrarg(PySocketSockObject *s, Py
  		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;
 +			if (straddr == NULL) {
 +				PyErr_SetString(socket_error, "getsockaddrarg: "
 +						"wrong format");
 +				return 0;
 +			}
 +			if (setbdaddr(straddr, &_BT_HCI_MEMB(addr, bdaddr)) < 0)
 +				return 0;
 +#else
  			_BT_HCI_MEMB(addr, family) = AF_BLUETOOTH;
  			if (!PyArg_ParseTuple(args, "i", &_BT_HCI_MEMB(addr, dev))) {
  				PyErr_SetString(socket_error, "getsockaddrarg: "
  						"wrong format");
  				return 0;
+ 			}
 +#endif
  			*len_ret = sizeof *addr;
  			return 1;
+ 		}
 @@ -4564,9 +4583,13 @@ init_socket(void)
  	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);
  	PyModule_AddIntConstant(m, "BTPROTO_SCO", BTPROTO_SCO);
  #endif