3 files changed, 143 insertions, 129 deletions

diff --git a/www/epiphany/Makefile b/www/epiphany/Makefile
index 7ec7bb1671b6..ec7ecb1170d5 100644
--- a/www/epiphany/Makefile
+++ b/www/epiphany/Makefile
@@ -3,11 +3,11 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/www/epiphany/Makefile,v 1.141 2007/03/11 20:12:27 mezz Exp $
+#   $MCom: ports/www/epiphany/Makefile,v 1.155 2007/10/15 21:47:21 mezz Exp $
 #
 
 PORTNAME=	epiphany
-PORTVERSION=	2.18.3
+PORTVERSION=	2.20.1
 CATEGORIES=	www gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
@@ -17,7 +17,8 @@ COMMENT=	An extremely lightweight and simple web browser for GNOME 2
 
 BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes
 LIB_DEPENDS=	dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib
-RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes
+RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes \
+    		${LOCALBASE}/share/themes/LowContrast/index.theme:${PORTSDIR}/x11-themes/gnome-themes
 
 USE_LDCONFIG=	yes
 INSTALLS_ICONS=	yes
@@ -32,7 +33,7 @@ WANT_GNOME=	yes
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 INSTALLS_OMF=	yes
-CONFIGURE_ARGS=	--with-mozilla=${GECKO}
+CONFIGURE_ARGS=	--with-gecko=${GECKO}
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
 		LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
 
@@ -77,8 +78,6 @@ post-patch:
 		${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's|/lib/mozilla/plugins"|/lib/browser_plugins" ":" MOZILLA_PREFIX "/lib/browser_linux_plugins"|' \
 		${WRKSRC}/embed/mozilla/mozilla-embed-single.cpp
-	@${REINPLACE_CMD} -e 's|[$$](datadir)/pygtk/2.0/defs|${LOCALBASE}/share/pygtk/2.0/defs|' \
-		${WRKSRC}/src/Makefile.in
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/data/epiphany-fonts.schemas \
diff --git a/www/epiphany/distinfo b/www/epiphany/distinfo
index 99dd06ba7946..8a567de151f5 100644
--- a/www/epiphany/distinfo
+++ b/www/epiphany/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/epiphany-2.18.3.tar.bz2) = 2e77f3f0651a27cac29224e82c3cc793
-SHA256 (gnome2/epiphany-2.18.3.tar.bz2) = ccceb15371782b2cfed2f7e4c078336dd20a0d864d9c1e31b28518aa5a25e6de
-SIZE (gnome2/epiphany-2.18.3.tar.bz2) = 4772883
+MD5 (gnome2/epiphany-2.20.1.tar.bz2) = bacb5c7f1a421f6d5adbec35d4cab3ea
+SHA256 (gnome2/epiphany-2.20.1.tar.bz2) = 2a1d9b9e928dd2cb7c3778d1990d5a42ae1b49b4d5e70d0bf86584a52d45bff1
+SIZE (gnome2/epiphany-2.20.1.tar.bz2) = 4878092
diff --git a/www/epiphany/pkg-plist b/www/epiphany/pkg-plist
index e6a3e1970474..42fa196eac82 100644
--- a/www/epiphany/pkg-plist
+++ b/www/epiphany/pkg-plist
@@ -37,84 +37,66 @@ lib/epiphany/%%EPHY_VERSION%%/plugins/libdesktopfileplugin.la
 lib/epiphany/%%EPHY_VERSION%%/plugins/libdesktopfileplugin.so
 libdata/pkgconfig/epiphany-%%EPHY_VERSION%%.pc
 share/aclocal/epiphany.m4
+share/applications/bme.desktop
+share/applications/epiphany.desktop
 share/dbus-1/services/org.gnome.Epiphany.service
