diff --git a/net/telepathy/telepathy-salut/Makefile b/net/telepathy/telepathy-salut/Makefile index 94fd4f9c50a..4365399b9e7 100644 --- a/net/telepathy/telepathy-salut/Makefile +++ b/net/telepathy/telepathy-salut/Makefile @@ -1,23 +1,23 @@ -# $OpenBSD: Makefile,v 1.11 2010/08/30 21:26:30 sthen Exp $ +# $OpenBSD: Makefile,v 1.12 2010/09/23 13:47:35 jasper Exp $ COMMENT= flexible communications framework, local-link component -DISTNAME= telepathy-salut-0.3.11 -REVISION= 1 +DISTNAME= telepathy-salut-0.3.13 MASTER_SITES= ${MASTER_SITES_TELEPATHY:=telepathy-salut/} WANTLIB += c crypto dbus-1 dbus-glib-1 gcrypt gio-2.0 glib-2.0 WANTLIB += gmodule-2.0 gnutls gobject-2.0 gpg-error gthread-2.0 -WANTLIB += m pcre pthread ssl tasn1 xml2 z +WANTLIB += m pcre pthread ssl tasn1 xml2 z soup-2.4.>=1 telepathy-glib +WANTLIB += avahi-client avahi-common avahi-glib avahi-gobject MODULES= devel/gettext \ lang/python BUILD_DEPENDS= ::textproc/libxslt -LIB_DEPENDS= avahi-client,avahi-common,avahi-glib,avahi-gobject::net/avahi \ - soup-2.4.>=1::devel/libsoup \ - telepathy-glib.>=5::net/telepathy/telepathy-glib +LIB_DEPENDS= ::net/avahi \ + ::devel/libsoup \ + ::net/telepathy/telepathy-glib USE_GMAKE= Yes USE_LIBTOOL= Yes @@ -31,6 +31,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ CONFIGURE_ARGS= ${CONFIGURE_SHARED} \ --enable-ssl -REGRESS_DEPENDS= ::devel/check +REGRESS_DEPENDS= ::devel/check \ + ::textproc/py-xmldiff .include diff --git a/net/telepathy/telepathy-salut/distinfo b/net/telepathy/telepathy-salut/distinfo index 4c09a49b26b..8c504d114d9 100644 --- a/net/telepathy/telepathy-salut/distinfo +++ b/net/telepathy/telepathy-salut/distinfo @@ -1,5 +1,5 @@ -MD5 (telepathy-salut-0.3.11.tar.gz) = lsqjqdvpW6c8+WIyMiWaCQ== -RMD160 (telepathy-salut-0.3.11.tar.gz) = fM1zD5SZ7eCUit2jE8K1E0app2A= -SHA1 (telepathy-salut-0.3.11.tar.gz) = L/OVehAlcf/lBjt9D2zWdSSPdqA= -SHA256 (telepathy-salut-0.3.11.tar.gz) = Udv60NV8mQ3XN4/H9/fkq13KYAhQEqeeBoXCVWcjjfg= -SIZE (telepathy-salut-0.3.11.tar.gz) = 1187612 +MD5 (telepathy-salut-0.3.13.tar.gz) = FzRI0mgAJsXjEffJfN2jJw== +RMD160 (telepathy-salut-0.3.13.tar.gz) = ay8ZyaW19zk45Jsf3/TOxOwUY3I= +SHA1 (telepathy-salut-0.3.13.tar.gz) = K2mr4yd8HBoSezepjv8T0AytE5k= +SHA256 (telepathy-salut-0.3.13.tar.gz) = BpdBOH5I0QNK0t3peMLwiSSgoeNYmLx8Xp25n0/vnpA= +SIZE (telepathy-salut-0.3.13.tar.gz) = 1209052 diff --git a/net/telepathy/telepathy-salut/patches/patch-lib_gibber_examples_test-resolv_c b/net/telepathy/telepathy-salut/patches/patch-lib_gibber_examples_test-resolv_c index c21c7d25f2a..d53373592e7 100644 --- a/net/telepathy/telepathy-salut/patches/patch-lib_gibber_examples_test-resolv_c +++ b/net/telepathy/telepathy-salut/patches/patch-lib_gibber_examples_test-resolv_c @@ -1,11 +1,10 @@ -$OpenBSD: patch-lib_gibber_examples_test-resolv_c,v 1.1 2009/06/03 16:40:06 ajacoutot Exp $ ---- lib/gibber/examples/test-resolv.c.orig Tue Jun 2 07:58:50 2009 -+++ lib/gibber/examples/test-resolv.c Tue Jun 2 07:58:58 2009 -@@ -2,6 +2,7 @@ +$OpenBSD: patch-lib_gibber_examples_test-resolv_c,v 1.2 2010/09/23 13:47:35 jasper Exp $ +--- lib/gibber/examples/test-resolv.c.orig Wed Aug 4 11:47:50 2010 ++++ lib/gibber/examples/test-resolv.c Tue Sep 21 20:20:45 2010 +@@ -1,3 +1,6 @@ ++#include ++#include ++ + #include #include - #include -+#include - - #include - diff --git a/net/telepathy/telepathy-salut/patches/patch-lib_gibber_gibber-bytestream-oob_c b/net/telepathy/telepathy-salut/patches/patch-lib_gibber_gibber-bytestream-oob_c deleted file mode 100644 index 4d5e4102c15..00000000000 --- a/net/telepathy/telepathy-salut/patches/patch-lib_gibber_gibber-bytestream-oob_c +++ /dev/null @@ -1,11 +0,0 @@ -$OpenBSD: patch-lib_gibber_gibber-bytestream-oob_c,v 1.1 2009/06/03 16:40:06 ajacoutot Exp $ ---- lib/gibber/gibber-bytestream-oob.c.orig Tue Jun 2 07:40:10 2009 -+++ lib/gibber/gibber-bytestream-oob.c Tue Jun 2 07:40:37 2009 -@@ -28,6 +28,7 @@ - #include - #include - #include -+#include - - #include - diff --git a/net/telepathy/telepathy-salut/patches/patch-lib_gibber_gibber-muc-connection_c b/net/telepathy/telepathy-salut/patches/patch-lib_gibber_gibber-muc-connection_c deleted file mode 100644 index 7173cc83526..00000000000 --- a/net/telepathy/telepathy-salut/patches/patch-lib_gibber_gibber-muc-connection_c +++ /dev/null @@ -1,11 +0,0 @@ -$OpenBSD: patch-lib_gibber_gibber-muc-connection_c,v 1.1 2009/06/03 16:40:06 ajacoutot Exp $ ---- lib/gibber/gibber-muc-connection.c.orig Tue Jun 2 07:41:47 2009 -+++ lib/gibber/gibber-muc-connection.c Tue Jun 2 07:42:00 2009 -@@ -26,6 +26,7 @@ - #include - #include - #include -+#include - - #include "gibber-muc-connection.h" - #include "gibber-signals-marshal.h" diff --git a/net/telepathy/telepathy-salut/patches/patch-lib_gibber_gibber-resolver_c b/net/telepathy/telepathy-salut/patches/patch-lib_gibber_gibber-resolver_c index 3a1b18fec7a..c11ff79e759 100644 --- a/net/telepathy/telepathy-salut/patches/patch-lib_gibber_gibber-resolver_c +++ b/net/telepathy/telepathy-salut/patches/patch-lib_gibber_gibber-resolver_c @@ -1,18 +1,10 @@ -$OpenBSD: patch-lib_gibber_gibber-resolver_c,v 1.1 2009/06/03 16:40:06 ajacoutot Exp $ +$OpenBSD: patch-lib_gibber_gibber-resolver_c,v 1.2 2010/09/23 13:47:35 jasper Exp $ Use GETSHORT instead of NS_GET16 which comes with libresolv. ---- lib/gibber/gibber-resolver.c.orig Thu Apr 2 12:12:20 2009 -+++ lib/gibber/gibber-resolver.c Tue Jun 2 08:38:27 2009 -@@ -27,6 +27,7 @@ - #include - #include - #include -+#include - - #include - -@@ -686,8 +687,8 @@ gibber_resolver_res_query_to_list (guchar *answer, int +--- lib/gibber/gibber-resolver.c.orig Tue Sep 21 20:10:57 2010 ++++ lib/gibber/gibber-resolver.c Tue Sep 21 20:12:26 2010 +@@ -683,8 +683,8 @@ gibber_resolver_res_query_to_list (guchar *answer, int /* Ignore the initial string, which has the query in it */ pos += len; @@ -23,7 +15,7 @@ Use GETSHORT instead of NS_GET16 which comes with libresolv. if (type != T_SRV || class != C_IN) goto failed; -@@ -695,9 +696,9 @@ gibber_resolver_res_query_to_list (guchar *answer, int +@@ -692,9 +692,9 @@ gibber_resolver_res_query_to_list (guchar *answer, int /* skip ttl and dlen */ pos += 6; diff --git a/net/telepathy/telepathy-salut/patches/patch-lib_gibber_gibber-tcp-transport_c b/net/telepathy/telepathy-salut/patches/patch-lib_gibber_gibber-tcp-transport_c index 8bcfb94fb52..e6e94098109 100644 --- a/net/telepathy/telepathy-salut/patches/patch-lib_gibber_gibber-tcp-transport_c +++ b/net/telepathy/telepathy-salut/patches/patch-lib_gibber_gibber-tcp-transport_c @@ -1,12 +1,13 @@ -$OpenBSD: patch-lib_gibber_gibber-tcp-transport_c,v 1.1 2009/06/03 16:40:06 ajacoutot Exp $ ---- lib/gibber/gibber-tcp-transport.c.orig Tue Jun 2 07:44:20 2009 -+++ lib/gibber/gibber-tcp-transport.c Tue Jun 2 07:51:39 2009 -@@ -19,6 +19,8 @@ - */ +$OpenBSD: patch-lib_gibber_gibber-tcp-transport_c,v 1.2 2010/09/23 13:47:35 jasper Exp $ +--- lib/gibber/gibber-tcp-transport.c.orig Tue Sep 21 20:10:16 2010 ++++ lib/gibber/gibber-tcp-transport.c Tue Sep 21 20:10:26 2010 +@@ -20,6 +20,9 @@ + #include +#include +#include ++ #include #include diff --git a/net/telepathy/telepathy-salut/patches/patch-lib_gibber_gibber-unix-transport_c b/net/telepathy/telepathy-salut/patches/patch-lib_gibber_gibber-unix-transport_c index 479bf21d333..0437e3cdef4 100644 --- a/net/telepathy/telepathy-salut/patches/patch-lib_gibber_gibber-unix-transport_c +++ b/net/telepathy/telepathy-salut/patches/patch-lib_gibber_gibber-unix-transport_c @@ -1,7 +1,7 @@ -$OpenBSD: patch-lib_gibber_gibber-unix-transport_c,v 1.2 2010/04/23 13:49:24 jasper Exp $ ---- lib/gibber/gibber-unix-transport.c.orig Mon Mar 22 00:13:59 2010 -+++ lib/gibber/gibber-unix-transport.c Fri Apr 23 15:47:59 2010 -@@ -22,15 +22,19 @@ +$OpenBSD: patch-lib_gibber_gibber-unix-transport_c,v 1.3 2010/09/23 13:47:35 jasper Exp $ +--- lib/gibber/gibber-unix-transport.c.orig Tue Sep 21 20:16:36 2010 ++++ lib/gibber/gibber-unix-transport.c Tue Sep 21 20:18:38 2010 +@@ -22,6 +22,13 @@ /* needed for struct ucred */ #define _GNU_SOURCE @@ -12,9 +12,10 @@ $OpenBSD: patch-lib_gibber_gibber-unix-transport_c,v 1.2 2010/04/23 13:49:24 jas +#include +#include + - #include - #include - #include + #include + + #ifdef G_OS_UNIX +@@ -34,9 +41,6 @@ #include #include #include @@ -24,7 +25,7 @@ $OpenBSD: patch-lib_gibber_gibber-unix-transport_c,v 1.2 2010/04/23 13:49:24 jas #include "gibber-unix-transport.h" #include "gibber-util.h" -@@ -38,6 +42,9 @@ +@@ -44,6 +48,9 @@ #define DEBUG_FLAG DEBUG_NET #include "gibber-debug.h" @@ -34,7 +35,7 @@ $OpenBSD: patch-lib_gibber_gibber-unix-transport_c,v 1.2 2010/04/23 13:49:24 jas G_DEFINE_TYPE(GibberUnixTransport, gibber_unix_transport, \ GIBBER_TYPE_FD_TRANSPORT) -@@ -227,9 +234,8 @@ gibber_unix_transport_send_credentials (GibberUnixTran +@@ -245,9 +252,8 @@ gibber_unix_transport_send_credentials (GibberUnixTran ch->cmsg_type = SCM_CREDENTIALS; cred = (struct ucred *) CMSG_DATA (ch); @@ -46,7 +47,7 @@ $OpenBSD: patch-lib_gibber_gibber-unix-transport_c,v 1.2 2010/04/23 13:49:24 jas ret = sendmsg (fd, &msg, 0); if (ret == -1) -@@ -326,9 +332,9 @@ gibber_unix_transport_read (GibberFdTransport *transpo +@@ -344,9 +350,9 @@ gibber_unix_transport_read (GibberFdTransport *transpo GibberCredentials credentials; cred = (struct ucred *) CMSG_DATA (ch); diff --git a/net/telepathy/telepathy-salut/patches/patch-lib_gibber_gibber-util_c b/net/telepathy/telepathy-salut/patches/patch-lib_gibber_gibber-util_c index 19a2cbb1055..9a146c8c6f6 100644 --- a/net/telepathy/telepathy-salut/patches/patch-lib_gibber_gibber-util_c +++ b/net/telepathy/telepathy-salut/patches/patch-lib_gibber_gibber-util_c @@ -1,12 +1,13 @@ -$OpenBSD: patch-lib_gibber_gibber-util_c,v 1.1 2009/06/03 16:40:06 ajacoutot Exp $ ---- lib/gibber/gibber-util.c.orig Tue Jun 2 07:52:50 2009 -+++ lib/gibber/gibber-util.c Tue Jun 2 07:53:07 2009 -@@ -18,6 +18,8 @@ - */ +$OpenBSD: patch-lib_gibber_gibber-util_c,v 1.2 2010/09/23 13:47:35 jasper Exp $ +--- lib/gibber/gibber-util.c.orig Tue Sep 21 20:09:28 2010 ++++ lib/gibber/gibber-util.c Tue Sep 21 20:09:47 2010 +@@ -19,6 +19,9 @@ + #include +#include +#include ++ #include - #include #include + #include