Date: Thu, 26 Jun 2014 16:29:24 +0000 (UTC) From: Olivier Duchateau <olivierd@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r359389 - head/x11-fm/thunar Message-ID: <201406261629.s5QGTOcB079725@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: olivierd Date: Thu Jun 26 16:29:23 2014 New Revision: 359389 URL: http://svnweb.freebsd.org/changeset/ports/359389 QAT: https://qat.redports.org/buildarchive/r359389/ Log: - Switch to USES= libtool - Add LICENSE* - Remove DBUS option, now dbus-glib is in LIB_DEPENDS - Bump PORTREVISION Modified: head/x11-fm/thunar/Makefile head/x11-fm/thunar/pkg-plist Modified: head/x11-fm/thunar/Makefile ============================================================================== --- head/x11-fm/thunar/Makefile Thu Jun 26 16:29:09 2014 (r359388) +++ head/x11-fm/thunar/Makefile Thu Jun 26 16:29:23 2014 (r359389) @@ -3,7 +3,7 @@ PORTNAME= Thunar PORTVERSION= 1.6.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-fm xfce MASTER_SITES= ${MASTER_SITE_XFCE} MASTER_SITE_SUBDIR= src/xfce/${PORTNAME:tl}/${PORTVERSION:R} @@ -12,7 +12,12 @@ DIST_SUBDIR= xfce4 MAINTAINER= xfce@FreeBSD.org COMMENT= Xfce file manager -LIB_DEPENDS= libtumbler-1.so:${PORTSDIR}/deskutils/xfce4-tumbler +LICENSE= GPLv2 LGPL20 +LICENSE_COMB= multi +LICENSE_FILE= ${WRKSRC}/COPYING ${WRKSRC}/COPYING.LIB + +LIB_DEPENDS= libtumbler-1.so:${PORTSDIR}/deskutils/xfce4-tumbler \ + libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib GNU_CONFIGURE= yes INSTALLS_ICONS= yes @@ -20,12 +25,13 @@ USE_GNOME= gtk20 intltool intlhack gdkpi USE_LDCONFIG= yes USE_XFCE= configenv libexo libmenu libutil USE_XORG= sm x11 -USES= desktop-file-utils gmake pathfix perl5 pkgconfig tar:bzip2 +USES= desktop-file-utils gmake pathfix perl5 libtool pkgconfig \ + tar:bzip2 -OPTIONS_DEFINE= DBUS DOCS GVFS NLS NOTIFY STARTUP +OPTIONS_DEFINE= DOCS GVFS NLS NOTIFY STARTUP OPTIONS_GROUP= PLUGINS OPTIONS_GROUP_PLUGINS= PLUG_APR PLUG_SBR PLUG_TPA PLUG_UCA PLUG_WALL -OPTIONS_DEFAULT= DBUS GVFS NOTIFY PLUG_APR PLUG_SBR PLUG_UCA PLUG_WALL STARTUP +OPTIONS_DEFAULT= GVFS NOTIFY PLUG_APR PLUG_SBR PLUG_UCA PLUG_WALL STARTUP # Override NOTIFY_DESC NOTIFY_DESC= Display notifications @@ -37,19 +43,11 @@ PLUG_UCA_DESC= User Customizable Actions PLUG_WALL_DESC= Wallpaper plugin CONFIGURE_ARGS+=--enable-gio-unix \ - --disable-gudev + --disable-gudev \ + --enable-dbus .include <bsd.port.options.mk> -.if ${PORT_OPTIONS:MDBUS} -LIB_DEPENDS+= libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib -CONFIGURE_ARGS+=--enable-dbus -PLIST_SUB+= WITH_DBUS="" -.else -CONFIGURE_ARGS+=--disable-dbus -PLIST_SUB+= WITH_DBUS="@comment " -.endif - .if ${PORT_OPTIONS:MNLS} USES+= gettext CONFIGURE_ARGS+=--enable-nls Modified: head/x11-fm/thunar/pkg-plist ============================================================================== --- head/x11-fm/thunar/pkg-plist Thu Jun 26 16:29:09 2014 (r359388) +++ head/x11-fm/thunar/pkg-plist Thu Jun 26 16:29:23 2014 (r359389) @@ -15,18 +15,13 @@ include/thunarx-2/thunarx/thunarx-rename include/thunarx-2/thunarx/thunarx.h lib/Thunar/ThunarBulkRename lib/Thunar/thunar-sendto-email -lib/libthunarx-2.la lib/libthunarx-2.so lib/libthunarx-2.so.0 -%%PLUGIN_APR%%lib/thunarx-2/thunar-apr.la +lib/libthunarx-2.so.0.0.0 %%PLUGIN_APR%%lib/thunarx-2/thunar-apr.so -%%PLUGIN_SBR%%lib/thunarx-2/thunar-sbr.la %%PLUGIN_SBR%%lib/thunarx-2/thunar-sbr.so -%%PLUGIN_UCA%%lib/thunarx-2/thunar-uca.la %%PLUGIN_UCA%%lib/thunarx-2/thunar-uca.so -%%PLUGIN_WALL%%lib/thunarx-2/thunar-wallpaper-plugin.la %%PLUGIN_WALL%%lib/thunarx-2/thunar-wallpaper-plugin.so -%%PLUGIN_TPA%%lib/xfce4/panel/plugins/libthunar-tpa.la %%PLUGIN_TPA%%lib/xfce4/panel/plugins/libthunar-tpa.so libdata/pkgconfig/thunarx-2.pc man/man1/Thunar.1.gz @@ -35,8 +30,8 @@ share/applications/Thunar-bulk-rename.de share/applications/Thunar-folder-handler.desktop share/applications/Thunar.desktop share/applications/thunar-settings.desktop -%%WITH_DBUS%%share/dbus-1/services/org.xfce.FileManager.service -%%WITH_DBUS%%share/dbus-1/services/org.xfce.Thunar.service +share/dbus-1/services/org.xfce.FileManager.service +share/dbus-1/services/org.xfce.Thunar.service %%DOCSDIR%%/README.gtkrc %%DOCSDIR%%/README.thunarrc %%APIDOCS%%share/gtk-doc/html/thunarx/ThunarxFileInfo.html @@ -148,12 +143,8 @@ share/pixmaps/Thunar/Thunar-about-logo.p %%NLS%%@dirrmtry share/locale/ug %%NLS%%@dirrmtry share/locale/te/LC_MESSAGES %%NLS%%@dirrmtry share/locale/te -%%NLS%%@dirrmtry share/locale/sk/LC_MESSAGES -%%NLS%%@dirrmtry share/locale/sk %%NLS%%@dirrmtry share/locale/si/LC_MESSAGES %%NLS%%@dirrmtry share/locale/si -%%NLS%%@dirrmtry share/locale/sr/LC_MESSAGES -%%NLS%%@dirrmtry share/locale/sr %%NLS%%@dirrmtry share/locale/kk/LC_MESSAGES %%NLS%%@dirrmtry share/locale/kk %%NLS%%@dirrmtry share/locale/ast/LC_MESSAGES
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201406261629.s5QGTOcB079725>