svn commit: r380565 - in head: . Mk Mk/Uses archivers/squeeze archivers/thunar-archive-plugin audio/thunar-media-tags-plugin audio/xfce4-mixer audio/xfce4-mpc-plugin audio/xfmpc deskutils/orage des...

Thu Mar 5 22:52:39 UTC 2015

Author: olivierd
Date: Thu Mar  5 22:52:30 2015
New Revision: 380565
URL: https://svnweb.freebsd.org/changeset/ports/380565
QAT: https://qat.redports.org/buildarchive/r380565/

Log:
  The FreeBSD Xfce team proudly presents Xfce 4.12.
  
  Announce: http://www.xfce.org/about/news/?post=1425081600
  
  Global changes:
  - Switch to USES= xfce (D677)
  - Reorganize options helper
  - Fix USES= gettext-* when NLS option is not set [1], [2]
  - Add LICENSE (when missing)
  
  Update:
  - to 4.12 (core components)
  - audio/xfce4-mpc-plugin to 0.4.5
  - deskutils/xfce4-tumbler to 0.1.31
  - deskutils/xfce4-xkb-plugin to 0.7.1
  - editors/mousepad to 0.4.0
  - graphics/ristretto to 0.8.0
  - multimedia/xfce4-parole to 0.8.0
  - sysutils/garcon to 0.4.0
  - sysutils/xfce4-diskperf-plugin to 2.5.5 [3]
  - sysutils/xfce4-fsguard-plugin to 1.0.2
  - sysutils/xfce4-power-manager to 1.4.3
  - sysutils/xfce4-wavelan-plugin to 0.5.12
  - x11/libexo to 0.10.3
  - x11-fm/thunar to 1.6.6
  - x11-themes/gtk-xfce-engine to 3.2.0
  
  PR:		196003 [1], 197251 [2], 198132
  Differential Revision:	https://reviews.freebsd.org/D677
  Submitted by:	Kamil Szczesny [1], amdmi3@ [2], myself
  Exp-run by:	antoine@
  Approved by:	danilo@ (maintainer) [3]
  Tested by:	Ivan <enitarzi at gmail.com>

Added:
  head/Mk/Uses/xfce.mk
     - copied, changed from r380549, head/Mk/bsd.xfce.mk
  head/sysutils/xfce4-power-manager/files/patch-config.h.in   (contents, props changed)
  head/sysutils/xfce4-power-manager/files/patch-configure   (contents, props changed)
  head/sysutils/xfce4-power-manager/files/patch-panel-plugins_power-manager-plugin_xfce_xfce-power-manager-plugin.c   (contents, props changed)
  head/sysutils/xfce4-power-manager/files/patch-src_xfpm-power.c   (contents, props changed)
  head/x11-toolkits/libxfce4gui/files/patch-libxfcegui4__xfce-exec.c   (contents, props changed)
Deleted:
  head/Mk/bsd.xfce.mk
  head/editors/mousepad/files/
  head/sysutils/xfce4-diskperf-plugin/files/
  head/sysutils/xfce4-power-manager/files/patch-src__xfpm-battery.c
  head/sysutils/xfce4-power-manager/files/patch-src__xfpm-battery.h
  head/sysutils/xfce4-power-manager/files/patch-src__xfpm-power.c
  head/sysutils/xfce4-settings/files/patch-dialogs__appearance-settings__appearance-install-theme
  head/x11-fm/thunar/files/patch-thunar_thunar-launcher.c
  head/x11-fm/thunar/files/patch-thunar_thunar-location-buttons.c
  head/x11-fm/thunar/files/patch-thunar_thunar-standard-view.c
  head/x11-fm/thunar/files/patch-thunar_thunar-templates-action.c
  head/x11-fm/thunar/files/patch-thunar_thunar-tree-view.c
  head/x11-fm/thunar/files/patch-thunar_thunar-window.c
  head/x11-wm/xfce4-desktop/files/
  head/x11-wm/xfce4-panel/files/patch-plugins_actions_actions.c
  head/x11-wm/xfce4-session/files/patch-xfce4-session_xfsm-shutdown-helper.c
  head/x11-wm/xfce4-wm/files/extrapatch-src__events.c
  head/x11-wm/xfce4-wm/files/patch-src__client.c
  head/x11/libxfce4menu/files/patch-libxfce4kbd-private__xfce-shortcut-dialog.c
  head/x11/libxfce4menu/files/patch-libxfce4kbd-private__xfce-shortcuts-grabber.c
  head/x11/xfce4-conf/files/patch-xfconf__xfconf-cache.c
Modified:
  head/CHANGES
  head/UPDATING
  head/archivers/squeeze/Makefile
  head/archivers/squeeze/pkg-plist
  head/archivers/thunar-archive-plugin/Makefile
  head/audio/thunar-media-tags-plugin/Makefile
  head/audio/xfce4-mixer/Makefile
  head/audio/xfce4-mpc-plugin/Makefile
  head/audio/xfce4-mpc-plugin/distinfo
  head/audio/xfce4-mpc-plugin/pkg-plist
  head/audio/xfmpc/Makefile
  head/deskutils/orage/Makefile
  head/deskutils/xfce4-generic-slider/Makefile
  head/deskutils/xfce4-notes-plugin/Makefile
  head/deskutils/xfce4-notes-plugin/pkg-plist
  head/deskutils/xfce4-notification-daemon/Makefile
  head/deskutils/xfce4-notifyd/Makefile
  head/deskutils/xfce4-tumbler/Makefile
  head/deskutils/xfce4-tumbler/distinfo
  head/deskutils/xfce4-tumbler/files/patch-tumblerd__tumbler.rc
  head/deskutils/xfce4-tumbler/pkg-plist
  head/deskutils/xfce4-volumed-pulse/Makefile
  head/deskutils/xfce4-volumed/Makefile
  head/deskutils/xfce4-xkb-plugin/Makefile
  head/deskutils/xfce4-xkb-plugin/distinfo
  head/deskutils/xfce4-xkb-plugin/pkg-descr
  head/deskutils/xfce4-xkb-plugin/pkg-plist
  head/devel/thunar-vcs-plugin/Makefile
  head/devel/xfce4-dev-tools/Makefile
  head/devel/xfce4-dev-tools/distinfo
  head/devel/xfce4-dev-tools/pkg-descr
  head/devel/xfce4-vala/Makefile
  head/editors/mousepad/Makefile
  head/editors/mousepad/distinfo
  head/editors/mousepad/pkg-descr
  head/editors/mousepad/pkg-plist
  head/graphics/ristretto/Makefile
  head/graphics/ristretto/distinfo
  head/graphics/ristretto/pkg-plist
  head/mail/xfce4-mailwatch-plugin/Makefile
  head/misc/xfce4-appfinder/Makefile
  head/misc/xfce4-appfinder/distinfo
  head/misc/xfce4-appfinder/pkg-descr
  head/misc/xfce4-appfinder/pkg-plist
  head/misc/xfce4-weather-plugin/Makefile
  head/multimedia/xfce4-parole/Makefile
  head/multimedia/xfce4-parole/distinfo
  head/multimedia/xfce4-parole/pkg-plist
  head/print/xfce4-print/Makefile
  head/science/xfce4-equake-plugin/Makefile
  head/sysutils/garcon/Makefile
  head/sysutils/garcon/distinfo
  head/sysutils/garcon/pkg-plist
  head/sysutils/gigolo/Makefile
  head/sysutils/xfburn/Makefile
  head/sysutils/xfce4-battery-plugin/Makefile
  head/sysutils/xfce4-bsdcpufreq-plugin/Makefile
  head/sysutils/xfce4-diskperf-plugin/Makefile
  head/sysutils/xfce4-diskperf-plugin/distinfo
  head/sysutils/xfce4-diskperf-plugin/pkg-plist
  head/sysutils/xfce4-fsguard-plugin/Makefile
  head/sysutils/xfce4-fsguard-plugin/distinfo
  head/sysutils/xfce4-fsguard-plugin/pkg-plist
  head/sysutils/xfce4-genmon-plugin/Makefile
  head/sysutils/xfce4-minicmd-plugin/Makefile
  head/sysutils/xfce4-minicmd-plugin/pkg-plist
  head/sysutils/xfce4-mount-plugin/Makefile
  head/sysutils/xfce4-netload-plugin/Makefile
  head/sysutils/xfce4-power-manager/Makefile
  head/sysutils/xfce4-power-manager/distinfo
  head/sysutils/xfce4-power-manager/pkg-plist
  head/sysutils/xfce4-settings/Makefile
  head/sysutils/xfce4-settings/distinfo
  head/sysutils/xfce4-settings/pkg-descr
  head/sysutils/xfce4-settings/pkg-plist
  head/sysutils/xfce4-systemload-plugin/Makefile
  head/sysutils/xfce4-systemload-plugin/pkg-descr
  head/sysutils/xfce4-wavelan-plugin/Makefile
  head/sysutils/xfce4-wavelan-plugin/distinfo
  head/sysutils/xfce4-wavelan-plugin/pkg-plist
  head/textproc/xfce4-dict-plugin/Makefile
  head/www/xfce4-smartbookmark-plugin/Makefile
  head/www/xfce4-smartbookmark-plugin/pkg-plist
  head/x11-clocks/xfce4-datetime-plugin/Makefile
  head/x11-clocks/xfce4-timer-out-plugin/Makefile
  head/x11-clocks/xfce4-timer-plugin/Makefile
  head/x11-fm/thunar-vfs/Makefile
  head/x11-fm/thunar-vfs/pkg-plist
  head/x11-fm/thunar/Makefile
  head/x11-fm/thunar/distinfo
  head/x11-fm/thunar/pkg-plist
  head/x11-themes/gtk-xfce-engine/Makefile
  head/x11-themes/gtk-xfce-engine/distinfo
  head/x11-themes/gtk-xfce-engine/pkg-descr
  head/x11-themes/gtk-xfce-engine/pkg-plist
  head/x11-toolkits/libxfce4gui/Makefile
  head/x11-toolkits/libxfce4gui/pkg-descr
  head/x11-toolkits/libxfce4gui/pkg-plist
  head/x11-wm/xfce4-desktop/Makefile
  head/x11-wm/xfce4-desktop/distinfo
  head/x11-wm/xfce4-desktop/pkg-descr
  head/x11-wm/xfce4-desktop/pkg-plist
  head/x11-wm/xfce4-panel/Makefile
  head/x11-wm/xfce4-panel/distinfo
  head/x11-wm/xfce4-panel/pkg-plist
  head/x11-wm/xfce4-session/Makefile
  head/x11-wm/xfce4-session/distinfo
  head/x11-wm/xfce4-session/pkg-descr
  head/x11-wm/xfce4-session/pkg-plist
  head/x11-wm/xfce4-wm/Makefile
  head/x11-wm/xfce4-wm/distinfo
  head/x11-wm/xfce4-wm/pkg-descr
  head/x11-wm/xfce4-wm/pkg-plist
  head/x11-wm/xfce4/Makefile
  head/x11/libexo/Makefile
  head/x11/libexo/distinfo
  head/x11/libexo/pkg-plist
  head/x11/libxfce4menu/Makefile
  head/x11/libxfce4menu/distinfo
  head/x11/libxfce4menu/pkg-descr
  head/x11/libxfce4menu/pkg-plist
  head/x11/libxfce4util/Makefile
  head/x11/libxfce4util/distinfo
  head/x11/libxfce4util/pkg-plist
  head/x11/xfce4-clipman-plugin/Makefile
  head/x11/xfce4-conf/Makefile
  head/x11/xfce4-conf/distinfo
  head/x11/xfce4-conf/pkg-plist
  head/x11/xfce4-dashboard/Makefile
  head/x11/xfce4-embed-plugin/Makefile
  head/x11/xfce4-quicklauncher-plugin/Makefile
  head/x11/xfce4-screenshooter-plugin/Makefile
  head/x11/xfce4-terminal/Makefile
  head/x11/xfce4-verve-plugin/Makefile
  head/x11/xfce4-whiskermenu-plugin/Makefile
  head/x11/xfce4-wmdock-plugin/Makefile