-%%DOCSDIR%%/EphyCommandManager.html
-%%DOCSDIR%%/EphyEmbed.html
-%%DOCSDIR%%/EphyNodeDb.html
-%%DOCSDIR%%/EphyTab.html
-%%DOCSDIR%%/EphyWindow.html
-%%DOCSDIR%%/ch01.html
-%%DOCSDIR%%/ch02.html
-%%DOCSDIR%%/epiphany-EphyEmbedFactory.html
-%%DOCSDIR%%/epiphany-EphyEmbedPersist.html
-%%DOCSDIR%%/epiphany-EphyEmbedSingle.html
-%%DOCSDIR%%/epiphany-EphyExtensionsManager.html
-%%DOCSDIR%%/epiphany-EphyGlade.html
-%%DOCSDIR%%/epiphany-EphyPermissionManager.html
-%%DOCSDIR%%/epiphany-ephy-cookie-manager.html
-%%DOCSDIR%%/epiphany-ephy-password-manager.html
-%%DOCSDIR%%/epiphany-ephy-session.html
-%%DOCSDIR%%/epiphany-ephy-shell.html
-%%DOCSDIR%%/epiphany.devhelp
-%%DOCSDIR%%/epiphany.devhelp2
-%%DOCSDIR%%/home.png
-%%DOCSDIR%%/index.html
-%%DOCSDIR%%/index.sgml
-%%DOCSDIR%%/left.png
-%%DOCSDIR%%/right.png
-%%DOCSDIR%%/style.css
-%%DOCSDIR%%/up.png
-share/gnome/applications/bme.desktop
-share/gnome/applications/epiphany.desktop
-share/gnome/epiphany/about.ini
-share/gnome/epiphany/chrome/branding/brand.dtd
-share/gnome/epiphany/chrome/branding/brand.properties
-share/gnome/epiphany/chrome/epiphany.manifest
-share/gnome/epiphany/chrome/global/about.xhtml
-share/gnome/epiphany/default-prefs.js
-share/gnome/epiphany/ephy-xml2ini.xsl
-share/gnome/epiphany/epiphany-bookmark-editor-ui.xml
-share/gnome/epiphany/epiphany-bookmarks-html.xsl
-share/gnome/epiphany/epiphany-bookmarksbar.xml
-share/gnome/epiphany/epiphany-fs-toolbar.xml
-share/gnome/epiphany/epiphany-history-window-ui.xml
-share/gnome/epiphany/epiphany-toolbar.xml
-share/gnome/epiphany/epiphany-ui.xml
-share/gnome/epiphany/epiphany.xhtml
-share/gnome/epiphany/glade/certificate-dialogs.glade
-share/gnome/epiphany/glade/epiphany.glade
-share/gnome/epiphany/glade/form-signing-dialog.glade
-share/gnome/epiphany/glade/prefs-dialog.glade
-share/gnome/epiphany/glade/print.glade
-share/gnome/epiphany/icons/hicolor/16x16/actions/bookmark-view.png
-share/gnome/epiphany/icons/hicolor/16x16/actions/bookmark-web.png
-share/gnome/epiphany/icons/hicolor/16x16/actions/download.png
-share/gnome/epiphany/icons/hicolor/16x16/actions/history-view.png
-share/gnome/epiphany/icons/hicolor/16x16/actions/location-entry.png
-share/gnome/epiphany/icons/hicolor/16x16/status/popup-hidden.png
-share/gnome/epiphany/icons/hicolor/22x22/actions/bookmark-view.png
-share/gnome/epiphany/icons/hicolor/22x22/actions/bookmark-web.png
-share/gnome/epiphany/icons/hicolor/22x22/actions/download.png
-share/gnome/epiphany/icons/hicolor/22x22/actions/history-view.png
-share/gnome/epiphany/icons/hicolor/22x22/actions/location-entry.png
-share/gnome/epiphany/icons/hicolor/22x22/status/popup-hidden.png
-share/gnome/epiphany/icons/hicolor/24x24/actions/bookmark-view.png
-share/gnome/epiphany/icons/hicolor/24x24/actions/bookmark-web.png
-share/gnome/epiphany/icons/hicolor/24x24/actions/download.png
-share/gnome/epiphany/icons/hicolor/24x24/actions/history-view.png
-share/gnome/epiphany/icons/hicolor/24x24/actions/location-entry.png
-share/gnome/epiphany/icons/hicolor/24x24/status/popup-hidden.png
-share/gnome/epiphany/icons/hicolor/32x32/actions/bookmark-view.png
-share/gnome/epiphany/icons/hicolor/32x32/actions/download.png
-share/gnome/epiphany/icons/hicolor/32x32/actions/history-view.png
-share/gnome/epiphany/icons/hicolor/32x32/actions/location-entry.png
-share/gnome/epiphany/icons/hicolor/32x32/status/popup-hidden.png
-share/gnome/epiphany/icons/hicolor/scalable/actions/bookmark-view.svg
-share/gnome/epiphany/icons/hicolor/scalable/actions/download.svg
-share/gnome/epiphany/icons/hicolor/scalable/actions/history-view.svg
-share/gnome/epiphany/icons/hicolor/scalable/actions/location-entry.svg
-share/gnome/epiphany/icons/hicolor/scalable/status/popup-hidden.svg
-share/gnome/epiphany/mime-types-permissions.xml
+%%DATADIR%%/about.ini
+%%DATADIR%%/chrome/branding/brand.dtd
+%%DATADIR%%/chrome/branding/brand.properties
+%%DATADIR%%/chrome/epiphany.manifest
+%%DATADIR%%/chrome/global/about.xhtml
+%%DATADIR%%/default-prefs.js
+%%DATADIR%%/ephy-xml2ini.xsl
+%%DATADIR%%/epiphany-bookmark-editor-ui.xml
+%%DATADIR%%/epiphany-bookmarks-html.xsl
+%%DATADIR%%/epiphany-bookmarksbar.xml
+%%DATADIR%%/epiphany-fs-toolbar.xml
+%%DATADIR%%/epiphany-history-window-ui.xml
+%%DATADIR%%/epiphany-toolbar.xml
+%%DATADIR%%/epiphany-ui.xml
+%%DATADIR%%/epiphany.xhtml
+%%DATADIR%%/glade/certificate-dialogs.glade
+%%DATADIR%%/glade/epiphany.glade
+%%DATADIR%%/glade/form-signing-dialog.glade
+%%DATADIR%%/glade/prefs-dialog.glade
+%%DATADIR%%/glade/print.glade
+%%DATADIR%%/icons/hicolor/16x16/actions/bookmark-view.png
+%%DATADIR%%/icons/hicolor/16x16/actions/history-view.png
+%%DATADIR%%/icons/hicolor/16x16/actions/location-entry.png
+%%DATADIR%%/icons/hicolor/16x16/places/bookmark-web.png
+%%DATADIR%%/icons/hicolor/16x16/status/lock-broken.png
+%%DATADIR%%/icons/hicolor/16x16/status/lock-insecure.png
+%%DATADIR%%/icons/hicolor/16x16/status/lock-secure-checked.png
+%%DATADIR%%/icons/hicolor/16x16/status/lock-secure.png
+%%DATADIR%%/icons/hicolor/16x16/status/popup-hidden.png
+%%DATADIR%%/icons/hicolor/22x22/actions/bookmark-view.png
+%%DATADIR%%/icons/hicolor/22x22/actions/history-view.png
+%%DATADIR%%/icons/hicolor/22x22/actions/location-entry.png
+%%DATADIR%%/icons/hicolor/22x22/places/bookmark-web.png
+%%DATADIR%%/icons/hicolor/22x22/status/popup-hidden.png
+%%DATADIR%%/icons/hicolor/24x24/actions/bookmark-view.png
+%%DATADIR%%/icons/hicolor/24x24/actions/history-view.png
+%%DATADIR%%/icons/hicolor/24x24/actions/location-entry.png
+%%DATADIR%%/icons/hicolor/24x24/places/bookmark-web.png
+%%DATADIR%%/icons/hicolor/24x24/status/lock-broken.png
+%%DATADIR%%/icons/hicolor/24x24/status/lock-insecure.png
+%%DATADIR%%/icons/hicolor/24x24/status/lock-secure-checked.png
+%%DATADIR%%/icons/hicolor/24x24/status/lock-secure.png
+%%DATADIR%%/icons/hicolor/24x24/status/popup-hidden.png
+%%DATADIR%%/icons/hicolor/32x32/actions/bookmark-view.png
+%%DATADIR%%/icons/hicolor/32x32/actions/history-view.png
+%%DATADIR%%/icons/hicolor/32x32/actions/location-entry.png
+%%DATADIR%%/icons/hicolor/32x32/actions/location-entry.svg
+%%DATADIR%%/icons/hicolor/32x32/status/popup-hidden.png
+%%DATADIR%%/icons/hicolor/48x48/status/lock-broken.png
+%%DATADIR%%/icons/hicolor/48x48/status/lock-insecure.png
+%%DATADIR%%/icons/hicolor/48x48/status/lock-secure-checked.png
+%%DATADIR%%/icons/hicolor/48x48/status/lock-secure.png
+%%DATADIR%%/icons/hicolor/scalable/actions/bookmark-view.svg
+%%DATADIR%%/icons/hicolor/scalable/actions/history-view.svg
+%%DATADIR%%/icons/hicolor/scalable/actions/location-entry.svg
+%%DATADIR%%/icons/hicolor/scalable/status/popup-hidden.svg
+%%DATADIR%%/mime-types-permissions.xml
 share/gnome/help/epiphany/C/epiphany.xml
 share/gnome/help/epiphany/C/figures/ephy-addressbar-smartbookmark-screenshot.png
 share/gnome/help/epiphany/C/figures/ephy-bookmarkbar-smartbookmark-screenshot.png
