diff options
| author | Koop Mast <kwm@FreeBSD.org> | 2013-03-08 10:51:34 +0000 |
|---|---|---|
| committer | Koop Mast <kwm@FreeBSD.org> | 2013-03-08 10:51:34 +0000 |
| commit | 7887c684adab042fed1bfcba2e91589ecd17c4a8 (patch) | |
| tree | 961839899dce7f75292a08c079f548973bdbd40d /net-im | |
| parent | - Update to 0.27 (diff) | |
* Update the glib to 2.34.3 and gtk20 to 2.24.17 and gtk30 to 3.6.4 which
are the latest stable releases.
* Update vala to the newest stable release 0.18.1, also update a few ports
in the gtk/gnome stack.
* The c++ bindings ports for glib, atk, gconf, etc, have now USE_GNOME toggles.
* Remove pkg-config run depends from glib20 and freetype2. This doesn't
eliminate pkg-config run dependency completely, a second phase is needed
and is planned.
* Support for .:run. and .:build. for USE_GNOME components was added.
Currently only libxml2 and libxslt support this mechanism.
* Updates of the telepathy stack and empathy.
* Trim makefile headers, convert ports to new options, trim off library
versions for some ports.
* Fix other ports so they build with the new glib version.
Thanks to miwi and crees for helping out with some exp-runs.
Approved by: portmgr (miwi & bapt)
Obtained from: gnome team repo
Notes
Notes:
svn path=/head/; revision=313633
Diffstat (limited to 'net-im')
61 files changed, 518 insertions, 651 deletions
diff --git a/net-im/Makefile b/net-im/Makefile index 1e069ef0aed1..b4174aa87b11 100644 --- a/net-im/Makefile +++ b/net-im/Makefile @@ -26,6 +26,7 @@ SUBDIR += farsight2 SUBDIR += finch SUBDIR += folks + SUBDIR += folks04 SUBDIR += freetalk SUBDIR += fugu SUBDIR += gajim diff --git a/net-im/empathy/Makefile b/net-im/empathy/Makefile index ddf9c981d350..f8c3d7dca79a 100644 --- a/net-im/empathy/Makefile +++ b/net-im/empathy/Makefile @@ -1,12 +1,9 @@ -# New ports collection makefile for: empathy -# Date created: 2007-10-29 -# Whom: Michael Johnson <ahze@FreeBSD.org> -# +# Created by: Michael Johnson <ahze@FreeBSD.org> # $FreeBSD$ -# $MCom: ports/net-im/empathy/Makefile,v 1.76 2010/11/18 18:04:55 kwm Exp $ +# $MCom: ports/net-im/empathy/Makefile,v 1.90 2012/08/17 19:06:45 kwm Exp $ PORTNAME= empathy -PORTVERSION= 2.32.2 +PORTVERSION= 2.34.0 PORTREVISION= 3 CATEGORIES= net-im gnome MASTER_SITES= GNOME @@ -17,20 +14,22 @@ COMMENT= GNOME IM client based around telepathy BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes \ ${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss \ ${LOCALBASE}/libexec/mission-control-5:${PORTSDIR}/net-im/telepathy-mission-control -LIB_DEPENDS= enchant.1:${PORTSDIR}/textproc/enchant \ - telepathy.2:${PORTSDIR}/net-im/libtelepathy \ - telepathy-glib.0:${PORTSDIR}/net-im/telepathy-glib \ - telepathy-farsight.0:${PORTSDIR}/net-im/telepathy-farsight \ - telepathy-logger.1:${PORTSDIR}/net-im/telepathy-logger \ - folks-telepathy.16:${PORTSDIR}/net-im/folks \ - gcr.0:${PORTSDIR}/security/gnome-keyring \ - notify.4:${PORTSDIR}/devel/libnotify \ - unique-1.0.2:${PORTSDIR}/x11-toolkits/unique \ - canberra-gtk.0:${PORTSDIR}/audio/libcanberra +LIB_DEPENDS= enchant:${PORTSDIR}/textproc/enchant \ + telepathy:${PORTSDIR}/net-im/libtelepathy \ + telepathy-glib:${PORTSDIR}/net-im/telepathy-glib \ + telepathy-farsight:${PORTSDIR}/net-im/telepathy-farsight \ + telepathy-logger:${PORTSDIR}/net-im/telepathy-logger \ + folks-telepathy:${PORTSDIR}/net-im/folks04 \ + unique-1.0:${PORTSDIR}/x11-toolkits/unique \ + notify:${PORTSDIR}/devel/libnotify \ + gcr:${PORTSDIR}/security/gnome-keyring \ + canberra-gtk:${PORTSDIR}/audio/libcanberra RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes \ ${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss \ ${LOCALBASE}/libexec/mission-control-5:${PORTSDIR}/net-im/telepathy-mission-control +CONFLICTS= empathy-3.[0-9]* + USE_GMAKE= yes USE_BZIP2= yes USE_GETTEXT= yes @@ -51,39 +50,39 @@ GLIB_SCHEMAS= org.gnome.Empathy.gschema.xml MAN1= empathy.1 empathy-accounts.1 -OPTIONS= JABBER "Enable jabber (XMPP) client support" on \ - MSN "Enable MSN client support" on \ - IRC "Enable IRC client support" on \ - SALUT "Enable link-local (serverless) XMPP support" off \ - HAZE "Enable libpurple protocol integration" off \ - WEBKIT "Enable Adium Message Style themes" on \ - NST "Enable Nautilus SendTo plugin" on \ - MAP "Enable graphical map support" on +OPTIONS_DEFINE= JABBER MSN IRC SALUT HAZE WEBKIT NST MAP +OPTIONS_DEFAULT=JABBER MSN IRC WEBKIT NST MAP +MSN_DESC= MSN client support +IRC_DESC= IRC client support +SALUT_DESC= Link-local (serverless) XMPP support +HAZE_DESC= Libpurple protocol integration +NST_DESC= Nautilus SendTo plugin +MAP_DESC= Graphical map support -.include <bsd.port.pre.mk> +.include <bsd.port.options.mk> -.if defined(WITH_JABBER) +.if ${PORT_OPTIONS:MJABBER} RUN_DEPENDS+= ${LOCALBASE}/libexec/telepathy-gabble:${PORTSDIR}/net-im/telepathy-gabble .endif -.if defined(WITH_MSN) +.if ${PORT_OPTIONS:MMSN} RUN_DEPENDS+= ${LOCALBASE}/libexec/telepathy-butterfly:${PORTSDIR}/net-im/telepathy-butterfly .endif -.if defined(WITH_IRC) +.if ${PORT_OPTIONS:MIRC} RUN_DEPENDS+= ${LOCALBASE}/libexec/telepathy-idle:${PORTSDIR}/net-im/telepathy-idle .endif -.if !defined(WITHOUT_SALUT) +.if ${PORT_OPTIONS:MSALUT} RUN_DEPENDS+= ${LOCALBASE}/libexec/telepathy-salut:${PORTSDIR}/net-im/telepathy-salut .endif -.if !defined(WITHOUT_HAZE) +.if ${PORT_OPTIONS:MHAZE} RUN_DEPENDS+= ${LOCALBASE}/libexec/telepathy-haze:${PORTSDIR}/net-im/telepathy-haze .endif -.if defined(WITH_WEBKIT) -LIB_DEPENDS+= webkitgtk-1.0.0:${PORTSDIR}/www/webkit-gtk2 +.if ${PORT_OPTIONS:MWEBKIT} +LIB_DEPENDS+= webkitgtk-1.0:${PORTSDIR}/www/webkit-gtk2 CONFIGURE_ARGS+=--enable-webkit PLIST_SUB+= ADIUM="" .else @@ -91,7 +90,7 @@ CONFIGURE_ARGS+=--disable-webkit PLIST_SUB+= ADIUM="@comment " .endif -.if defined(WITH_NST) +.if ${PORT_OPTIONS:MNST} BUILD_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/nautilus-sendto.pc:${PORTSDIR}/deskutils/nautilus-sendto RUN_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/nautilus-sendto.pc:${PORTSDIR}/deskutils/nautilus-sendto CONFIGURE_ARGS+=--enable-nautilus-sendto=yes @@ -101,8 +100,8 @@ CONFIGURE_ARGS+=--enable-nautilus-sendto=no PLIST_SUB+= NST="@comment " .endif -.if !defined(WITHOUT_MAP) -LIB_DEPENDS+= champlain-0.8.1:${PORTSDIR}/graphics/libchamplain +.if ${PORT_OPTIONS:MMAP} +LIB_DEPENDS+= champlain-0.8:${PORTSDIR}/graphics/libchamplain CONFIGURE_ARGS+=--enable-map PLIST_SUB+= MAP="" .else @@ -110,4 +109,4 @@ CONFIGURE_ARGS+=--disable-map PLIST_SUB+= MAP="@comment " .endif -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/net-im/empathy/distinfo b/net-im/empathy/distinfo index aef3ef0e3e1f..1cfcc35b5f86 100644 --- a/net-im/empathy/distinfo +++ b/net-im/empathy/distinfo @@ -1,2 +1,2 @@ -SHA256 (empathy-2.32.2.tar.bz2) = f90a45955205fd8bd783a55acae4603197caab4f16a880106f8639cbbbe5e861 -SIZE (empathy-2.32.2.tar.bz2) = 2936340 +SHA256 (empathy-2.34.0.tar.bz2) = 6efa0ae3ac3580ac9600f889c92497f36983e22da79d547a65030a14691369d1 +SIZE (empathy-2.34.0.tar.bz2) = 3361496 diff --git a/net-im/empathy/files/patch-configure b/net-im/empathy/files/patch-configure index 9bf98699b386..300f783e450a 100644 --- a/net-im/empathy/files/patch-configure +++ b/net-im/empathy/files/patch-configure @@ -1,5 +1,5 @@ ---- configure.orig 2011-08-16 16:19:02.000000000 +0200 -+++ configure 2011-08-16 16:19:59.000000000 +0200 +--- configure.orig 2010-11-18 17:41:43.000000000 +0100 ++++ configure 2010-11-18 17:41:43.000000000 +0100 @@ -13390,8 +13390,8 @@ .SECONDARY: $(gsettings_SCHEMAS) @@ -11,74 +11,3 @@ install-gsettings-schemas: $(gsettings_SCHEMAS:.xml=.valid) @$(NORMAL_INSTALL) -@@ -14771,14 +14771,14 @@ - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libnotify >= \$LIBNOTIFY_REQUIRED -- libnotify < 0.7\""; } >&5 -+ libnotify < 0.9\""; } >&5 - ($PKG_CONFIG --exists --print-errors "libnotify >= $LIBNOTIFY_REQUIRED -- libnotify < 0.7") 2>&5 -+ libnotify < 0.9") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - pkg_cv_LIBNOTIFY_CFLAGS=`$PKG_CONFIG --cflags "libnotify >= $LIBNOTIFY_REQUIRED -- libnotify < 0.7" 2>/dev/null` -+ libnotify < 0.9" 2>/dev/null` - else - pkg_failed=yes - fi -@@ -14790,14 +14790,14 @@ - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libnotify >= \$LIBNOTIFY_REQUIRED -- libnotify < 0.7\""; } >&5 -+ libnotify < 0.9\""; } >&5 - ($PKG_CONFIG --exists --print-errors "libnotify >= $LIBNOTIFY_REQUIRED -- libnotify < 0.7") 2>&5 -+ libnotify < 0.9") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - pkg_cv_LIBNOTIFY_LIBS=`$PKG_CONFIG --libs "libnotify >= $LIBNOTIFY_REQUIRED -- libnotify < 0.7" 2>/dev/null` -+ libnotify < 0.9" 2>/dev/null` - else - pkg_failed=yes - fi -@@ -14818,16 +14818,16 @@ - fi - if test $_pkg_short_errors_supported = yes; then - LIBNOTIFY_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libnotify >= $LIBNOTIFY_REQUIRED -- libnotify < 0.7" 2>&1` -+ libnotify < 0.9" 2>&1` - else - LIBNOTIFY_PKG_ERRORS=`$PKG_CONFIG --print-errors "libnotify >= $LIBNOTIFY_REQUIRED -- libnotify < 0.7" 2>&1` -+ libnotify < 0.9" 2>&1` - fi - # Put the nasty error message in config.log where it belongs - echo "$LIBNOTIFY_PKG_ERRORS" >&5 - - as_fn_error $? "Package requirements (libnotify >= $LIBNOTIFY_REQUIRED -- libnotify < 0.7) were not met: -+ libnotify < 0.9) were not met: - - $LIBNOTIFY_PKG_ERRORS - -@@ -15049,11 +15049,11 @@ - fi - - # Enable GSEAL checks if needed --if test $USE_MAINTAINER_MODE = yes; then -+#if test $USE_MAINTAINER_MODE = yes; then - --$as_echo "#define GSEAL_ENABLE /**/" >>confdefs.h -+#$as_echo "#define GSEAL_ENABLE /**/" >>confdefs.h - --fi -+#fi - - # ----------------------------------------------------------- - # Enable debug diff --git a/net-im/empathy/files/patch-libempathy_empathy-auth-factory.c b/net-im/empathy/files/patch-libempathy_empathy-auth-factory.c new file mode 100644 index 000000000000..879313c5b7c1 --- /dev/null +++ b/net-im/empathy/files/patch-libempathy_empathy-auth-factory.c @@ -0,0 +1,10 @@ +--- libempathy/empathy-auth-factory.c.orig 2011-12-07 17:19:17.000000000 +0000 ++++ libempathy/empathy-auth-factory.c 2011-12-07 17:19:45.000000000 +0000 +@@ -23,6 +23,7 @@ + #include <telepathy-glib/interfaces.h> + #include <telepathy-glib/simple-handler.h> + #include <telepathy-glib/util.h> ++#include <telepathy-glib/channel-dispatch-operation.h> + + #define DEBUG_FLAG EMPATHY_DEBUG_TLS + #include "empathy-debug.h" diff --git a/net-im/empathy/files/patch-src_empathy-chat-window.c b/net-im/empathy/files/patch-src_empathy-chat-window.c deleted file mode 100644 index a01730405e99..000000000000 --- a/net-im/empathy/files/patch-src_empathy-chat-window.c +++ /dev/null @@ -1,11 +0,0 @@ ---- src/empathy-chat-window.c.orig 2011-08-16 16:23:38.000000000 +0200 -+++ src/empathy-chat-window.c 2011-08-16 16:24:00.000000000 +0200 -@@ -1300,7 +1300,7 @@ chat_window_show_or_update_notification - to an existing notification with the same title. - In this way the previous message will not be lost: the new - message will appear below it, in the same notification */ -- notification = notify_notification_new (header, escaped, NULL, NULL); -+ notification = notify_notification_new (header, escaped, NULL); - - if (priv->notification == NULL) { - priv->notification = notification; diff --git a/net-im/empathy/files/patch-src_empathy-status-icon.c b/net-im/empathy/files/patch-src_empathy-status-icon.c deleted file mode 100644 index 354fa5a4e037..000000000000 --- a/net-im/empathy/files/patch-src_empathy-status-icon.c +++ /dev/null @@ -1,13 +0,0 @@ ---- src/empathy-status-icon.c.orig 2011-08-16 16:25:07.000000000 +0200 -+++ src/empathy-status-icon.c 2011-08-16 16:25:32.000000000 +0200 -@@ -206,8 +206,8 @@ status_icon_update_notification (Empathy - to an existing notification with the same title. - In this way the previous message will not be lost: the new - message will appear below it, in the same notification */ -- notification = notify_notification_new_with_status_icon -- (priv->event->header, message_esc, NULL, priv->icon); -+ notification = notify_notification_new -+ (priv->event->header, message_esc, NULL); - - if (priv->notification == NULL) { - priv->notification = notification; diff --git a/net-im/empathy/pkg-plist b/net-im/empathy/pkg-plist index daa8228d30de..77cbcd0e4bca 100644 --- a/net-im/empathy/pkg-plist +++ b/net-im/empathy/pkg-plist @@ -11,6 +11,7 @@ share/applications/empathy-accounts.desktop share/applications/empathy.desktop share/dbus-1/services/org.freedesktop.Telepathy.Client.Empathy.AudioVideo.service share/dbus-1/services/org.freedesktop.Telepathy.Client.Empathy.Auth.service +share/dbus-1/services/org.freedesktop.Telepathy.Client.Empathy.Call.service share/dbus-1/services/org.freedesktop.Telepathy.Client.Empathy.service %%DATADIR%%/Template.html %%DATADIR%%/codec-preferences @@ -32,6 +33,7 @@ share/dbus-1/services/org.freedesktop.Telepathy.Client.Empathy.service %%DATADIR%%/empathy-chat.ui %%DATADIR%%/empathy-chatroom-manager.dtd %%DATADIR%%/empathy-chatrooms-window.ui +%%DATADIR%%/empathy-contact-blocking-dialog.ui %%DATADIR%%/empathy-contact-dialogs.ui %%DATADIR%%/empathy-contact-groups.dtd %%DATADIR%%/empathy-contact-selector-dialog.ui @@ -1059,6 +1061,7 @@ share/gnome/help/empathy/zh_CN/video-call.page share/icons/hicolor/16x16/apps/empathy.png share/icons/hicolor/22x22/apps/empathy.png share/icons/hicolor/24x24/apps/empathy.png +share/icons/hicolor/256x256/apps/empathy.png share/icons/hicolor/32x32/apps/empathy.png share/icons/hicolor/48x48/apps/empathy.png share/icons/hicolor/scalable/apps/empathy.svg @@ -1142,6 +1145,7 @@ share/locale/zh_HK/LC_MESSAGES/empathy.mo share/locale/zh_TW/LC_MESSAGES/empathy.mo share/telepathy/clients/Empathy.AudioVideo.client share/telepathy/clients/Empathy.Auth.client +share/telepathy/clients/Empathy.Call.client share/telepathy/clients/Empathy.client @dirrmtry share/telepathy/clients @dirrmtry share/telepathy diff --git a/net-im/farsight2/Makefile b/net-im/farsight2/Makefile index 135a1ede1794..1f5ee13c4744 100644 --- a/net-im/farsight2/Makefile +++ b/net-im/farsight2/Makefile @@ -1,36 +1,29 @@ -# New ports collection makefile for: farsight2 -# Date created: 27 February 2009 -# Whom: Joe Marcus Clarke <marcus@FreeBSD.org> -# +# Created by: Joe Marcus Clarke <marcus@FreeBSD.org> # $FreeBSD$ -# +# $MCom: ports/net-im/farsight2/Makefile,v 1.10 2012/06/13 09:31:14 kwm Exp $ PORTNAME= farsight2 -PORTVERSION= 0.0.22 -PORTREVISION= 1 +PORTVERSION= 0.0.31 CATEGORIES= net-im devel MASTER_SITES= http://farsight.freedesktop.org/releases/farsight2/ MAINTAINER= gnome@FreeBSD.org COMMENT= Collection of GStreamer modules and libraries for videoconferencing -LIB_DEPENDS= nice.0:${PORTSDIR}/net-im/libnice +LIB_DEPENDS= nice:${PORTSDIR}/net-im/libnice +CONFLICTS= farstream-[0-9]* + +FETCH_ARGS= -Fpr USE_GMAKE= yes USE_GETTEXT= yes USE_LDCONFIG= yes USE_PYTHON= yes -USE_GNOME= gnomehack pkgconfig glib20 ltverhack \ - pygtk2 +USE_GNOME= gnomehack glib20 ltverhack +USE_PKGCONFIG= build USE_GSTREAMER= core good bad python USE_AUTOTOOLS= libtool CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -.include <bsd.port.pre.mk> - -.if ${OSVERSION} < 702000 -BROKEN= does not build on FreeBSD 7.X prior 7.2 -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/net-im/farsight2/distinfo b/net-im/farsight2/distinfo index b604007cbc31..07486ea0dd1a 100644 --- a/net-im/farsight2/distinfo +++ b/net-im/farsight2/distinfo @@ -1,2 +1,2 @@ -SHA256 (farsight2-0.0.22.tar.gz) = 3ae59aa61a8071c9fad111e5fd606aabc27961eb4192f8729987a27dae6b3974 -SIZE (farsight2-0.0.22.tar.gz) = 1117646 +SHA256 (farsight2-0.0.31.tar.gz) = 55ce219c67a93bc55bcf30d6a5bfcadf09e1c5349d179b2da9ccb74c42271f9b +SIZE (farsight2-0.0.31.tar.gz) = 1231416 diff --git a/net-im/farsight2/files/patch-transmitters_shm_fs-shm-transmitter.c b/net-im/farsight2/files/patch-transmitters_shm_fs-shm-transmitter.c deleted file mode 100644 index eb06175ea5a8..000000000000 --- a/net-im/farsight2/files/patch-transmitters_shm_fs-shm-transmitter.c +++ /dev/null @@ -1,12 +0,0 @@ ---- transmitters/shm/fs-shm-transmitter.c.orig 2010-11-26 23:51:31.000000000 -0500 -+++ transmitters/shm/fs-shm-transmitter.c 2010-11-26 23:50:40.000000000 -0500 -@@ -52,7 +52,9 @@ - # define close closesocket - #else /*G_OS_WIN32*/ - # include <netdb.h> -+# include <sys/types.h> - # include <sys/socket.h> -+# include <netinet/in.h> - # include <netinet/ip.h> - # include <arpa/inet.h> - #endif /*G_OS_WIN32*/ diff --git a/net-im/farsight2/pkg-plist b/net-im/farsight2/pkg-plist index 08365a4f44e8..36e9477ee231 100644 --- a/net-im/farsight2/pkg-plist +++ b/net-im/farsight2/pkg-plist @@ -7,10 +7,12 @@ include/gstreamer-0.10/gst/farsight/fs-enum-types.h include/gstreamer-0.10/gst/farsight/fs-interfaces.h include/gstreamer-0.10/gst/farsight/fs-participant.h include/gstreamer-0.10/gst/farsight/fs-plugin.h +include/gstreamer-0.10/gst/farsight/fs-rtp.h include/gstreamer-0.10/gst/farsight/fs-session.h include/gstreamer-0.10/gst/farsight/fs-stream-transmitter.h include/gstreamer-0.10/gst/farsight/fs-stream.h include/gstreamer-0.10/gst/farsight/fs-transmitter.h +include/gstreamer-0.10/gst/farsight/fs-utils.h lib/farsight2-0.0/libmulticast-transmitter.a lib/farsight2-0.0/libmulticast-transmitter.la lib/farsight2-0.0/libmulticast-transmitter.so @@ -29,6 +31,9 @@ lib/gstreamer-0.10/libfsfunnel.so lib/gstreamer-0.10/libfsmsnconference.a lib/gstreamer-0.10/libfsmsnconference.la lib/gstreamer-0.10/libfsmsnconference.so +lib/gstreamer-0.10/libfsrawconference.a +lib/gstreamer-0.10/libfsrawconference.la +lib/gstreamer-0.10/libfsrawconference.so lib/gstreamer-0.10/libfsrtcpfilter.a lib/gstreamer-0.10/libfsrtcpfilter.la lib/gstreamer-0.10/libfsrtcpfilter.so @@ -46,6 +51,8 @@ lib/libgstfarsight-0.10.so.0 %%PYTHON_SITELIBDIR%%/farsight.la %%PYTHON_SITELIBDIR%%/farsight.so libdata/pkgconfig/farsight2-0.10.pc +share/farsight2/0.0/fsrtpconference/default-codec-preferences +share/farsight2/0.0/fsrtpconference/default-element-properties share/gtk-doc/html/farsight2-libs-0.10/FsBaseConference.html share/gtk-doc/html/farsight2-libs-0.10/FsConference.html share/gtk-doc/html/farsight2-libs-0.10/FsElementAddedNotifier.html @@ -59,12 +66,15 @@ share/gtk-doc/html/farsight2-libs-0.10/ch03.html share/gtk-doc/html/farsight2-libs-0.10/ch04.html share/gtk-doc/html/farsight2-libs-0.10/ch05.html share/gtk-doc/html/farsight2-libs-0.10/ch06.html +share/gtk-doc/html/farsight2-libs-0.10/ch07.html share/gtk-doc/html/farsight2-libs-0.10/farsight2-libs-0.10.devhelp share/gtk-doc/html/farsight2-libs-0.10/farsight2-libs-0.10.devhelp2 share/gtk-doc/html/farsight2-libs-0.10/farsight2-libs-FsCandidate.html share/gtk-doc/html/farsight2-libs-0.10/farsight2-libs-FsCodec.html share/gtk-doc/html/farsight2-libs-0.10/farsight2-libs-FsPlugin.html share/gtk-doc/html/farsight2-libs-0.10/farsight2-libs-Network-interfaces-discovery.html +share/gtk-doc/html/farsight2-libs-0.10/farsight2-libs-RTP-Specific-types.html +share/gtk-doc/html/farsight2-libs-0.10/farsight2-libs-Utility-functions.html share/gtk-doc/html/farsight2-libs-0.10/farsight2-libs-fs-session.html share/gtk-doc/html/farsight2-libs-0.10/home.png share/gtk-doc/html/farsight2-libs-0.10/index.html @@ -89,11 +99,16 @@ share/gtk-doc/html/farsight2-plugins-0.10/farsight2-plugins-FsMsnSession.html share/gtk-doc/html/farsight2-plugins-0.10/farsight2-plugins-FsMsnStream.html share/gtk-doc/html/farsight2-plugins-0.10/farsight2-plugins-FsMulticastStreamTransmitter.html share/gtk-doc/html/farsight2-plugins-0.10/farsight2-plugins-FsNiceStreamTransmitter.html +share/gtk-doc/html/farsight2-plugins-0.10/farsight2-plugins-FsRawConference.html +share/gtk-doc/html/farsight2-plugins-0.10/farsight2-plugins-FsRawParticipant.html +share/gtk-doc/html/farsight2-plugins-0.10/farsight2-plugins-FsRawSession.html +share/gtk-doc/html/farsight2-plugins-0.10/farsight2-plugins-FsRawStream.html share/gtk-doc/html/farsight2-plugins-0.10/farsight2-plugins-FsRawUdpStreamTransmitter.html share/gtk-doc/html/farsight2-plugins-0.10/farsight2-plugins-FsRtpConference.html share/gtk-doc/html/farsight2-plugins-0.10/farsight2-plugins-FsRtpParticipant.html share/gtk-doc/html/farsight2-plugins-0.10/farsight2-plugins-FsRtpSession.html share/gtk-doc/html/farsight2-plugins-0.10/farsight2-plugins-FsRtpStream.html +share/gtk-doc/html/farsight2-plugins-0.10/farsight2-plugins-FsShmStreamTransmitter.html share/gtk-doc/html/farsight2-plugins-0.10/farsight2-plugins-GstVideoanyrate.html share/gtk-doc/html/farsight2-plugins-0.10/home.png share/gtk-doc/html/farsight2-plugins-0.10/index.html @@ -109,5 +124,8 @@ share/gtk-doc/html/farsight2-plugins-0.10/up.png @dirrm share/gtk-doc/html/farsight2-libs-0.10 @dirrmtry share/gtk-doc/html @dirrmtry share/gtk-doc +@dirrm share/farsight2/0.0/fsrtpconference +@dirrm share/farsight2/0.0 +@dirrm share/farsight2 @dirrm lib/farsight2-0.0 @dirrm include/gstreamer-0.10/gst/farsight diff --git a/net-im/folks/Makefile b/net-im/folks/Makefile index fec8de126d2c..96abe0a587d6 100644 --- a/net-im/folks/Makefile +++ b/net-im/folks/Makefile @@ -1,14 +1,9 @@ -# New ports collection makefile for: folks -# Date created: 23 July 2010 -# Whom: Koop Mast <kwm@FreeBSD.org> -# +# Created by: Koop Mast <kwm@FreeBSD.org> # $FreeBSD$ -# $MCom: ports/net-im/folks/Makefile,v 1.8 2010/10/26 08:47:55 kwm Exp $ -# +# $MCom: ports/net-im/folks/Makefile,v 1.29 2012/08/17 19:06:45 kwm Exp $ PORTNAME= folks -PORTVERSION= 0.2.1 -PORTREVISION= 1 +PORTVERSION= 0.7.0 CATEGORIES= net-im MASTER_SITES= GNOME @@ -17,17 +12,36 @@ COMMENT= library to aggregates people from multiple sources BUILD_DEPENDS= vapigen:${PORTSDIR}/lang/vala-vapigen \ g-ir-scanner:${PORTSDIR}/devel/gobject-introspection -LIB_DEPENDS= gee.2:${PORTSDIR}/devel/libgee \ +LIB_DEPENDS= gee:${PORTSDIR}/devel/libgee06 \ telepathy-glib.0:${PORTSDIR}/net-im/telepathy-glib -USE_BZIP2= yes +CONFLICTS= folks-0.4.[0-9]* + +USE_XZ= yes +USE_AUTOTOOLS= libtool USE_LDCONFIG= yes USE_GMAKE= yes -USE_GNOME= gnomehack +USE_GNOME= gnomehier gnomehack intlhack ltverhack evolutiondataserver3 +USE_GETTEXT= yes GNU_CONFIGURE= yes -CPPFLAGS+= -I${LOCALBASE}/include +CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -PLIST_SUB= VERSION=16 +PLIST_SUB= LIBVER=25 VERSION=33 + +#OPTIONS= SOCIALWEB "Enable social web backend" on + +#.include <bsd.port.options.mk> + +#.if defined(WITH_SOCIALWEB) +#LIB_DEPENDS+= socialweb.0:${PORTSDIR}/www/libsocialweb +#CONFIGURE_ARGS+=--enable-libsocialweb-backend=yes +#.else +CONFIGURE_ARGS+=--enable-libsocialweb-backend=no +#.endif + +post-patch: + @${REINPLACE_CMD} -e 's|^build_old_libs=yes|build_old_libs=no|g' \ + ${WRKDIR}/gnome-libtool .include <bsd.port.mk> diff --git a/net-im/folks/distinfo b/net-im/folks/distinfo index 2422467dd045..65e986124ef7 100644 --- a/net-im/folks/distinfo +++ b/net-im/folks/distinfo @@ -1,2 +1,2 @@ -SHA256 (folks-0.2.1.tar.bz2) = f8eeeb6a6974416d4db1ab6b18187173fb6ff4ec7830bece379dfba9b25f2a29 -SIZE (folks-0.2.1.tar.bz2) = 465522 +SHA256 (folks-0.7.0.tar.xz) = 861da1007e859e6bad43388a3bee56c31b3e9d003329086a5038fa6b19c6abf7 +SIZE (folks-0.7.0.tar.xz) = 1415856 diff --git a/net-im/folks/files/patch-backends_telepathy_lib_tpf-persona-store.vala b/net-im/folks/files/patch-backends_telepathy_lib_tpf-persona-store.vala deleted file mode 100644 index 8e8e86cd2da2..000000000000 --- a/net-im/folks/files/patch-backends_telepathy_lib_tpf-persona-store.vala +++ /dev/null @@ -1,109 +0,0 @@ ---- backends/telepathy/lib/tpf-persona-store.vala.orig 2011-07-22 14:19:09.000000000 +0200 -+++ backends/telepathy/lib/tpf-persona-store.vala 2011-07-22 14:30:40.000000000 +0200 -@@ -22,7 +22,6 @@ - using GLib; - using Gee; - using TelepathyGLib; --using TelepathyGLib.ContactFeature; - using Folks; - - /** -@@ -36,6 +35,15 @@ public class Tpf.PersonaStore : Folks.Pe - { - private string[] undisplayed_groups = { "publish", "stored", "subscribe" }; - -+ private static ContactFeature[] _contact_features = -+ { -+ ContactFeature.ALIAS, -+ ContactFeature.AVATAR_DATA, -+ ContactFeature.AVATAR_TOKEN, -+ ContactFeature.CAPABILITIES, -+ ContactFeature.PRESENCE -+ }; -+ - private HashTable<string, Persona> _personas; - /* universal, contact owner handles (not channel-specific) */ - private HashMap<uint, Persona> handle_persona_map; -@@ -407,7 +415,7 @@ public class Tpf.PersonaStore : Folks.Pe - if (change_maps.size < 1) - return; - -- foreach (var entry in change_maps) -+ foreach (var entry in change_maps.entries) - { - var changes = entry.key; - -@@ -640,7 +648,7 @@ public class Tpf.PersonaStore : Folks.Pe - /* - * remove all persona-keyed entries - */ -- foreach (var entry in this.channel_group_personas_map) -+ foreach (var entry in this.channel_group_personas_map.entries) - { - var channel = (Channel) entry.key; - var members = this.channel_group_personas_map[channel]; -@@ -648,9 +656,8 @@ public class Tpf.PersonaStore : Folks.Pe - members.remove (persona); - } - -- foreach (var entry in this.group_outgoing_adds) -+ foreach (var name in this.group_outgoing_adds.keys) - { -- var name = (string) entry.key; - var members = this.group_outgoing_adds[name]; - if (members != null) - members.remove (persona); -@@ -866,14 +873,6 @@ public class Tpf.PersonaStore : Folks.Pe - Channel channel, - Array<uint> channel_handles) - { -- ContactFeature[] features = -- { -- ALIAS, -- AVATAR_DATA, -- AVATAR_TOKEN, -- PRESENCE -- }; -- - uint[] contact_handles = {}; - for (var i = 0; i < channel_handles.length; i++) - { -@@ -891,7 +890,7 @@ public class Tpf.PersonaStore : Folks.Pe - - GLib.List<TelepathyGLib.Contact> contacts = - yield this.ll.connection_get_contacts_by_handle_async ( -- this.conn, contact_handles, (uint[]) features); -+ this.conn, contact_handles, (uint[]) _contact_features); - - if (contacts == null || contacts.length () < 1) - return; -@@ -918,19 +917,11 @@ public class Tpf.PersonaStore : Folks.Pe - private async GLib.List<Tpf.Persona>? create_personas_from_contact_ids ( - string[] contact_ids) throws GLib.Error - { -- ContactFeature[] features = -- { -- ALIAS, -- AVATAR_DATA, -- AVATAR_TOKEN, -- PRESENCE -- }; -- - if (contact_ids.length > 0) - { - GLib.List<TelepathyGLib.Contact> contacts = - yield this.ll.connection_get_contacts_by_id_async ( -- this.conn, contact_ids, (uint[]) features); -+ this.conn, contact_ids, (uint[]) _contact_features); - - GLib.List<Persona> personas = new GLib.List<Persona> (); - uint err_count = 0; -@@ -1027,7 +1018,7 @@ public class Tpf.PersonaStore : Folks.Pe - - private void channel_groups_add_new_personas () - { -- foreach (var entry in this.channel_group_incoming_adds) -+ foreach (var entry in this.channel_group_incoming_adds.entries) - { - var channel = (Channel) entry.key; - var members_added = new GLib.List<Persona> (); diff --git a/net-im/folks/pkg-plist b/net-im/folks/pkg-plist index a9cd7dbadde4..09989046be10 100644 --- a/net-im/folks/pkg-plist +++ b/net-im/folks/pkg-plist @@ -1,26 +1,50 @@ bin/folks-import +include/folks/folks-eds.h include/folks/folks-telepathy.h include/folks/folks.h -lib/folks/%%VERSION%%/backends/key-file/libfolks-backend-key-file.la -lib/folks/%%VERSION%%/backends/key-file/libfolks-backend-key-file.so -lib/folks/%%VERSION%%/backends/telepathy/libfolks-backend-telepathy.la -lib/folks/%%VERSION%%/backends/telepathy/libfolks-backend-telepathy.so +lib/folks/%%VERSION%%/backends/eds/eds.la +lib/folks/%%VERSION%%/backends/eds/eds.so +lib/folks/%%VERSION%%/backends/key-file/key-file.la +lib/folks/%%VERSION%%/backends/key-file/key-file.so +lib/folks/%%VERSION%%/backends/telepathy/telepathy.la +lib/folks/%%VERSION%%/backends/telepathy/telepathy.so +lib/girepository-1.0/Folks-0.6.typelib +lib/libfolks-eds.la +lib/libfolks-eds.so +lib/libfolks-eds.so.%%LIBVER%% lib/libfolks-telepathy.la lib/libfolks-telepathy.so -lib/libfolks-telepathy.so.%%VERSION%% +lib/libfolks-telepathy.so.%%LIBVER%% lib/libfolks.la lib/libfolks.so -lib/libfolks.so.%%VERSION%% +lib/libfolks.so.%%LIBVER%% +libdata/pkgconfig/folks-eds.pc libdata/pkgconfig/folks-telepathy.pc libdata/pkgconfig/folks.pc +share/gir-1.0/Folks-0.6.gir +share/locale/cs/LC_MESSAGES/folks.mo +share/locale/de/LC_MESSAGES/folks.mo +share/locale/en_GB/LC_MESSAGES/folks.mo +share/locale/eo/LC_MESSAGES/folks.mo +share/locale/es/LC_MESSAGES/folks.mo +share/locale/gl/LC_MESSAGES/folks.mo +share/locale/it/LC_MESSAGES/folks.mo +share/locale/nb/LC_MESSAGES/folks.mo +share/locale/pl/LC_MESSAGES/folks.mo +share/locale/pt_BR/LC_MESSAGES/folks.mo +share/locale/sl/LC_MESSAGES/folks.mo +share/locale/sv/LC_MESSAGES/folks.mo +share/locale/uk/LC_MESSAGES/folks.mo +share/locale/zh_CN/LC_MESSAGES/folks.mo +share/vala/vapi/folks-eds.deps +share/vala/vapi/folks-eds.vapi share/vala/vapi/folks-telepathy.deps share/vala/vapi/folks-telepathy.vapi share/vala/vapi/folks.deps share/vala/vapi/folks.vapi -@dirrmtry share/vala/vapi -@dirrmtry share/vala @dirrm lib/folks/%%VERSION%%/backends/telepathy @dirrm lib/folks/%%VERSION%%/backends/key-file +@dirrm lib/folks/%%VERSION%%/backends/eds @dirrm lib/folks/%%VERSION%%/backends @dirrm lib/folks/%%VERSION%% @dirrm lib/folks diff --git a/net-im/folks04/Makefile b/net-im/folks04/Makefile new file mode 100644 index 000000000000..e69ceca1d134 --- /dev/null +++ b/net-im/folks04/Makefile @@ -0,0 +1,32 @@ +# Created by: Koop Mast <kwm@FreeBSD.org> +# $FreeBSD$ +# $MCom: ports/net-im/folks04/Makefile,v 1.2 2012/04/27 13:28:44 kwm Exp $ + +PORTNAME= folks +PORTVERSION= 0.4.3 +PORTREVISOIN= 1 +CATEGORIES= net-im +MASTER_SITES= GNOME + +MAINTAINER= gnome@FreeBSD.org +COMMENT= library to aggregates people from multiple sources + +BUILD_DEPENDS= vapigen:${PORTSDIR}/lang/vala-vapigen \ + g-ir-scanner:${PORTSDIR}/devel/gobject-introspection +LIB_DEPENDS= gee:${PORTSDIR}/devel/libgee06 \ + telepathy-glib.0:${PORTSDIR}/net-im/telepathy-glib + +CONFLICTS= folks-0.[6-9].[0-9]* + +USE_BZIP2= yes +USE_LDCONFIG= yes +USE_GMAKE= yes +USE_GNOME= gnomehack intlhack gnomehier +USE_GETTEXT= yes +GNU_CONFIGURE= yes +CPPFLAGS= -I${LOCALBASE}/include +LDFLAGS= -L${LOCALBASE}/lib + +PLIST_SUB= VERSION=22 + +.include <bsd.port.mk> diff --git a/net-im/folks04/distinfo b/net-im/folks04/distinfo new file mode 100644 index 000000000000..a309c99ef70c --- /dev/null +++ b/net-im/folks04/distinfo @@ -0,0 +1,2 @@ +SHA256 (folks-0.4.3.tar.bz2) = e5a5bbe1524130ff5b6400726db3e12299b12ffefa108bc89169509f343d925e +SIZE (folks-0.4.3.tar.bz2) = 635168 diff --git a/net-im/folks04/pkg-descr b/net-im/folks04/pkg-descr new file mode 100644 index 000000000000..21280dabf8d6 --- /dev/null +++ b/net-im/folks04/pkg-descr @@ -0,0 +1,7 @@ +libfolks is a library that aggregates people from multiple sources +(eg, Telepathy connection managers and eventually evolution data server, +Facebook, etc.) to create metacontacts. It's written in Vala (in part to +evaluate Vala). The initial goal is for GObject/C support, though the Vala +bindings should basically automatic. + +WWW: http://telepathy.freedesktop.org/wiki/Folks diff --git a/net-im/folks04/pkg-plist b/net-im/folks04/pkg-plist new file mode 100644 index 000000000000..56064f49711c --- /dev/null +++ b/net-im/folks04/pkg-plist @@ -0,0 +1,26 @@ +bin/folks-import +include/folks/folks-telepathy.h +include/folks/folks.h +lib/folks/%%VERSION%%/backends/key-file/libfolks-backend-key-file.la +lib/folks/%%VERSION%%/backends/key-file/libfolks-backend-key-file.so +lib/folks/%%VERSION%%/backends/telepathy/libfolks-backend-telepathy.la +lib/folks/%%VERSION%%/backends/telepathy/libfolks-backend-telepathy.so +lib/libfolks-telepathy.la +lib/libfolks-telepathy.so +lib/libfolks-telepathy.so.%%VERSION%% +lib/libfolks.la +lib/libfolks.so +lib/libfolks.so.%%VERSION%% +libdata/pkgconfig/folks-telepathy.pc +libdata/pkgconfig/folks.pc +share/locale/de/LC_MESSAGES/folks.mo +share/vala/vapi/folks-telepathy.deps +share/vala/vapi/folks-telepathy.vapi +share/vala/vapi/folks.deps +share/vala/vapi/folks.vapi +@dirrm lib/folks/%%VERSION%%/backends/telepathy +@dirrm lib/folks/%%VERSION%%/backends/key-file +@dirrm lib/folks/%%VERSION%%/backends +@dirrm lib/folks/%%VERSION%% +@dirrm lib/folks +@dirrm include/folks diff --git a/net-im/libnice/Makefile b/net-im/libnice/Makefile index 8be2a43aaa4e..d0ec8679480f 100644 --- a/net-im/libnice/Makefile +++ b/net-im/libnice/Makefile @@ -1,13 +1,9 @@ -# New ports collection makefile for: libnice -# Date created: 27 February 2009 -# Whom: Joe Marcus Clarke <marcus@FreeBSD.org> -# +# Created by: Joe Marcus Clarke <marcus@FreeBSD.org> # $FreeBSD$ -# +# $MCom$ PORTNAME= libnice -PORTVERSION= 0.0.13 -PORTREVISION= 3 +PORTVERSION= 0.1.3 CATEGORIES= net-im devel MASTER_SITES= http://nice.freedesktop.org/releases/ @@ -17,25 +13,18 @@ COMMENT= Library and transmitter that implements ICE-19 USE_GMAKE= yes USE_GETTEXT= yes USE_LDCONFIG= yes -USE_GNOME= gnomehack pkgconfig glib20 ltverhack +USE_GNOME= gnomehack glib20 ltverhack +USE_PKGCONFIG= build USE_GSTREAMER= yes USE_AUTOTOOLS= libtool +CONFIGURE_ARGS= --without-gstreamer --with-gstreamer-0.10 CPPFLAGS+= -I${LOCALBASE}/include -DHAVE_GETIFADDRS LDFLAGS+= -L${LOCALBASE}/lib post-patch: - @${REINPLACE_CMD} -e 's|__BYTE_ORDER|_BYTE_ORDER|g ; \ - s|__BIG_ENDIAN|_BIG_ENDIAN|g' \ - ${WRKSRC}/stun/md5.c \ - ${WRKSRC}/stun/sha1.c @${FIND} ${WRKSRC} -name Makefile.in | ${XARGS} ${REINPLACE_CMD} -e \ 's|-Wno-missing-field-initializers|#|g' @${REINPLACE_CMD} -e 's|-Wno-missing-field-initializers|#|g' \ ${WRKSRC}/common.mk -post-configure: - @${TOUCH} -f ${WRKSRC}/config.h ${WRKSRC}/aclocal.m4 \ - ${WRKSRC}/configure ${WRKSRC}/Makefile.in \ - ${WRKSRC}/Makefile - .include <bsd.port.mk> diff --git a/net-im/libnice/distinfo b/net-im/libnice/distinfo index 7bedd8d7b330..fbc6a2d7b975 100644 --- a/net-im/libnice/distinfo +++ b/net-im/libnice/distinfo @@ -1,2 +1,2 @@ -SHA256 (libnice-0.0.13.tar.gz) = d8dd260c486a470a6052a5323920878a084e44a19df09b15728b85c9e3d6edf0 -SIZE (libnice-0.0.13.tar.gz) = 635783 +SHA256 (libnice-0.1.3.tar.gz) = 046ce11f66638b54f2e042e7b1fbcc537ec99c27185fb006edbfd80d7f990074 +SIZE (libnice-0.1.3.tar.gz) = 672174 diff --git a/net-im/libnice/files/patch-agent_interfaces.c b/net-im/libnice/files/patch-agent_interfaces.c deleted file mode 100644 index d3d33d3a376f..000000000000 --- a/net-im/libnice/files/patch-agent_interfaces.c +++ /dev/null @@ -1,19 +0,0 @@ ---- agent/interfaces.c.orig 2010-07-20 17:54:40.000000000 -0400 -+++ agent/interfaces.c 2010-07-24 20:24:19.000000000 -0400 -@@ -46,6 +46,7 @@ - #include <ifaddrs.h> - #endif - -+#include <netinet/in.h> - #include <net/if.h> - #include <net/if_arp.h> - #include <arpa/inet.h> -@@ -198,7 +199,7 @@ nice_interfaces_get_local_ips (gboolean - struct sockaddr_in6 *sa6 = (struct sockaddr_in6 *)ifa->ifa_addr; - - /* Skip link-local addresses, they require a scope */ -- if (IN6_IS_ADDR_LINKLOCAL (sa6->sin6_addr.s6_addr)) -+ if (IN6_IS_ADDR_LINKLOCAL (&sa6->sin6_addr)) - continue; - - if (inet_ntop (AF_INET6, &sa6->sin6_addr, addr_as_string, diff --git a/net-im/libnice/files/patch-stun_md5.c b/net-im/libnice/files/patch-stun_md5.c deleted file mode 100644 index 8f787548f7ea..000000000000 --- a/net-im/libnice/files/patch-stun_md5.c +++ /dev/null @@ -1,10 +0,0 @@ ---- stun/md5.c.orig 2009-02-27 23:04:31.000000000 -0500 -+++ stun/md5.c 2009-02-27 23:05:15.000000000 -0500 -@@ -13,6 +13,7 @@ - */ - - #include "md5.h" -+#include <sys/endian.h> - #include <string.h> - - /* ===== start - public domain MD5 implementation ===== */ diff --git a/net-im/libnice/files/patch-stun_sha1.c b/net-im/libnice/files/patch-stun_sha1.c deleted file mode 100644 index 33e3775b2981..000000000000 --- a/net-im/libnice/files/patch-stun_sha1.c +++ /dev/null @@ -1,10 +0,0 @@ ---- stun/sha1.c.orig 2009-02-27 23:05:24.000000000 -0500 -+++ stun/sha1.c 2009-02-27 23:05:33.000000000 -0500 -@@ -13,6 +13,7 @@ - */ - - #include "sha1.h" -+#include <sys/endian.h> - #include <string.h> - - diff --git a/net-im/libnice/pkg-plist b/net-im/libnice/pkg-plist index ea510f2bacf7..fd0cae2d3277 100644 --- a/net-im/libnice/pkg-plist +++ b/net-im/libnice/pkg-plist @@ -16,13 +16,13 @@ include/stun/usages/ice.h include/stun/usages/timer.h include/stun/usages/turn.h include/stun/win32_common.h -lib/gstreamer-0.10/libgstnice.a -lib/gstreamer-0.10/libgstnice.la -lib/gstreamer-0.10/libgstnice.so +lib/gstreamer-0.10/libgstnice010.a +lib/gstreamer-0.10/libgstnice010.la +lib/gstreamer-0.10/libgstnice010.so lib/libnice.a lib/libnice.la lib/libnice.so -lib/libnice.so.0 +lib/libnice.so.10 libdata/pkgconfig/nice.pc share/gtk-doc/html/libnice/NiceAgent.html share/gtk-doc/html/libnice/ch01.html @@ -45,7 +45,6 @@ share/gtk-doc/html/libnice/libnice-StunAgent.html share/gtk-doc/html/libnice/libnice-StunMessage.html share/gtk-doc/html/libnice/libnice-TURN.html share/gtk-doc/html/libnice/libnice-Timer.html -share/gtk-doc/html/libnice/libnice.devhelp share/gtk-doc/html/libnice/libnice.devhelp2 share/gtk-doc/html/libnice/pt01.html share/gtk-doc/html/libnice/pt02.html diff --git a/net-im/libtelepathy/Makefile b/net-im/libtelepathy/Makefile index 213e01ba2853..5deea477290f 100644 --- a/net-im/libtelepathy/Makefile +++ b/net-im/libtelepathy/Makefile @@ -1,7 +1,4 @@ -# New ports collection makefile for: libtelepathy -# Date created: Apr 16 2007 -# Whom: Florent Thoumie <flz@FreeBSD.org> -# +# Created by: Florent Thoumie <flz@FreeBSD.org> # $FreeBSD$ # $MCom: ports/net-im/libtelepathy/Makefile,v 1.3 2008/02/27 14:00:06 ahze Exp $ @@ -24,7 +21,7 @@ RUN_DEPENDS+= ${LIB_PC_DEPENDS:C|^|${LOCALBASE}/libdata/pkgconfig/|g} USE_GMAKE= yes USE_LDCONFIG= yes -USE_GNOME= gnomehack pkgconfig glib20 ltverhack +USE_GNOME= gnomehack glib20 ltverhack USE_AUTOTOOLS= libtool .include <bsd.port.mk> diff --git a/net-im/loudmouth/Makefile b/net-im/loudmouth/Makefile index ae26d4726e5a..ffc876b020ab 100644 --- a/net-im/loudmouth/Makefile +++ b/net-im/loudmouth/Makefile @@ -1,9 +1,5 @@ -# New ports collection makefile for: loudmouth -# Date created: 08 July 2003 -# Whom: Adam Weinberger <adamw@FreeBSD.org> -# +# Created by: Adam Weinberger <adamw@FreeBSD.org> # $FreeBSD$ -# PORTNAME= loudmouth PORTVERSION= 1.4.3 @@ -14,7 +10,7 @@ MASTER_SITES= GNOME MAINTAINER= gnome@FreeBSD.org COMMENT= Lightweight Jabber client library -LIB_DEPENDS= idn.17:${PORTSDIR}/dns/libidn +LIB_DEPENDS= idn:${PORTSDIR}/dns/libidn USE_BZIP2= yes USE_GMAKE= yes @@ -26,23 +22,24 @@ CONFIGURE_ARGS= --disable-gtk-doc CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -Wl,-Bsymbolic -L${LOCALBASE}/lib -OPTIONS= GNUTLS "Enable SSL (via GnuTLS) support" on \ - OPENSSL "Enable SSL (via OpenSSL) support" off +OPTIONS_DEFAULT=GNUTLS +OPTIONS_RADIO= SSL +OPTIONS_RADIO_SSL= GNUTLS OPENSSL -.include <bsd.port.pre.mk> +.include <bsd.port.options.mk> -.if defined(WITH_GNUTLS) -LIB_DEPENDS+= gnutls.26:${PORTSDIR}/security/gnutls +.if ${PORT_OPTIONS:MGNUTLS} +LIB_DEPENDS+= gnutls:${PORTSDIR}/security/gnutls RUN_DEPENDS+= ${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss .endif -.if defined(WITH_OPENSSL) +.if ${PORT_OPTIONS:MOPENSSL} USE_OPENSSL= yes CONFIGURE_ARGS+=--with-ssl=openssl RUN_DEPENDS+= ${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss .endif -.if !defined(WITH_GNUTLS) && !defined(WITH_OPENSSL) +.if !${PORT_OPTIONS:MGNUTLS} && !${PORT_OPTIONS:MOPENSSL} CONFIGURE_ARGS+=--without-ssl .endif @@ -50,4 +47,4 @@ post-patch: @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \ ${WRKSRC}/loudmouth/lm-ssl-gnutls.c -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/net-im/loudmouth/files/patch-loudmouth_lm-error.c b/net-im/loudmouth/files/patch-loudmouth_lm-error.c new file mode 100644 index 000000000000..61f65fce2447 --- /dev/null +++ b/net-im/loudmouth/files/patch-loudmouth_lm-error.c @@ -0,0 +1,11 @@ +--- loudmouth/lm-error.c.orig 2012-05-22 10:05:29.000000000 +0200 ++++ loudmouth/lm-error.c 2012-05-22 10:05:41.000000000 +0200 +@@ -19,7 +19,7 @@ + */ + + #include <config.h> +-#include <glib/gerror.h> ++#include <glib.h> + #include "lm-error.h" + + /** diff --git a/net-im/meanwhile/Makefile b/net-im/meanwhile/Makefile index a612f374ea94..8e08ef1957d9 100644 --- a/net-im/meanwhile/Makefile +++ b/net-im/meanwhile/Makefile @@ -7,7 +7,7 @@ PORTNAME= meanwhile PORTVERSION= 1.0.2 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= net-im MASTER_SITES= SF @@ -17,13 +17,18 @@ COMMENT= Open Source implementation of the Lotus Sametime protocol USE_AUTOTOOLS= libtool USE_GMAKE= yes USE_GNOME= gnomehack glib20 +USE_PKGCONFIG= build USE_LDCONFIG= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-doxygen=no \ --with-gmp-prefix=${LOCALBASE} -CPPFLAGS+= -I${LOCALBASE}/include +CPPFLAGS+= -I${LOCALBASE}/include -DGLIB_COMPILATION LDFLAGS+= -L${LOCALBASE}/lib DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}-doc-${PORTVERSION} +post-patch: + @${REINPLACE_CMD} -e 's|glib/.*\.h>|glib.h>|g' \ + ${WRKSRC}/samples/*.c ${WRKSRC}/src/*.[ch] + .include <bsd.port.mk> diff --git a/net-im/pidgin-bs/Makefile b/net-im/pidgin-bs/Makefile index 1137a67f3182..d6acb695e315 100644 --- a/net-im/pidgin-bs/Makefile +++ b/net-im/pidgin-bs/Makefile @@ -22,6 +22,7 @@ RUN_DEPENDS= pidgin:${PORTSDIR}/net-im/pidgin GNU_CONFIGURE= yes USE_BZIP2= yes +USE_GMAKE= yes USE_GNOME= gtk20 USE_LDCONFIG= ${PREFIX}/lib/pidgin diff --git a/net-im/psimedia/Makefile b/net-im/psimedia/Makefile index 91f1ed78e4bc..504e33de74fb 100644 --- a/net-im/psimedia/Makefile +++ b/net-im/psimedia/Makefile @@ -36,6 +36,13 @@ CONFIGURE_ARGS+= --debug PLIST_SUB+= DEBUG="" .endif +post-patch: + @${REINPLACE_CMD} -e 's|glib/.*\.h>|glib.h>|g' \ + ${WRKSRC}/gstprovider/rwcontrol.h \ + ${WRKSRC}/gstprovider/gstthread.h \ + ${WRKSRC}/gstprovider/gstelements/static/gstelements.h \ + ${WRKSRC}/gstprovider/gstcustomelements/gstcustomelements.h + do-install: ${MKDIR} ${PREFIX}/${PSI_PLUGIN_DIR} ${INSTALL_PROGRAM} ${WRKSRC}/gstprovider/libgstprovider.so \ diff --git a/net-im/telepathy-farsight/Makefile b/net-im/telepathy-farsight/Makefile index 4293350dd27d..0f7f5c8c8299 100644 --- a/net-im/telepathy-farsight/Makefile +++ b/net-im/telepathy-farsight/Makefile @@ -1,35 +1,25 @@ -# New ports collection makefile for: telepathy-farsight -# Date created: 27 February 2009 -# Whom: Joe Marcus Clarke <marcus@FreeBSD.org> -# +# Created by: Joe Marcus Clarke <marcus@FreeBSD.org> # $FreeBSD$ -# +# $MCom$ PORTNAME= telepathy-farsight -PORTVERSION= 0.0.15 -PORTREVISION= 1 +PORTVERSION= 0.0.19 CATEGORIES= net-im MASTER_SITES= http://telepathy.freedesktop.org/releases/${PORTNAME}/ MAINTAINER= gnome@FreeBSD.org COMMENT= Farsight 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 \ - farsight2-0.10.pc:${PORTSDIR}/net-im/farsight2 - -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} +LIB_DEPENDS= dbus-glib-1:${PORTSDIR}/devel/dbus-glib \ + telepathy-glib:${PORTSDIR}/net-im/telepathy-glib \ + gstfarsight-0.10:${PORTSDIR}/net-im/farsight2 GNU_CONFIGURE= yes USE_GMAKE= yes USE_LDCONFIG= yes USE_PYTHON= yes USE_AUTOTOOLS= libtool -USE_GNOME= gnomehack pkgconfig glib20 ltverhack +USE_GNOME= gnomehack glib20 ltverhack libxslt:build CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} diff --git a/net-im/telepathy-farsight/distinfo b/net-im/telepathy-farsight/distinfo index c5f308b89eb2..05732589e893 100644 --- a/net-im/telepathy-farsight/distinfo +++ b/net-im/telepathy-farsight/distinfo @@ -1,2 +1,2 @@ -SHA256 (telepathy-farsight-0.0.15.tar.gz) = 3dc3d9cdb43fb9ef772d16917e50e3cc95f71b1585d26d740f3148f4fdb6eb0f -SIZE (telepathy-farsight-0.0.15.tar.gz) = 555835 +SHA256 (telepathy-farsight-0.0.19.tar.gz) = 2c89b8b259f91df33f93703eab1de493b193b163c32facb532ec2710b8f05269 +SIZE (telepathy-farsight-0.0.19.tar.gz) = 585743 diff --git a/net-im/telepathy-farsight/files/patch-telepathy-farsight_Makefile.in b/net-im/telepathy-farsight/files/patch-telepathy-farsight_Makefile.in deleted file mode 100644 index 1215ad50b91c..000000000000 --- a/net-im/telepathy-farsight/files/patch-telepathy-farsight_Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- telepathy-farsight/Makefile.in.orig 2009-02-28 00:03:16.000000000 -0500 -+++ telepathy-farsight/Makefile.in 2009-02-28 00:03:37.000000000 -0500 -@@ -250,7 +250,7 @@ libtelepathy_farsight_la_SOURCES = \ - - nodist_libtelepathy_farsight_la_SOURCES = $(BUILT_SOURCES) - lib_LTLIBRARIES = libtelepathy-farsight.la --pkgconfigdir = ${libdir}/pkgconfig -+pkgconfigdir = $(prefix)/libdata/pkgconfig - pkgconfig_DATA = telepathy-farsight.pc - AM_CFLAGS = \ - $(ERROR_CFLAGS) \ diff --git a/net-im/telepathy-gabble/Makefile b/net-im/telepathy-gabble/Makefile index 038b3f80ee36..1f0e057bb7d2 100644 --- a/net-im/telepathy-gabble/Makefile +++ b/net-im/telepathy-gabble/Makefile @@ -1,43 +1,37 @@ -# New ports collection makefile for: telepathy-gabble -# Date created: Apr 19 2007 -# Whom: Florent Thoumie <flz@FreeBSD.org> -# # $FreeBSD$ -# $MCom: ports/net-im/telepathy-gabble/Makefile,v 1.10 2010/11/14 16:18:09 marcus Exp $ +# $MCom: ports/net-im/telepathy-gabble/Makefile,v 1.22 2012/08/08 16:56:40 kwm Exp $ PORTNAME= telepathy-gabble -PORTVERSION= 0.10.4 +PORTVERSION= 0.16.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 \ - nice.pc:${PORTSDIR}/net-im/libnice \ - uuid.pc:${PORTSDIR}/misc/e2fsprogs-libuuid \ - 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} +BUILD_DEPENDS= xsltproc:${PORTSDIR}/textproc/libxslt \ + telepathy-glib>=0.18.0:${PORTSDIR}/net-im/telepathy-glib \ + ${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss +LIB_DEPENDS= soup-2.4:${PORTSDIR}/devel/libsoup \ + nice:${PORTSDIR}/net-im/libnice \ + telepathy-glib:${PORTSDIR}/net-im/telepathy-glib \ + dbus-glib-1:${PORTSDIR}/devel/dbus-glib \ + uuid:${PORTSDIR}/misc/e2fsprogs-libuuid \ + loudmouth-1:${PORTSDIR}/net-im/loudmouth +RUN_DEPENDS= ${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss GNU_CONFIGURE= yes -CONFIGURE_ARGS= --disable-Werror LDFLAGS+= ${PTHREAD_LIBS} USE_GMAKE= yes -USE_GNOME= gnomehack pkgconfig glib20 +USE_GNOME= gnomehack glib20 +USE_SQLITE= yes USE_OPENSSL= yes USE_PYTHON_BUILD= yes +CONFIGURE_ARGS= --with-ca-certificates=${LOCALBASE}/share/certs/ca-root-nss.crt MAN8= telepathy-gabble.8 -.include <bsd.port.pre.mk> +PLIST_SUB= PVERSION=${PORTVERSION} .if defined(WITH_OPENSSL_BASE) CONFIGURE_ENV+= OPENSSL_LIBS="-L/usr/lib -ssl -crypto" OPENSSL_CFLAGS="-I/usr/include" @@ -47,4 +41,4 @@ post-patch: @${REINPLACE_CMD} -e 's|-Werror||g' \ ${WRKSRC}/lib/ext/wocky/configure -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/net-im/telepathy-gabble/distinfo b/net-im/telepathy-gabble/distinfo index 7f77130ac4aa..3bd9465407b1 100644 --- a/net-im/telepathy-gabble/distinfo +++ b/net-im/telepathy-gabble/distinfo @@ -1,2 +1,2 @@ -SHA256 (telepathy-gabble-0.10.4.tar.gz) = abdf07e833b934fa7cd0c9e34894a11da037adf03a4fdde4dc7818ed990a662c -SIZE (telepathy-gabble-0.10.4.tar.gz) = 2936168 +SHA256 (telepathy-gabble-0.16.1.tar.gz) = 77536d0ca6c040f1b1bd46c6f5914d0677a6dc6ecf1e858816c24fcf07e3f310 +SIZE (telepathy-gabble-0.16.1.tar.gz) = 2644994 diff --git a/net-im/telepathy-gabble/pkg-plist b/net-im/telepathy-gabble/pkg-plist index 2bd653be6e31..62bf393cab5e 100644 --- a/net-im/telepathy-gabble/pkg-plist +++ b/net-im/telepathy-gabble/pkg-plist @@ -1,6 +1,17 @@ +bin/telepathy-gabble-xmpp-console +lib/telepathy/gabble-0/lib/libgabble-plugins-%%PVERSION%%.so +lib/telepathy/gabble-0/lib/libgabble-plugins.a +lib/telepathy/gabble-0/lib/libgabble-plugins.la +lib/telepathy/gabble-0/lib/libgabble-plugins.so +lib/telepathy/gabble-0/lib/libwocky-telepathy-gabble-%%PVERSION%%.so +lib/telepathy/gabble-0/lib/libwocky.a +lib/telepathy/gabble-0/lib/libwocky.la +lib/telepathy/gabble-0/lib/libwocky.so +lib/telepathy/gabble-0/plugins/libconsole.la +lib/telepathy/gabble-0/plugins/libconsole.so +lib/telepathy/gabble-0/plugins/libgateways.la +lib/telepathy/gabble-0/plugins/libgateways.so libexec/telepathy-gabble -lib/telepathy/gabble-0/gateways.la -lib/telepathy/gabble-0/gateways.so share/dbus-1/services/org.freedesktop.Telepathy.ConnectionManager.gabble.service %%DOCSDIR%%/muc-bytestream.html %%DOCSDIR%%/olpc.html @@ -10,5 +21,7 @@ share/telepathy/managers/gabble.manager @dirrmtry share/telepathy/managers @dirrmtry share/telepathy @dirrm %%DOCSDIR%% -@dirrm lib/telepathy/gabble-0 +@dirrmtry lib/telepathy/gabble-0/plugins +@dirrmtry lib/telepathy/gabble-0/lib +@dirrmtry lib/telepathy/gabble-0 @dirrmtry lib/telepathy diff --git a/net-im/telepathy-glib/Makefile b/net-im/telepathy-glib/Makefile index 7273ab234f2d..be3fcd84aaa1 100644 --- a/net-im/telepathy-glib/Makefile +++ b/net-im/telepathy-glib/Makefile @@ -1,42 +1,31 @@ -# New ports collection makefile for: telepathy-glib -# Date created: Apr 19 2007 -# Whom: Florent Thoumie <flz@FreeBSD.org> -# # $FreeBSD$ -# $MCom: ports/net-im/telepathy-glib/Makefile,v 1.15 2010/10/21 17:35:24 kwm Exp $ +# $MCom: ports/net-im/telepathy-glib/Makefile,v 1.38 2012/08/07 20:30:33 kwm Exp $ PORTNAME= telepathy-glib -PORTVERSION= 0.12.7 -PORTREVISION= 1 +PORTVERSION= 0.18.2 CATEGORIES= net-im MASTER_SITES= http://telepathy.freedesktop.org/releases/${PORTNAME}/ MAINTAINER= gnome@FreeBSD.org COMMENT= GLib utility library for the Telepathy framework -LIB_PC_DEPENDS= gobject-2.0.pc:${PORTSDIR}/devel/glib20 \ - dbus-glib-1.pc:${PORTSDIR}/devel/dbus-glib - BUILD_DEPENDS= xsltproc:${PORTSDIR}/textproc/libxslt \ - vapigen:${PORTSDIR}/lang/vala-vapigen \ + vala-vapigen>=0.14.0:${PORTSDIR}/lang/vala-vapigen \ g-ir-scanner:${PORTSDIR}/devel/gobject-introspection - -BUILD_DEPENDS+= ${LIB_PC_DEPENDS:C|^|${LOCALBASE}/libdata/pkgconfig/|g} -RUN_DEPENDS+= ${LIB_PC_DEPENDS:C|^|${LOCALBASE}/libdata/pkgconfig/|g} \ - vapigen:${PORTSDIR}/lang/vala-vapigen +LIB_DEPENDS= dbus-glib-1:${PORTSDIR}/devel/dbus-glib +RUN_DEPENDS= vapigen:${PORTSDIR}/lang/vala-vapigen USE_AUTOTOOLS= libtool USE_GMAKE= yes USE_LDCONFIG= yes -USE_GNOME= gnomehack pkgconfig glib20 ltverhack +USE_GNOME= gnomehack glib20 ltverhack gnomehier USE_PYTHON_BUILD= yes MAKE_JOBS_UNSAFE= yes +GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-vala-bindings post-patch: @${REINPLACE_CMD} -e 's|\(^pkgconfigdir =\).*|\1 ${PREFIX}/libdata/pkgconfig|' \ ${WRKSRC}/telepathy-glib/Makefile.in - @${REINPLACE_CMD} -e 's|datarootdir)/vala/vapi|datarootdir)/vala-0.12/vapi|g' \ - ${WRKSRC}/vala/Makefile.in .include <bsd.port.mk> diff --git a/net-im/telepathy-glib/distinfo b/net-im/telepathy-glib/distinfo index 89878457b359..83cbaecd20bb 100644 --- a/net-im/telepathy-glib/distinfo +++ b/net-im/telepathy-glib/distinfo @@ -1,2 +1,2 @@ -SHA256 (telepathy-glib-0.12.7.tar.gz) = 4c76b78c283620556c253bd9a483f8b6e1bbd014fb8a22de704e117eaa9e3c97 -SIZE (telepathy-glib-0.12.7.tar.gz) = 2572558 +SHA256 (telepathy-glib-0.18.2.tar.gz) = 372375578be8053398f9fb1e12188a8b472d6d897e0ac73b230d31e112c68b3f +SIZE (telepathy-glib-0.18.2.tar.gz) = 3539165 diff --git a/net-im/telepathy-glib/files/patch-telepathy-glib_Makefile.in b/net-im/telepathy-glib/files/patch-telepathy-glib_Makefile.in index d88266770456..e69de29bb2d1 100644 --- a/net-im/telepathy-glib/files/patch-telepathy-glib_Makefile.in +++ b/net-im/telepathy-glib/files/patch-telepathy-glib_Makefile.in @@ -1,22 +0,0 @@ ---- telepathy-glib/Makefile.in.orig 2011-07-22 13:41:13.000000000 +0200 -+++ telepathy-glib/Makefile.in 2011-07-22 14:00:23.000000000 +0200 -@@ -1649,7 +1649,7 @@ - @HAVE_INTROSPECTION_TRUE@ $(AM_V_GEN)$(INTROSPECTION_SCANNER) -v \ - @HAVE_INTROSPECTION_TRUE@ --namespace TelepathyGLib \ - @HAVE_INTROSPECTION_TRUE@ --nsversion=0.12 \ --@HAVE_INTROSPECTION_TRUE@ $(gi_identifier_prefix_arg)=Tp \ -+@HAVE_INTROSPECTION_TRUE@ --identifier-prefix=Tp \ - @HAVE_INTROSPECTION_TRUE@ -I$(top_builddir) \ - @HAVE_INTROSPECTION_TRUE@ -I$(top_srcdir) \ - @HAVE_INTROSPECTION_TRUE@ --include=GLib-2.0 \ -@@ -1658,7 +1658,9 @@ - @HAVE_INTROSPECTION_TRUE@ --library=libtelepathy-glib.la \ - @HAVE_INTROSPECTION_TRUE@ --pkg gio-2.0 \ - @HAVE_INTROSPECTION_TRUE@ --pkg dbus-glib-1 \ --@HAVE_INTROSPECTION_TRUE@ $(gi_warn_all_arg) \ -+@HAVE_INTROSPECTION_TRUE@ --pkg-export telepathy-glib \ -+@HAVE_INTROSPECTION_TRUE@ --c-include="telepathy-glib/telepathy-glib.h" \ -+@HAVE_INTROSPECTION_TRUE@ --warn-all \ - @HAVE_INTROSPECTION_TRUE@ --output _gen/$@.tmp \ - @HAVE_INTROSPECTION_TRUE@ $(INTROSPECTION_FILES) - @HAVE_INTROSPECTION_TRUE@ @xsltproc $(srcdir)/kludge.xsl _gen/$@.tmp > $@ diff --git a/net-im/telepathy-glib/pkg-descr b/net-im/telepathy-glib/pkg-descr index f2fa32bf5b4d..49f70dbb2703 100644 --- a/net-im/telepathy-glib/pkg-descr +++ b/net-im/telepathy-glib/pkg-descr @@ -1,3 +1,6 @@ GLib utility library for the Telepathy framework. WWW: http://telepathy.freedesktop.org/ + +- Florent Thoumie +flz@FreeBSD.org diff --git a/net-im/telepathy-glib/pkg-plist b/net-im/telepathy-glib/pkg-plist index 457fc925a6f1..afaaa0ac1b4a 100644 --- a/net-im/telepathy-glib/pkg-plist +++ b/net-im/telepathy-glib/pkg-plist @@ -5,6 +5,10 @@ include/telepathy-1.0/telepathy-glib/_gen/telepathy-enums.h include/telepathy-1.0/telepathy-glib/_gen/telepathy-interfaces.h include/telepathy-1.0/telepathy-glib/_gen/tp-cli-account-manager.h include/telepathy-1.0/telepathy-glib/_gen/tp-cli-account.h +include/telepathy-1.0/telepathy-glib/_gen/tp-cli-call-content-media-description.h +include/telepathy-1.0/telepathy-glib/_gen/tp-cli-call-content.h +include/telepathy-1.0/telepathy-glib/_gen/tp-cli-call-stream-endpoint.h +include/telepathy-1.0/telepathy-glib/_gen/tp-cli-call-stream.h include/telepathy-1.0/telepathy-glib/_gen/tp-cli-channel-dispatch-operation.h include/telepathy-1.0/telepathy-glib/_gen/tp-cli-channel-dispatcher.h include/telepathy-1.0/telepathy-glib/_gen/tp-cli-channel-request.h @@ -19,6 +23,10 @@ include/telepathy-1.0/telepathy-glib/_gen/tp-cli-media-stream-handler.h include/telepathy-1.0/telepathy-glib/_gen/tp-cli-protocol.h include/telepathy-1.0/telepathy-glib/_gen/tp-svc-account-manager.h include/telepathy-1.0/telepathy-glib/_gen/tp-svc-account.h +include/telepathy-1.0/telepathy-glib/_gen/tp-svc-call-content-media-description.h +include/telepathy-1.0/telepathy-glib/_gen/tp-svc-call-content.h +include/telepathy-1.0/telepathy-glib/_gen/tp-svc-call-stream-endpoint.h +include/telepathy-1.0/telepathy-glib/_gen/tp-svc-call-stream.h include/telepathy-1.0/telepathy-glib/_gen/tp-svc-channel-dispatch-operation.h include/telepathy-1.0/telepathy-glib/_gen/tp-svc-channel-dispatcher.h include/telepathy-1.0/telepathy-glib/_gen/tp-svc-channel-request.h @@ -36,11 +44,29 @@ include/telepathy-1.0/telepathy-glib/account-channel-request.h include/telepathy-1.0/telepathy-glib/account-manager.h include/telepathy-1.0/telepathy-glib/account.h include/telepathy-1.0/telepathy-glib/add-dispatch-operation-context.h +include/telepathy-1.0/telepathy-glib/automatic-client-factory.h +include/telepathy-1.0/telepathy-glib/automatic-proxy-factory.h +include/telepathy-1.0/telepathy-glib/base-call-channel.h +include/telepathy-1.0/telepathy-glib/base-call-content.h +include/telepathy-1.0/telepathy-glib/base-call-stream.h include/telepathy-1.0/telepathy-glib/base-channel.h include/telepathy-1.0/telepathy-glib/base-client.h include/telepathy-1.0/telepathy-glib/base-connection-manager.h include/telepathy-1.0/telepathy-glib/base-connection.h +include/telepathy-1.0/telepathy-glib/base-contact-list.h +include/telepathy-1.0/telepathy-glib/base-media-call-channel.h +include/telepathy-1.0/telepathy-glib/base-media-call-content.h +include/telepathy-1.0/telepathy-glib/base-media-call-stream.h +include/telepathy-1.0/telepathy-glib/base-password-channel.h include/telepathy-1.0/telepathy-glib/base-protocol.h +include/telepathy-1.0/telepathy-glib/base-room-config.h +include/telepathy-1.0/telepathy-glib/basic-proxy-factory.h +include/telepathy-1.0/telepathy-glib/call-channel.h +include/telepathy-1.0/telepathy-glib/call-content-media-description.h +include/telepathy-1.0/telepathy-glib/call-content.h +include/telepathy-1.0/telepathy-glib/call-misc.h +include/telepathy-1.0/telepathy-glib/call-stream-endpoint.h +include/telepathy-1.0/telepathy-glib/call-stream.h include/telepathy-1.0/telepathy-glib/capabilities.h include/telepathy-1.0/telepathy-glib/channel-dispatch-operation.h include/telepathy-1.0/telepathy-glib/channel-dispatcher.h @@ -49,21 +75,31 @@ include/telepathy-1.0/telepathy-glib/channel-iface.h include/telepathy-1.0/telepathy-glib/channel-manager.h include/telepathy-1.0/telepathy-glib/channel-request.h include/telepathy-1.0/telepathy-glib/channel.h +include/telepathy-1.0/telepathy-glib/client-channel-factory.h +include/telepathy-1.0/telepathy-glib/client-message.h include/telepathy-1.0/telepathy-glib/client.h +include/telepathy-1.0/telepathy-glib/cm-message.h +include/telepathy-1.0/telepathy-glib/connection-contact-list.h include/telepathy-1.0/telepathy-glib/connection-manager.h include/telepathy-1.0/telepathy-glib/connection.h -include/telepathy-1.0/telepathy-glib/contacts-mixin.h +include/telepathy-1.0/telepathy-glib/contact-operations.h +include/telepathy-1.0/telepathy-glib/contact-search-result.h +include/telepathy-1.0/telepathy-glib/contact-search.h include/telepathy-1.0/telepathy-glib/contact.h +include/telepathy-1.0/telepathy-glib/contacts-mixin.h include/telepathy-1.0/telepathy-glib/dbus-daemon.h include/telepathy-1.0/telepathy-glib/dbus-properties-mixin.h +include/telepathy-1.0/telepathy-glib/dbus-tube-channel.h include/telepathy-1.0/telepathy-glib/dbus.h include/telepathy-1.0/telepathy-glib/debug-ansi.h include/telepathy-1.0/telepathy-glib/debug-sender.h include/telepathy-1.0/telepathy-glib/debug.h include/telepathy-1.0/telepathy-glib/defs.h +include/telepathy-1.0/telepathy-glib/dtmf.h include/telepathy-1.0/telepathy-glib/enums.h include/telepathy-1.0/telepathy-glib/errors.h include/telepathy-1.0/telepathy-glib/exportable-channel.h +include/telepathy-1.0/telepathy-glib/file-transfer-channel.h include/telepathy-1.0/telepathy-glib/gnio-util.h include/telepathy-1.0/telepathy-glib/group-mixin.h include/telepathy-1.0/telepathy-glib/gtypes.h @@ -77,6 +113,7 @@ include/telepathy-1.0/telepathy-glib/interfaces.h include/telepathy-1.0/telepathy-glib/intset.h include/telepathy-1.0/telepathy-glib/media-interfaces.h include/telepathy-1.0/telepathy-glib/message-mixin.h +include/telepathy-1.0/telepathy-glib/message.h include/telepathy-1.0/telepathy-glib/observe-channels-context.h include/telepathy-1.0/telepathy-glib/presence-mixin.h include/telepathy-1.0/telepathy-glib/properties-mixin.h @@ -84,11 +121,17 @@ include/telepathy-1.0/telepathy-glib/protocol.h include/telepathy-1.0/telepathy-glib/proxy-subclass.h include/telepathy-1.0/telepathy-glib/proxy.h include/telepathy-1.0/telepathy-glib/run.h +include/telepathy-1.0/telepathy-glib/signalled-message.h include/telepathy-1.0/telepathy-glib/simple-approver.h +include/telepathy-1.0/telepathy-glib/simple-client-factory.h include/telepathy-1.0/telepathy-glib/simple-handler.h include/telepathy-1.0/telepathy-glib/simple-observer.h +include/telepathy-1.0/telepathy-glib/simple-password-manager.h +include/telepathy-1.0/telepathy-glib/stream-tube-channel.h +include/telepathy-1.0/telepathy-glib/stream-tube-connection.h include/telepathy-1.0/telepathy-glib/svc-account-manager.h include/telepathy-1.0/telepathy-glib/svc-account.h +include/telepathy-1.0/telepathy-glib/svc-call.h include/telepathy-1.0/telepathy-glib/svc-channel-dispatch-operation.h include/telepathy-1.0/telepathy-glib/svc-channel-dispatcher.h include/telepathy-1.0/telepathy-glib/svc-channel-request.h @@ -103,6 +146,7 @@ include/telepathy-1.0/telepathy-glib/svc-properties-interface.h include/telepathy-1.0/telepathy-glib/svc-protocol.h include/telepathy-1.0/telepathy-glib/svc-tls.h include/telepathy-1.0/telepathy-glib/telepathy-glib.h +include/telepathy-1.0/telepathy-glib/text-channel.h include/telepathy-1.0/telepathy-glib/text-mixin.h include/telepathy-1.0/telepathy-glib/util.h include/telepathy-1.0/telepathy-glib/verify.h @@ -113,18 +157,33 @@ lib/libtelepathy-glib.so lib/libtelepathy-glib.so.0 libdata/pkgconfig/telepathy-glib.pc share/gir-1.0/TelepathyGLib-0.12.gir +share/gtk-doc/html/telepathy-glib/TpBaseCallChannel.html +share/gtk-doc/html/telepathy-glib/TpBaseCallContent.html +share/gtk-doc/html/telepathy-glib/TpBaseCallStream.html share/gtk-doc/html/telepathy-glib/TpBaseChannel.html share/gtk-doc/html/telepathy-glib/TpBaseConnection.html share/gtk-doc/html/telepathy-glib/TpBaseConnectionManager.html +share/gtk-doc/html/telepathy-glib/TpBaseMediaCallChannel.html +share/gtk-doc/html/telepathy-glib/TpBaseMediaCallContent.html +share/gtk-doc/html/telepathy-glib/TpBaseMediaCallStream.html +share/gtk-doc/html/telepathy-glib/TpBaseRoomConfig.html +share/gtk-doc/html/telepathy-glib/TpCMMessage.html +share/gtk-doc/html/telepathy-glib/TpCallContentMediaDescription.html +share/gtk-doc/html/telepathy-glib/TpCallStreamEndpoint.html share/gtk-doc/html/telepathy-glib/TpChannelFactoryIface.html share/gtk-doc/html/telepathy-glib/TpChannelIface.html share/gtk-doc/html/telepathy-glib/TpChannelManager.html -share/gtk-doc/html/telepathy-glib/TpExportableChannel.html +share/gtk-doc/html/telepathy-glib/TpClientMessage.html share/gtk-doc/html/telepathy-glib/TpDynamicHandleRepo.html +share/gtk-doc/html/telepathy-glib/TpExportableChannel.html +share/gtk-doc/html/telepathy-glib/TpIntset.html +share/gtk-doc/html/telepathy-glib/TpMessage.html +share/gtk-doc/html/telepathy-glib/TpSignalledMessage.html share/gtk-doc/html/telepathy-glib/TpStaticHandleRepo.html share/gtk-doc/html/telepathy-glib/annotation-glossary.html share/gtk-doc/html/telepathy-glib/ch-client.html share/gtk-doc/html/telepathy-glib/ch-dbus.html +share/gtk-doc/html/telepathy-glib/ch-obsolete.html share/gtk-doc/html/telepathy-glib/ch-protocol.html share/gtk-doc/html/telepathy-glib/ch-service-base.html share/gtk-doc/html/telepathy-glib/ch-service-dbus.html @@ -139,19 +198,28 @@ share/gtk-doc/html/telepathy-glib/style.css share/gtk-doc/html/telepathy-glib/telepathy-glib-TpContactsMixin.html share/gtk-doc/html/telepathy-glib/telepathy-glib-TpGroupMixin.html share/gtk-doc/html/telepathy-glib/telepathy-glib-TpHeap.html -share/gtk-doc/html/telepathy-glib/telepathy-glib-TpIntset.html share/gtk-doc/html/telepathy-glib/telepathy-glib-TpMessageMixin.html share/gtk-doc/html/telepathy-glib/telepathy-glib-TpPresenceMixin.html share/gtk-doc/html/telepathy-glib/telepathy-glib-TpPropertiesMixin.html share/gtk-doc/html/telepathy-glib/telepathy-glib-TpTextMixin.html share/gtk-doc/html/telepathy-glib/telepathy-glib-account-channel-request.html -share/gtk-doc/html/telepathy-glib/telepathy-glib-add-dispatch-operation-context.html -share/gtk-doc/html/telepathy-glib/telepathy-glib-asv.html share/gtk-doc/html/telepathy-glib/telepathy-glib-account-manager.html share/gtk-doc/html/telepathy-glib/telepathy-glib-account.html +share/gtk-doc/html/telepathy-glib/telepathy-glib-add-dispatch-operation-context.html +share/gtk-doc/html/telepathy-glib/telepathy-glib-asv.html +share/gtk-doc/html/telepathy-glib/telepathy-glib-automatic-client-factory.html +share/gtk-doc/html/telepathy-glib/telepathy-glib-automatic-proxy-factory.html share/gtk-doc/html/telepathy-glib/telepathy-glib-base-client.html +share/gtk-doc/html/telepathy-glib/telepathy-glib-base-contact-list.html +share/gtk-doc/html/telepathy-glib/telepathy-glib-base-password-channel.html share/gtk-doc/html/telepathy-glib/telepathy-glib-base-protocol.html +share/gtk-doc/html/telepathy-glib/telepathy-glib-basic-proxy-factory.html +share/gtk-doc/html/telepathy-glib/telepathy-glib-call-channel.html +share/gtk-doc/html/telepathy-glib/telepathy-glib-call-content.html +share/gtk-doc/html/telepathy-glib/telepathy-glib-call-misc.html +share/gtk-doc/html/telepathy-glib/telepathy-glib-call-stream.html share/gtk-doc/html/telepathy-glib/telepathy-glib-capabilities.html +share/gtk-doc/html/telepathy-glib/telepathy-glib-channel-auth.html share/gtk-doc/html/telepathy-glib/telepathy-glib-channel-contactsearch.html share/gtk-doc/html/telepathy-glib/telepathy-glib-channel-dispatch-operation.html share/gtk-doc/html/telepathy-glib/telepathy-glib-channel-dispatcher.html @@ -159,36 +227,52 @@ share/gtk-doc/html/telepathy-glib/telepathy-glib-channel-file-transfer.html share/gtk-doc/html/telepathy-glib/telepathy-glib-channel-group.html share/gtk-doc/html/telepathy-glib/telepathy-glib-channel-media.html share/gtk-doc/html/telepathy-glib/telepathy-glib-channel-request.html +share/gtk-doc/html/telepathy-glib/telepathy-glib-channel-room.html share/gtk-doc/html/telepathy-glib/telepathy-glib-channel-roomlist.html share/gtk-doc/html/telepathy-glib/telepathy-glib-channel-text.html share/gtk-doc/html/telepathy-glib/telepathy-glib-channel-tube.html share/gtk-doc/html/telepathy-glib/telepathy-glib-channel-tubes.html share/gtk-doc/html/telepathy-glib/telepathy-glib-channel.html share/gtk-doc/html/telepathy-glib/telepathy-glib-cli-anonymity.html +share/gtk-doc/html/telepathy-glib/telepathy-glib-cli-call-channel.html +share/gtk-doc/html/telepathy-glib/telepathy-glib-cli-call-content.html +share/gtk-doc/html/telepathy-glib/telepathy-glib-cli-call-misc.html +share/gtk-doc/html/telepathy-glib/telepathy-glib-cli-call-stream.html share/gtk-doc/html/telepathy-glib/telepathy-glib-cli-service-point.html +share/gtk-doc/html/telepathy-glib/telepathy-glib-client-channel-factory.html share/gtk-doc/html/telepathy-glib/telepathy-glib-client.html +share/gtk-doc/html/telepathy-glib/telepathy-glib-connection-addressing.html share/gtk-doc/html/telepathy-glib/telepathy-glib-connection-aliasing.html share/gtk-doc/html/telepathy-glib/telepathy-glib-connection-avatars.html share/gtk-doc/html/telepathy-glib/telepathy-glib-connection-balance.html share/gtk-doc/html/telepathy-glib/telepathy-glib-connection-caps.html share/gtk-doc/html/telepathy-glib/telepathy-glib-connection-cellular.html +share/gtk-doc/html/telepathy-glib/telepathy-glib-connection-client-types.html share/gtk-doc/html/telepathy-glib/telepathy-glib-connection-contact-info.html +share/gtk-doc/html/telepathy-glib/telepathy-glib-connection-contact-list.html share/gtk-doc/html/telepathy-glib/telepathy-glib-connection-contacts.html share/gtk-doc/html/telepathy-glib/telepathy-glib-connection-location.html +share/gtk-doc/html/telepathy-glib/telepathy-glib-connection-mail.html share/gtk-doc/html/telepathy-glib/telepathy-glib-connection-manager.html +share/gtk-doc/html/telepathy-glib/telepathy-glib-connection-powersaving.html share/gtk-doc/html/telepathy-glib/telepathy-glib-connection-presence.html share/gtk-doc/html/telepathy-glib/telepathy-glib-connection-requests.html share/gtk-doc/html/telepathy-glib/telepathy-glib-connection-simple-presence.html share/gtk-doc/html/telepathy-glib/telepathy-glib-connection.html +share/gtk-doc/html/telepathy-glib/telepathy-glib-contact-search-result.html +share/gtk-doc/html/telepathy-glib/telepathy-glib-contact-search.html share/gtk-doc/html/telepathy-glib/telepathy-glib-contact.html share/gtk-doc/html/telepathy-glib/telepathy-glib-dbus-properties-mixin.html +share/gtk-doc/html/telepathy-glib/telepathy-glib-dbus-tube-channel.html share/gtk-doc/html/telepathy-glib/telepathy-glib-dbus.html share/gtk-doc/html/telepathy-glib/telepathy-glib-debug-ansi.html share/gtk-doc/html/telepathy-glib/telepathy-glib-debug-sender.html share/gtk-doc/html/telepathy-glib/telepathy-glib-debug.html share/gtk-doc/html/telepathy-glib/telepathy-glib-defs.html +share/gtk-doc/html/telepathy-glib/telepathy-glib-dtmf.html share/gtk-doc/html/telepathy-glib/telepathy-glib-enums.html share/gtk-doc/html/telepathy-glib/telepathy-glib-errors.html +share/gtk-doc/html/telepathy-glib/telepathy-glib-file-transfer-channel.html share/gtk-doc/html/telepathy-glib/telepathy-glib-gnio-util.html share/gtk-doc/html/telepathy-glib/telepathy-glib-gtypes.html share/gtk-doc/html/telepathy-glib/telepathy-glib-handle-channels-context.html @@ -204,20 +288,29 @@ share/gtk-doc/html/telepathy-glib/telepathy-glib-proxy-tp-properties.html share/gtk-doc/html/telepathy-glib/telepathy-glib-proxy.html share/gtk-doc/html/telepathy-glib/telepathy-glib-run.html share/gtk-doc/html/telepathy-glib/telepathy-glib-simple-approver.html +share/gtk-doc/html/telepathy-glib/telepathy-glib-simple-client-factory.html share/gtk-doc/html/telepathy-glib/telepathy-glib-simple-handler.html share/gtk-doc/html/telepathy-glib/telepathy-glib-simple-observer.html +share/gtk-doc/html/telepathy-glib/telepathy-glib-simple-password-manager.html +share/gtk-doc/html/telepathy-glib/telepathy-glib-stream-tube-channel.html +share/gtk-doc/html/telepathy-glib/telepathy-glib-stream-tube-connection.html share/gtk-doc/html/telepathy-glib/telepathy-glib-svc-account-manager.html share/gtk-doc/html/telepathy-glib/telepathy-glib-svc-account.html share/gtk-doc/html/telepathy-glib/telepathy-glib-svc-anonymity.html +share/gtk-doc/html/telepathy-glib/telepathy-glib-svc-channel-auth.html +share/gtk-doc/html/telepathy-glib/telepathy-glib-svc-channel-call.html share/gtk-doc/html/telepathy-glib/telepathy-glib-svc-channel-contactlist.html share/gtk-doc/html/telepathy-glib/telepathy-glib-svc-channel-contactsearch.html share/gtk-doc/html/telepathy-glib/telepathy-glib-svc-channel-dispatch-operation.html share/gtk-doc/html/telepathy-glib/telepathy-glib-svc-channel-dispatcher.html share/gtk-doc/html/telepathy-glib/telepathy-glib-svc-channel-file-transfer.html +share/gtk-doc/html/telepathy-glib/telepathy-glib-svc-channel-ft-metadata.html share/gtk-doc/html/telepathy-glib/telepathy-glib-svc-channel-group.html share/gtk-doc/html/telepathy-glib/telepathy-glib-svc-channel-media.html share/gtk-doc/html/telepathy-glib/telepathy-glib-svc-channel-request.html +share/gtk-doc/html/telepathy-glib/telepathy-glib-svc-channel-room.html share/gtk-doc/html/telepathy-glib/telepathy-glib-svc-channel-roomlist.html +share/gtk-doc/html/telepathy-glib/telepathy-glib-svc-channel-securable.html share/gtk-doc/html/telepathy-glib/telepathy-glib-svc-channel-text.html share/gtk-doc/html/telepathy-glib/telepathy-glib-svc-channel-tube.html share/gtk-doc/html/telepathy-glib/telepathy-glib-svc-channel-tubes.html @@ -228,21 +321,19 @@ share/gtk-doc/html/telepathy-glib/telepathy-glib-svc-connection.html share/gtk-doc/html/telepathy-glib/telepathy-glib-svc-debug.html share/gtk-doc/html/telepathy-glib/telepathy-glib-svc-generic.html share/gtk-doc/html/telepathy-glib/telepathy-glib-svc-media-interfaces.html +share/gtk-doc/html/telepathy-glib/telepathy-glib-svc-protocol.html share/gtk-doc/html/telepathy-glib/telepathy-glib-svc-service-point.html share/gtk-doc/html/telepathy-glib/telepathy-glib-svc-tls.html -share/gtk-doc/html/telepathy-glib/telepathy-glib-svc-protocol.html share/gtk-doc/html/telepathy-glib/telepathy-glib-svc.html +share/gtk-doc/html/telepathy-glib/telepathy-glib-text-channel.html share/gtk-doc/html/telepathy-glib/telepathy-glib-util.html -share/gtk-doc/html/telepathy-glib/telepathy-glib.devhelp share/gtk-doc/html/telepathy-glib/telepathy-glib.devhelp2 share/gtk-doc/html/telepathy-glib/up.png -share/vala-0.12/vapi/telepathy-glib.deps -share/vala-0.12/vapi/telepathy-glib.vapi +share/vala/vapi/telepathy-glib.deps +share/vala/vapi/telepathy-glib.vapi @dirrm share/gtk-doc/html/telepathy-glib @dirrmtry share/gtk-doc/html @dirrmtry share/gtk-doc @dirrm include/telepathy-1.0/telepathy-glib/_gen @dirrm include/telepathy-1.0/telepathy-glib @dirrmtry include/telepathy-1.0 -@dirrmtry lib/girepository-1.0 -@dirrmtry share/gir-1.0 diff --git a/net-im/telepathy-haze/Makefile b/net-im/telepathy-haze/Makefile index 3db35fa9993f..e77616021ad2 100644 --- a/net-im/telepathy-haze/Makefile +++ b/net-im/telepathy-haze/Makefile @@ -1,29 +1,22 @@ -# New ports collection makefile for: telepathy-haze -# Date created: 2007-10-29 -# Whom: Michael Johnson <ahze@FreeBSD.org> -# +# Created by: Michael Johnson <ahze@FreeBSD.org> # $FreeBSD$ -# $MCom: ports/net-im/telepathy-haze/Makefile,v 1.3 2008/03/02 19:50:45 marcus Exp $ +# $MCom: ports/net-im/telepathy-haze/Makefile,v 1.7 2012/06/13 00:59:50 mezz Exp $ -PORTNAME= haze -PORTVERSION= 0.4.0 -PORTREVISION= 5 +PORTNAME= telepathy-haze +PORTVERSION= 0.6.0 CATEGORIES= net-im MASTER_SITES= http://telepathy.freedesktop.org/releases/telepathy-haze/ -PKGNAMEPREFIX= telepathy- -DISTNAME= ${PKGNAMEPREFIX}${PORTNAME}-${PORTVERSION} MAINTAINER= gnome@FreeBSD.org COMMENT= Libpurple connection manager for telepathy BUILD_DEPENDS= xsltproc:${PORTSDIR}/textproc/libxslt -LIB_DEPENDS= purple.10:${PORTSDIR}/net-im/libpurple \ - idn.17:${PORTSDIR}/dns/libidn \ - telepathy-glib.0:${PORTSDIR}/net-im/telepathy-glib +LIB_DEPENDS= purple:${PORTSDIR}/net-im/libpurple \ + idn:${PORTSDIR}/dns/libidn \ + telepathy-glib:${PORTSDIR}/net-im/telepathy-glib -USE_GNOME= pkgconfig CPPFLAGS+= -I${LOCALBASE}/include -WRKSRC= ${WRKDIR}/telepathy-${PORTNAME}-${DISTVERSION} +WRKSRC= ${WRKDIR}/telepathy-${PORTNAME}-${DISTVERSION} GNU_CONFIGURE= yes USE_GMAKE= yes diff --git a/net-im/telepathy-haze/distinfo b/net-im/telepathy-haze/distinfo index 2e64f11d0c9d..29a2001ae072 100644 --- a/net-im/telepathy-haze/distinfo +++ b/net-im/telepathy-haze/distinfo @@ -1,2 +1,2 @@ -SHA256 (telepathy-haze-0.4.0.tar.gz) = f699e4e127d710ab30ac34c60acfdb2b3b7fd19b9c7d4fa6970ac6fe45172353 -SIZE (telepathy-haze-0.4.0.tar.gz) = 465716 +SHA256 (telepathy-haze-0.6.0.tar.gz) = e267c54aef8f85746899e365ae344fe9ec73c1aec04298bedad6a88732ab2fe3 +SIZE (telepathy-haze-0.6.0.tar.gz) = 558413 diff --git a/net-im/telepathy-haze/pkg-plist b/net-im/telepathy-haze/pkg-plist index 37a9a039f8a0..2af48b6c689b 100644 --- a/net-im/telepathy-haze/pkg-plist +++ b/net-im/telepathy-haze/pkg-plist @@ -1,5 +1,2 @@ libexec/telepathy-haze share/dbus-1/services/org.freedesktop.Telepathy.ConnectionManager.haze.service -share/telepathy/managers/haze.manager -@dirrmtry share/telepathy/managers -@dirrmtry share/telepathy diff --git a/net-im/telepathy-idle/Makefile b/net-im/telepathy-idle/Makefile index f3f99eeb3802..7e5aaa63b195 100644 --- a/net-im/telepathy-idle/Makefile +++ b/net-im/telepathy-idle/Makefile @@ -1,47 +1,41 @@ -# New ports collection makefile for: telepathy-idle -# Date created: Apr 19 2007 -# Whom: Florent Thoumie <flz@FreeBSD.org> -# # $FreeBSD$ -# +# $MCom: ports/net-im/telepathy-idle/Makefile,v 1.6 2012/08/17 19:06:45 kwm Exp $ PORTNAME= telepathy-idle -PORTVERSION= 0.1.7 +PORTVERSION= 0.1.11 CATEGORIES= net-im MASTER_SITES= http://telepathy.freedesktop.org/releases/${PORTNAME}/ MAINTAINER= gnome@FreeBSD.org COMMENT= IRC 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 - -BUILD_DEPENDS= ${LIB_PC_DEPENDS:C|^|${LOCALBASE}/libdata/pkgconfig/|g} \ - xsltproc:${PORTSDIR}/textproc/libxslt -RUN_DEPENDS= ${LIB_PC_DEPENDS:C|^|${LOCALBASE}/libdata/pkgconfig/|g} - -LIB_DEPENDS= execinfo.1:${PORTSDIR}/devel/libexecinfo +BUILD_DEPENDS= xsltproc:${PORTSDIR}/textproc/libxslt +LIB_DEPENDS= execinfo:${PORTSDIR}/devel/libexecinfo \ + dbus-glib-1:${PORTSDIR}/devel/dbus-glib \ + telepathy-glib:${PORTSDIR}/net-im/telepathy-glib GNU_CONFIGURE= yes USE_OPENSSL= yes USE_GMAKE= yes -USE_GNOME= gnomehack pkgconfig glib20 +USE_GNOME= gnomehack glib20 +USE_PKGCONFIG= build MAN8= telepathy-idle.8 CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -.include <bsd.port.pre.mk> - -.if defined(WITH_OPENSSL_BASE) +#.if defined(WITH_OPENSSL_BASE) CONFIGURE_ENV+= OPENSSL_LIBS="-L/usr/lib -lssl -lcrypto" OPENSSL_CFLAGS="-I/usr/include" -.endif +#.endif +# OPENSSL_CFLAGS +# C compiler flags for OPENSSL, overriding pkg-config +# OPENSSL_LIBS +# linker flags for OPENSSL, overriding pkg-config post-patch: @${REINPLACE_CMD} -e 's|strnlen(\([^,]*\), [^)]*)|strlen(\1)|' \ ${WRKSRC}/src/idle-connection.c \ ${WRKSRC}/src/idle-parser.c -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/net-im/telepathy-idle/distinfo b/net-im/telepathy-idle/distinfo index 072fbc8430f1..effb00700203 100644 --- a/net-im/telepathy-idle/distinfo +++ b/net-im/telepathy-idle/distinfo @@ -1,2 +1,2 @@ -SHA256 (telepathy-idle-0.1.7.tar.gz) = b65df4f8ebdf1039e1f1e406f53cc7b6106fab6c4d8e784e360709f8d85df0c3 -SIZE (telepathy-idle-0.1.7.tar.gz) = 482415 +SHA256 (telepathy-idle-0.1.11.tar.gz) = 047ccbec0b91ac187467ede5a90966f9ec881df56fd8c80cb3bce3710f66fda0 +SIZE (telepathy-idle-0.1.11.tar.gz) = 505354 diff --git a/net-im/telepathy-idle/files/patch-src_idle-server-connection.c b/net-im/telepathy-idle/files/patch-src_idle-server-connection.c index 1715d87320a8..e69de29bb2d1 100644 --- a/net-im/telepathy-idle/files/patch-src_idle-server-connection.c +++ b/net-im/telepathy-idle/files/patch-src_idle-server-connection.c @@ -1,14 +0,0 @@ ---- src/idle-server-connection.c.orig 2009-02-23 01:02:04.000000000 -0500 -+++ src/idle-server-connection.c 2009-02-23 01:05:04.000000000 -0500 -@@ -28,9 +28,10 @@ - - #include <arpa/inet.h> - #include <fcntl.h> --#include <netinet/tcp.h> - #include <sys/types.h> - #include <sys/socket.h> -+#include <netinet/in.h> -+#include <netinet/tcp.h> - #include <unistd.h> - - #define IDLE_DEBUG_FLAG IDLE_DEBUG_NETWORK diff --git a/net-im/telepathy-logger/Makefile b/net-im/telepathy-logger/Makefile index 39a04c63c5a6..a38da11d3192 100644 --- a/net-im/telepathy-logger/Makefile +++ b/net-im/telepathy-logger/Makefile @@ -1,35 +1,34 @@ -# New ports collection makefile for: telepathy-logger -# Date created: 23 July 2010 -# Whom: Koop Mast <kwm@FreeBSD.org> -# +# Created by: Koop Mast <kwm@FreeBSD.org> # $FreeBSD$ -# $MCom: ports/net-im/telepathy-logger/Makefile,v 1.3 2010/09/01 23:50:23 avl Exp $ +# $MCom: ports/net-im/telepathy-logger/Makefile,v 1.14 2012/08/17 19:06:45 kwm Exp $ PORTNAME= telepathy-logger -PORTVERSION= 0.1.7 +PORTVERSION= 0.4.0 CATEGORIES= net-im MASTER_SITES= http://telepathy.freedesktop.org/releases/${PORTNAME}/ MAINTAINER= gnome@FreeBSD.org COMMENT= Logger utility library for the Telepathy framework -BUILD_DEPENDS= xsltproc:${PORTSDIR}/textproc/libxslt -LIB_DEPENDS= dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \ - xml2.5:${PORTSDIR}/textproc/libxml2 \ - telepathy-glib.0:${PORTSDIR}/net-im/telepathy-glib \ - sqlite3.8:${PORTSDIR}/databases/sqlite3 +BUILD_DEPENDS= g-ir-scanner:${PORTSDIR}/devel/gobject-introspection +LIB_DEPENDS= dbus-glib-1:${PORTSDIR}/devel/dbus-glib \ + telepathy-glib:${PORTSDIR}/net-im/telepathy-glib + +LICENSE= LGPL21 USE_BZIP2= yes USE_AUTOTOOLS= libtool USE_GMAKE= yes USE_LDCONFIG= yes -USE_GNOME= gnomehack pkgconfig glib20 intltool gnomedocutils ltverhack +USE_GNOME= gnomehack glib20 intltool gnomedocutils ltverhack libxml2 \ + libxslt:build +USE_PKGCONFIG= build +USE_SQLITE= yes USE_PYTHON_BUILD= yes -#MAKE_JOBS_UNSAFE= yes GLIB_SCHEMAS= org.freedesktop.Telepathy.Logger.gschema.xml -#post-patch: -# @${REINPLACE_CMD} -e 's|\(^pkgconfigdir =\).*|\1 ${PREFIX}/libdata/pkgconfig|' \ -# ${WRKSRC}/telepathy-glib/Makefile.in +post-patch: + @${REINPLACE_CMD} -e 's|/usr/bin/python|/usr/bin/env python|g' \ + ${WRKSRC}/tools/*.py .include <bsd.port.mk> diff --git a/net-im/telepathy-logger/distinfo b/net-im/telepathy-logger/distinfo index 4e53cd3ef96f..35dcf03c5d53 100644 --- a/net-im/telepathy-logger/distinfo +++ b/net-im/telepathy-logger/distinfo @@ -1,2 +1,2 @@ -SHA256 (telepathy-logger-0.1.7.tar.bz2) = 5466350fee82cbd75194ffe06591a03a75904d15c6b3d4d2db9b005734dd33d1 -SIZE (telepathy-logger-0.1.7.tar.bz2) = 452362 +SHA256 (telepathy-logger-0.4.0.tar.bz2) = 06b5ab0616afd7572a1bbda58e6a9487bb305f69358c85985a8999f26f4465e5 +SIZE (telepathy-logger-0.4.0.tar.bz2) = 523642 diff --git a/net-im/telepathy-logger/pkg-plist b/net-im/telepathy-logger/pkg-plist index 983770d4dd69..874268543d86 100644 --- a/net-im/telepathy-logger/pkg-plist +++ b/net-im/telepathy-logger/pkg-plist @@ -1,18 +1,23 @@ -include/telepathy-logger-0.1/telepathy-logger/entity.h -include/telepathy-logger-0.1/telepathy-logger/entry-text.h -include/telepathy-logger-0.1/telepathy-logger/entry.h -include/telepathy-logger-0.1/telepathy-logger/log-manager.h -include/telepathy-logger-0.1/telepathy-logger/telepathy-logger.h +include/telepathy-logger-0.2/telepathy-logger/call-event.h +include/telepathy-logger-0.2/telepathy-logger/entity.h +include/telepathy-logger-0.2/telepathy-logger/event.h +include/telepathy-logger-0.2/telepathy-logger/log-manager.h +include/telepathy-logger-0.2/telepathy-logger/telepathy-logger.h +include/telepathy-logger-0.2/telepathy-logger/text-event.h +lib/girepository-1.0/TelepathyLogger-0.2.typelib lib/libtelepathy-logger.a lib/libtelepathy-logger.la lib/libtelepathy-logger.so -lib/libtelepathy-logger.so.1 -libdata/pkgconfig/telepathy-logger-0.1.pc +lib/libtelepathy-logger.so.2 +libdata/pkgconfig/telepathy-logger-0.2.pc libexec/telepathy-logger share/dbus-1/services/org.freedesktop.Telepathy.Client.Logger.service share/dbus-1/services/org.freedesktop.Telepathy.Logger.service -share/gtk-doc/html/telepathy-logger/TplEntry.html -share/gtk-doc/html/telepathy-logger/TplEntryText.html +share/gir-1.0/TelepathyLogger-0.2.gir +share/gtk-doc/html/telepathy-logger/TplEntity.html +share/gtk-doc/html/telepathy-logger/TplEvent.html +share/gtk-doc/html/telepathy-logger/TplLogManager.html +share/gtk-doc/html/telepathy-logger/TplTextEvent.html share/gtk-doc/html/telepathy-logger/ch-public.html share/gtk-doc/html/telepathy-logger/home.png share/gtk-doc/html/telepathy-logger/index.html @@ -20,9 +25,6 @@ share/gtk-doc/html/telepathy-logger/index.sgml share/gtk-doc/html/telepathy-logger/left.png share/gtk-doc/html/telepathy-logger/right.png share/gtk-doc/html/telepathy-logger/style.css -share/gtk-doc/html/telepathy-logger/telepathy-logger-TplEntity.html -share/gtk-doc/html/telepathy-logger/telepathy-logger-TplLogManager.html -share/gtk-doc/html/telepathy-logger/telepathy-logger.devhelp share/gtk-doc/html/telepathy-logger/telepathy-logger.devhelp2 share/gtk-doc/html/telepathy-logger/up.png share/telepathy/clients/Logger.client @@ -31,5 +33,5 @@ share/telepathy/clients/Logger.client @dirrm share/gtk-doc/html/telepathy-logger @dirrmtry share/gtk-doc/html @dirrmtry share/gtk-doc -@dirrm include/telepathy-logger-0.1/telepathy-logger -@dirrm include/telepathy-logger-0.1 +@dirrm include/telepathy-logger-0.2/telepathy-logger +@dirrm include/telepathy-logger-0.2 diff --git a/net-im/telepathy-mission-control/Makefile b/net-im/telepathy-mission-control/Makefile index 6386e5f4451e..200774ab47ec 100644 --- a/net-im/telepathy-mission-control/Makefile +++ b/net-im/telepathy-mission-control/Makefile @@ -1,13 +1,9 @@ -# New ports collection makefile for: telepathy-mission-control -# Date created: 2007-10-29 -# Whom: Michael Johnson <ahze@FreeBSD.org> -# +# Created by: Michael Johnson <ahze@FreeBSD.org> # $FreeBSD$ -# $MCom: ports/net-im/telepathy-mission-control/Makefile,v 1.14 2010/09/22 12:13:31 avl Exp $ +# $MCom: ports/net-im/telepathy-mission-control/Makefile,v 1.23 2012/08/17 19:06:46 kwm Exp $ PORTNAME= telepathy-mission-control -PORTVERSION= 5.6.1 -PORTREVISION= 1 +PORTVERSION= 5.12.0 CATEGORIES= net-im devel MASTER_SITES= http://telepathy.freedesktop.org/releases/telepathy-mission-control/ @@ -17,13 +13,13 @@ COMMENT= Telepathy component to apps to abstract details of connection managers LIB_DEPENDS= telepathy.2:${PORTSDIR}/net-im/libtelepathy \ dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib -USE_GNOME= gnomeprefix pkgconfig gconf2 libxslt gnomehack ltverhack +USE_GNOME= gnomeprefix libxslt gnomehack ltverhack USE_AUTOTOOLS= libtool CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib USE_GMAKE= yes USE_LDCONFIG= yes -MAKE_JOBS_UNSAFE=yes +GLIB_SCHEMAS= im.telepathy.MissionControl.FromEmpathy.gschema.xml MAN1= mc-tool.1 mc-wait-for-name.1 MAN8= mission-control-5.8 diff --git a/net-im/telepathy-mission-control/distinfo b/net-im/telepathy-mission-control/distinfo index bdf58c05d156..17624836d670 100644 --- a/net-im/telepathy-mission-control/distinfo +++ b/net-im/telepathy-mission-control/distinfo @@ -1,2 +1,2 @@ -SHA256 (telepathy-mission-control-5.6.1.tar.gz) = 4b3b45eed5e6ffab36957c529ed75e88e0db3b59dc17f2e7288d5c9dd8d0b19a -SIZE (telepathy-mission-control-5.6.1.tar.gz) = 1302051 +SHA256 (telepathy-mission-control-5.12.0.tar.gz) = 660aeb65543e1b029dfde6a895934cb20b766644bae2a68c0030052aa6645e77 +SIZE (telepathy-mission-control-5.12.0.tar.gz) = 1014502 diff --git a/net-im/telepathy-mission-control/pkg-plist b/net-im/telepathy-mission-control/pkg-plist index 2185201acab3..cef8b825d38a 100644 --- a/net-im/telepathy-mission-control/pkg-plist +++ b/net-im/telepathy-mission-control/pkg-plist @@ -3,6 +3,7 @@ bin/mc-wait-for-name include/mission-control-5.5/mission-control-plugins/account-storage.h include/mission-control-5.5/mission-control-plugins/account.h include/mission-control-5.5/mission-control-plugins/dbus-acl.h +include/mission-control-5.5/mission-control-plugins/debug.h include/mission-control-5.5/mission-control-plugins/dispatch-operation-policy.h include/mission-control-5.5/mission-control-plugins/dispatch-operation.h include/mission-control-5.5/mission-control-plugins/loader.h @@ -18,11 +19,10 @@ libdata/pkgconfig/mission-control-plugins.pc libexec/mission-control-5 share/dbus-1/services/org.freedesktop.Telepathy.AccountManager.service share/dbus-1/services/org.freedesktop.Telepathy.MissionControl5.service -share/doc/mission-control-plugins/McpAccountStorage.html +share/doc/mission-control-plugins/McpAccountManager.html share/doc/mission-control-plugins/McpDispatchOperation.html -share/doc/mission-control-plugins/McpDispatchOperationPolicy.html share/doc/mission-control-plugins/McpRequest.html -share/doc/mission-control-plugins/McpRequestPolicy.html +share/doc/mission-control-plugins/annotation-glossary.html share/doc/mission-control-plugins/api-index-full.html share/doc/mission-control-plugins/ch01.html share/doc/mission-control-plugins/ch02.html @@ -32,9 +32,10 @@ share/doc/mission-control-plugins/home.png share/doc/mission-control-plugins/index.html share/doc/mission-control-plugins/index.sgml share/doc/mission-control-plugins/left.png +share/doc/mission-control-plugins/mission-control-plugins-McpAccountStorage.html +share/doc/mission-control-plugins/mission-control-plugins-McpDispatchOperationPolicy.html +share/doc/mission-control-plugins/mission-control-plugins-McpRequestPolicy.html share/doc/mission-control-plugins/mission-control-plugins-Plugin-loader-and-global-functions.html -share/doc/mission-control-plugins/mission-control-plugins-account.html -share/doc/mission-control-plugins/mission-control-plugins.devhelp share/doc/mission-control-plugins/mission-control-plugins.devhelp2 share/doc/mission-control-plugins/object-tree.html share/doc/mission-control-plugins/right.png @@ -43,4 +44,3 @@ share/doc/mission-control-plugins/up.png @dirrm share/doc/mission-control-plugins @dirrm include/mission-control-5.5/mission-control-plugins @dirrm include/mission-control-5.5 -@dirrmtry lib/mission-control-plugins.0 diff --git a/net-im/telepathy-salut/Makefile b/net-im/telepathy-salut/Makefile index 16a4a6c12d11..3e6e39709bb3 100644 --- a/net-im/telepathy-salut/Makefile +++ b/net-im/telepathy-salut/Makefile @@ -1,36 +1,28 @@ -# New ports collection makefile for: telepathy-salut -# Date created: Apr 16 2007 -# Whom: Florent Thoumie <flz@FreeBSD.org> -# # $FreeBSD$ -# $MCom: ports/net-im/telepathy-salut/Makefile,v 1.4 2009/01/08 07:12:15 marcus Exp $ -# +# $MCom: ports/net-im/telepathy-salut/Makefile,v 1.9 2012/08/17 19:06:46 kwm Exp $ PORTNAME= telepathy-salut -PORTVERSION= 0.4.0 +PORTVERSION= 0.8.0 CATEGORIES= net-im MASTER_SITES= http://telepathy.freedesktop.org/releases/${PORTNAME}/ MAINTAINER= gnome@FreeBSD.org COMMENT= Link-local Connection Manager for Telepathy Framework -LIB_PC_DEPENDS= gobject-2.0.pc:${PORTSDIR}/devel/glib20 \ - avahi-glib.pc:${PORTSDIR}/net/avahi-app \ - telepathy-glib.pc:${PORTSDIR}/net-im/telepathy-glib \ - libsoup-2.4.pc:${PORTSDIR}/devel/libsoup - -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} +LIB_DEPENDS= avahi-glib.1:${PORTSDIR}/net/avahi-app \ + telepathy-glib.0:${PORTSDIR}/net-im/telepathy-glib \ + soup-2.4.1:${PORTSDIR}/devel/libsoup GNU_CONFIGURE= yes USE_GMAKE= yes -USE_GNOME= gnomehack pkgconfig +USE_GNOME= gnomehack glib20 libxslt:build +USE_PKGCONFIG= build USE_OPENSSL= yes USE_PYTHON_BUILD= yes -CONFIGURE_ENV= LIBS="${PTHREAD_LIBS}" +USE_SQLITE= 3 +CONFIGURE_ARGS= --disable-Werror --enable-avahi-tests=no CPPFLAGS+= ${PTHREAD_CFLAGS} +LDFLAGS+= ${PTHREAD_LIBS} MAN8= telepathy-salut.8 diff --git a/net-im/telepathy-salut/distinfo b/net-im/telepathy-salut/distinfo index 85e54116a36b..555f29083631 100644 --- a/net-im/telepathy-salut/distinfo +++ b/net-im/telepathy-salut/distinfo @@ -1,2 +1,2 @@ -SHA256 (telepathy-salut-0.4.0.tar.gz) = f87dfe3d1b54243ac4f8eff5ca6aa8b39e9a06be5ad6be79e68599bd324bc9c8 -SIZE (telepathy-salut-0.4.0.tar.gz) = 1174079 +SHA256 (telepathy-salut-0.8.0.tar.gz) = f504faf472e81c17c2707696124d4219fe869c83d7cdbbe53a035eb724bfb5ce +SIZE (telepathy-salut-0.8.0.tar.gz) = 1822511 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 deleted file mode 100644 index 842337118809..000000000000 --- a/net-im/telepathy-salut/files/patch-lib_gibber_gibber-xmpp-connection-listener.c +++ /dev/null @@ -1,10 +0,0 @@ ---- lib/gibber/gibber-xmpp-connection-listener.c.orig 2010-05-20 06:10:39.000000000 -0400 -+++ lib/gibber/gibber-xmpp-connection-listener.c 2010-07-24 20:48:34.000000000 -0400 -@@ -23,6 +23,7 @@ - #include <string.h> - #include <time.h> - #include <sys/types.h> -+#include <netinet/in.h> - #include <unistd.h> - #include <errno.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 deleted file mode 100644 index b27d1b466ebc..000000000000 --- a/net-im/telepathy-salut/files/patch-src_salut-contact.h +++ /dev/null @@ -1,11 +0,0 @@ ---- 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-self.c b/net-im/telepathy-salut/files/patch-src_salut-self.c deleted file mode 100644 index 27bb5b5a7163..000000000000 --- a/net-im/telepathy-salut/files/patch-src_salut-self.c +++ /dev/null @@ -1,10 +0,0 @@ ---- 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-plist b/net-im/telepathy-salut/pkg-plist index fba720fb7c8c..9e7944e82d2e 100644 --- a/net-im/telepathy-salut/pkg-plist +++ b/net-im/telepathy-salut/pkg-plist @@ -1,7 +1,18 @@ +lib/telepathy/salut-0/lib/libsalut-plugins-0.8.0.so +lib/telepathy/salut-0/lib/libsalut-plugins.la +lib/telepathy/salut-0/lib/libsalut-plugins.so +lib/telepathy/salut-0/lib/libwocky-telepathy-salut-0.8.0.so +lib/telepathy/salut-0/lib/libwocky.a +lib/telepathy/salut-0/lib/libwocky.la +lib/telepathy/salut-0/lib/libwocky.so libexec/telepathy-salut -share/telepathy/managers/salut.manager share/dbus-1/services/org.freedesktop.Telepathy.ConnectionManager.salut.service %%DOCSDIR%%/clique.html +share/telepathy/managers/salut.manager @dirrmtry share/telepathy/managers @dirrmtry share/telepathy @dirrm %%DOCSDIR%% +@dirrmtry lib/telepathy/salut-0/plugins +@dirrmtry lib/telepathy/salut-0/lib +@dirrmtry lib/telepathy/salut-0 +@dirrmtry lib/telepathy |