Modified: head/CHANGES
==============================================================================

--- head/CHANGES	Thu Mar  5 22:47:38 2015	(r380564)
+++ head/CHANGES	Thu Mar  5 22:52:30 2015	(r380565)
@@ -10,6 +10,12 @@ in the release notes and/or placed into 
 
 All ports committers are allowed to commit to this file.
 
+20150305:
+  AUTHOR: olivierd at FreeBSD.org
+
+  Dependencies on the Xfce ports have been migrated to USES. Instead
+  of USE_XFCE= configenv, you should use USES= xfce.
+
 20150224:
   AUTHOR: makc at FreeBSD.org
 

Copied and modified: head/Mk/Uses/xfce.mk (from r380549, head/Mk/bsd.xfce.mk)
==============================================================================
--- head/Mk/bsd.xfce.mk	Thu Mar  5 19:47:11 2015	(r380549, copy source)
+++ head/Mk/Uses/xfce.mk	Thu Mar  5 22:52:30 2015	(r380565)
@@ -1,72 +1,105 @@
 #
 # $FreeBSD$
 #
+# Provide support for Xfce related ports.
+#
+# Feature:	xfce
+# Usage:	USES=xfce or USES=xfce:ARGS
+# Valid ARGS:	gtk3
+#
+# Variables, which can be set by the port:
+#
+# MASTER_SITE_SUBDIR	Path
+# USE_XFCE		List of components
+#
+# MAINTAINER: xfce at FreeBSD.org
 
-.if !defined(_POSTMKINCLUDED) && !defined(Xfce_Pre_Include)
-
-Xfce_Pre_Include=		bsd.xfce.mk
-Xfce_Include_MAINTAINER=	xfce at FreeBSD.org
+.if !defined(_INCLUDE_USES_XFCE_Mk)
+_INCLUDE_USES_XFCE_Mk=	yes
+_USES_POST+=	xfce
 
-# This file contains some variable definitions that are supposed to
-# make your life easier when dealing with ports related to the Xfce
-# desktop environment. It's automatically included when USE_XFCE
-# is defined in the ports' makefile.
+_USE_XFCE_ALL=	garcon libexo libgui libmenu libutil panel thunar xfconf
 
-_USE_XFCE_ALL=			configenv garcon libexo libgui libmenu libutil panel \
-				thunar wm xfconf xfdev
+MASTER_SITE_SUBDIR?=	xfce/4.12/src
 
-MASTER_SITE_SUBDIR?=		xfce/4.10/src
+xfce_ARGS?=	# empty
 
-configenv_CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include -L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LIBS+=	-L${LOCALBASE}/lib
 
-garcon_BUILD_DEPENDS=		garcon>=0.2.1:${PORTSDIR}/sysutils/garcon
-garcon_RUN_DEPENDS=		garcon>=0.2.1:${PORTSDIR}/sysutils/garcon
+garcon_LIB_DEPENDS=	libgarcon-1.so:${PORTSDIR}/sysutils/garcon
+garcon_USE_XFCE_REQ=	libmenu
 
-libexo_BUILD_DEPENDS=		libexo>=0.10.1:${PORTSDIR}/x11/libexo
-libexo_RUN_DEPENDS=		libexo>=0.10.1:${PORTSDIR}/x11/libexo
+libexo_LIB_DEPENDS=	libexo-1.so:${PORTSDIR}/x11/libexo
+libexo_USE_XFCE_REQ=	libmenu
 
-libgui_BUILD_DEPENDS=		libxfce4gui>=4.10.0:${PORTSDIR}/x11-toolkits/libxfce4gui
-libgui_RUN_DEPENDS=		libxfce4gui>=4.10.0:${PORTSDIR}/x11-toolkits/libxfce4gui
+libgui_LIB_DEPENDS=	libxfcegui4.so:${PORTSDIR}/x11-toolkits/libxfce4gui
+libgui_USE_XFCE_REQ=	libutil
 
-libmenu_BUILD_DEPENDS=		libxfce4menu>=4.10.0:${PORTSDIR}/x11/libxfce4menu
-libmenu_RUN_DEPENDS=		libxfce4menu>=4.10.0:${PORTSDIR}/x11/libxfce4menu
+libmenu_LIB_DEPENDS=	libxfce4ui-1.so:${PORTSDIR}/x11/libxfce4menu
+libmenu_USE_XFCE_REQ=	xfconf
 
-libutil_BUILD_DEPENDS=		libxfce4util>=4.10.1:${PORTSDIR}/x11/libxfce4util
-libutil_RUN_DEPENDS=		libxfce4util>=4.10.1:${PORTSDIR}/x11/libxfce4util
+libutil_LIB_DEPENDS=	libxfce4util.so:${PORTSDIR}/x11/libxfce4util
 
-panel_BUILD_DEPENDS=		xfce4-panel>=4.10.1:${PORTSDIR}/x11-wm/xfce4-panel
-panel_RUN_DEPENDS=		xfce4-panel>=4.10.1:${PORTSDIR}/x11-wm/xfce4-panel
+panel_LIB_DEPENDS=	libxfce4panel-1.0.so:${PORTSDIR}/x11-wm/xfce4-panel
+panel_RUN_DEPENDS=	xfce4-panel:${PORTSDIR}/x11-wm/xfce4-panel
+panel_USE_XFCE_REQ=	garcon libexo xfconf
 