@@ -126,6 +108,11 @@ share/gnome/help/epiphany/bg/figures/ephy-addressbar-smartbookmark-screenshot.pn
 share/gnome/help/epiphany/bg/figures/ephy-bookmarkbar-smartbookmark-screenshot.png
 share/gnome/help/epiphany/bg/figures/ephy-history-window-screenshot.png
 share/gnome/help/epiphany/bg/figures/ephy-screenshot.png
+share/gnome/help/epiphany/ca/epiphany.xml
+share/gnome/help/epiphany/ca/figures/ephy-addressbar-smartbookmark-screenshot.png
+share/gnome/help/epiphany/ca/figures/ephy-bookmarkbar-smartbookmark-screenshot.png
+share/gnome/help/epiphany/ca/figures/ephy-history-window-screenshot.png
+share/gnome/help/epiphany/ca/figures/ephy-screenshot.png
 share/gnome/help/epiphany/de/epiphany.xml
 share/gnome/help/epiphany/de/figures/ephy-addressbar-smartbookmark-screenshot.png
 share/gnome/help/epiphany/de/figures/ephy-bookmarkbar-smartbookmark-screenshot.png
@@ -176,6 +163,11 @@ share/gnome/help/epiphany/nl/figures/ephy-addressbar-smartbookmark-screenshot.pn
 share/gnome/help/epiphany/nl/figures/ephy-bookmarkbar-smartbookmark-screenshot.png
 share/gnome/help/epiphany/nl/figures/ephy-history-window-screenshot.png
 share/gnome/help/epiphany/nl/figures/ephy-screenshot.png
