aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkwm <kwm@FreeBSD.org>2013-06-12 14:58:52 +0800
committerkwm <kwm@FreeBSD.org>2013-06-12 14:58:52 +0800
commit6629e19386e63eeaa3b5fb0de5650e0e150f4004 (patch)
tree9d4d05afdfe819a4c1ff3198469b8dd86ff89657
parent74574256a4b7d9cc2322908ea30380f930594493 (diff)
downloadfreebsd-ports-gnome-6629e19386e63eeaa3b5fb0de5650e0e150f4004.tar.gz
freebsd-ports-gnome-6629e19386e63eeaa3b5fb0de5650e0e150f4004.tar.zst
freebsd-ports-gnome-6629e19386e63eeaa3b5fb0de5650e0e150f4004.zip
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]
-rw-r--r--www/epiphany/Makefile8
-rw-r--r--www/epiphany/pkg-plist5
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 <bsd.port.mk>
+
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