-thunar_BUILD_DEPENDS=		Thunar>=1.6.3:${PORTSDIR}/x11-fm/thunar
-thunar_RUN_DEPENDS=		Thunar>=1.6.3:${PORTSDIR}/x11-fm/thunar
+thunar_LIB_DEPENDS=	libthunarx-2.so:${PORTSDIR}/x11-fm/thunar
+thunar_RUN_DEPENDS=	Thunar:${PORTSDIR}/x11-fm/thunar
+thunar_USE_XFCE_REQ=	xfconf libmenu
 
-wm_BUILD_DEPENDS=		xfce4-wm>=4.10.1:${PORTSDIR}/x11-wm/xfce4-wm
-wm_RUN_DEPENDS=			xfce4-wm>=4.10.1:${PORTSDIR}/x11-wm/xfce4-wm
+xfconf_LIB_DEPENDS=	libxfconf-0.so:${PORTSDIR}/x11/xfce4-conf
+xfconf_USE_XFCE_REQ=	libutil
 
-xfconf_BUILD_DEPENDS=		xfce4-conf>=4.10.0:${PORTSDIR}/x11/xfce4-conf
-xfconf_RUN_DEPENDS=		xfce4-conf>=4.10.0:${PORTSDIR}/x11/xfce4-conf
+.if defined(USE_XFCE)
+# First, expand all USE_XFCE_REQ recursively.
+.for comp in ${_USE_XFCE_ALL}
+. for subcomp in ${${comp}_USE_XFCE_REQ}
+${comp}_USE_XFCE_REQ+=${${subcomp}_USE_XFCE_REQ}
+. endfor
+.endfor
 
-xfdev_BUILD_DEPENDS=		xdt-csource:${PORTSDIR}/devel/xfce4-dev-tools
-xfdev_RUN_DEPENDS=		xdt-csource:${PORTSDIR}/devel/xfce4-dev-tools
+# Then, use already expanded USE_XFCE_REQ to expand USE_XFCE.
+.for comp in ${USE_XFCE}
+. if ${_USE_XFCE_ALL:M${comp}} == ""
+IGNORE=	cannot install: Unknown component ${comp}
+. endif
+_USE_XFCE+=	${${comp}_USE_XFCE_REQ} ${comp}
+.endfor
 
-.endif
+# Remove duplicate components
+USE_XFCE=	${_USE_XFCE:O:u}
 
-.if defined(_POSTMKINCLUDED) && !defined(Xfce_Post_Include)
+.for comp in ${USE_XFCE}
+. if defined(${comp}_BUILD_DEPENDS)
+BUILD_DEPENDS+=	${${comp}_BUILD_DEPENDS}
+. endif
 
-Xfce_Post_Include=		bsd.xfce.mk
+. if defined(${comp}_LIB_DEPENDS)
+LIB_DEPENDS+=	${${comp}_LIB_DEPENDS}
+. endif
 
-.for component in ${USE_XFCE}
-BUILD_DEPENDS+=	${${component}_BUILD_DEPENDS}
-LIB_DEPENDS+=	${${component}_LIB_DEPENDS}
-RUN_DEPENDS+=	${${component}_RUN_DEPENDS}
-CONFIGURE_ENV+=	${${component}_CONFIGURE_ENV} \
-	ac_cv_prog_AWK="${AWK}"
+. if defined(${comp}_RUN_DEPENDS)
+RUN_DEPENDS+=	${${comp}_RUN_DEPENDS}
+. endif
 .endfor
 
-.for component in ${USE_XFCE}
-. if ${_USE_XFCE_ALL:M${component}}==""
-IGNORE=	cannot install: Unknown component ${component}
+.if ${USE_XFCE:M*gui} == libgui
+DEPRECATED?=	Depends on unmaintained x11-toolkits/libxfce4gui
 . endif
-.endfor
+
+.if ${xfce_ARGS} == gtk3
+. if exists(${LOCALBASE}/lib/libxfce4ui-1.so) && !exists(${LOCALBASE}/lib/libxfce4ui-2.so)
+BROKEN=	GTK3 option needs to be set in x11/libxfce4menu
+. endif
+.endif
+
+.endif # end of defined(USE_XFCE)
+
+.endif
+
+.if defined(_POSTMKINCLUDED) && !defined(_INCLUDE_USES_XFCE_POST_MK)
+_INCLUDE_USES_XFCE_POST_MK=	yes
 
 .endif

Modified: head/UPDATING
==============================================================================
--- head/UPDATING	Thu Mar  5 22:47:38 2015	(r380564)
+++ head/UPDATING	Thu Mar  5 22:52:30 2015	(r380565)
@@ -5,6 +5,27 @@ they are unavoidable.
 You should get into the habit of checking this file for changes each time
 you update your ports collection, before attempting any port upgrades.
 
+20150305:
+  AFFECTS: users of x11-wm/xfce4 and multimedia/xfce4-parole
+  AUTHOR: olivierd at FreeBSD.org
+
+  Xfce 4.12 has been imported. Please use the following instructions to
+  upgrade.
+
+  For package users:
+  # pkg upgrade
+
+  For ports users:
+  # portmaster -a
+  # portmaster x11-wm/xfce4
+
+  GStreamer 1.0 is enabled by default in Parole media player.
+
+  Xfce 4.12 now depends of Adwaita icon theme. If you are upgrading from
+  Xfce 4.10 you probably still have the Tango or GNOME theme selected.
+  Open the Settings Manager and select Appearance. Inside dialog box switch
+  to the Icons tag and select the "Adwaita" entry in the list.
+
 20150304:
   AFFECTS: users of security/libressl
   AUTHOR: vsevolod at highsecure.ru

Modified: head/archivers/squeeze/Makefile
==============================================================================
--- head/archivers/squeeze/Makefile	Thu Mar  5 22:47:38 2015	(r380564)
+++ head/archivers/squeeze/Makefile	Thu Mar  5 22:52:30 2015	(r380565)
@@ -3,7 +3,7 @@
 
 PORTNAME=	squeeze
 PORTVERSION=	0.2.3
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	archivers xfce
 MASTER_SITES=	${MASTER_SITE_XFCE}
 MASTER_SITE_SUBDIR=	src/apps/${PORTNAME}/${PORTVERSION:R}
