From owner-svn-ports-head@FreeBSD.ORG  Tue Jul 17 21:26:28 2012
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id DA34E106564A;
	Tue, 17 Jul 2012 21:26:28 +0000 (UTC)
	(envelope-from olivierd@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id C4F838FC12;
	Tue, 17 Jul 2012 21:26:28 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q6HLQSxF097128;
	Tue, 17 Jul 2012 21:26:28 GMT
	(envelope-from olivierd@svn.freebsd.org)
Received: (from olivierd@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q6HLQSCp097126;
	Tue, 17 Jul 2012 21:26:28 GMT
	(envelope-from olivierd@svn.freebsd.org)
Message-Id: <201207172126.q6HLQSCp097126@svn.freebsd.org>
From: Olivier Duchateau <olivierd@FreeBSD.org>
Date: Tue, 17 Jul 2012 21:26:28 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
	svn-ports-head@freebsd.org
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r301043 - head/sysutils/xfce4-settings
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the ports tree for head
	<svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>, 
	<mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
	<mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 17 Jul 2012 21:26:28 -0000

Author: olivierd
Date: Tue Jul 17 21:26:28 2012
New Revision: 301043
URL: http://svn.freebsd.org/changeset/ports/301043

Log:
  Fix missing icons and GTK theme.
  
  PR:	168688
  Approved by:	miwi, rene (mentors)

Modified:
  head/sysutils/xfce4-settings/Makefile

Modified: head/sysutils/xfce4-settings/Makefile
==============================================================================
--- head/sysutils/xfce4-settings/Makefile	Tue Jul 17 21:14:08 2012	(r301042)
+++ head/sysutils/xfce4-settings/Makefile	Tue Jul 17 21:26:28 2012	(r301043)
@@ -7,7 +7,7 @@
 
 PORTNAME=	xfce4-settings
 PORTVERSION=	4.10.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	sysutils xfce
 MASTER_SITES=	${MASTER_SITE_XFCE}
 DIST_SUBDIR=	xfce4
@@ -31,7 +31,7 @@ CONFIGURE_ARGS=	--enable-pluggable-dialo
 		--enable-gio-unix
 
 OPTIONS_DEFINE=		XKLAVIER XCURSOR XRANDR NOTIFY NLS SOUND
-OPTIONS_DEFAULT=	XCURSOR XRANDR NOTIFY NLS SOUND
+OPTIONS_DEFAULT=	XKLAVIER XCURSOR XRANDR NOTIFY NLS
 SOUND_DESC=		Enable sound control
 
 .include <bsd.port.options.mk>
@@ -85,7 +85,9 @@ CONFIGURE_ARGS+=--disable-sound-settings
 post-patch:
 	# until xfce4-icon-theme is back we rely on Tango
 	@${REINPLACE_CMD} -e 's|Rodent|Tango|g' \
-		${WRKSRC}/dialogs/appearance-settings/main.c \
+		${WRKSRC}/dialogs/appearance-settings/main.c
+	@${REINPLACE_CMD} -e 's|IconThemeName" type="empty|IconThemeName" type="string" value="Tango|; \
+		s|"ThemeName" type="empty|"ThemeName" type="string" value="Xfce|' \
 		${WRKSRC}/xfsettingsd/xsettings.xml
 	@${REINPLACE_CMD} -e 's|xkl_config_registry_load (settings->priv->xkl_registry)|xkl_config_registry_load (settings->priv->xkl_registry, FALSE)|g; \
 		s|xkl_engine_stop_listen (settings->priv->xkl_engine)|xkl_engine_stop_listen (settings->priv->xkl_engine, FALSE)|g' \