Index: branches/2017Q1/x11-wm/xfce4-desktop/Makefile
===================================================================
--- branches/2017Q1/x11-wm/xfce4-desktop/Makefile	(revision 431406)
+++ branches/2017Q1/x11-wm/xfce4-desktop/Makefile	(revision 431407)
@@ -1,49 +1,50 @@
 # Created by: James Earl <jdearl@telus.net>
 # $FreeBSD$
 
 PORTNAME=	xfce4-desktop
 PORTVERSION=	4.12.3
+PORTREVISION=	1
 CATEGORIES=	x11-wm xfce
 MASTER_SITES=	XFCE/src/xfce/xfdesktop/${PORTVERSION:R}/
 DISTNAME=	xfdesktop-${PORTVERSION}
 DIST_SUBDIR=	xfce4
 
 MAINTAINER=	xfce@FreeBSD.org
 COMMENT=	Xfce's desktop manager
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libdbus-glib-1.so:devel/dbus-glib \
 		libnotify.so:devel/libnotify
 
 GNU_CONFIGURE=	yes
 INSTALLS_ICONS=	yes
 USE_GNOME=	glib20 gtk20 intltool intlhack libwnck
 USE_XFCE=	garcon
 USES=	gettext-tools gmake pkgconfig tar:bzip2 xfce
 USE_XORG=	x11 sm
 INSTALL_TARGET=	install-strip
 
 CONFIGURE_ARGS+=--enable-gio-unix \
 	--enable-notifications
 
 OPTIONS_DEFINE=		NLS THUNAR
 OPTIONS_DEFAULT=	THUNAR
 NLS_USES=	gettext-runtime
 NLS_CONFIGURE_ENABLE=	nls
 THUNAR_USE=	xfce=thunar
 THUNAR_CONFIGURE_ENABLE=	thunarx
 THUNAR_CONFIGURE_WITH=	file-manager-fallback=Thunar
 THUNAR_USE_OFF=	xfce=libexo
 THUNAR_DESC=	Thunar file manager support
 OPTIONS_SUB=	yes
 
-.include <bsd.port.pre.mk>
-
 post-patch:
-.if !${PORT_OPTIONS:MNLS}
+	${REINPLACE_CMD} -e 's|inode/directory|folder|' \
+		${WRKSRC}/src/xfdesktop-file-icon-manager.c
+
+post-patch-NLS-off:
 	@${REINPLACE_CMD} -e 's|po ||' ${WRKSRC}/Makefile.in
-.endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Index: branches/2017Q1
===================================================================
--- branches/2017Q1	(revision 431406)
+++ branches/2017Q1	(revision 431407)

Property changes on: branches/2017Q1
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r431365