diff options
| -rw-r--r-- | net-im/empathy/Makefile | 14 | ||||
| -rw-r--r-- | net-im/empathy/distinfo | 6 | ||||
| -rw-r--r-- | net-im/empathy/files/patch-configure | 58 | ||||
| -rw-r--r-- | net-im/empathy/pkg-plist | 134 |
4 files changed, 195 insertions, 17 deletions
diff --git a/net-im/empathy/Makefile b/net-im/empathy/Makefile index 7b47bfa1d..2ae25d48f 100644 --- a/net-im/empathy/Makefile +++ b/net-im/empathy/Makefile @@ -3,10 +3,10 @@ # Whom: Michael Johnson <ahze@FreeBSD.org> # # $FreeBSD$ -# $MCom$ +# $MCom: ports/net-im/empathy/Makefile,v 1.66 2010/04/26 23:54:08 kwm Exp $ PORTNAME= empathy -PORTVERSION= 2.31.3 +PORTVERSION= 2.31.90 CATEGORIES= net-im gnome MASTER_SITES= GNOME @@ -19,6 +19,8 @@ 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.12:${PORTSDIR}/net-im/folks \ unique-1.0.2:${PORTSDIR}/x11-toolkits/unique \ canberra-gtk.0:${PORTSDIR}/audio/libcanberra RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes \ @@ -37,11 +39,11 @@ USE_PYTHON= yes MAKE_JOBS_UNSAFE=yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" -CONFIGURE_ARGS= --enable-tpl=no +CONFIGURE_ARGS= --enable-tpl=no --enable-gtk3=no -GCONF_SCHEMAS= empathy.schemas +GLIB_SCHEMAS= org.gnome.Empathy.gschema.xml -MAN1= empathy.1 +MAN1= empathy.1 empathy-accounts.1 OPTIONS= JABBER "Enable jabber (XMPP) client support" on \ MSN "Enable MSN client support" on \ @@ -75,7 +77,7 @@ RUN_DEPENDS+= ${LOCALBASE}/libexec/telepathy-haze:${PORTSDIR}/net-im/telepathy-h .endif .if defined(WITH_WEBKIT) -LIB_DEPENDS+= webkit-1.0.13:${PORTSDIR}/www/webkit-gtk2 +LIB_DEPENDS+= webkitgtk-1.0.13:${PORTSDIR}/www/webkit-gtk2 CONFIGURE_ARGS+=--enable-webkit PLIST_SUB+= ADIUM="" .else diff --git a/net-im/empathy/distinfo b/net-im/empathy/distinfo index 5cc3a61ec..6b0cd6ee9 100644 --- a/net-im/empathy/distinfo +++ b/net-im/empathy/distinfo @@ -1,3 +1,3 @@ -MD5 (empathy-2.31.3.tar.bz2) = b0d654567cf553f125ee2b4b7959ce0c -SHA256 (empathy-2.31.3.tar.bz2) = c5e72ffb3f25ce7d3ab03d5df13f2c1f30ff5f5cd50551c404f62bb0e4dbbece -SIZE (empathy-2.31.3.tar.bz2) = 2685578 +MD5 (empathy-2.31.90.tar.bz2) = 7a7795b8f56b0c8e6e95d17994954535 +SHA256 (empathy-2.31.90.tar.bz2) = 4a0633e12a97ed2c227506f3bcf0ec2696f1ed9847cda5f58320a48138d9c157 +SIZE (empathy-2.31.90.tar.bz2) = 2756095 diff --git a/net-im/empathy/files/patch-configure b/net-im/empathy/files/patch-configure new file mode 100644 index 000000000..bd519ec05 --- /dev/null +++ b/net-im/empathy/files/patch-configure @@ -0,0 +1,58 @@ +--- configure.orig 2010-08-18 15:00:58.000000000 +0200 ++++ configure 2010-08-18 15:04:03.000000000 +0200 +@@ -13408,8 +13408,8 @@ + .SECONDARY: $(gsettings_SCHEMAS) + + gsettings__base_list = \ +- sed "$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g" | \ +- sed "$$!N;$$!N;$$!N;$$!N;s/\n/ /g" ++ sed '\''$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g'\'' | \ ++ sed '\''$$!N;$$!N;$$!N;$$!N;s/\n/ /g'\'' + + install-gsettings-schemas: $(gsettings_SCHEMAS:.xml=.valid) + @$(NORMAL_INSTALL) +@@ -14591,7 +14591,7 @@ + as_fn_error "Could not find gtk3 dependencies." "$LINENO" 5 + fi + +-if test "x$have_gtk3" == "xyes"; then ++if test "x$have_gtk3" = "xyes"; then + # GTK3 specific deps + + pkg_failed=no +@@ -16219,7 +16219,7 @@ + + if test "x$enable_webkit" != "xno"; then + +- if test "x$have_gtk3" == "xno"; then ++ if test "x$have_gtk3" = "xno"; then + + pkg_failed=no + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for WEBKIT" >&5 +@@ -16545,7 +16545,7 @@ + + if test "x$enable_map" != "xno"; then + +- if test "x$have_gtk3" == "xno"; then ++ if test "x$have_gtk3" = "xno"; then + + pkg_failed=no + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBCHAMPLAIN" >&5 +@@ -16936,7 +16936,7 @@ + + + if test "x$enable_nautilus_sendto" != "xno"; then +- if test "x$have_gtk3" == "xno"; then ++ if test "x$have_gtk3" = "xno"; then + # Newer NST requires GTK+3 so we can't use it + + pkg_failed=no +@@ -17156,7 +17156,7 @@ + + if test "x$enable_control_center_embedding" != "xno"; then + +- if test "x$have_gtk3" == "xno"; then ++ if test "x$have_gtk3" = "xno"; then + + pkg_failed=no + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CONTROL_CENTER_EMBEDDING" >&5 diff --git a/net-im/empathy/pkg-plist b/net-im/empathy/pkg-plist index 1dedcf7c8..3f82c2c61 100644 --- a/net-im/empathy/pkg-plist +++ b/net-im/empathy/pkg-plist @@ -4,8 +4,11 @@ bin/empathy-debugger %%NST%%lib/nautilus-sendto/plugins/libnstempathy.a %%NST%%lib/nautilus-sendto/plugins/libnstempathy.la %%NST%%lib/nautilus-sendto/plugins/libnstempathy.so +libexec/empathy-av +share/GConf/gsettings/empathy.convert 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.service %%DATADIR%%/Template.html %%DATADIR%%/codec-preferences @@ -34,7 +37,6 @@ share/dbus-1/services/org.freedesktop.Telepathy.Client.Empathy.service %%DATADIR%%/empathy-ft-manager.ui %%DATADIR%%/empathy-import-dialog.ui %%DATADIR%%/empathy-irc-networks.dtd -%%DATADIR%%/empathy-log-manager.xsl %%DATADIR%%/empathy-log-window.ui %%DATADIR%%/empathy-main-window.ui %%MAP%%%%DATADIR%%/empathy-map-view.ui @@ -66,13 +68,13 @@ share/dbus-1/services/org.freedesktop.Telepathy.Client.Empathy.service %%DATADIR%%/icons/hicolor/16x16/apps/im-sip.png %%DATADIR%%/icons/hicolor/16x16/apps/im-yahoo.png %%DATADIR%%/icons/hicolor/16x16/apps/im-zephyr.png +%%DATADIR%%/icons/hicolor/16x16/status/empathy-pending.png +%%DATADIR%%/icons/hicolor/16x16/status/im-message.png %%DATADIR%%/icons/hicolor/16x16/status/user-available.png %%DATADIR%%/icons/hicolor/16x16/status/user-away.png %%DATADIR%%/icons/hicolor/16x16/status/user-busy.png %%DATADIR%%/icons/hicolor/16x16/status/user-idle.png %%DATADIR%%/icons/hicolor/16x16/status/user-offline.png -%%DATADIR%%/icons/hicolor/16x16/status/empathy-pending.png -%%DATADIR%%/icons/hicolor/16x16/status/im-message.png %%DATADIR%%/icons/hicolor/16x16/status/user-typing.png %%DATADIR%%/icons/hicolor/22x22/actions/im-message-new.png %%DATADIR%%/icons/hicolor/22x22/apps/im-aim.png @@ -87,7 +89,6 @@ share/dbus-1/services/org.freedesktop.Telepathy.Client.Empathy.service %%DATADIR%%/icons/hicolor/22x22/apps/im-jabber.png %%DATADIR%%/icons/hicolor/22x22/apps/im-local-xmpp.png %%DATADIR%%/icons/hicolor/22x22/apps/im-meanwhile.png -%%DATADIR%%/icons/hicolor/22x22/status/im-message.png %%DATADIR%%/icons/hicolor/22x22/apps/im-msn.png %%DATADIR%%/icons/hicolor/22x22/apps/im-mxit.png %%DATADIR%%/icons/hicolor/22x22/apps/im-myspace.png @@ -97,12 +98,13 @@ share/dbus-1/services/org.freedesktop.Telepathy.Client.Empathy.service %%DATADIR%%/icons/hicolor/22x22/apps/im-sip.png %%DATADIR%%/icons/hicolor/22x22/apps/im-yahoo.png %%DATADIR%%/icons/hicolor/22x22/apps/im-zephyr.png +%%DATADIR%%/icons/hicolor/22x22/status/empathy-pending.png +%%DATADIR%%/icons/hicolor/22x22/status/im-message.png %%DATADIR%%/icons/hicolor/22x22/status/user-available.png %%DATADIR%%/icons/hicolor/22x22/status/user-away.png %%DATADIR%%/icons/hicolor/22x22/status/user-busy.png %%DATADIR%%/icons/hicolor/22x22/status/user-idle.png %%DATADIR%%/icons/hicolor/22x22/status/user-offline.png -%%DATADIR%%/icons/hicolor/22x22/status/empathy-pending.png %%DATADIR%%/icons/hicolor/24x24/actions/im-message-new.png %%DATADIR%%/icons/hicolor/24x24/apps/im-aim.png %%DATADIR%%/icons/hicolor/24x24/apps/im-ekiga.png @@ -124,12 +126,12 @@ share/dbus-1/services/org.freedesktop.Telepathy.Client.Empathy.service %%DATADIR%%/icons/hicolor/24x24/apps/im-sip.png %%DATADIR%%/icons/hicolor/24x24/apps/im-yahoo.png %%DATADIR%%/icons/hicolor/24x24/apps/im-zephyr.png +%%DATADIR%%/icons/hicolor/24x24/status/empathy-pending.png %%DATADIR%%/icons/hicolor/24x24/status/user-available.png %%DATADIR%%/icons/hicolor/24x24/status/user-away.png %%DATADIR%%/icons/hicolor/24x24/status/user-busy.png %%DATADIR%%/icons/hicolor/24x24/status/user-idle.png %%DATADIR%%/icons/hicolor/24x24/status/user-offline.png -%%DATADIR%%/icons/hicolor/24x24/status/empathy-pending.png %%DATADIR%%/icons/hicolor/32x32/apps/im-aim.png %%DATADIR%%/icons/hicolor/32x32/apps/im-ekiga.png %%DATADIR%%/icons/hicolor/32x32/apps/im-gadugadu.png @@ -150,12 +152,12 @@ share/dbus-1/services/org.freedesktop.Telepathy.Client.Empathy.service %%DATADIR%%/icons/hicolor/32x32/apps/im-sip.png %%DATADIR%%/icons/hicolor/32x32/apps/im-yahoo.png %%DATADIR%%/icons/hicolor/32x32/apps/im-zephyr.png +%%DATADIR%%/icons/hicolor/32x32/status/empathy-pending.png %%DATADIR%%/icons/hicolor/32x32/status/user-available.png %%DATADIR%%/icons/hicolor/32x32/status/user-away.png %%DATADIR%%/icons/hicolor/32x32/status/user-busy.png %%DATADIR%%/icons/hicolor/32x32/status/user-idle.png %%DATADIR%%/icons/hicolor/32x32/status/user-offline.png -%%DATADIR%%/icons/hicolor/32x32/status/empathy-pending.png %%DATADIR%%/icons/hicolor/48x48/apps/im-aim.png %%DATADIR%%/icons/hicolor/48x48/apps/im-ekiga.png %%DATADIR%%/icons/hicolor/48x48/apps/im-facebook.png @@ -177,12 +179,12 @@ share/dbus-1/services/org.freedesktop.Telepathy.Client.Empathy.service %%DATADIR%%/icons/hicolor/48x48/apps/im-sip.png %%DATADIR%%/icons/hicolor/48x48/apps/im-yahoo.png %%DATADIR%%/icons/hicolor/48x48/apps/im-zephyr.png +%%DATADIR%%/icons/hicolor/48x48/status/empathy-pending.png %%DATADIR%%/icons/hicolor/48x48/status/user-available.png %%DATADIR%%/icons/hicolor/48x48/status/user-away.png %%DATADIR%%/icons/hicolor/48x48/status/user-busy.png %%DATADIR%%/icons/hicolor/48x48/status/user-idle.png %%DATADIR%%/icons/hicolor/48x48/status/user-offline.png -%%DATADIR%%/icons/hicolor/48x48/status/empathy-pending.png %%DATADIR%%/icons/hicolor/icon-theme.cache %%DATADIR%%/icons/hicolor/scalable/apps/im-aim.svg %%DATADIR%%/icons/hicolor/scalable/apps/im-ekiga.svg @@ -706,6 +708,61 @@ share/gnome/help/empathy/fr/set-custom-status.page share/gnome/help/empathy/fr/share-desktop.page share/gnome/help/empathy/fr/status-icons.page share/gnome/help/empathy/fr/video-call.page +share/gnome/help/empathy/gl/account-irc.page +share/gnome/help/empathy/gl/account-jabber.page +share/gnome/help/empathy/gl/accounts-window.page +share/gnome/help/empathy/gl/add-account.page +share/gnome/help/empathy/gl/add-contact.page +share/gnome/help/empathy/gl/audio-call.page +share/gnome/help/empathy/gl/audio-video.page +share/gnome/help/empathy/gl/change-status.page +share/gnome/help/empathy/gl/create-account.page +share/gnome/help/empathy/gl/disable-account.page +share/gnome/help/empathy/gl/favorite-rooms.page +share/gnome/help/empathy/gl/figures/audio-input-microphone.png +share/gnome/help/empathy/gl/figures/available.png +share/gnome/help/empathy/gl/figures/away.png +share/gnome/help/empathy/gl/figures/busy.png +share/gnome/help/empathy/gl/figures/camera-web.png +share/gnome/help/empathy/gl/figures/empathy-logo.png +share/gnome/help/empathy/gl/figures/empathy-main-window.png +share/gnome/help/empathy/gl/figures/gtk-add.png +share/gnome/help/empathy/gl/figures/gtk-edit.png +share/gnome/help/empathy/gl/figures/gtk-remove.png +share/gnome/help/empathy/gl/figures/offline.png +share/gnome/help/empathy/gl/geolocation-not-showing.page +share/gnome/help/empathy/gl/geolocation-privacy.page +share/gnome/help/empathy/gl/geolocation-supported.page +share/gnome/help/empathy/gl/geolocation-turn.page +share/gnome/help/empathy/gl/geolocation-what-is.page +share/gnome/help/empathy/gl/geolocation.page +share/gnome/help/empathy/gl/group-conversations.page +share/gnome/help/empathy/gl/hide-contacts.page +share/gnome/help/empathy/gl/import-account.page +share/gnome/help/empathy/gl/index.page +share/gnome/help/empathy/gl/introduction.page +share/gnome/help/empathy/gl/irc-commands.page +share/gnome/help/empathy/gl/irc-join-pwd.page +share/gnome/help/empathy/gl/irc-join-room.page +share/gnome/help/empathy/gl/irc-manage.page +share/gnome/help/empathy/gl/irc-nick-password.page +share/gnome/help/empathy/gl/irc-send-file.page +share/gnome/help/empathy/gl/irc-start-conversation.page +share/gnome/help/empathy/gl/license.page +share/gnome/help/empathy/gl/prev-conv.page +share/gnome/help/empathy/gl/prob-conn-acctdisabled.page +share/gnome/help/empathy/gl/prob-conn-auth.page +share/gnome/help/empathy/gl/prob-conn-name.page +share/gnome/help/empathy/gl/prob-conn-neterror.page +share/gnome/help/empathy/gl/prob-conn.page +share/gnome/help/empathy/gl/remove-account.page +share/gnome/help/empathy/gl/salut-protocol.page +share/gnome/help/empathy/gl/send-file.page +share/gnome/help/empathy/gl/send-message.page +share/gnome/help/empathy/gl/set-custom-status.page +share/gnome/help/empathy/gl/share-desktop.page +share/gnome/help/empathy/gl/status-icons.page +share/gnome/help/empathy/gl/video-call.page share/gnome/help/empathy/it/account-irc.page share/gnome/help/empathy/it/account-jabber.page share/gnome/help/empathy/it/accounts-window.page @@ -871,6 +928,61 @@ share/gnome/help/empathy/sv/set-custom-status.page share/gnome/help/empathy/sv/share-desktop.page share/gnome/help/empathy/sv/status-icons.page share/gnome/help/empathy/sv/video-call.page +share/gnome/help/empathy/zh_CN/account-irc.page +share/gnome/help/empathy/zh_CN/account-jabber.page +share/gnome/help/empathy/zh_CN/accounts-window.page +share/gnome/help/empathy/zh_CN/add-account.page +share/gnome/help/empathy/zh_CN/add-contact.page +share/gnome/help/empathy/zh_CN/audio-call.page +share/gnome/help/empathy/zh_CN/audio-video.page +share/gnome/help/empathy/zh_CN/change-status.page +share/gnome/help/empathy/zh_CN/create-account.page +share/gnome/help/empathy/zh_CN/disable-account.page +share/gnome/help/empathy/zh_CN/favorite-rooms.page +share/gnome/help/empathy/zh_CN/figures/audio-input-microphone.png +share/gnome/help/empathy/zh_CN/figures/available.png +share/gnome/help/empathy/zh_CN/figures/away.png +share/gnome/help/empathy/zh_CN/figures/busy.png +share/gnome/help/empathy/zh_CN/figures/camera-web.png +share/gnome/help/empathy/zh_CN/figures/empathy-logo.png +share/gnome/help/empathy/zh_CN/figures/empathy-main-window.png +share/gnome/help/empathy/zh_CN/figures/gtk-add.png +share/gnome/help/empathy/zh_CN/figures/gtk-edit.png +share/gnome/help/empathy/zh_CN/figures/gtk-remove.png +share/gnome/help/empathy/zh_CN/figures/offline.png +share/gnome/help/empathy/zh_CN/geolocation-not-showing.page +share/gnome/help/empathy/zh_CN/geolocation-privacy.page +share/gnome/help/empathy/zh_CN/geolocation-supported.page +share/gnome/help/empathy/zh_CN/geolocation-turn.page +share/gnome/help/empathy/zh_CN/geolocation-what-is.page +share/gnome/help/empathy/zh_CN/geolocation.page +share/gnome/help/empathy/zh_CN/group-conversations.page +share/gnome/help/empathy/zh_CN/hide-contacts.page +share/gnome/help/empathy/zh_CN/import-account.page +share/gnome/help/empathy/zh_CN/index.page +share/gnome/help/empathy/zh_CN/introduction.page +share/gnome/help/empathy/zh_CN/irc-commands.page +share/gnome/help/empathy/zh_CN/irc-join-pwd.page +share/gnome/help/empathy/zh_CN/irc-join-room.page +share/gnome/help/empathy/zh_CN/irc-manage.page +share/gnome/help/empathy/zh_CN/irc-nick-password.page +share/gnome/help/empathy/zh_CN/irc-send-file.page +share/gnome/help/empathy/zh_CN/irc-start-conversation.page +share/gnome/help/empathy/zh_CN/license.page +share/gnome/help/empathy/zh_CN/prev-conv.page +share/gnome/help/empathy/zh_CN/prob-conn-acctdisabled.page +share/gnome/help/empathy/zh_CN/prob-conn-auth.page +share/gnome/help/empathy/zh_CN/prob-conn-name.page +share/gnome/help/empathy/zh_CN/prob-conn-neterror.page +share/gnome/help/empathy/zh_CN/prob-conn.page +share/gnome/help/empathy/zh_CN/remove-account.page +share/gnome/help/empathy/zh_CN/salut-protocol.page +share/gnome/help/empathy/zh_CN/send-file.page +share/gnome/help/empathy/zh_CN/send-message.page +share/gnome/help/empathy/zh_CN/set-custom-status.page +share/gnome/help/empathy/zh_CN/share-desktop.page +share/gnome/help/empathy/zh_CN/status-icons.page +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 @@ -928,6 +1040,7 @@ share/locale/ms/LC_MESSAGES/empathy.mo share/locale/nb/LC_MESSAGES/empathy.mo share/locale/ne/LC_MESSAGES/empathy.mo share/locale/nl/LC_MESSAGES/empathy.mo +share/locale/nn/LC_MESSAGES/empathy.mo share/locale/oc/LC_MESSAGES/empathy.mo share/locale/or/LC_MESSAGES/empathy.mo share/locale/pa/LC_MESSAGES/empathy.mo @@ -952,15 +1065,20 @@ share/locale/vi/LC_MESSAGES/empathy.mo share/locale/zh_CN/LC_MESSAGES/empathy.mo 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.client @dirrmtry share/telepathy/clients @dirrmtry share/telepathy +@dirrm share/gnome/help/empathy/zh_CN/figures +@dirrm share/gnome/help/empathy/zh_CN @dirrm share/gnome/help/empathy/sv/figures @dirrm share/gnome/help/empathy/sv @dirrm share/gnome/help/empathy/ru/figures @dirrm share/gnome/help/empathy/ru @dirrm share/gnome/help/empathy/it/figures @dirrm share/gnome/help/empathy/it +@dirrm share/gnome/help/empathy/gl/figures +@dirrm share/gnome/help/empathy/gl @dirrm share/gnome/help/empathy/fr/figures @dirrm share/gnome/help/empathy/fr @dirrm share/gnome/help/empathy/fi/figures |