From owner-svn-ports-head@FreeBSD.ORG  Wed Jun 12 06:58:53 2013
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 6D1483E7;
 Wed, 12 Jun 2013 06:58:53 +0000 (UTC) (envelope-from kwm@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 45DF513B0;
 Wed, 12 Jun 2013 06:58:53 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5C6wrKu080651;
 Wed, 12 Jun 2013 06:58:53 GMT (envelope-from kwm@svn.freebsd.org)
Received: (from kwm@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5C6wqAA080649;
 Wed, 12 Jun 2013 06:58:52 GMT (envelope-from kwm@svn.freebsd.org)
Message-Id: <201306120658.r5C6wqAA080649@svn.freebsd.org>
From: Koop Mast <kwm@FreeBSD.org>
Date: Wed, 12 Jun 2013 06:58:52 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r320666 - head/www/epiphany
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.14
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/options/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: Wed, 12 Jun 2013 06:58:53 -0000

Author: kwm
Date: Wed Jun 12 06:58:52 2013
New Revision: 320666
URL: http://svnweb.freebsd.org/changeset/ports/320666

Log:
  Switch to USES=desktop-file-utils, and sort USES.
  Fix build with pkg in DEVELOPER_MODE, by not trying to remove non existing
  directories. [1]
  
  Submitted by:	miwi [1]

Modified:
  head/www/epiphany/Makefile
  head/www/epiphany/pkg-plist   (contents, props changed)

Modified: head/www/epiphany/Makefile
==============================================================================
--- head/www/epiphany/Makefile	Wed Jun 12 06:46:16 2013	(r320665)
+++ head/www/epiphany/Makefile	Wed Jun 12 06:58:52 2013	(r320666)
@@ -29,8 +29,8 @@ USE_LDCONFIG=	yes
 INSTALLS_ICONS=	yes
 USE_BZIP2=	yes
 USE_PYTHON=	yes
-USES=		pathfix gettext
-USE_GNOME=	gnomeprefix intlhack gnomedesktop desktopfileutils
+USES=		desktop-file-utils gettext pathfix
+USE_GNOME=	gnomeprefix intlhack gnomedesktop
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 INSTALLS_OMF=	yes
@@ -76,7 +76,5 @@ post-patch:
 		-e 's|EPIPHANY_API_VERSION=2.29|EPIPHANY_API_VERSION=2.30|g' \
 		${WRKSRC}/configure
 
-post-install:
-	@-update-desktop-database
-
 .include <bsd.port.mk>
+

Modified: head/www/epiphany/pkg-plist
==============================================================================
--- head/www/epiphany/pkg-plist	Wed Jun 12 06:46:16 2013	(r320665)
+++ head/www/epiphany/pkg-plist	Wed Jun 12 06:58:52 2013	(r320666)
@@ -401,14 +401,9 @@ share/omf/epiphany/epiphany-uk.omf
 @dirrmtry %%DATADIR%%
 @dirrmtry %%DOCSDIR%%
 @dirrmtry share/applications
-@dirrmtry lib/epiphany/%%EPHY_VERSION%%/plugins
-@dirrmtry lib/epiphany/%%EPHY_VERSION%%
-@dirrmtry lib/epiphany
 @dirrm include/epiphany/%%EPHY_VERSION%%/epiphany
 @dirrm include/epiphany/%%EPHY_VERSION%%
 @dirrm include/epiphany
-@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
-@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
 @dirrmtry share/locale/zh_HK/LC_MESSAGES
 @dirrmtry share/locale/zh_HK
 @dirrmtry share/locale/yo/LC_MESSAGES