+share/gnome/help/epiphany/oc/epiphany.xml
+share/gnome/help/epiphany/oc/figures/ephy-addressbar-smartbookmark-screenshot.png
+share/gnome/help/epiphany/oc/figures/ephy-bookmarkbar-smartbookmark-screenshot.png
+share/gnome/help/epiphany/oc/figures/ephy-history-window-screenshot.png
+share/gnome/help/epiphany/oc/figures/ephy-screenshot.png
 share/gnome/help/epiphany/ru/epiphany.xml
 share/gnome/help/epiphany/ru/figures/ephy-addressbar-smartbookmark-screenshot.png
 share/gnome/help/epiphany/ru/figures/ephy-bookmarkbar-smartbookmark-screenshot.png
@@ -191,22 +183,15 @@ share/gnome/help/epiphany/uk/figures/ephy-addressbar-smartbookmark-screenshot.pn
 share/gnome/help/epiphany/uk/figures/ephy-bookmarkbar-smartbookmark-screenshot.png
 share/gnome/help/epiphany/uk/figures/ephy-history-window-screenshot.png
 share/gnome/help/epiphany/uk/figures/ephy-screenshot.png
-share/gnome/omf/epiphany/epiphany-C.omf
-share/gnome/omf/epiphany/epiphany-bg.omf
-share/gnome/omf/epiphany/epiphany-de.omf
-share/gnome/omf/epiphany/epiphany-el.omf
-share/gnome/omf/epiphany/epiphany-en_GB.omf
-share/gnome/omf/epiphany/epiphany-es.omf
-share/gnome/omf/epiphany/epiphany-eu.omf
-share/gnome/omf/epiphany/epiphany-fi.omf
-share/gnome/omf/epiphany/epiphany-fr.omf
-share/gnome/omf/epiphany/epiphany-it.omf
-share/gnome/omf/epiphany/epiphany-ja.omf
-share/gnome/omf/epiphany/epiphany-nl.omf
-share/gnome/omf/epiphany/epiphany-ru.omf
-share/gnome/omf/epiphany/epiphany-sv.omf
-share/gnome/omf/epiphany/epiphany-uk.omf
+share/icons/HighContrastLargePrint/48x48/apps/gnome-web-browser.png
+share/icons/HighContrastLargePrintInverse/48x48/apps/gnome-web-browser.png
+share/icons/LowContrastLargePrint/48x48/apps/gnome-web-browser.png
+share/icons/hicolor/16x16/apps/gnome-web-browser.png
+share/icons/hicolor/22x22/apps/gnome-web-browser.png
+share/icons/hicolor/24x24/apps/gnome-web-browser.png
+share/icons/hicolor/32x32/apps/gnome-web-browser.png
 share/icons/hicolor/48x48/apps/epiphany-bookmarks.png
