From owner-svn-ports-all@FreeBSD.ORG  Sun Jan 19 18:21:18 2014
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 50225AB7;
 Sun, 19 Jan 2014 18:21:18 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 3CB5D11C3;
 Sun, 19 Jan 2014 18:21:18 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0JILIA0036342;
 Sun, 19 Jan 2014 18:21:18 GMT (envelope-from ehaupt@svn.freebsd.org)
Received: (from ehaupt@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0JILHpm036339;
 Sun, 19 Jan 2014 18:21:17 GMT (envelope-from ehaupt@svn.freebsd.org)
Message-Id: <201401191821.s0JILHpm036339@svn.freebsd.org>
From: Emanuel Haupt <ehaupt@FreeBSD.org>
Date: Sun, 19 Jan 2014 18:21:17 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r340330 - head/x11/xterm
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 19 Jan 2014 18:21:18 -0000

Author: ehaupt
Date: Sun Jan 19 18:21:17 2014
New Revision: 340330
URL: http://svnweb.freebsd.org/changeset/ports/340330
QAT: https://qat.redports.org/buildarchive/r340330/

Log:
  Simplify desktop-file-utils usage.
  
  Submitted by:	bapt

Modified:
  head/x11/xterm/Makefile
  head/x11/xterm/pkg-plist

Modified: head/x11/xterm/Makefile
==============================================================================
--- head/x11/xterm/Makefile	Sun Jan 19 18:17:54 2014	(r340329)
+++ head/x11/xterm/Makefile	Sun Jan 19 18:21:17 2014	(r340330)
@@ -15,8 +15,8 @@ COMMENT=	Terminal emulator for the X Win
 
 CONFLICTS=	x11iraf-[0-9]*
 
+USES=		desktop-file-utils
 USE_XORG=	xaw xft
-WANT_GNOME=	desktopfileutils
 GNU_CONFIGURE=	yes
 
 CONFIGURE_ENV+=	LIBS="-L${LOCALBASE}/lib"
@@ -26,7 +26,7 @@ CPPFLAGS+=	-I${LOCALBASE}/include
 
 ICONVERSION=	1
 
-OPTIONS_DEFINE=	WCHAR LUIT DECTERM PCRE GNOME DABBREV 256COLOR SIXEL
+OPTIONS_DEFINE=	WCHAR LUIT DECTERM PCRE DABBREV 256COLOR SIXEL
 
 DABBREV_DESC=	Enable support for dabbrev-expand
 DECTERM_DESC=	Enable DECterm Locator support
@@ -46,7 +46,6 @@ PCRE_CONFIGURE_WITH=	pcre
 PCRE_LIB_DEPENDS=	libpcre.so:${PORTSDIR}/devel/pcre
 DABBREV_CONFIGURE_ENABLE=	dabbrev
 SIXEL_CONFIGURE_ENABLE=	sixel-graphics
-GNOME_USES=	desktop-file-utils
 
 .include <bsd.port.options.mk>
 

Modified: head/x11/xterm/pkg-plist
==============================================================================
--- head/x11/xterm/pkg-plist	Sun Jan 19 18:17:54 2014	(r340329)
+++ head/x11/xterm/pkg-plist	Sun Jan 19 18:21:17 2014	(r340330)
@@ -21,3 +21,5 @@ share/pixmaps/xterm-color_32x32.xpm
 share/pixmaps/xterm-color_48x48.xpm
 share/pixmaps/xterm_32x32.xpm
 share/pixmaps/xterm_48x48.xpm
+%%GNOME%%@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
+%%GNOME%%@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true