- we have avahi now, so unbreak

- update to the latest stable release
This commit is contained in:
ajacoutot 2009-06-03 16:40:06 +00:00
parent d6d8ea4d98
commit 776e7e1052
12 changed files with 151 additions and 18 deletions

View File

@ -1,27 +1,33 @@
# $OpenBSD: Makefile,v 1.4 2009/03/24 20:07:05 jasper Exp $
BROKEN= needs avahi
# $OpenBSD: Makefile,v 1.5 2009/06/03 16:40:06 ajacoutot Exp $
COMMENT= flexible communications framework, local-link component
DISTNAME= telepathy-salut-0.1.5
PKGNAME= ${DISTNAME}p1
DISTNAME= telepathy-salut-0.3.9
MASTER_SITES= ${MASTER_SITES_TELEPATHY:=telepathy-salut/}
WANTLIB= dbus-1 glib-2.0 gobject-2.0
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
MODULES= devel/gettext \
lang/python
LIB_DEPENDS= dbus-glib-1::x11/dbus-glib
LIB_DEPENDS= avahi-client,avahi-common,avahi-glib,avahi-gobject::net/avahi \
soup-2.4.>=1::devel/libsoup \
telepathy-glib.>=4::net/telepathy/telepathy-glib
USE_GMAKE= Yes
USE_LIBTOOL= Yes
CONFIGURE_STYLE= gnu
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib" \
OPENSSL_LIBS="-L/usr/lib -lssl -lcrypto" \
OPENSSL_CFLAGS="-I/usr/include"
LIBSSL_LIBS="-L/usr/lib -lssl -lcrypto" \
LIBSSL_CFLAGS="-I/usr/include"
CONFIGURE_ARGS= ${CONFIGURE_SHARED} \
--enable-ssl
REGRESS_DEPENDS= ::devel/check
.include <bsd.port.mk>

View File

@ -1,5 +1,5 @@
MD5 (telepathy-salut-0.1.5.tar.gz) = mCWEwT8oj3vtfztoIV81Dg==
RMD160 (telepathy-salut-0.1.5.tar.gz) = kHWWlssif0nQDOZats2z0Xuuq/A=
SHA1 (telepathy-salut-0.1.5.tar.gz) = OpJ15vCKdbovlI3dRHD+Cux/3rw=
SHA256 (telepathy-salut-0.1.5.tar.gz) = r9/Gffg50h456W0CFFfgSETRMvdQ0vhlszWB5E2BoAQ=
SIZE (telepathy-salut-0.1.5.tar.gz) = 645325
MD5 (telepathy-salut-0.3.9.tar.gz) = thtvioawehAxXEzKnXi0+g==
RMD160 (telepathy-salut-0.3.9.tar.gz) = Gtuhv2/Qna/mSCQ6+kkGSjWlEq8=
SHA1 (telepathy-salut-0.3.9.tar.gz) = MPMjyL8oEVIhFR4Jwv4QyQ1+hnc=
SHA256 (telepathy-salut-0.3.9.tar.gz) = Ftgp5jUQFvu/SQdNGxjpFNSEuaDw/UoT1GBXXT/qLb8=
SIZE (telepathy-salut-0.3.9.tar.gz) = 1172347

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-configure,v 1.1.1.1 2007/10/27 16:18:54 jasper Exp $
--- configure.orig Fri Oct 12 22:50:08 2007
+++ configure Fri Oct 12 22:50:19 2007
@@ -21377,7 +21377,7 @@ echo "$as_me: error: dbus-binding-tool (from dbus-glib
$OpenBSD: patch-configure,v 1.2 2009/06/03 16:40:06 ajacoutot Exp $
--- configure.orig Thu Apr 2 19:23:13 2009
+++ configure Tue Jun 2 07:28:00 2009
@@ -13502,7 +13502,7 @@ $as_echo "$as_me: error: dbus-binding-tool (from dbus-
{ (exit 1); exit 1; }; }
fi
PYTHON=

View File

@ -0,0 +1,11 @@
$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 @@
#include <stdlib.h>
#include <string.h>
+#include <netinet/in.h>
#include <glib.h>

View File

@ -0,0 +1,11 @@
$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 <netdb.h>
#include <unistd.h>
#include <fcntl.h>
+#include <netinet/in.h>
#include <glib.h>

View File

@ -0,0 +1,11 @@
$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 <sys/types.h>
#include <sys/socket.h>
#include <netdb.h>
+#include <netinet/in.h>
#include "gibber-muc-connection.h"
#include "gibber-signals-marshal.h"

View File

@ -0,0 +1,38 @@
$OpenBSD: patch-lib_gibber_gibber-resolver_c,v 1.1 2009/06/03 16:40:06 ajacoutot 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 <resolv.h>
#include <sys/types.h>
#include <netdb.h>
+#include <netinet/in.h>
#include <errno.h>
@@ -686,8 +687,8 @@ gibber_resolver_res_query_to_list (guchar *answer, int
/* Ignore the initial string, which has the query in it */
pos += len;
- NS_GET16 (type, pos);
- NS_GET16 (class, pos);
+ GETSHORT (type, pos);
+ GETSHORT (class, pos);
if (type != T_SRV || class != C_IN)
goto failed;
@@ -695,9 +696,9 @@ gibber_resolver_res_query_to_list (guchar *answer, int
/* skip ttl and dlen */
pos += 6;
- NS_GET16 (pref, pos);
- NS_GET16 (weight, pos);
- NS_GET16 (port, pos);
+ GETSHORT (pref, pos);
+ GETSHORT (weight, pos);
+ GETSHORT (port, pos);
len = dn_expand (answer, end, pos, name, 255);
list = g_list_prepend (list,

View File

@ -0,0 +1,12 @@
$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 @@
*/
+#include <sys/types.h>
+#include <netinet/in.h>
#include <stdio.h>
#include <stdlib.h>

View File

@ -0,0 +1,12 @@
$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 @@
*/
+#include <sys/types.h>
+#include <sys/socket.h>
#include <stdio.h>
#include <unistd.h>
#include <stdlib.h>

View File

@ -0,0 +1,11 @@
$OpenBSD: patch-lib_gibber_gibber-util_h,v 1.1 2009/06/03 16:40:06 ajacoutot Exp $
--- lib/gibber/gibber-util.h.orig Tue Jun 2 07:54:39 2009
+++ lib/gibber/gibber-util.h Tue Jun 2 07:54:56 2009
@@ -21,6 +21,7 @@
#define __GIBBER_UTIL_H__
#include <netdb.h>
+#include <netinet/in.h>
#include <glib.h>

View File

@ -0,0 +1,12 @@
$OpenBSD: patch-src_salut-contact_h,v 1.1 2009/06/03 16:40:06 ajacoutot Exp $
--- src/salut-contact.h.orig Tue Jun 2 08:40:33 2009
+++ src/salut-contact.h Tue Jun 2 08:40:51 2009
@@ -20,6 +20,8 @@
#ifndef __SALUT_CONTACT_H__
#define __SALUT_CONTACT_H__
+#include <sys/socket.h>
+
#include "config.h"
#include <netinet/in.h>

View File

@ -0,0 +1,9 @@
@comment $OpenBSD: PLIST,v 1.1 2009/06/03 16:40:06 ajacoutot Exp $
@bin libexec/telepathy-salut
@man man/man8/telepathy-salut.8
share/dbus-1/services/org.freedesktop.Telepathy.ConnectionManager.salut.service
share/doc/telepathy-salut/
share/doc/telepathy-salut/clique.html
share/telepathy/
share/telepathy/managers/
share/telepathy/managers/salut.manager