Add a missing dependency on sqlite3.

git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@14389 df743ca5-7f9a-e211-a948-0013205c9059

13 files changed, 273 insertions, 0 deletions

diff --git a/net-im/telepathy-gabble/Makefile b/net-im/telepathy-gabble/Makefile
new file mode 100644
index 000000000..2fb934c89
--- /dev/null
+++ b/net-im/telepathy-gabble/Makefile
@@ -0,0 +1,44 @@
+# New ports collection makefile for:	telepathy-gabble
+# Date created:				Apr 19 2007
+# Whom:					Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD: ports/net-im/telepathy-gabble/Makefile,v 1.42 2010/05/22 07:25:23 marcus Exp $
+#    $MCom: ports/net-im/telepathy-gabble/Makefile,v 1.5 2009/01/08 07:03:21 marcus Exp $
+
+PORTNAME=	telepathy-gabble
+PORTVERSION=	0.8.13
+PORTREVISION=	1
+CATEGORIES=	net-im
+MASTER_SITES=	http://telepathy.freedesktop.org/releases/${PORTNAME}/
+
+MAINTAINER=	gnome@FreeBSD.org
+COMMENT=	Jabber Connection Manager for Telepathy Framework
+
+LIB_PC_DEPENDS=	gobject-2.0.pc:${PORTSDIR}/devel/glib20 \
+		dbus-glib-1.pc:${PORTSDIR}/devel/dbus-glib \
+		telepathy-glib.pc:${PORTSDIR}/net-im/telepathy-glib \
+		loudmouth-1.0.pc:${PORTSDIR}/net-im/loudmouth
+
+BUILD_DEPENDS=	xsltproc:${PORTSDIR}/textproc/libxslt
+
+BUILD_DEPENDS+=	${LIB_PC_DEPENDS:C|^|${LOCALBASE}/libdata/pkgconfig/|g}
+LIB_DEPENDS=	soup-2.4.1:${PORTSDIR}/devel/libsoup \
+		sqlite3.8:${PORTSDIR}/databases/sqlite3
+RUN_DEPENDS+=	${LIB_PC_DEPENDS:C|^|${LOCALBASE}/libdata/pkgconfig/|g}
+
+GNU_CONFIGURE=	yes
+LDFLAGS=	${PTHREAD_LIBS}
+USE_GMAKE=	yes
+USE_GNOME=	gnomehack pkgconfig glib20
+USE_OPENSSL=	yes
+USE_PYTHON_BUILD=	yes
+
+MAN8=		telepathy-gabble.8
+
+.include <bsd.port.pre.mk>
+
+.if defined(WITH_OPENSSL_BASE)
+CONFIGURE_ENV+=	OPENSSL_LIBS="-L/usr/lib -ssl -crypto" OPENSSL_CFLAGS="-I/usr/include"
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/net-im/telepathy-gabble/distinfo b/net-im/telepathy-gabble/distinfo
new file mode 100644
index 000000000..f296c2883
--- /dev/null
+++ b/net-im/telepathy-gabble/distinfo
@@ -0,0 +1,3 @@
+MD5 (telepathy-gabble-0.8.13.tar.gz) = 2a3a9afe165dfcaceaf186a5a9cd048e
+SHA256 (telepathy-gabble-0.8.13.tar.gz) = 3e9b101b7d40290c26749da72a06bc81662d5d7fb15fd979373bee8526859a24
+SIZE (telepathy-gabble-0.8.13.tar.gz) = 1508639
diff --git a/net-im/telepathy-gabble/files/patch-Makefile.in b/net-im/telepathy-gabble/files/patch-Makefile.in
new file mode 100644
index 000000000..911ee27c5
--- /dev/null
+++ b/net-im/telepathy-gabble/files/patch-Makefile.in
@@ -0,0 +1,11 @@
+--- Makefile.in.orig	2009-03-12 20:41:53.000000000 -0400
++++ Makefile.in	2009-03-12 20:41:59.000000000 -0400
+@@ -203,7 +203,7 @@ top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ ACLOCAL_AMFLAGS = -I m4
+-SUBDIRS = docs tools extensions lib src data m4 tests
++SUBDIRS = docs tools extensions lib src data m4
+ DISTCHECK_CONFIGURE_FLAGS = --disable-debug
+ CLEANFILES = FIXME.out
+ LCOV_CHECK_ARGS = CHECK_TWISTED_SLEEP=6
diff --git a/net-im/telepathy-gabble/files/patch-lib_gibber_asyncns.c b/net-im/telepathy-gabble/files/patch-lib_gibber_asyncns.c
new file mode 100644
index 000000000..ff3bb3733
--- /dev/null
+++ b/net-im/telepathy-gabble/files/patch-lib_gibber_asyncns.c
@@ -0,0 +1,10 @@
+--- lib/gibber/asyncns.c.orig	2009-03-08 13:01:42.000000000 -0400
++++ lib/gibber/asyncns.c	2009-03-08 13:02:06.000000000 -0400
+@@ -35,6 +35,7 @@
+ #include <errno.h>
+ #include <sys/wait.h>
+ #include <sys/types.h>
++#include <sys/resource.h>
+ #include <pwd.h>
+ #include <netinet/in.h>
+ #include <arpa/nameser.h>
diff --git a/net-im/telepathy-gabble/files/patch-lib_gibber_gibber-fd-transport.h b/net-im/telepathy-gabble/files/patch-lib_gibber_gibber-fd-transport.h
new file mode 100644
index 000000000..8cf86b314
--- /dev/null
+++ b/net-im/telepathy-gabble/files/patch-lib_gibber_gibber-fd-transport.h
@@ -0,0 +1,12 @@
+--- lib/gibber/gibber-fd-transport.h.orig	2009-01-08 01:53:58.000000000 -0500
++++ lib/gibber/gibber-fd-transport.h	2009-01-08 01:54:11.000000000 -0500
+@@ -23,7 +23,9 @@
+ 
+ #include <glib-object.h>
+ 
++#include <sys/types.h>
+ #include <sys/socket.h>
++#include <netinet/in.h>
+ #include <netdb.h>
+ 
+ #include "gibber-transport.h"
diff --git a/net-im/telepathy-gabble/files/patch-lib_gibber_gibber-resolver.c b/net-im/telepathy-gabble/files/patch-lib_gibber_gibber-resolver.c
new file mode 100644
index 000000000..6d20d57dc
--- /dev/null
+++ b/net-im/telepathy-gabble/files/patch-lib_gibber_gibber-resolver.c
@@ -0,0 +1,12 @@
+--- lib/gibber/gibber-resolver.c.orig	2009-03-15 02:48:07.000000000 -0400
++++ lib/gibber/gibber-resolver.c	2009-03-15 02:48:53.000000000 -0400
+@@ -735,7 +735,9 @@ gibber_resolver_gai_error_to_g_error (in
+       break;
+ 
+     case EAI_MEMORY:
++#ifdef EAI_OVERFLOW
+     case EAI_OVERFLOW:
++#endif
+       code = GIBBER_RESOLVER_ERROR_MEMORY;
+       break;
+ 
diff --git a/net-im/telepathy-gabble/files/patch-lib_gibber_gibber-unix-transport.c b/net-im/telepathy-gabble/files/patch-lib_gibber_gibber-unix-transport.c
new file mode 100644
index 000000000..79aaa44ec
--- /dev/null
+++ b/net-im/telepathy-gabble/files/patch-lib_gibber_gibber-unix-transport.c
@@ -0,0 +1,116 @@
+--- lib/gibber/gibber-unix-transport.c.orig	2009-06-02 23:56:27.000000000 -0400
++++ lib/gibber/gibber-unix-transport.c	2009-06-03 00:13:18.000000000 -0400
+@@ -200,11 +200,12 @@ gibber_unix_transport_send_credentials (
+     gsize size)
+ {
+   int fd, ret;
+-  struct ucred *cred;
+   struct msghdr msg;
+-  struct cmsghdr *ch;
+   struct iovec iov;
+-  char buffer[CMSG_SPACE (sizeof (struct ucred))];
++  union {
++	  struct cmsghdr hdr;
++	  char cred[CMSG_SPACE (sizeof (struct cmsgcred))];
++  } cmsg;
+ 
+   DEBUG ("send credentials");
+   fd = GIBBER_FD_TRANSPORT (transport)->fd;
+@@ -217,19 +218,12 @@ gibber_unix_transport_send_credentials (
+   memset (&msg, 0, sizeof msg);
+   msg.msg_iov = &iov;
+   msg.msg_iovlen = 1;
+-  msg.msg_control = buffer;
+-  msg.msg_controllen = sizeof (buffer);
+-
+-  /* Set the credentials */
+-  ch = CMSG_FIRSTHDR (&msg);
+-  ch->cmsg_len = CMSG_LEN (sizeof (struct ucred));
+-  ch->cmsg_level = SOL_SOCKET;
+-  ch->cmsg_type = SCM_CREDENTIALS;
+-
+-  cred = (struct ucred *) CMSG_DATA (ch);
+-  cred->pid = getpid ();
+-  cred->uid = getuid ();
+-  cred->gid = getgid ();
++  msg.msg_control = (caddr_t) &cmsg;
++  msg.msg_controllen = CMSG_SPACE (sizeof (struct cmsgcred));
++  memset (&cmsg, 0, sizeof (cmsg));
++  cmsg.hdr.cmsg_len = CMSG_LEN (sizeof (struct cmsgcred));
++  cmsg.hdr.cmsg_level = SOL_SOCKET;
++  cmsg.hdr.cmsg_type = SCM_CREDS;
+ 
+   ret = sendmsg (fd, &msg, 0);
+   if (ret == -1)
+@@ -256,9 +250,11 @@ gibber_unix_transport_read (GibberFdTran
+   GibberBuffer buf;
+   struct iovec iov;
+   struct msghdr msg;
+-  char control[CMSG_SPACE (sizeof (struct ucred))];
+-  struct cmsghdr *ch;
+-  struct ucred *cred;
++  struct cmsgcred *cred;
++  union {
++	  struct cmsghdr hdr;
++	  char cred[CMSG_SPACE (sizeof *cred)];
++  } cmsg;
+   int opt;
+ 
+   if (priv->recv_creds_cb == NULL)
+@@ -268,8 +264,10 @@ gibber_unix_transport_read (GibberFdTran
+   fd = transport->fd;
+ 
+   /* set SO_PASSCRED flag */
++#ifdef SO_PASSCRED
+   opt = 1;
+   setsockopt (fd, SOL_SOCKET, SO_PASSCRED, &opt, sizeof (opt));
++#endif
+ 
+   memset (buffer, 0, sizeof (buffer));
+   memset (&iov, 0, sizeof (iov));
+@@ -279,8 +277,8 @@ gibber_unix_transport_read (GibberFdTran
+   memset (&msg, 0, sizeof (msg));
+   msg.msg_iov = &iov;
+   msg.msg_iovlen = 1;
+-  msg.msg_control = control;
+-  msg.msg_controllen = sizeof (control);
++  msg.msg_control = (caddr_t) &cmsg;
++  msg.msg_controllen = CMSG_SPACE (sizeof *cred);
+ 
+   bytes_read = recvmsg (fd, &msg, 0);
+ 
+@@ -300,15 +298,17 @@ gibber_unix_transport_read (GibberFdTran
+     }
+ 
+   /* unset SO_PASSCRED flag */
++#ifdef SO_PASSCRED
+   opt = 0;
+   setsockopt (fd, SOL_SOCKET, SO_PASSCRED, &opt, sizeof (opt));
++#endif
+ 
+   buf.data = buffer;
+   buf.length = bytes_read;
+ 
+   /* extract the credentials */
+-  ch = CMSG_FIRSTHDR (&msg);
+-  if (ch == NULL)
++  if (cmsg.hdr.cmsg_len < CMSG_LEN (sizeof *cred) ||
++      cmsg.hdr.cmsg_type != SCM_CREDS)
+     {
+       GError *err = NULL;
+ 
+@@ -325,10 +325,10 @@ gibber_unix_transport_read (GibberFdTran
+     {
+       GibberCredentials credentials;
+ 
+-      cred = (struct ucred *) CMSG_DATA (ch);
+-      credentials.pid = cred->pid;
+-      credentials.uid = cred->uid;
+-      credentials.gid = cred->gid;
++      cred = (struct cmsgcred *) CMSG_DATA (&cmsg.hdr);
++      credentials.pid = cred->cmcred_pid;
++      credentials.uid = cred->cmcred_uid;
++      credentials.gid = cred->cmcred_gid;
+ 
+       priv->recv_creds_cb (self, &buf, &credentials, NULL,
+           priv->recv_creds_data);
diff --git a/net-im/telepathy-gabble/files/patch-lib_gibber_gibber-util.h b/net-im/telepathy-gabble/files/patch-lib_gibber_gibber-util.h
new file mode 100644
index 000000000..e690611c3
--- /dev/null
+++ b/net-im/telepathy-gabble/files/patch-lib_gibber_gibber-util.h
@@ -0,0 +1,12 @@
+--- lib/gibber/gibber-util.h.orig	2009-01-08 01:55:08.000000000 -0500
++++ lib/gibber/gibber-util.h	2009-01-08 01:56:05.000000000 -0500
+@@ -20,6 +20,9 @@
+ #ifndef __GIBBER_UTIL_H__
+ #define __GIBBER_UTIL_H__
+ 
++#include <sys/types.h>
++#include <sys/socket.h>
++#include <netinet/in.h>
+ #include <netdb.h>
+ 
+ #include <glib.h>
diff --git a/net-im/telepathy-gabble/files/patch-src_bytestream-socks5.c b/net-im/telepathy-gabble/files/patch-src_bytestream-socks5.c
new file mode 100644
index 000000000..07bf4c2ab
--- /dev/null
+++ b/net-im/telepathy-gabble/files/patch-src_bytestream-socks5.c
@@ -0,0 +1,11 @@
+--- src/bytestream-socks5.c.orig	2009-01-08 01:57:01.000000000 -0500
++++ src/bytestream-socks5.c	2009-01-08 01:57:20.000000000 -0500
+@@ -21,6 +21,8 @@
+ #include "config.h"
+ #include "bytestream-socks5.h"
+ 
++#include <sys/types.h>
++#include <sys/socket.h>
+ #include <arpa/inet.h>
+ #include <errno.h>
+ #include <fcntl.h>
diff --git a/net-im/telepathy-gabble/files/patch-src_jingle-factory.c b/net-im/telepathy-gabble/files/patch-src_jingle-factory.c
new file mode 100644
index 000000000..6f75e4951
--- /dev/null
+++ b/net-im/telepathy-gabble/files/patch-src_jingle-factory.c
@@ -0,0 +1,13 @@
+--- src/jingle-factory.c.orig	2009-03-08 13:03:05.000000000 -0400
++++ src/jingle-factory.c	2009-03-08 13:04:05.000000000 -0400
+@@ -20,6 +20,10 @@
+ 
+ #include "jingle-factory.h"
+ 
++#include <sys/types.h>
++#include <sys/socket.h>
++#include <netinet/in.h>
++#include <arpa/inet.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
diff --git a/net-im/telepathy-gabble/files/patch-src_tube-stream.c b/net-im/telepathy-gabble/files/patch-src_tube-stream.c
new file mode 100644
index 000000000..9118a52ad
--- /dev/null
+++ b/net-im/telepathy-gabble/files/patch-src_tube-stream.c
@@ -0,0 +1,10 @@
+--- src/tube-stream.c.orig	2008-01-17 01:49:11.000000000 -0500
++++ src/tube-stream.c	2008-01-17 01:49:22.000000000 -0500
+@@ -24,6 +24,7 @@
+ #include <time.h>
+ #include <sys/types.h>
+ #include <sys/socket.h>
++#include <netinet/in.h>
+ #include <sys/un.h>
+ #include <unistd.h>
+ #include <fcntl.h>
diff --git a/net-im/telepathy-gabble/pkg-descr b/net-im/telepathy-gabble/pkg-descr
new file mode 100644
index 000000000..730ea4f1c
--- /dev/null
+++ b/net-im/telepathy-gabble/pkg-descr
@@ -0,0 +1,9 @@
+Gabble is a Jabber/XMPP connection manager for the Telepathy framework,
+currently supporting single user chats, multi user chats and voice/video
+calls. Install this package to use Telepathy instant messaging clients
+with Jabber/XMPP servers, including Google Talk.
+
+WWW: http://telepathy.freedesktop.org/
+
+- Florent Thoumie
+flz@FreeBSD.org
diff --git a/net-im/telepathy-gabble/pkg-plist b/net-im/telepathy-gabble/pkg-plist
new file mode 100644
index 000000000..fff4ba5c0
--- /dev/null
+++ b/net-im/telepathy-gabble/pkg-plist
@@ -0,0 +1,10 @@
+libexec/telepathy-gabble
+share/dbus-1/services/org.freedesktop.Telepathy.ConnectionManager.gabble.service
+%%DOCSDIR%%/muc-bytestream.html
+%%DOCSDIR%%/olpc.html
+%%DOCSDIR%%/si-multiple.html
+%%DOCSDIR%%/tubes.html
+share/telepathy/managers/gabble.manager
+@dirrmtry share/telepathy/managers
+@dirrmtry share/telepathy
+@dirrm %%DOCSDIR%%