@@ -19,22 +19,14 @@ LIB_DEPENDS=	libthunar-vfs-1.so:${PORTSD
 SSP_UNSAFE=	yes
 GNU_CONFIGURE=	yes
 INSTALLS_ICONS=	yes
-USES=		tar:bzip2 pkgconfig gmake gettext pathfix desktop-file-utils libtool
-USE_XFCE=	configenv libutil thunar
+USES=		tar:bzip2 pkgconfig gmake gettext pathfix desktop-file-utils \
+	libtool xfce
+USE_XFCE=	thunar
 USE_XORG=	x11
 USE_GNOME=	gtk20 glib20 intltool intlhack
 USE_LDCONFIG=	yes
 MAKE_JOB_SAFE=	yes
 
-OPTIONS_DEFINE=	DOCS
-OPTIONS_SUB=	yes
-
-.include <bsd.port.options.mk>
-
-post-patch:
-# Needed to remove gtk-doc installation
-.if empty(PORT_OPTIONS:MDOCS)
-	@${REINPLACE_CMD} -e "s|docs||g" ${WRKSRC}/Makefile.in
-.endif
+CONFIGURE_ARGS=--disable-static --without-html-dir
 
 .include <bsd.port.mk>

Modified: head/archivers/squeeze/pkg-plist
==============================================================================
--- head/archivers/squeeze/pkg-plist	Thu Mar  5 22:47:38 2015	(r380564)
+++ head/archivers/squeeze/pkg-plist	Thu Mar  5 22:52:30 2015	(r380565)
@@ -5,7 +5,6 @@ include/libsqueeze-0.2/libsqueeze/libsqu
 include/libsqueeze-0.2/libsqueeze/libsqueeze-vfs-mime.h
 include/libsqueeze-0.2/libsqueeze/libsqueeze-view.h
 include/libsqueeze-0.2/libsqueeze/libsqueeze.h
-lib/libsqueeze-0.2.a
 lib/libsqueeze-0.2.so
 lib/libsqueeze-0.2.so.0
 lib/libsqueeze-0.2.so.0.0.2
@@ -30,22 +29,6 @@ share/locale/tr/LC_MESSAGES/squeeze.mo
 share/locale/uk/LC_MESSAGES/squeeze.mo
 share/pixmaps/squeeze/archive-add.png
 share/pixmaps/squeeze/archive-extract.png
-%%PORTDOCS%%share/gtk-doc/html/libsqueeze/LSQArchive.html
-%%PORTDOCS%%share/gtk-doc/html/libsqueeze/LSQArchiveCommand.html
-%%PORTDOCS%%share/gtk-doc/html/libsqueeze/archiving.html
-%%PORTDOCS%%share/gtk-doc/html/libsqueeze/home.png
-%%PORTDOCS%%share/gtk-doc/html/libsqueeze/index.html
-%%PORTDOCS%%share/gtk-doc/html/libsqueeze/index.sgml
-%%PORTDOCS%%share/gtk-doc/html/libsqueeze/ix01.html
-%%PORTDOCS%%share/gtk-doc/html/libsqueeze/left.png
-%%PORTDOCS%%share/gtk-doc/html/libsqueeze/libsqueeze-LSQArchiveSupport.html
-%%PORTDOCS%%share/gtk-doc/html/libsqueeze/libsqueeze-libsqueeze.html
-%%PORTDOCS%%share/gtk-doc/html/libsqueeze/libsqueeze.devhelp
-%%PORTDOCS%%share/gtk-doc/html/libsqueeze/libsqueeze.devhelp2
-%%PORTDOCS%%share/gtk-doc/html/libsqueeze/libsqueeze.html
-%%PORTDOCS%%share/gtk-doc/html/libsqueeze/right.png
-%%PORTDOCS%%share/gtk-doc/html/libsqueeze/style.css
-%%PORTDOCS%%share/gtk-doc/html/libsqueeze/up.png
 share/icons/hicolor/16x16/apps/squeeze.png
 share/icons/hicolor/48x48/apps/squeeze.png
 share/icons/hicolor/scalable/apps/squeeze.svg

Modified: head/archivers/thunar-archive-plugin/Makefile
==============================================================================
--- head/archivers/thunar-archive-plugin/Makefile	Thu Mar  5 22:47:38 2015	(r380564)
+++ head/archivers/thunar-archive-plugin/Makefile	Thu Mar  5 22:52:30 2015	(r380565)
@@ -3,7 +3,7 @@
 
 PORTNAME=	thunar-archive-plugin
 PORTVERSION=	0.3.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	archivers xfce
 MASTER_SITES=	${MASTER_SITE_XFCE}
 MASTER_SITE_SUBDIR=src/thunar-plugins/${PORTNAME}/${PORTVERSION:R}
@@ -13,8 +13,8 @@ MAINTAINER=	xfce at FreeBSD.org
 COMMENT=	Archive plugin for the Thunar File Manager
 
 GNU_CONFIGURE=	yes
-USE_XFCE=	configenv libexo thunar
-USES=		gettext gmake libtool pkgconfig tar:bzip2
+USE_XFCE=	thunar
+USES=		gettext gmake libtool pkgconfig xfce tar:bzip2
 INSTALLS_ICONS=	yes
 USE_GNOME=	intltool
 

Modified: head/audio/thunar-media-tags-plugin/Makefile
==============================================================================
--- head/audio/thunar-media-tags-plugin/Makefile	Thu Mar  5 22:47:38 2015	(r380564)
+++ head/audio/thunar-media-tags-plugin/Makefile	Thu Mar  5 22:52:30 2015	(r380565)
@@ -3,7 +3,7 @@
 
 PORTNAME=	thunar-media-tags-plugin
 PORTVERSION=	0.2.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	audio xfce
 MASTER_SITES=	${MASTER_SITE_XFCE}
 MASTER_SITE_SUBDIR=src/thunar-plugins/${PORTNAME}/${PORTVERSION:R}
@@ -17,9 +17,9 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libtag.so:${PORTSDIR}/audio/taglib
 
-USES=		gmake pkgconfig gettext libtool tar:bzip2
+USES=		gmake pkgconfig gettext libtool xfce tar:bzip2
 GNU_CONFIGURE=	yes
 USE_GNOME=	gtk20 intltool intlhack
-USE_XFCE=	configenv libexo thunar
+USE_XFCE=	thunar
 
 .include <bsd.port.mk>

Modified: head/audio/xfce4-mixer/Makefile
==============================================================================
--- head/audio/xfce4-mixer/Makefile	Thu Mar  5 22:47:38 2015	(r380564)
+++ head/audio/xfce4-mixer/Makefile	Thu Mar  5 22:52:30 2015	(r380565)
@@ -3,7 +3,7 @@
 
 PORTNAME=	xfce4-mixer
 PORTVERSION=	4.11.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio xfce
 MASTER_SITES=	${MASTER_SITE_XFCE}
 MASTER_SITE_SUBDIR=	src/apps/${PORTNAME}/${PORTVERSION:R}
@@ -19,34 +19,20 @@ LIB_DEPENDS=	libdbus-glib-1.so:${PORTSDI
 
 GNU_CONFIGURE=	yes
 INSTALLS_ICONS= yes
-USES=		gmake libtool pkgconfig tar:bzip2
+USES=		gmake libtool pkgconfig gettext-tools xfce tar:bzip2
 USE_GNOME=	glib20 gtk20 intltool intlhack
-USE_XFCE=	configenv libmenu libutil panel xfconf
+USE_XFCE=	panel
 USE_GSTREAMER=	good
 
 MAKE_JOBS_UNSAFE=	yes
 
 OPTIONS_DEFINE=	KEYBIND NLS
-
 KEYBIND_DESC=	Multimedia keyboard shortcuts
-
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MKEYBIND}
-LIB_DEPENDS+=	libkeybinder.so:${PORTSDIR}/x11/keybinder
-CONFIGURE_ARGS+=--enable-keybinder
-.else
-CONFIGURE_ARGS+=--disable-keybinder
-.endif
-
-.if ${PORT_OPTIONS:MNLS}
-USES+=  gettext
-CONFIGURE_ARGS+=--enable-nls
-PLIST_SUB+=     NLS=""
-.else
-CONFIGURE_ARGS+=--disable-nls
-PLIST_SUB+=     NLS="@comment "
-.endif
+KEYBIND_LIB_DEPENDS=	libkeybinder.so:${PORTSDIR}/x11/keybinder
+KEYBIND_CONFIGURE_ENABLE=	keybinder
+NLS_USES=	gettext-runtime
+NLS_CONFIGURE_ENABLE=	nls
+OPTIONS_SUB=	yes
 
 post-patch:
 	@${FIND} ${WRKSRC} -name 'Makefile.in' -or -name 'xfce-mixer-track.c' \

Modified: head/audio/xfce4-mpc-plugin/Makefile
==============================================================================
--- head/audio/xfce4-mpc-plugin/Makefile	Thu Mar  5 22:47:38 2015	(r380564)
+++ head/audio/xfce4-mpc-plugin/Makefile	Thu Mar  5 22:52:30 2015	(r380565)
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	xfce4-mpc-plugin
-PORTVERSION=	0.4.4
-PORTREVISION=	8
+PORTVERSION=	0.4.5
 CATEGORIES=	audio xfce
 MASTER_SITES=	${MASTER_SITE_XFCE}
 MASTER_SITE_SUBDIR=src/panel-plugins/${PORTNAME}/${PORTVERSION:R}
@@ -19,8 +18,8 @@ RUN_DEPENDS=	musicpd:${PORTSDIR}/audio/m
 
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
-USES=		gettext gmake libtool pkgconfig tar:bzip2
+USES=		gettext gmake libtool pkgconfig xfce tar:bzip2
 USE_GNOME=	gtk20 intltool intlhack
-USE_XFCE=	configenv libexo libmenu panel
+USE_XFCE=	panel
 
 .include <bsd.port.mk>

Modified: head/audio/xfce4-mpc-plugin/distinfo
==============================================================================
--- head/audio/xfce4-mpc-plugin/distinfo	Thu Mar  5 22:47:38 2015	(r380564)
+++ head/audio/xfce4-mpc-plugin/distinfo	Thu Mar  5 22:52:30 2015	(r380565)
@@ -1,2 +1,2 @@
-SHA256 (xfce4/xfce4-mpc-plugin-0.4.4.tar.bz2) = 4f0ce6146aa2680a4c1ca7bad1be30187a8a179e8c4355a8fe13d1fc38dac5c5
-SIZE (xfce4/xfce4-mpc-plugin-0.4.4.tar.bz2) = 287320
+SHA256 (xfce4/xfce4-mpc-plugin-0.4.5.tar.bz2) = e71f57a28915c57459d6ce0eeeee1d0934f523c0ed083158c3d3b3836fc06fcf
+SIZE (xfce4/xfce4-mpc-plugin-0.4.5.tar.bz2) = 284335

Modified: head/audio/xfce4-mpc-plugin/pkg-plist
==============================================================================
--- head/audio/xfce4-mpc-plugin/pkg-plist	Thu Mar  5 22:47:38 2015	(r380564)
+++ head/audio/xfce4-mpc-plugin/pkg-plist	Thu Mar  5 22:52:30 2015	(r380565)
@@ -1,11 +1,13 @@
 lib/xfce4/panel/plugins/libmpc.so
 share/locale/ar/LC_MESSAGES/xfce4-mpc-plugin.mo
 share/locale/ast/LC_MESSAGES/xfce4-mpc-plugin.mo
+share/locale/bg/LC_MESSAGES/xfce4-mpc-plugin.mo
 share/locale/ca/LC_MESSAGES/xfce4-mpc-plugin.mo
 share/locale/cs/LC_MESSAGES/xfce4-mpc-plugin.mo
 share/locale/da/LC_MESSAGES/xfce4-mpc-plugin.mo
 share/locale/de/LC_MESSAGES/xfce4-mpc-plugin.mo
 share/locale/el/LC_MESSAGES/xfce4-mpc-plugin.mo
+share/locale/en_AU/LC_MESSAGES/xfce4-mpc-plugin.mo
 share/locale/en_GB/LC_MESSAGES/xfce4-mpc-plugin.mo
 share/locale/es/LC_MESSAGES/xfce4-mpc-plugin.mo
 share/locale/eu/LC_MESSAGES/xfce4-mpc-plugin.mo
@@ -20,14 +22,19 @@ share/locale/ja/LC_MESSAGES/xfce4-mpc-pl
 share/locale/ko/LC_MESSAGES/xfce4-mpc-plugin.mo
 share/locale/lt/LC_MESSAGES/xfce4-mpc-plugin.mo
 share/locale/lv/LC_MESSAGES/xfce4-mpc-plugin.mo
+share/locale/ms/LC_MESSAGES/xfce4-mpc-plugin.mo
+share/locale/nb/LC_MESSAGES/xfce4-mpc-plugin.mo
 share/locale/nl/LC_MESSAGES/xfce4-mpc-plugin.mo
+share/locale/oc/LC_MESSAGES/xfce4-mpc-plugin.mo
 share/locale/pl/LC_MESSAGES/xfce4-mpc-plugin.mo
 share/locale/pt/LC_MESSAGES/xfce4-mpc-plugin.mo
 share/locale/pt_BR/LC_MESSAGES/xfce4-mpc-plugin.mo
 share/locale/ru/LC_MESSAGES/xfce4-mpc-plugin.mo
 share/locale/sk/LC_MESSAGES/xfce4-mpc-plugin.mo
 share/locale/sq/LC_MESSAGES/xfce4-mpc-plugin.mo
+share/locale/sr/LC_MESSAGES/xfce4-mpc-plugin.mo
 share/locale/sv/LC_MESSAGES/xfce4-mpc-plugin.mo
+share/locale/th/LC_MESSAGES/xfce4-mpc-plugin.mo
 share/locale/tr/LC_MESSAGES/xfce4-mpc-plugin.mo
 share/locale/ug/LC_MESSAGES/xfce4-mpc-plugin.mo
 share/locale/uk/LC_MESSAGES/xfce4-mpc-plugin.mo

Modified: head/audio/xfmpc/Makefile
==============================================================================
--- head/audio/xfmpc/Makefile	Thu Mar  5 22:47:38 2015	(r380564)
+++ head/audio/xfmpc/Makefile	Thu Mar  5 22:52:30 2015	(r380565)
@@ -3,7 +3,7 @@
 
 PORTNAME=	xfmpc
 PORTVERSION=	0.2.2
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	audio xfce
 MASTER_SITES=	${MASTER_SITE_XFCE}
 MASTER_SITE_SUBDIR=/src/apps/${PORTNAME}/${PORTVERSION:R}
@@ -12,14 +12,16 @@ DIST_SUBDIR=	xfce4
 MAINTAINER=	xfce at FreeBSD.org
 COMMENT=	Graphical MPD client focusing on low footprint
 
+LICENSE=	GPLv2
+
 BUILD_DEPENDS=	valac:${PORTSDIR}/lang/vala
 LIB_DEPENDS=	libmpd.so:${PORTSDIR}/audio/libmpd
 
 INSTALLS_ICONS=	yes
-USES=		tar:bzip2 gettext gmake pkgconfig
+USES=		tar:bzip2 gettext gmake xfce pkgconfig
 GNU_CONFIGURE=	yes
 USE_GNOME=	gtk20 intltool intlhack
-USE_XFCE=	configenv libmenu libutil
+USE_XFCE=	libmenu
 
 post-extract:
 	${CP} ${FILESDIR}/config.vapi ${WRKSRC}/src

Modified: head/deskutils/orage/Makefile
==============================================================================
--- head/deskutils/orage/Makefile	Thu Mar  5 22:47:38 2015	(r380564)
+++ head/deskutils/orage/Makefile	Thu Mar  5 22:52:30 2015	(r380565)
@@ -3,7 +3,7 @@
 
 PORTNAME=	orage
 PORTVERSION=	4.10.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	deskutils xfce
 MASTER_SITES=	${MASTER_SITE_XFCE}
 MASTER_SITE_SUBDIR=src/apps/${PORTNAME}/${PORTVERSION:R}
@@ -20,12 +20,13 @@ LIB_DEPENDS=	libpopt.so:${PORTSDIR}/deve
 
 GNU_CONFIGURE=	yes
 INSTALLS_ICONS=	yes
-USES=		pkgconfig gettext desktop-file-utils gmake tar:bzip2
+USES=		pkgconfig gettext desktop-file-utils gmake \
+	xfce tar:bzip2
 USE_GNOME=	gtk20 intltool intlhack
-USE_XFCE=	configenv libmenu panel
+USE_XFCE=	panel
 USE_XORG=	xext xrender xinerama xi xrandr xcursor xcomposite xdamage x11 \
 		xfixes
-LDFLAGS+=	-L${LOCALBASE}/lib
+#LDFLAGS+=	-L${LOCALBASE}/lib
 OPTIONS_DEFINE=	BDB ICAL NOTIFY
 OPTIONS_DEFAULT=	NOTIFY
 

Modified: head/deskutils/xfce4-generic-slider/Makefile
==============================================================================
--- head/deskutils/xfce4-generic-slider/Makefile	Thu Mar  5 22:47:38 2015	(r380564)
+++ head/deskutils/xfce4-generic-slider/Makefile	Thu Mar  5 22:52:30 2015	(r380565)
@@ -3,7 +3,7 @@
 
 PORTNAME=	xfce4-generic-slider
 PORTVERSION=	0.0.20100827
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	deskutils
 MASTER_SITES=	LOCAL/ehaupt/
 
@@ -12,8 +12,8 @@ COMMENT=	Slider plugin to adjust and/or 
 
 LICENSE=	GPLv3
 
-USES=		pkgconfig
-USE_XFCE=	panel libutil libgui
+USES=		pkgconfig xfce
+USE_XFCE=	panel libgui
 
 CFLAGS+=	`pkg-config --cflags libxfce4panel-1.0 libxfcegui4-1.0`
 LDFLAGS+=	`pkg-config --libs libxfce4panel-1.0 libxfcegui4-1.0`

Modified: head/deskutils/xfce4-notes-plugin/Makefile
==============================================================================
--- head/deskutils/xfce4-notes-plugin/Makefile	Thu Mar  5 22:47:38 2015	(r380564)
+++ head/deskutils/xfce4-notes-plugin/Makefile	Thu Mar  5 22:52:30 2015	(r380565)
@@ -3,7 +3,7 @@
 
 PORTNAME=	xfce4-notes-plugin
 PORTVERSION=	1.7.7
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	deskutils xfce
 MASTER_SITES=	${MASTER_SITE_XFCE}
 MASTER_SITE_SUBDIR=src/panel-plugins/${PORTNAME}/${PORTVERSION:R}
@@ -17,9 +17,11 @@ LICENSE=	GPLv2
 LIB_DEPENDS=	libunique-1.0.so:${PORTSDIR}/x11-toolkits/unique
 
 GNU_CONFIGURE=	yes
-USES=		gettext gmake libtool pkgconfig tar:bzip2
+USES=		gettext gmake libtool pkgconfig xfce tar:bzip2
 USE_GNOME=	glib20 gtk20 intltool intlhack
-USE_XFCE=	configenv libgui libutil panel xfconf
+USE_XFCE=	libgui panel
 INSTALLS_ICONS=	yes
 
+CONFIGURE_ARGS=--disable-static
+
 .include <bsd.port.mk>

Modified: head/deskutils/xfce4-notes-plugin/pkg-plist
==============================================================================
--- head/deskutils/xfce4-notes-plugin/pkg-plist	Thu Mar  5 22:47:38 2015	(r380564)
+++ head/deskutils/xfce4-notes-plugin/pkg-plist	Thu Mar  5 22:52:30 2015	(r380565)
@@ -2,7 +2,6 @@ bin/xfce4-notes
 bin/xfce4-notes-settings
 bin/xfce4-popup-notes
 etc/xdg/autostart/xfce4-notes-autostart.desktop
-lib/xfce4/panel-plugins/libnotes.a
 lib/xfce4/panel-plugins/libnotes.so
 lib/xfce4/panel-plugins/libnotes.so.0
 lib/xfce4/panel-plugins/libnotes.so.0.0.0

Modified: head/deskutils/xfce4-notification-daemon/Makefile
==============================================================================
--- head/deskutils/xfce4-notification-daemon/Makefile	Thu Mar  5 22:47:38 2015	(r380564)
+++ head/deskutils/xfce4-notification-daemon/Makefile	Thu Mar  5 22:52:30 2015	(r380565)
@@ -3,7 +3,7 @@
 
 PORTNAME=	notification-daemon
 PORTVERSION=	0.3.7
-PORTREVISION=	21
+PORTREVISION=	22
 CATEGORIES=	deskutils xfce
 MASTER_SITES=	LOCAL/ehaupt/
 PKGNAMEPREFIX=	xfce4-
@@ -22,10 +22,10 @@ RUN_DEPENDS=	dbus-daemon:${PORTSDIR}/dev
 
 GNU_CONFIGURE=	yes
 INSTALLS_ICONS=	yes
-USES=		gmake libtool pkgconfig tar:bzip2
+USES=		gmake libtool pkgconfig gettext-tools xfce tar:bzip2
 USE_GNOME=	librsvg2
 USE_LDCONFIG=	yes
-USE_XFCE=	configenv libutil libgui
+USE_XFCE=	libgui
 
 CONFIGURE_ARGS+=	--libdir=${PREFIX}/lib/xfce4 \
 			--libexecdir=${PREFIX}/libexec/xfce4 \
@@ -43,7 +43,7 @@ OPTIONS_DEFAULT=CLOSE NLS
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MNLS}
-USES+=		gettext
+USES+=		gettext-runtime
 PLIST_SUB+=	NLS=""
 .else
 PLIST_SUB+=	NLS="@comment "

