Index: x11-wm/xfce4-panel/Makefile
===================================================================
--- x11-wm/xfce4-panel/Makefile
+++ x11-wm/xfce4-panel/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	xfce4-panel
 PORTVERSION=	4.12.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-wm xfce
 MASTER_SITES=	XFCE
 DIST_SUBDIR=	xfce4
@@ -11,32 +11,39 @@
 MAINTAINER=	xfce@FreeBSD.org
 COMMENT=	Xfce's panel
 
-LICENSE=	GPLv2 LGPL21
-LICENSE_COMB=	multi
+LICENSE=		GPLv2 LGPL21
+LICENSE_COMB=		multi
 LICENSE_DISTFILES=	${WRKSRC}/COPYING \
-	${WRKSRC}/COPYING.LIB
+			${WRKSRC}/COPYING.LIB
 
 LIB_DEPENDS=	libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib
 
 USES=		desktop-file-utils gmake libtool pathfix gettext-tools perl5 \
 		pkgconfig tar:bzip2
-GNU_CONFIGURE=	yes
-INSTALLS_ICONS=	yes
 USE_GNOME=	glib20 gtk20 intltool intlhack libwnck cairo
 USE_LDCONFIG=	yes
 USE_XFCE=	garcon libexo
 USE_XORG=	x11 sm
 
-CONFIGURE_ARGS+=--enable-gio-unix --without-html-dir
+INSTALLS_ICONS=	yes
+
+GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--enable-gio-unix \
+		--without-html-dir
 
-OPTIONS_DEFINE=		GTK3 NLS
+OPTIONS_DEFINE=		DEBUG GTK3 NLS
 OPTIONS_DEFAULT=	GTK3 NLS
-GTK3_USES=	xfce:gtk3
-GTK3_USE=	gnome=gtk30
+OPTIONS_SUB=		yes
+
+DEBUG_CONFIGURE_ENABLE=	debug
+DEBUG_VARS=		WITH_DEBUG=yes
+
 GTK3_CONFIGURE_ENABLE=	gtk3
-GTK3_USES_OFF=	xfce
-NLS_USES=	gettext-runtime
+GTK3_USE=		gnome=gtk30
+GTK3_USES=		xfce:gtk3
+GTK3_USES_OFF=		xfce
+
+NLS_USES=		gettext-runtime
 NLS_CONFIGURE_ENABLE=	nls
-OPTIONS_SUB=	yes
 
 .include <bsd.port.mk>
Index: x11-wm/xfce4-panel/files/patch-configure
===================================================================
--- x11-wm/xfce4-panel/files/patch-configure
+++ x11-wm/xfce4-panel/files/patch-configure
@@ -1,6 +1,6 @@
---- ./configure.orig	2013-05-05 15:47:13.000000000 +0000
-+++ ./configure	2013-05-05 21:39:20.000000000 +0000
-@@ -13517,7 +13517,7 @@
+--- configure.orig	2015-02-28 16:21:59 UTC
++++ configure
+@@ -14102,7 +14102,7 @@ $as_echo "#define HAVE_LC_MESSAGES 1" >>
  
      fi
    fi