Add telepathy-salut, a link-local connection manager for the telepathy framework.

10 files changed, 122 insertions, 0 deletions

diff --git a/net-im/Makefile b/net-im/Makefile
index e5bc7bcb918e..da8d9a1a7445 100644
--- a/net-im/Makefile
+++ b/net-im/Makefile
@@ -124,6 +124,7 @@
     SUBDIR += sulci
     SUBDIR += telepathy-gabble
     SUBDIR += telepathy-glib
+    SUBDIR += telepathy-salut
     SUBDIR += tik
     SUBDIR += tkabber
     SUBDIR += tkabber-devel
diff --git a/net-im/telepathy-salut/Makefile b/net-im/telepathy-salut/Makefile
new file mode 100644
index 000000000000..349915d575ec
--- /dev/null
+++ b/net-im/telepathy-salut/Makefile
@@ -0,0 +1,38 @@
+# New ports collection makefile for:	telepathy-salut
+# Date created:				Apr 16 2007
+# Whom:					Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	telepathy-salut
+PORTVERSION=	0.1.1
+CATEGORIES=	net-im
+MASTER_SITES=	http://telepathy.freedesktop.org/releases/${PORTNAME}/
+
+MAINTAINER=	flz@FreeBSD.org
+COMMENT=	Link-local Connection Manager for Telepathy Framework
+
+LIB_PC_DEPENDS=	gobject-2.0.pc:${PORTSDIR}/devel/glib20 \
+		dbus-glib-1.pc:${PORTSDIR}/devel/dbus-glib \
+		avahi-glib.pc:${PORTSDIR}/net/avahi
+
+BUILD_DEPENDS=	xsltproc:${PORTSDIR}/textproc/libxslt
+
+BUILD_DEPENDS+=	${LIB_PC_DEPENDS:C|^|${LOCALBASE}/libdata/pkgconfig/|g}
+RUN_DEPENDS+=	${LIB_PC_DEPENDS:C|^|${LOCALBASE}/libdata/pkgconfig/|g}
+
+GNU_CONFIGURE=	yes
+USE_GMAKE=	yes
+USE_GNOME=	gnomehack pkgconfig
+USE_OPENSSL=	yes
+
+CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
+
+post-patch:
+	@${REINPLACE_CMD} -e 's|make -C|${GMAKE} -C|g' \
+		${WRKSRC}/src/Makefile.in \
+		${WRKSRC}/tests/Makefile.in \
+		${WRKSRC}/lib/gibber/examples/Makefile.in
+
+.include <bsd.port.mk>
diff --git a/net-im/telepathy-salut/distinfo b/net-im/telepathy-salut/distinfo
new file mode 100644
index 000000000000..87b4de77d254
--- /dev/null
+++ b/net-im/telepathy-salut/distinfo
@@ -0,0 +1,3 @@
+MD5 (telepathy-salut-0.1.1.tar.gz) = 8821ddd1300e1db21332c7f93a211f41
+SHA256 (telepathy-salut-0.1.1.tar.gz) = 57c814de8c7f9017c0efec45a383b400e964f906586e5d2d559267aa306b1463
+SIZE (telepathy-salut-0.1.1.tar.gz) = 521898
diff --git a/net-im/telepathy-salut/files/patch-lib_gibber_gibber-linklocal-transport.c b/net-im/telepathy-salut/files/patch-lib_gibber_gibber-linklocal-transport.c
new file mode 100644
index 000000000000..36995fa17fc7
--- /dev/null
+++ b/net-im/telepathy-salut/files/patch-lib_gibber_gibber-linklocal-transport.c
@@ -0,0 +1,26 @@
+--- lib/gibber/gibber-linklocal-transport.c.orig	Thu Apr 19 16:56:03 2007
++++ lib/gibber/gibber-linklocal-transport.c	Thu Apr 19 17:06:11 2007
+@@ -18,6 +18,9 @@
+  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+  */
+ 
++#include <sys/types.h>
++#include <netinet/in.h>
++
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <unistd.h>
+@@ -196,7 +199,13 @@
+   if (s6->sin6_family == AF_INET6 && IN6_IS_ADDR_V4MAPPED(&(s6->sin6_addr))) {
+     /* Normalize to ipv4 address */
+     s4->sin_family = AF_INET;
++#if defined(__Linux__)
+     s4->sin_addr.s_addr = s6->sin6_addr.s6_addr32[3];
++#elif defined(__FreeBSD__)
++    s4->sin_addr.s_addr = s6->sin6_addr.__u6_addr.__u6_addr32[3];
++#else
++#error XXX - fill in the blanks.    
++#endif
+   }
+   return success;
+ }
diff --git a/net-im/telepathy-salut/files/patch-lib_gibber_gibber-tcp-transport.c b/net-im/telepathy-salut/files/patch-lib_gibber_gibber-tcp-transport.c
new file mode 100644
index 000000000000..a3b3f8ef41fc
--- /dev/null
+++ b/net-im/telepathy-salut/files/patch-lib_gibber_gibber-tcp-transport.c
@@ -0,0 +1,10 @@
+--- lib/gibber/gibber-tcp-transport.c.orig	Thu Apr 19 16:54:23 2007
++++ lib/gibber/gibber-tcp-transport.c	Thu Apr 19 16:54:46 2007
+@@ -18,6 +18,7 @@
+  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+  */
+ 
++#include <netinet/in.h>
+ 
+ #include <stdio.h>
+ #include <stdlib.h>
diff --git a/net-im/telepathy-salut/files/patch-src_salut-contact.h b/net-im/telepathy-salut/files/patch-src_salut-contact.h
new file mode 100644
index 000000000000..b27d1b466ebc
--- /dev/null
+++ b/net-im/telepathy-salut/files/patch-src_salut-contact.h
@@ -0,0 +1,11 @@
+--- src/salut-contact.h.orig	Thu Apr 19 17:06:44 2007
++++ src/salut-contact.h	Thu Apr 19 17:08:20 2007
+@@ -20,6 +20,8 @@
+ #ifndef __SALUT_CONTACT_H__
+ #define __SALUT_CONTACT_H__
+ 
++#include <sys/socket.h>
++
+ #include <netinet/in.h>
+ #include <glib-object.h>
+ 
diff --git a/net-im/telepathy-salut/files/patch-src_salut-muc-connection.c b/net-im/telepathy-salut/files/patch-src_salut-muc-connection.c
new file mode 100644
index 000000000000..35c1fef6c581
--- /dev/null
+++ b/net-im/telepathy-salut/files/patch-src_salut-muc-connection.c
@@ -0,0 +1,11 @@
+--- src/salut-muc-connection.c.orig	Thu Apr 19 17:11:46 2007
++++ src/salut-muc-connection.c	Thu Apr 19 17:11:58 2007
+@@ -27,6 +27,8 @@
+ #include <sys/socket.h>
+ #include <netdb.h>
+ 
++#include <netinet/in.h>
++
+ #include "salut-muc-connection.h"
+ #include "salut-muc-connection-signals-marshal.h"
+ 
diff --git a/net-im/telepathy-salut/files/patch-src_salut-self.c b/net-im/telepathy-salut/files/patch-src_salut-self.c
new file mode 100644
index 000000000000..27bb5b5a7163
--- /dev/null
+++ b/net-im/telepathy-salut/files/patch-src_salut-self.c
@@ -0,0 +1,10 @@
+--- src/salut-self.c.orig	Thu Apr 19 17:09:13 2007
++++ src/salut-self.c	Thu Apr 19 17:10:24 2007
+@@ -24,6 +24,7 @@
+ #include <string.h>
+ #include <sys/types.h>
+ #include <sys/socket.h>
++#include <netinet/in.h>
+ #include <netdb.h>
+ #include <errno.h>
+ 
diff --git a/net-im/telepathy-salut/pkg-descr b/net-im/telepathy-salut/pkg-descr
new file mode 100644
index 000000000000..f5785c128d7c
--- /dev/null
+++ b/net-im/telepathy-salut/pkg-descr
@@ -0,0 +1,7 @@
+Telepathy is a real time communications framework.  Salut provides
+Link-local Jabber functionality for Telepathy.
+
+WWW: http://telepathy.freedesktop.org/
+
+- Florent Thoumie
+flz@FreeBSD.org
diff --git a/net-im/telepathy-salut/pkg-plist b/net-im/telepathy-salut/pkg-plist
new file mode 100644
index 000000000000..fe5c1b4fb88d
--- /dev/null
+++ b/net-im/telepathy-salut/pkg-plist
@@ -0,0 +1,5 @@
+bin/telepathy-salut
+share/telepathy/managers/salut.manager
+share/dbus-1/services/org.freedesktop.Telepathy.ConnectionManager.salut.service
+@dirrmtry share/telepathy/managers
+@dirrmtry share/telepathy