Modified: head/deskutils/xfce4-notifyd/Makefile
==============================================================================
--- head/deskutils/xfce4-notifyd/Makefile	Thu Mar  5 22:47:38 2015	(r380564)
+++ head/deskutils/xfce4-notifyd/Makefile	Thu Mar  5 22:52:30 2015	(r380565)
@@ -3,6 +3,7 @@
 
 PORTNAME=	xfce4-notifyd
 PORTVERSION=	0.2.4
+PORTREVISION=	1
 CATEGORIES=	deskutils xfce
 MASTER_SITES=	XFCE
 MASTER_SITE_SUBDIR=	src/apps/${PORTNAME}/${PORTVERSION:R}
@@ -16,10 +17,10 @@ LICENSE=	GPLv3
 LIB_DEPENDS=	libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib \
 		libnotify.so:${PORTSDIR}/devel/libnotify
 
-USES=		gmake libtool pkgconfig tar:bzip2
+USES=		gmake libtool pkgconfig gettext-tools xfce tar:bzip2
 GNU_CONFIGURE=	yes
 USE_GNOME=	gtk20 intltool intlhack
-USE_XFCE=	configenv libmenu libutil xfconf
+USE_XFCE=	libmenu
 INSTALLS_ICONS=	yes
 USE_XORG=	x11
 