+share/icons/hicolor/scalable/apps/gnome-web-browser.svg
 share/locale/am/LC_MESSAGES/epiphany.mo
 share/locale/ar/LC_MESSAGES/epiphany.mo
 share/locale/az/LC_MESSAGES/epiphany.mo
@@ -267,6 +252,7 @@ share/locale/pt_BR/LC_MESSAGES/epiphany.mo
 share/locale/ro/LC_MESSAGES/epiphany.mo
 share/locale/ru/LC_MESSAGES/epiphany.mo
 share/locale/rw/LC_MESSAGES/epiphany.mo
+share/locale/si/LC_MESSAGES/epiphany.mo
 share/locale/sk/LC_MESSAGES/epiphany.mo
 share/locale/sl/LC_MESSAGES/epiphany.mo
 share/locale/sq/LC_MESSAGES/epiphany.mo
@@ -284,14 +270,33 @@ share/locale/wa/LC_MESSAGES/epiphany.mo
 share/locale/zh_CN/LC_MESSAGES/epiphany.mo
 share/locale/zh_HK/LC_MESSAGES/epiphany.mo
 share/locale/zh_TW/LC_MESSAGES/epiphany.mo
-%%PYTHON%%share/pygtk/2.0/defs/epiphany.defs
-@dirrm share/gnome/omf/epiphany
+share/omf/epiphany/epiphany-C.omf
+share/omf/epiphany/epiphany-bg.omf
+share/omf/epiphany/epiphany-ca.omf
+share/omf/epiphany/epiphany-de.omf
+share/omf/epiphany/epiphany-el.omf
+share/omf/epiphany/epiphany-en_GB.omf
+share/omf/epiphany/epiphany-es.omf
+share/omf/epiphany/epiphany-eu.omf
+share/omf/epiphany/epiphany-fi.omf
+share/omf/epiphany/epiphany-fr.omf
+share/omf/epiphany/epiphany-it.omf
+share/omf/epiphany/epiphany-ja.omf
+share/omf/epiphany/epiphany-nl.omf
+share/omf/epiphany/epiphany-oc.omf
+share/omf/epiphany/epiphany-ru.omf
+share/omf/epiphany/epiphany-sv.omf
+share/omf/epiphany/epiphany-uk.omf
+share/pygtk/2.0/defs/epiphany.defs
+@dirrm share/omf/epiphany
 @dirrm share/gnome/help/epiphany/uk/figures
 @dirrm share/gnome/help/epiphany/uk
 @dirrm share/gnome/help/epiphany/sv/figures
 @dirrm share/gnome/help/epiphany/sv
 @dirrm share/gnome/help/epiphany/ru/figures
 @dirrm share/gnome/help/epiphany/ru
+@dirrm share/gnome/help/epiphany/oc/figures
+@dirrm share/gnome/help/epiphany/oc
 @dirrm share/gnome/help/epiphany/nl/figures
 @dirrm share/gnome/help/epiphany/nl
 @dirrm share/gnome/help/epiphany/ja/figures
@@ -312,38 +317,45 @@ share/locale/zh_TW/LC_MESSAGES/epiphany.mo
 @dirrm share/gnome/help/epiphany/el
 @dirrm share/gnome/help/epiphany/de/figures
 @dirrm share/gnome/help/epiphany/de
+@dirrm share/gnome/help/epiphany/ca/figures
+@dirrm share/gnome/help/epiphany/ca
 @dirrm share/gnome/help/epiphany/bg/figures
 @dirrm share/gnome/help/epiphany/bg
 @dirrm share/gnome/help/epiphany/C/figures
 @dirrm share/gnome/help/epiphany/C
 @dirrm share/gnome/help/epiphany
