9 files changed, 70 insertions, 33 deletions

diff --git a/net-im/telepathy-salut/Makefile b/net-im/telepathy-salut/Makefile
index f82b95b5aa17..79b19c3f4d6c 100644
--- a/net-im/telepathy-salut/Makefile
+++ b/net-im/telepathy-salut/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	telepathy-salut
-PORTVERSION=	0.1.3
+PORTVERSION=	0.3.1
 CATEGORIES=	net-im
 MASTER_SITES=	http://telepathy.freedesktop.org/releases/${PORTNAME}/
 
@@ -24,11 +24,11 @@ RUN_DEPENDS+=	${LIB_PC_DEPENDS:C|^|${LOCALBASE}/libdata/pkgconfig/|g}
 
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-USE_GNOME=	gnomehack pkgconfig
+USE_GNOME=	gnomehack pkgconfig gnometarget
 USE_OPENSSL=	yes
 USE_PYTHON_BUILD=	yes
 
-CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
+MAN8=		telepathy-salut.8
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|make -C|${GMAKE} -C|g' \
diff --git a/net-im/telepathy-salut/distinfo b/net-im/telepathy-salut/distinfo
index f8c05befa894..9bc094c3f917 100644
--- a/net-im/telepathy-salut/distinfo
+++ b/net-im/telepathy-salut/distinfo
@@ -1,3 +1,3 @@
-MD5 (telepathy-salut-0.1.3.tar.gz) = 92589387610b8c62760efb782afa4534
-SHA256 (telepathy-salut-0.1.3.tar.gz) = 14d2db936bcfdb8e441536106bfcce7f2f59e6d0d4f635af22657801345139ab
-SIZE (telepathy-salut-0.1.3.tar.gz) = 537566
+MD5 (telepathy-salut-0.3.1.tar.gz) = c727ddf089a9ddcc99a8d499f61bf66f
+SHA256 (telepathy-salut-0.3.1.tar.gz) = 2df146c58ba3e131e8252ff144f828e3f867e66b3f2965e7febeb20999773c3a
+SIZE (telepathy-salut-0.3.1.tar.gz) = 714663
diff --git a/net-im/telepathy-salut/files/patch-lib_gibber_gibber-bytestream-oob.h b/net-im/telepathy-salut/files/patch-lib_gibber_gibber-bytestream-oob.h
new file mode 100644
index 000000000000..2bea200aa4eb
--- /dev/null
+++ b/net-im/telepathy-salut/files/patch-lib_gibber_gibber-bytestream-oob.h
@@ -0,0 +1,10 @@
+--- lib/gibber/gibber-bytestream-oob.h.orig	2008-01-17 00:55:20.000000000 -0500
++++ lib/gibber/gibber-bytestream-oob.h	2008-01-17 00:55:54.000000000 -0500
+@@ -22,6 +22,7 @@
+ 
+ #include <glib-object.h>
+ 
++#include <netinet/in.h>
+ #include <netdb.h>
+ 
+ #include "gibber-bytestream-iface.h"
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
deleted file mode 100644
index 36995fa17fc7..000000000000
--- a/net-im/telepathy-salut/files/patch-lib_gibber_gibber-linklocal-transport.c
+++ /dev/null
@@ -1,26 +0,0 @@
---- 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-resolver.c b/net-im/telepathy-salut/files/patch-lib_gibber_gibber-resolver.c
new file mode 100644
index 000000000000..76c9aff087c2
--- /dev/null
+++ b/net-im/telepathy-salut/files/patch-lib_gibber_gibber-resolver.c
@@ -0,0 +1,22 @@
+--- lib/gibber/gibber-resolver.c.orig	2008-03-19 22:59:19.000000000 -0400
++++ lib/gibber/gibber-resolver.c	2008-03-19 23:00:18.000000000 -0400
+@@ -720,7 +720,9 @@ gibber_resolver_gai_error_to_g_error (in
+ 
+   switch (error) {
+     case EAI_BADFLAGS:
++#ifdef EAI_ADDRFAMILY
+     case EAI_ADDRFAMILY:
++#endif
+     case EAI_SOCKTYPE:
+     case EAI_FAMILY:
+     case EAI_SERVICE:
+@@ -731,7 +733,9 @@ gibber_resolver_gai_error_to_g_error (in
+       code = GIBBER_RESOLVER_ERROR_RESOLVE_TEMPORARY_FAILURE;
+       break;
+     case EAI_FAIL:
++#ifdef EAI_NODATA
+     case EAI_NODATA:
++#endif
+     case EAI_NONAME:
+       code = GIBBER_RESOLVER_ERROR_RESOLVE_FAILURE;
+       break;
diff --git a/net-im/telepathy-salut/files/patch-lib_gibber_gibber-util.c b/net-im/telepathy-salut/files/patch-lib_gibber_gibber-util.c
new file mode 100644
index 000000000000..be92164c0c2d
--- /dev/null
+++ b/net-im/telepathy-salut/files/patch-lib_gibber_gibber-util.c
@@ -0,0 +1,11 @@
+--- lib/gibber/gibber-util.c.orig	2008-01-17 00:59:24.000000000 -0500
++++ lib/gibber/gibber-util.c	2008-01-17 00:59:48.000000000 -0500
+@@ -18,6 +18,8 @@
+  */
+ 
+ 
++#include <sys/types.h>
++#include <sys/socket.h>
+ #include <stdio.h>
+ #include <unistd.h>
+ #include <stdlib.h>
diff --git a/net-im/telepathy-salut/files/patch-lib_gibber_gibber-util.h b/net-im/telepathy-salut/files/patch-lib_gibber_gibber-util.h
new file mode 100644
index 000000000000..d6eb90222549
--- /dev/null
+++ b/net-im/telepathy-salut/files/patch-lib_gibber_gibber-util.h
@@ -0,0 +1,10 @@
+--- lib/gibber/gibber-util.h.orig	2008-01-17 00:57:54.000000000 -0500
++++ lib/gibber/gibber-util.h	2008-01-17 00:58:06.000000000 -0500
+@@ -21,6 +21,7 @@
+ #define __GIBBER_UTIL_H__
+ 
+ #include <netdb.h>
++#include <netinet/in.h>
+ 
+ #include <glib.h>
+ 
diff --git a/net-im/telepathy-salut/files/patch-lib_gibber_gibber-xmpp-connection-listener.c b/net-im/telepathy-salut/files/patch-lib_gibber_gibber-xmpp-connection-listener.c
new file mode 100644
index 000000000000..7d0cabfe1c73
--- /dev/null
+++ b/net-im/telepathy-salut/files/patch-lib_gibber_gibber-xmpp-connection-listener.c
@@ -0,0 +1,10 @@
+--- lib/gibber/gibber-xmpp-connection-listener.c.orig	2008-01-17 00:56:23.000000000 -0500
++++ lib/gibber/gibber-xmpp-connection-listener.c	2008-01-17 00:56:46.000000000 -0500
+@@ -24,6 +24,7 @@
+ #include <time.h>
+ #include <sys/types.h>
+ #include <sys/socket.h>
++#include <netinet/in.h>
+ #include <netdb.h>
+ #include <unistd.h>
+ #include <errno.h>
diff --git a/net-im/telepathy-salut/pkg-plist b/net-im/telepathy-salut/pkg-plist
index fe5c1b4fb88d..02a5d18b7d84 100644
--- a/net-im/telepathy-salut/pkg-plist
+++ b/net-im/telepathy-salut/pkg-plist
@@ -1,4 +1,4 @@
-bin/telepathy-salut
+libexec/telepathy-salut
 share/telepathy/managers/salut.manager
 share/dbus-1/services/org.freedesktop.Telepathy.ConnectionManager.salut.service
 @dirrmtry share/telepathy/managers