@@ -28,7 +29,7 @@ OPTIONS_DEFINE=	NLS
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MNLS}
-USES+=		gettext
+USES+=		gettext-runtime
 CONFIGURE_ARGS+=--enable-nls
 PLIST_SUB+=	NLS=""
 .else

Modified: head/deskutils/xfce4-tumbler/Makefile
==============================================================================
--- head/deskutils/xfce4-tumbler/Makefile	Thu Mar  5 22:47:38 2015	(r380564)
+++ head/deskutils/xfce4-tumbler/Makefile	Thu Mar  5 22:52:30 2015	(r380565)
@@ -2,11 +2,9 @@
 # $FreeBSD$
 
 PORTNAME=	tumbler
-PORTVERSION=	0.1.30
-PORTREVISION=	6
+PORTVERSION=	0.1.31
 CATEGORIES=	deskutils xfce
 MASTER_SITES=	${MASTER_SITE_XFCE}
-MASTER_SITE_SUBDIR=	src/xfce/${PORTNAME}/${PORTVERSION:R}
 PKGNAMEPREFIX=	xfce4-
 DIST_SUBDIR=	xfce4
 
@@ -19,163 +17,43 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png \
 		libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib
 
-USES=		pathfix pkgconfig gmake libtool tar:bzip2
+USES=		pathfix pkgconfig gmake libtool gettext-tools xfce tar:bzip2
 GNU_CONFIGURE=	yes
-USE_GNOME=	glib20 intltool intlhack
+USE_GNOME=	glib20 intltool intlhack gdkpixbuf2
 USE_LDCONFIG=	yes
-USE_XFCE=	configenv
 
 CONFIGURE_ARGS=	--enable-xdg-cache \
-		--disable-gtk-doc-html
+		--enable-pixbuf-thumbnailer \
+		--disable-gtk-doc-html \
+		--without-html-dir
+
+OPTIONS_DEFINE=	NLS FONTS JPEG FFMPEG POPPLER \
+		GSTREAMER ODF COVER
+OPTIONS_DEFAULT=	FONTS JPEG POPPLER GSTREAMER ODF
 
-OPTIONS_DEFINE=	DOCS NLS PIXBUF FONTS JPEG FFMPEG POPPLER \
-		GSTREAMER ODF OPENRAW COVER
-OPTIONS_DEFAULT=	PIXBUF FONTS JPEG POPPLER ODF
 FONTS_DESC=	Fonts thumbnailer plugin
 COVER_DESC=	Open Movie Database thumbnailer plugin
 GSTREAMER_DESC=	GStreamer (1.0) thumbnailer plugin
 
-SUB_FILES=	pkg-message
-
-.include <bsd.port.options.mk>
+NLS_USES=	gettext-runtime
+NLS_CONFIGURE_ENABLE=	nls
+FONTS_LIB_DEPENDS=	libfreetype.so:${PORTSDIR}/print/freetype2
+FONTS_CONFIGURE_ENABLE=	font-thumbnailer
+JPEG_LIB_DEPENDS=	libjpeg.so:${PORTSDIR}/graphics/jpeg \
+	libexif.so:${PORTSDIR}/graphics/libexif
+JPEG_CONFIGURE_ENABLE=	jpeg-thumbnailer
+FFMPEG_LIB_DEPENDS=	libffmpegthumbnailer.so:${PORTSDIR}/multimedia/ffmpegthumbnailer
+FFMPEG_CONFIGURE_ENABLE=	ffmpeg-thumbnailer
+POPPLER_LIB_DEPENDS=	libpoppler-glib.so:${PORTSDIR}/graphics/poppler-glib
+POPPLER_CONFIGURE_ENABLE=	poppler-thumbnailer
+GSTREAMER_USE=	gstreamer1=yes
+GSTREAMER_CONFIGURE_ENABLE=	gstreamer-thumbnailer
+ODF_USE=	gnome=libgsf
+ODF_CONFIGURE_ENABLE=	odf-thumbnailer
+COVER_LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl
+COVER_CONFIGURE_ENABLE=	cover-thumbnailer
+OPTIONS_SUB=	yes
 
