diff options
Diffstat (limited to 'chat')
-rw-r--r-- | chat/telepathy-gabble/Makefile | 19 | ||||
-rw-r--r-- | chat/telepathy-gabble/distinfo | 12 | ||||
-rw-r--r-- | chat/telepathy-gabble/patches/patch-ab | 23 | ||||
-rw-r--r-- | chat/telepathy-gabble/patches/patch-ac | 25 |
4 files changed, 40 insertions, 39 deletions
diff --git a/chat/telepathy-gabble/Makefile b/chat/telepathy-gabble/Makefile index 4ffd3c36293..d98bb95c175 100644 --- a/chat/telepathy-gabble/Makefile +++ b/chat/telepathy-gabble/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.8 2009/09/09 11:16:56 wiz Exp $ +# $NetBSD: Makefile,v 1.9 2009/12/03 23:58:59 wiz Exp $ # -DISTNAME= telepathy-gabble-0.7.21 +DISTNAME= telepathy-gabble-0.9.2 CATEGORIES= chat MASTER_SITES= http://telepathy.freedesktop.org/releases/telepathy-gabble/ @@ -19,18 +19,23 @@ USE_TOOLS+= gmake pkg-config .if ${PYPKGPREFIX} == "py24" BUILD_DEPENDS+= ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat .endif -CONFIGURE_ENV+= ac_cv_prog_PYTHON=${PYTHONBIN} -BUILDLINK_API_DEPENDS.telepathy-glib+= telepathy-glib>=0.7.23 +pre-configure: wocky-pkg-config-hack +wocky-pkg-config-hack: + ${LN} -s ${WRKSRC}/lib/ext/wocky/wocky/wocky-uninstalled.pc \ + ${BUILDLINK_DIR}/lib/pkgconfig + +BUILDLINK_API_DEPENDS.telepathy-glib+= telepathy-glib>=0.7.37 .include "../../chat/telepathy-glib/buildlink3.mk" -BUILDLINK_API_DEPENDS.loudmouth+= loudmouth>=1.3.2 -.include "../../chat/loudmouth/buildlink3.mk" -BUILDLINK_API_DEPENDS.glib2+= glib2>=2.16.0 +BUILDLINK_API_DEPENDS.glib2+= glib2>=2.21.0 .include "../../devel/glib2/buildlink3.mk" .include "../../lang/python/application.mk" +.include "../../net/libsoup24/buildlink3.mk" BUILDLINK_API_DEPENDS.dbus-glib+= dbus-glib>=0.78 .include "../../sysutils/dbus-glib/buildlink3.mk" BUILDLINK_API_DEPENDS.dbus+= dbus>=1.1 .include "../../sysutils/dbus/buildlink3.mk" .include "../../textproc/libxslt/buildlink3.mk" +.include "../../security/cyrus-sasl/buildlink3.mk" +.include "../../security/openssl/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/chat/telepathy-gabble/distinfo b/chat/telepathy-gabble/distinfo index ad68c7e0afe..92d4ae61226 100644 --- a/chat/telepathy-gabble/distinfo +++ b/chat/telepathy-gabble/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.7 2009/09/20 12:36:03 sno Exp $ +$NetBSD: distinfo,v 1.8 2009/12/03 23:58:59 wiz Exp $ -SHA1 (telepathy-gabble-0.7.21.tar.gz) = b6c19456ace1812e98c69b52648b324fdf6f1faa -RMD160 (telepathy-gabble-0.7.21.tar.gz) = 3f2ba18a09bab5bc9fb1f58ce3dd5922f8a3fcbc -Size (telepathy-gabble-0.7.21.tar.gz) = 1597740 bytes +SHA1 (telepathy-gabble-0.9.2.tar.gz) = 615821d1f80aecd4cdefaf578b8755e8adbae6d6 +RMD160 (telepathy-gabble-0.9.2.tar.gz) = 2767db9ac8173649e302189440fd1f18446b00ad +Size (telepathy-gabble-0.9.2.tar.gz) = 2274608 bytes SHA1 (patch-aa) = c6f579acd92f43bd327136b4ebabce8d3a54976c -SHA1 (patch-ab) = 15bf26b3b3be950db46b63b8904e98f52d5e2547 -SHA1 (patch-ac) = afe4969ae0845dc1ac07881beaa90713c0d65490 +SHA1 (patch-ab) = b231ff2d99da0d4246134956a5cb0931358b28fd +SHA1 (patch-ac) = 2d3c4fcb5490acbca969c11f168a1f80fe133d11 SHA1 (patch-ad) = 9eab302f5b2a754b55bd9d0f4d6262fd04e1c444 diff --git a/chat/telepathy-gabble/patches/patch-ab b/chat/telepathy-gabble/patches/patch-ab index 8a06b01cee2..1b337630258 100644 --- a/chat/telepathy-gabble/patches/patch-ab +++ b/chat/telepathy-gabble/patches/patch-ab @@ -1,14 +1,13 @@ -$NetBSD: patch-ab,v 1.2 2009/08/16 18:46:27 wiz Exp $ +$NetBSD: patch-ab,v 1.3 2009/12/03 23:58:59 wiz Exp $ -http://bugs.freedesktop.org/show_bug.cgi?id=23348 - ---- lib/gibber/gibber-fd-transport.h.orig 2008-12-18 17:41:05.000000000 +0100 -+++ lib/gibber/gibber-fd-transport.h -@@ -25,6 +25,7 @@ - - #include <sys/socket.h> - #include <netdb.h> -+#include <netinet/in.h> - - #include "gibber-transport.h" +--- configure.orig 2009-10-27 17:12:34.000000000 +0000 ++++ configure +@@ -12537,7 +12537,7 @@ if test "${am_cv_pathless_PYTHON+set}" = + $as_echo_n "(cached) " >&6 + else +- for am_cv_pathless_PYTHON in python python2 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 python1.6 python1.5 none; do ++ for am_cv_pathless_PYTHON in python python2 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 python1.6 python1.5 none; do + test "$am_cv_pathless_PYTHON" = none && break + prog="import sys, string + # split strings by '.' and convert to numeric. Append some zeros diff --git a/chat/telepathy-gabble/patches/patch-ac b/chat/telepathy-gabble/patches/patch-ac index 480b75e0c48..d1acaf26e14 100644 --- a/chat/telepathy-gabble/patches/patch-ac +++ b/chat/telepathy-gabble/patches/patch-ac @@ -1,15 +1,12 @@ -$NetBSD: patch-ac,v 1.3 2009/08/16 18:46:27 wiz Exp $ +$NetBSD: patch-ac,v 1.4 2009/12/03 23:58:59 wiz Exp $ -http://bugs.freedesktop.org/show_bug.cgi?id=23349 - ---- lib/gibber/gibber-util.h.orig 2009-02-19 19:25:00 +0200 -+++ lib/gibber/gibber-util.h 2009-03-14 18:58:53 +0200 -@@ -21,6 +21,8 @@ - #define __GIBBER_UTIL_H__ - - #include <netdb.h> -+#include <netinet/in.h> -+#include <sys/socket.h> - - #include <glib.h> - +--- lib/gibber/asyncns.c.orig 2009-02-27 13:05:19.000000000 +0000 ++++ lib/gibber/asyncns.c +@@ -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> |