Date: Fri, 11 Apr 2014 12:13:13 +0000 (UTC) From: Baptiste Daroussin <bapt@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r350929 - head/net-im/empathy Message-ID: <201404111213.s3BCDDkb018766@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bapt Date: Fri Apr 11 12:13:13 2014 New Revision: 350929 URL: http://svnweb.freebsd.org/changeset/ports/350929 QAT: https://qat.redports.org/buildarchive/r350929/ Log: Support stage Remove NST option USES=libtool to reduce overlinking Modified: head/net-im/empathy/Makefile head/net-im/empathy/pkg-plist Modified: head/net-im/empathy/Makefile ============================================================================== --- head/net-im/empathy/Makefile Fri Apr 11 12:03:51 2014 (r350928) +++ head/net-im/empathy/Makefile Fri Apr 11 12:13:13 2014 (r350929) @@ -4,7 +4,7 @@ PORTNAME= empathy PORTVERSION= 2.34.0 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= net-im gnome MASTER_SITES= GNOME @@ -14,28 +14,27 @@ COMMENT= GNOME IM client based around te 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:${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 +LIB_DEPENDS= libenchant.so:${PORTSDIR}/textproc/enchant \ + libtelepathy.so:${PORTSDIR}/net-im/libtelepathy \ + libtelepathy-glib.so:${PORTSDIR}/net-im/telepathy-glib \ + libtelepathy-farsight.so:${PORTSDIR}/net-im/telepathy-farsight \ + libtelepathy-logger.so:${PORTSDIR}/net-im/telepathy-logger \ + libfolks-telepathy.so:${PORTSDIR}/net-im/folks04 \ + libunique-1.0.so:${PORTSDIR}/x11-toolkits/unique \ + libnotify.so:${PORTSDIR}/devel/libnotify \ + libgcr.so:${PORTSDIR}/security/gnome-keyring \ + libcanberra-gtk.so:${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_BZIP2= yes -USES= gettext gmake pkgconfig +USES= gettext gmake libtool pathfix pkgconfig tar:bzip2 USE_LDCONFIG= yes -USE_GNOME= evolutiondataserver gnomehack gnomeprefix pygtk2 ltverhack +USE_GNOME= evolutiondataserver gnomeprefix pygtk2 +GNU_CONFIGURE= yes USE_GSTREAMER= yes -USE_AUTOTOOLS= libtool INSTALLS_OMF= yes INSTALLS_ICONS= yes USE_PYTHON= yes @@ -43,22 +42,19 @@ MAKE_JOBS_UNSAFE=yes CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ARGS= --disable-Werror \ - --with-ca-file=${LOCALBASE}/share/certs/ca-root-nss.crt + --with-ca-file=${LOCALBASE}/share/certs/ca-root-nss.crt \ + --enable-nautilus-sendto=no GLIB_SCHEMAS= org.gnome.Empathy.gschema.xml -MAN1= empathy.1 empathy-accounts.1 - -OPTIONS_DEFINE= JABBER MSN IRC SALUT HAZE WEBKIT NST MAP -OPTIONS_DEFAULT=JABBER MSN IRC WEBKIT NST MAP +OPTIONS_DEFINE= JABBER MSN IRC SALUT HAZE WEBKIT MAP +OPTIONS_DEFAULT=JABBER MSN IRC WEBKIT 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 -NO_STAGE= yes .include <bsd.port.options.mk> .if ${PORT_OPTIONS:MJABBER} @@ -82,7 +78,7 @@ RUN_DEPENDS+= ${LOCALBASE}/libexec/telep .endif .if ${PORT_OPTIONS:MWEBKIT} -LIB_DEPENDS+= webkitgtk-1.0:${PORTSDIR}/www/webkit-gtk2 +LIB_DEPENDS+= libwebkitgtk-1.0.so:${PORTSDIR}/www/webkit-gtk2 CONFIGURE_ARGS+=--enable-webkit PLIST_SUB+= ADIUM="" .else @@ -90,19 +86,9 @@ CONFIGURE_ARGS+=--disable-webkit PLIST_SUB+= ADIUM="@comment " .endif -.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 -PLIST_SUB+= NST="" -.else -CONFIGURE_ARGS+=--enable-nautilus-sendto=no -PLIST_SUB+= NST="@comment " -.endif - .if ${PORT_OPTIONS:MMAP} USE_GL= gl -LIB_DEPENDS+= champlain-0.8:${PORTSDIR}/graphics/libchamplain +LIB_DEPENDS+= libchamplain-0.8.so:${PORTSDIR}/graphics/libchamplain CONFIGURE_ARGS+=--enable-map PLIST_SUB+= MAP="" .else Modified: head/net-im/empathy/pkg-plist ============================================================================== --- head/net-im/empathy/pkg-plist Fri Apr 11 12:03:51 2014 (r350928) +++ head/net-im/empathy/pkg-plist Fri Apr 11 12:13:13 2014 (r350929) @@ -1,11 +1,10 @@ bin/empathy bin/empathy-accounts 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-auth-client libexec/empathy-av +man/man1/empathy-accounts.1.gz +man/man1/empathy.1.gz share/GConf/gsettings/empathy.convert share/applications/empathy-accounts.desktop share/applications/empathy.desktop @@ -1222,6 +1221,8 @@ share/telepathy/clients/Empathy.client @dirrmtry share/locale/mai @dirrmtry share/locale/ku/LC_MESSAGES @dirrmtry share/locale/ku +@dirrmtry share/locale/kk/LC_MESSAGES +@dirrmtry share/locale/kk @dirrmtry share/locale/en@shaw/LC_MESSAGES @dirrmtry share/locale/en@shaw @dirrmtry share/locale/dz/LC_MESSAGES
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201404111213.s3BCDDkb018766>