-.if ${PORT_OPTIONS:MNLS}
-USES+=		gettext
-CONFIGURE_ARGS+=--enable-nls
-PLIST_SUB+=	NLS=""
-.else
-CONFIGURE_ARGS+=--disable-nls
-PLIST_SUB+=	NLS="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MDOCS}
-CONFIGURE_ARGS+=--with-html-dir=${PREFIX}/share/gtk-doc/html
-PLIST_SUB+=	APIDOCS=""
-.else
-CONFIGURE_ARGS+=--without-html-dir
-PLIST_SUB+=	APIDOCS="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MPIXBUF}
-USE_GNOME+=	gdkpixbuf2
-CONFIGURE_ARGS+=--enable-pixbuf-thumbnailer
-PLIST_SUB+=	PIXBUF=""
-.else
-CONFIGURE_ARGS+=--disable-pixbuf-thumbnailer
-PLIST_SUB+=	PIXBUF="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MFONTS}
-# PIXBUF needs to be set
-.if ! ${PORT_OPTIONS:MPIXBUF}
-USE_GNOME+=	gdkpixbuf2
-CONFIGURE_ARGS+=--enable-pixbuf-thumbnailer
-PLIST_SUB+=	PIXBUF=""
-.endif
-LIB_DEPENDS+=	libfreetype.so:${PORTSDIR}/print/freetype2
-CONFIGURE_ARGS+=--enable-font-thumbnailer
-PLIST_SUB+=	FONTS=""
-.else
-CONFIGURE_ARGS+=--disable-font-thumbnailer
-PLIST_SUB+=	FONTS="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MJPEG}
-.if ! ${PORT_OPTIONS:MPIXBUF}
-USE_GNOME+=	gdkpixbuf2
-CONFIGURE_ARGS+=--enable-pixbuf-thumbnailer
-PLIST_SUB+=	PIXBUF=""
-.endif
-LIB_DEPENDS+=	libjpeg.so:${PORTSDIR}/graphics/jpeg
-CONFIGURE_ARGS+=--enable-jpeg-thumbnailer
-PLIST_SUB+=	JPEG=""
-.else
-CONFIGURE_ARGS+=--disable-jpeg-thumbnailer
-PLIST_SUB+=	JPEG="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MFFMPEG}
-.if ! ${PORT_OPTIONS:MPIXBUF}
-USE_GNOME+=	gdkpixbuf2
-CONFIGURE_ARGS+=--enable-pixbuf-thumbnailer
-PLIST_SUB+=	PIXBUF=""
-.endif
-LIB_DEPENDS+=	libffmpegthumbnailer.so:${PORTSDIR}/multimedia/ffmpegthumbnailer
-CONFIGURE_ARGS+=--enable-ffmpeg-thumbnailer
-PLIST_SUB+=	FFMPEG=""
-.else
-CONFIGURE_ARGS+=--disable-ffmpeg-thumbnailer
-PLIST_SUB+=	FFMPEG="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MPOPPLER}
-.if ! ${PORT_OPTIONS:MPIXBUF}
-USE_GNOME+=	gdkpixbuf2
-CONFIGURE_ARGS+=--enable-pixbuf-thumbnailer
-PLIST_SUB+=	PIXBUF=""
-.endif
-LIB_DEPENDS+=	libpoppler-glib.so:${PORTSDIR}/graphics/poppler-glib
-CONFIGURE_ARGS+=--enable-poppler-thumbnailer
-PLIST_SUB+=	POPPLER=""
-.else
-CONFIGURE_ARGS+=--disable-poppler-thumbnailer
-PLIST_SUB+=	POPPLER="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MGSTREAMER}
-.if ! ${PORT_OPTIONS:MPIXBUF}
-USE_GNOME+=	gdkpixbuf2
-CONFIGURE_ARGS+=--enable-pixbuf-thumbnailer
-PLIST_SUB+=	PIXBUF=""
-.endif
-USE_GSTREAMER1=	yes
-CONFIGURE_ARGS+=--enable-gstreamer-thumbnailer
-PLIST_SUB+=	GSTREAMER=""
-.else
-CONFIGURE_ARGS+=--disable-gstreamer-thumbnailer
-PLIST_SUB+=	GSTREAMER="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MODF}
-.if ! ${PORT_OPTIONS:MPIXBUF}
-USE_GNOME+=	gdkpixbuf2
-CONFIGURE_ARGS+=--enable-pixbuf-thumbnailer
-PLIST_SUB+=	PIXBUF=""
-.endif
-USE_GNOME+=	libgsf
-CONFIGURE_ARGS+=--enable-odf-thumbnailer
-PLIST_SUB+=	ODF=""
-.else
-CONFIGURE_ARGS+=--disable-odf-thumbnailer
-PLIST_SUB+=	ODF="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MOPENRAW}
-.if ! ${PORT_OPTIONS:MPIXBUF}
-USE_GNOME+=	gdkpixbuf2
-CONFIGURE_ARGS+=--enable-pixbuf-thumbnailer
-PLIST_SUB+=	PIXBUF=""
-.endif
-LIB_DEPENDS+=	libopenraw.so:${PORTSDIR}/graphics/libopenraw
-CONFIGURE_ARGS+=--enable-raw-thumbnailer
-PLIST_SUB+=	RAW=""
-.else
-CONFIGURE_ARGS+=--disable-raw-thumbnailer
-PLIST_SUB+=	RAW="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MCOVER}
-.if ! ${PORT_OPTIONS:MPIXBUF}
-USE_GNOME+=	gdkpixbuf2
-CONFIGURE_ARGS+=--enable-pixbuf-thumbnailer
-PLIST_SUB+=	PIXBUF=""
-.endif
-LIB_DEPENDS+=	libcurl.so:${PORTSDIR}/ftp/curl
-CONFIGURE_ARGS+=--enable-cover-thumbnailer
-PLIST_SUB+=	COVER=""
-.else
-CONFIGURE_ARGS+=--disable-cover-thumbnailer
-PLIST_SUB+=	COVER="@comment "
-.endif
+SUB_FILES=	pkg-message
 
 .include <bsd.port.mk>

Modified: head/deskutils/xfce4-tumbler/distinfo
==============================================================================
--- head/deskutils/xfce4-tumbler/distinfo	Thu Mar  5 22:47:38 2015	(r380564)
+++ head/deskutils/xfce4-tumbler/distinfo	Thu Mar  5 22:52:30 2015	(r380565)
@@ -1,2 +1,2 @@
-SHA256 (xfce4/tumbler-0.1.30.tar.bz2) = e7c20d79c830465f8b3b792893f05e8b8d5ba90aec4973e7517e07ef31537304
-SIZE (xfce4/tumbler-0.1.30.tar.bz2) = 515676
+SHA256 (xfce4/tumbler-0.1.31.tar.bz2) = d0fd329273ff6ac98885eade4c3d8c87a4dd0816f713646130808bfa90b87173
+SIZE (xfce4/tumbler-0.1.31.tar.bz2) = 550650

Modified: head/deskutils/xfce4-tumbler/files/patch-tumblerd__tumbler.rc
==============================================================================
--- head/deskutils/xfce4-tumbler/files/patch-tumblerd__tumbler.rc	Thu Mar  5 22:47:38 2015	(r380564)
+++ head/deskutils/xfce4-tumbler/files/patch-tumblerd__tumbler.rc	Thu Mar  5 22:52:30 2015	(r380565)
@@ -1,6 +1,6 @@
---- ./tumblerd/tumbler.rc.orig	2013-01-12 11:14:28.000000000 +0000
-+++ ./tumblerd/tumbler.rc	2013-01-12 22:12:40.000000000 +0000
-@@ -37,7 +37,7 @@
+--- tumblerd/tumbler.rc.orig	2015-02-28 15:23:08 UTC
++++ tumblerd/tumbler.rc
+@@ -37,7 +37,7 @@ MaxFileSize=0
  
  # RAW image files using libopenraw
  [RawThumbnailer]
@@ -9,7 +9,7 @@
  Priority=1
  Locations=
  MaxFileSize=0
-@@ -58,14 +58,14 @@
+@@ -58,7 +58,7 @@ MaxFileSize=0
  
  # ffmpegthumbnailer plugin
  [FfmegThumbnailer]
@@ -18,11 +18,3 @@
  Priority=2
  Locations=
  MaxFileSize=0
- 
- # GStreamer plugin
- [GstThumbnailer]
--Disabled=false
-+Disabled=true
- Priority=1
- Locations=
- MaxFileSize=0

Modified: head/deskutils/xfce4-tumbler/pkg-plist
==============================================================================
--- head/deskutils/xfce4-tumbler/pkg-plist	Thu Mar  5 22:47:38 2015	(r380564)
+++ head/deskutils/xfce4-tumbler/pkg-plist	Thu Mar  5 22:52:30 2015	(r380565)
@@ -27,42 +27,13 @@ lib/tumbler-1/plugins/cache/tumbler-xdg-
 %%JPEG%%lib/tumbler-1/plugins/tumbler-jpeg-thumbnailer.so
 %%GSTREAMER%%lib/tumbler-1/plugins/tumbler-gst-thumbnailer.so
 %%ODF%%lib/tumbler-1/plugins/tumbler-odf-thumbnailer.so
-%%PIXBUF%%lib/tumbler-1/plugins/tumbler-pixbuf-thumbnailer.so
+lib/tumbler-1/plugins/tumbler-pixbuf-thumbnailer.so
 %%POPPLER%%lib/tumbler-1/plugins/tumbler-poppler-thumbnailer.so
-%%RAW%%lib/tumbler-1/plugins/tumbler-raw-thumbnailer.so
 lib/tumbler-1/tumblerd
 libdata/pkgconfig/tumbler-1.pc
 share/dbus-1/services/org.xfce.Tumbler.Cache1.service
 share/dbus-1/services/org.xfce.Tumbler.Manager1.service
 share/dbus-1/services/org.xfce.Tumbler.Thumbnailer1.service
