update to dbus-python 0.83.1 and enable regression.

maintainer (ajacoutot@) ok

x11/dbus-python/Makefile

@@ -1,37 +1,35 @@
-# $OpenBSD: Makefile,v 1.13 2010/08/30 21:47:46 sthen Exp $
+# $OpenBSD: Makefile,v 1.14 2010/09/06 16:20:26 fgsch Exp $
 
-COMMENT=	dbus bindings for Python
+COMMENT =	dbus bindings for Python
 
-DISTNAME=	dbus-python-0.83.0
-REVISION=	4
+DISTNAME =	dbus-python-0.83.1
 
-CATEGORIES=	x11
-MASTER_SITES=	${HOMEPAGE}releases/dbus-python/
+CATEGORIES =	x11
 
-HOMEPAGE=	http://dbus.freedesktop.org/
+HOMEPAGE =	http://dbus.freedesktop.org/
 
-MAINTAINER=	Antoine Jacoutot <ajacoutot@openbsd.org>
+MAINTAINER =	Antoine Jacoutot <ajacoutot@openbsd.org>
 
 # ISC-like
-PERMIT_DISTFILES_CDROM=	Yes
-PERMIT_DISTFILES_FTP=	Yes
-PERMIT_PACKAGE_CDROM=	Yes
-PERMIT_PACKAGE_FTP=	Yes
+PERMIT_PACKAGE_CDROM =	Yes
+PERMIT_PACKAGE_FTP =	Yes
+PERMIT_DISTFILES_CDROM = Yes
+PERMIT_DISTFILES_FTP =	Yes
 
-WANTLIB+=	glib-2.0 gobject-2.0 pcre dbus-1 dbus-glib-1
+WANTLIB =	glib-2.0 gobject-2.0 gthread-2.0 pcre dbus-1 dbus-glib-1
 
-MODULES=	lang/python \
+MASTER_SITES =	${HOMEPAGE}releases/dbus-python/
+
+MODULES =	lang/python \
 		devel/gettext
 
-LIB_DEPENDS+=	::x11/dbus \
+LIB_DEPENDS =	::x11/dbus \
 		::x11/dbus-glib
 
-USE_LIBTOOL=	Yes
+USE_LIBTOOL =	Yes
 
-CONFIGURE_STYLE= gnu
-CONFIGURE_ARGS=	${CONFIGURE_SHARED} \
-		--disable-html-docs
-
-NO_REGRESS=	Yes
+CONFIGURE_STYLE = gnu
+CONFIGURE_ARGS = ${CONFIGURE_SHARED} \
+		 --disable-html-docs
 
 .include <bsd.port.mk>

x11/dbus-python/distinfo

@@ -1,5 +1,5 @@
-MD5 (dbus-python-0.83.0.tar.gz) = Vix4h2IZv0WNeaBBrxgpPQ==
-RMD160 (dbus-python-0.83.0.tar.gz) = oLSVIRmTIJkrg4NP7MqlN7Ya6OI=
-SHA1 (dbus-python-0.83.0.tar.gz) = wqbtr2m1IGbo+yBevulqGq4UGUQ=
-SHA256 (dbus-python-0.83.0.tar.gz) = id0dWqXCugRnfRqiYWyqUCdNjAjz1rwWTm97mTB3YZE=
-SIZE (dbus-python-0.83.0.tar.gz) = 494281
+MD5 (dbus-python-0.83.1.tar.gz) = X985cKoMAAICid57qPO+GA==
+RMD160 (dbus-python-0.83.1.tar.gz) = 1Un7UrUslg3FqmRugJkGFC3LBns=
+SHA1 (dbus-python-0.83.1.tar.gz) = ogneJq3iVGJR5Yd/O2UHiYcHVaQ=
+SHA256 (dbus-python-0.83.1.tar.gz) = zig4BvGvTyMi4YOidlKKiAtQPHSXKTK9CfBr23/MG5k=
+SIZE (dbus-python-0.83.1.tar.gz) = 533391

x11/dbus-python/patches/patch-test_TestSuitePythonService_service_in

@@ -0,0 +1,8 @@
+$OpenBSD: patch-test_TestSuitePythonService_service_in,v 1.1 2010/09/06 16:20:26 fgsch Exp $
+--- test/TestSuitePythonService.service.in.orig	Mon Sep  6 12:04:31 2010
++++ test/TestSuitePythonService.service.in	Mon Sep  6 12:04:36 2010
+@@ -1,3 +1,3 @@
+ [D-BUS Service]
+ Name=org.freedesktop.DBus.TestSuitePythonService
+-Exec=/bin/bash -c "@PYTHON@ @abs_top_srcdir@/test/test-service.py"
++Exec=/bin/sh -c "@PYTHON@ @abs_top_srcdir@/test/test-service.py"

x11/dbus-python/patches/patch-test_run-test_sh

@@ -0,0 +1,18 @@
+$OpenBSD: patch-test_run-test_sh,v 1.1 2010/09/06 16:20:26 fgsch Exp $
+--- test/run-test.sh.orig	Mon Sep  6 12:03:32 2010
++++ test/run-test.sh	Mon Sep  6 12:03:42 2010
+@@ -1,4 +1,4 @@
+-#! /bin/bash
++#! /bin/sh
+ 
+ # Copyright (C) 2006 Red Hat Inc. <http://www.redhat.com/>
+ # Copyright (C) 2006-2007 Collabora Ltd. <http://www.collabora.co.uk/>
+@@ -26,7 +26,7 @@
+ export DBUS_FATAL_WARNINGS=1
+ ulimit -c unlimited
+ 
+-function die() 
++function die
+ {
+     if ! test -z "$DBUS_SESSION_BUS_PID" ; then
+         echo "killing message bus $DBUS_SESSION_BUS_PID" >&2

x11/dbus-python/patches/patch-test_run-with-tmp-session-bus_sh

@@ -0,0 +1,27 @@
+$OpenBSD: patch-test_run-with-tmp-session-bus_sh,v 1.1 2010/09/06 16:20:26 fgsch Exp $
+--- test/run-with-tmp-session-bus.sh.orig	Mon Sep  6 12:03:50 2010
++++ test/run-with-tmp-session-bus.sh	Mon Sep  6 12:04:02 2010
+@@ -1,4 +1,4 @@
+-#! /bin/bash
++#! /bin/sh
+ 
+ # Copyright (C) 2003-2005 Red Hat Inc. <http://www.redhat.com/>
+ # Copyright (C) 2005 Colin Walters
+@@ -28,7 +28,7 @@ SCRIPTNAME=$0
+ WRAPPED_SCRIPT=$1
+ shift
+ 
+-function die()
++function die
+ {
+     if ! test -z "$DBUS_SESSION_BUS_PID" ; then
+         echo "killing message bus $DBUS_SESSION_BUS_PID" >&2
+@@ -43,7 +43,7 @@ if test -z "$DBUS_TOP_BUILDDIR" ; then
+ fi
+ 
+ ## convenient to be able to ctrl+C without leaking the message bus process
+-trap 'die "Received SIGINT"' SIGINT
++trap 'die "Received SIGINT"' 2
+ 
+ CONFIG_FILE="$DBUS_TOP_BUILDDIR"/test/tmp-session-bus.conf
+