- update telepathy-gabble to 0.7.12

feedback and ok ajacoutot@

net/telepathy/telepathy-gabble/Makefile

@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.3 2007/12/30 22:49:28 jasper Exp $
+# $OpenBSD: Makefile,v 1.4 2008/10/27 00:05:59 jasper Exp $
 
 COMMENT=		flexible communications framework, xmpp component
 
-DISTNAME=		telepathy-gabble-0.7.1
+DISTNAME=		telepathy-gabble-0.7.12
 
 MASTER_SITES=		${MASTER_SITES_TELEPATHY:=telepathy-gabble/}
 
@@ -12,7 +12,9 @@ WANTLIB=		c crypto dbus-1 dbus-glib-1 glib-2.0 gobject-2.0 \
 MODULES=		devel/gettext \
 			lang/python
 
-BUILD_DEPENDS=		${RUN_DEPENDS}
+BUILD_DEPENDS=		${RUN_DEPENDS} \
+			::devel/py-twisted/words \
+			::net/py-xmpp
 RUN_DEPENDS=		${MODPY_EXPAT_DEPENDS} \
 			::textproc/libxslt
 LIB_DEPENDS=		loudmouth-1::net/loudmouth \
@@ -22,7 +24,9 @@ USE_GMAKE=		Yes
 USE_LIBTOOL=		Yes
 CONFIGURE_STYLE=	gnu
 
-# needs a running instance of dbus-daemon
-REGRESS_IS_INTERACTIVE= Yes
+SUBST_VARS=		MODPY_VERSION
+
+pre-configure:
+	${SUBST_CMD} ${WRKSRC}/configure
 
 .include <bsd.port.mk>

net/telepathy/telepathy-gabble/distinfo

@@ -1,5 +1,5 @@
-MD5 (telepathy-gabble-0.7.1.tar.gz) = lLv5Kazqx2AUIeYLo1aDpQ==
-RMD160 (telepathy-gabble-0.7.1.tar.gz) = Op+TRLm5fBSMO6LLh/jKuYPigeA=
-SHA1 (telepathy-gabble-0.7.1.tar.gz) = zDs+hv2ZVmDFrrn4BpikQMaZyVI=
-SHA256 (telepathy-gabble-0.7.1.tar.gz) = Y803dS0VPSIvpKH+CPYYiDI0H0FlJIK9eJHj++D/jdc=
-SIZE (telepathy-gabble-0.7.1.tar.gz) = 778185
+MD5 (telepathy-gabble-0.7.12.tar.gz) = 6N1toNUQgo2llRZXxNXLrg==
+RMD160 (telepathy-gabble-0.7.12.tar.gz) = R/JFpHxszjdMLRcStttAOoV41Uk=
+SHA1 (telepathy-gabble-0.7.12.tar.gz) = 2vomYNr+q6fVWXTqZCUS7vA7+g0=
+SHA256 (telepathy-gabble-0.7.12.tar.gz) = SxE7ePukBuQY+bJJRm7+bndSCycD/Zz953jmYuxX11w=
+SIZE (telepathy-gabble-0.7.12.tar.gz) = 1376187

net/telepathy/telepathy-gabble/patches/patch-configure

@@ -1,12 +1,21 @@
-$OpenBSD: patch-configure,v 1.2 2007/12/30 22:49:28 jasper Exp $
---- configure.orig	Mon Nov 12 21:08:54 2007
-+++ configure	Mon Nov 19 22:04:19 2007
-@@ -21259,7 +21259,7 @@ echo "$as_me: error: dbus-binding-tool (from dbus-glib
-    { (exit 1); exit 1; }; }
- fi
+$OpenBSD: patch-configure,v 1.3 2008/10/27 00:05:59 jasper Exp $
+--- configure.orig	Thu Oct 23 16:44:36 2008
++++ configure	Sun Oct 26 16:12:50 2008
+@@ -21411,7 +21411,7 @@ fi
+ # >= 2.3 with the standard library will do. We prefer older versions,
+ # to ensure that when we claim that 2.3 is sufficient we are telling the truth.
  PYTHON=
 -for ac_prog in python2.3 python2.4 python2.5 python
-+for ac_prog in python2.5
++for ac_prog in python${MODPY_VERSION}
  do
    # Extract the first word of "$ac_prog", so it can be a program name with args.
  set dummy $ac_prog; ac_word=$2
+@@ -21462,7 +21462,7 @@ fi
+ # Check for a Python >= 2.4 with Twisted, to run the tests
+ { echo "$as_me:$LINENO: checking for Python >= 2.4 with Twisted and XMPP protocol support" >&5
+ echo $ECHO_N "checking for Python >= 2.4 with Twisted and XMPP protocol support... $ECHO_C" >&6; }
+-for TEST_PYTHON in python2.4 python2.5 python; do
++for TEST_PYTHON in python${MODPY_VERSION}; do
+   if $TEST_PYTHON -c "from sys import version_info; raise SystemExit(version_info < (2, 4, 0, 'final', 0))" >/dev/null 2>&1; then
+     if $TEST_PYTHON -c "import twisted.words.xish.domish, twisted.words.protocols.jabber, twisted.internet.reactor" >/dev/null 2>&1; then
+       { echo "$as_me:$LINENO: result: $TEST_PYTHON" >&5

net/telepathy/telepathy-gabble/patches/patch-src_tube-stream_c

@@ -1,11 +1,11 @@
-$OpenBSD: patch-src_tube-stream_c,v 1.1 2007/12/30 22:49:28 jasper Exp $
---- src/tube-stream.c.orig	Mon Nov 19 22:06:39 2007
-+++ src/tube-stream.c	Mon Nov 19 22:06:55 2007
-@@ -29,6 +29,7 @@
+$OpenBSD: patch-src_tube-stream_c,v 1.2 2008/10/27 00:05:59 jasper Exp $
+--- src/tube-stream.c.orig	Thu Oct  2 13:29:49 2008
++++ src/tube-stream.c	Sun Oct 26 14:31:03 2008
+@@ -28,6 +28,7 @@
  #include <fcntl.h>
  #include <errno.h>
  #include <netdb.h>
 +#include <netinet/in.h>
  
- #include <glib.h>
  #include <glib/gstdio.h>
+ #include <loudmouth/loudmouth.h>

net/telepathy/telepathy-gabble/pkg/PLIST

@@ -1,9 +1,11 @@
-@comment $OpenBSD: PLIST,v 1.2 2007/12/30 22:49:28 jasper Exp $
-libexec/telepathy-gabble
+@comment $OpenBSD: PLIST,v 1.3 2008/10/27 00:06:00 jasper Exp $
+@bin libexec/telepathy-gabble
 @man man/man8/telepathy-gabble.8
-share/dbus-1/
-share/dbus-1/services/
 share/dbus-1/services/org.freedesktop.Telepathy.ConnectionManager.gabble.service
+share/doc/telepathy-gabble/
+share/doc/telepathy-gabble/muc-bytestream.html
+share/doc/telepathy-gabble/olpc.html
+share/doc/telepathy-gabble/tubes.html
 share/telepathy/
 share/telepathy/managers/
 share/telepathy/managers/gabble.manager