-@dirrm share/gnome/epiphany/icons/hicolor/scalable/status
-@dirrm share/gnome/epiphany/icons/hicolor/scalable/actions
-@dirrm share/gnome/epiphany/icons/hicolor/scalable
-@dirrm share/gnome/epiphany/icons/hicolor/32x32/status
-@dirrm share/gnome/epiphany/icons/hicolor/32x32/actions
-@dirrm share/gnome/epiphany/icons/hicolor/32x32
-@dirrm share/gnome/epiphany/icons/hicolor/24x24/status
-@dirrm share/gnome/epiphany/icons/hicolor/24x24/actions
-@dirrm share/gnome/epiphany/icons/hicolor/24x24
-@dirrm share/gnome/epiphany/icons/hicolor/22x22/status
-@dirrm share/gnome/epiphany/icons/hicolor/22x22/actions
-@dirrm share/gnome/epiphany/icons/hicolor/22x22
-@dirrm share/gnome/epiphany/icons/hicolor/16x16/status
-@dirrm share/gnome/epiphany/icons/hicolor/16x16/actions
-@dirrm share/gnome/epiphany/icons/hicolor/16x16
-@dirrm share/gnome/epiphany/icons/hicolor
-@dirrm share/gnome/epiphany/icons
-@dirrm share/gnome/epiphany/glade
-@dirrm share/gnome/epiphany/chrome/global
-@dirrm share/gnome/epiphany/chrome/branding
-@dirrm share/gnome/epiphany/chrome
-@dirrm share/gnome/epiphany/art
-@dirrm share/gnome/epiphany
+@dirrm %%DATADIR%%/icons/hicolor/scalable/status
+@dirrm %%DATADIR%%/icons/hicolor/scalable/actions
+@dirrm %%DATADIR%%/icons/hicolor/scalable
+@dirrm %%DATADIR%%/icons/hicolor/48x48/status
+@dirrm %%DATADIR%%/icons/hicolor/48x48
+@dirrm %%DATADIR%%/icons/hicolor/32x32/status
+@dirrm %%DATADIR%%/icons/hicolor/32x32/actions
+@dirrm %%DATADIR%%/icons/hicolor/32x32
+@dirrm %%DATADIR%%/icons/hicolor/24x24/status
+@dirrm %%DATADIR%%/icons/hicolor/24x24/places
+@dirrm %%DATADIR%%/icons/hicolor/24x24/actions
+@dirrm %%DATADIR%%/icons/hicolor/24x24
+@dirrm %%DATADIR%%/icons/hicolor/22x22/status
+@dirrm %%DATADIR%%/icons/hicolor/22x22/places
+@dirrm %%DATADIR%%/icons/hicolor/22x22/actions
+@dirrm %%DATADIR%%/icons/hicolor/22x22
+@dirrm %%DATADIR%%/icons/hicolor/16x16/status
+@dirrm %%DATADIR%%/icons/hicolor/16x16/places
+@dirrm %%DATADIR%%/icons/hicolor/16x16/actions
+@dirrm %%DATADIR%%/icons/hicolor/16x16
+@dirrm %%DATADIR%%/icons/hicolor
+@dirrm %%DATADIR%%/icons
+@dirrm %%DATADIR%%/glade
+@dirrm %%DATADIR%%/chrome/global
+@dirrm %%DATADIR%%/chrome/branding
+@dirrm %%DATADIR%%/chrome
+@dirrm %%DATADIR%%/art
+@dirrm %%DATADIR%%
 @dirrm %%DOCSDIR%%
-@dirrmtry lib/epiphany/%%EPHY_VERSION%%/plugins
-@dirrmtry lib/epiphany/%%EPHY_VERSION%%
-@dirrmtry lib/epiphany
+@dirrm lib/epiphany/%%EPHY_VERSION%%/plugins
+@dirrm lib/epiphany/%%EPHY_VERSION%%
+@dirrm lib/epiphany
 @dirrm include/epiphany/%%EPHY_VERSION%%/epiphany
 @dirrm include/epiphany/%%EPHY_VERSION%%
 @dirrm include/epiphany
@@ -353,6 +365,8 @@ share/locale/zh_TW/LC_MESSAGES/epiphany.mo
 @dirrmtry share/locale/zh_HK
 @dirrmtry share/locale/te/LC_MESSAGES
 @dirrmtry share/locale/te
+@dirrmtry share/locale/si/LC_MESSAGES
+@dirrmtry share/locale/si
 @dirrmtry share/locale/rw/LC_MESSAGES
 @dirrmtry share/locale/rw
 @dirrmtry share/locale/oc/LC_MESSAGES
@@ -369,3 +383,4 @@ share/locale/zh_TW/LC_MESSAGES/epiphany.mo
 @dirrmtry share/locale/dz
 @dirrmtry share/locale/bn_IN/LC_MESSAGES
 @dirrmtry share/locale/bn_IN
+@dirrmtry share/applications