-%%APIDOCS%%share/gtk-doc/html/tumbler/TumblerAbstractThumbnailer.html
-%%APIDOCS%%share/gtk-doc/html/tumbler/TumblerCache.html
-%%APIDOCS%%share/gtk-doc/html/tumbler/TumblerThumbnail.html
-%%APIDOCS%%share/gtk-doc/html/tumbler/TumblerThumbnailerProvider.html
-%%APIDOCS%%share/gtk-doc/html/tumbler/api-index-full.html
-%%APIDOCS%%share/gtk-doc/html/tumbler/extension-api.html
-%%APIDOCS%%share/gtk-doc/html/tumbler/extension-tutorial.html
-%%APIDOCS%%share/gtk-doc/html/tumbler/home.png
-%%APIDOCS%%share/gtk-doc/html/tumbler/index.html
-%%APIDOCS%%share/gtk-doc/html/tumbler/index.sgml
-%%APIDOCS%%share/gtk-doc/html/tumbler/left-insensitive.png
-%%APIDOCS%%share/gtk-doc/html/tumbler/left.png
-%%APIDOCS%%share/gtk-doc/html/tumbler/miscellaneous.html
-%%APIDOCS%%share/gtk-doc/html/tumbler/object-tree.html
-%%APIDOCS%%share/gtk-doc/html/tumbler/pt01.html
-%%APIDOCS%%share/gtk-doc/html/tumbler/right-insensitive.png
-%%APIDOCS%%share/gtk-doc/html/tumbler/right.png
-%%APIDOCS%%share/gtk-doc/html/tumbler/style.css
-%%APIDOCS%%share/gtk-doc/html/tumbler/thumbnails.html
-%%APIDOCS%%share/gtk-doc/html/tumbler/tumbler-Error-Domain-and-Types.html
-%%APIDOCS%%share/gtk-doc/html/tumbler/tumbler-Various-Enumeration-Types.html
-%%APIDOCS%%share/gtk-doc/html/tumbler/tumbler-Version-Information-and-Compatibility-Checks.html
-%%APIDOCS%%share/gtk-doc/html/tumbler/tumbler-tumbler-file-info.html
-%%APIDOCS%%share/gtk-doc/html/tumbler/tumbler-tumbler-provider-factory.html
-%%APIDOCS%%share/gtk-doc/html/tumbler/tumbler-tumbler-provider-plugin.html
-%%APIDOCS%%share/gtk-doc/html/tumbler/tumbler.devhelp2
-%%APIDOCS%%share/gtk-doc/html/tumbler/up-insensitive.png
-%%APIDOCS%%share/gtk-doc/html/tumbler/up.png
 %%NLS%%share/locale/ar/LC_MESSAGES/tumbler.mo
 %%NLS%%share/locale/ast/LC_MESSAGES/tumbler.mo
 %%NLS%%share/locale/bg/LC_MESSAGES/tumbler.mo
@@ -80,6 +51,7 @@ share/dbus-1/services/org.xfce.Tumbler.T
 %%NLS%%share/locale/fr/LC_MESSAGES/tumbler.mo
 %%NLS%%share/locale/gl/LC_MESSAGES/tumbler.mo
 %%NLS%%share/locale/he/LC_MESSAGES/tumbler.mo
+%%NLS%%share/locale/hr/LC_MESSAGES/tumbler.mo
 %%NLS%%share/locale/hu/LC_MESSAGES/tumbler.mo
 %%NLS%%share/locale/id/LC_MESSAGES/tumbler.mo
 %%NLS%%share/locale/is/LC_MESSAGES/tumbler.mo

Modified: head/deskutils/xfce4-volumed-pulse/Makefile
==============================================================================
--- head/deskutils/xfce4-volumed-pulse/Makefile	Thu Mar  5 22:47:38 2015	(r380564)
+++ head/deskutils/xfce4-volumed-pulse/Makefile	Thu Mar  5 22:52:30 2015	(r380565)
@@ -3,6 +3,7 @@
 
 PORTNAME=	xfce4-volumed-pulse
 PORTVERSION=	0.2.0
+PORTREVISION=	1
 CATEGORIES=	deskutils xfce
 MASTER_SITES=	https://launchpadlibrarian.net/133628016/ \
 	https://launchpad.net/${PORTNAME}/trunk/${PORTVERSION}/+download/
@@ -18,10 +19,10 @@ LIB_DEPENDS=	libpulse.so:${PORTSDIR}/aud
 	libnotify.so:${PORTSDIR}/devel/libnotify \
 	libkeybinder.so:${PORTSDIR}/x11/keybinder
 
-USES=	pkgconfig gmake tar:bz2
+USES=	pkgconfig gmake xfce tar:bz2
 GNU_CONFIGURE=	yes
 USE_GNOME=	glib20 gtk20
-USE_XFCE=	configenv xfconf
+USE_XFCE=	xfconf
 INSTALL_TARGET=	install-strip
 
 CONFIGURE_ARGS=--enable-libnotify

Modified: head/deskutils/xfce4-volumed/Makefile
==============================================================================
--- head/deskutils/xfce4-volumed/Makefile	Thu Mar  5 22:47:38 2015	(r380564)
+++ head/deskutils/xfce4-volumed/Makefile	Thu Mar  5 22:52:30 2015	(r380565)
@@ -3,7 +3,7 @@
 
 PORTNAME=	xfce4-volumed
 PORTVERSION=	0.1.13
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	deskutils xfce
 MASTER_SITES=	XFCE
 MASTER_SITE_SUBDIR=	src/apps/${PORTNAME}/${PORTVERSION:R}
@@ -17,10 +17,10 @@ LICENSE=	GPLv3
 LIB_DEPENDS=	libnotify.so:${PORTSDIR}/devel/libnotify \
 		libkeybinder.so:${PORTSDIR}/x11/keybinder
 
-USES=		pkgconfig gmake tar:bzip2
+USES=		pkgconfig gmake xfce tar:bzip2
 GNU_CONFIGURE=	yes
 USE_GNOME=	glib20
 USE_GSTREAMER=	yes
-USE_XFCE=	configenv xfconf
+USE_XFCE=	xfconf
 
 .include <bsd.port.mk>

Modified: head/deskutils/xfce4-xkb-plugin/Makefile
==============================================================================
--- head/deskutils/xfce4-xkb-plugin/Makefile	Thu Mar  5 22:47:38 2015	(r380564)
+++ head/deskutils/xfce4-xkb-plugin/Makefile	Thu Mar  5 22:52:30 2015	(r380565)
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	xfce4-xkb-plugin
-PORTVERSION=	0.5.6
-PORTREVISION=	2
+PORTVERSION=	0.7.1
 CATEGORIES=	deskutils xfce
 MASTER_SITES=	${MASTER_SITE_XFCE}
 MASTER_SITE_SUBDIR=	src/panel-plugins/${PORTNAME}/${PORTVERSION:R}
@@ -10,12 +9,14 @@ MASTER_SITE_SUBDIR=	src/panel-plugins/${
 MAINTAINER=	xfce at FreeBSD.org
 COMMENT=	Keyboard layout switching plugin for the Xfce panel
 
+LICENSE=	GPLv2
+
 LIB_DEPENDS=	libxklavier.so:${PORTSDIR}/x11/libxklavier
 
 GNU_CONFIGURE=	yes
-USES=		gettext pkgconfig gmake tar:bzip2
+USES=		gettext pkgconfig gmake xfce tar:bzip2
 USE_GNOME=	gtk20 intltool intlhack librsvg2 libwnck
-USE_XFCE=	configenv libmenu libutil panel
+USE_XFCE=	panel
 USE_XORG=	x11
 
 .include <bsd.port.mk>

Modified: head/deskutils/xfce4-xkb-plugin/distinfo
==============================================================================
--- head/deskutils/xfce4-xkb-plugin/distinfo	Thu Mar  5 22:47:38 2015	(r380564)
+++ head/deskutils/xfce4-xkb-plugin/distinfo	Thu Mar  5 22:52:30 2015	(r380565)
@@ -1,2 +1,2 @@
-SHA256 (xfce4-xkb-plugin-0.5.6.tar.bz2) = 09e4623033987ce7b711252609a17291b306cdf60863ee39677a4995a93318a5
-SIZE (xfce4-xkb-plugin-0.5.6.tar.bz2) = 815228
+SHA256 (xfce4-xkb-plugin-0.7.1.tar.bz2) = 61fe2e33fe99939d5d06a682e94e40e05ef844c930ad612154090d158b2ce681
+SIZE (xfce4-xkb-plugin-0.7.1.tar.bz2) = 837922

Modified: head/deskutils/xfce4-xkb-plugin/pkg-descr
==============================================================================
--- head/deskutils/xfce4-xkb-plugin/pkg-descr	Thu Mar  5 22:47:38 2015	(r380564)
+++ head/deskutils/xfce4-xkb-plugin/pkg-descr	Thu Mar  5 22:52:30 2015	(r380565)
@@ -7,6 +7,6 @@ label for that layout.

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
