From ce529a68edf1a9f3e9e4fe2fa236a7f41bd94bc3 Mon Sep 17 00:00:00 2001 From: Koop Mast Date: Wed, 12 Jun 2013 06:58:52 +0000 Subject: [PATCH] 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] --- www/epiphany/Makefile | 8 +++----- www/epiphany/pkg-plist | 5 ----- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/www/epiphany/Makefile b/www/epiphany/Makefile index 38afe20b1442..84c7ed2800e8 100644 --- a/www/epiphany/Makefile +++ b/www/epiphany/Makefile @@ -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 + diff --git a/www/epiphany/pkg-plist b/www/epiphany/pkg-plist index c14e43c94c51..fb1938e5f910 100644 --- a/www/epiphany/pkg-plist +++ b/www/epiphany/pkg-plist @@ -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