- Update to latest HEAD

PR:		193849

3 files changed, 46 insertions, 44 deletions

diff --git a/www/xpi-conkeror/Makefile b/www/xpi-conkeror/Makefile
index d53672432641..a988f6d86416 100644
--- a/www/xpi-conkeror/Makefile
+++ b/www/xpi-conkeror/Makefile
@@ -2,11 +2,11 @@
 # $FreeBSD$
 
 PORTNAME=	conkeror
-PORTVERSION=	20131117
-PORTREVISION=	2
+PORTVERSION=	20140911
 CATEGORIES=	www
-MASTER_SITES=	${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	dhn
+MASTER_SITES=	http://distfiles.pirateparty.in/%SUBDIR%/ \
+		${MASTER_SITE_LOCAL}
+MASTER_SITE_SUBDIR=	ashish
 
 MAINTAINER=	ashish@FreeBSD.org
 COMMENT=	Keyboard-oriented, customizable web browser based on Mozilla XULRunner
@@ -22,9 +22,8 @@ OPTIONS_DEFAULT+=	LIBXUL
 
 USES=		desktop-file-utils tar:xz
 
-WRKSRC=		${WRKDIR}/conkeror
 LIBXUL_USES=	gecko
-FIREFOX_USES=	gecko:firefox,25
+FIREFOX_USES=	gecko:firefox,32
 
 .include <bsd.port.options.mk>
 
diff --git a/www/xpi-conkeror/distinfo b/www/xpi-conkeror/distinfo
index 9527dfadc8f5..f2902837a7eb 100644
--- a/www/xpi-conkeror/distinfo
+++ b/www/xpi-conkeror/distinfo
@@ -1,2 +1,2 @@
-SHA256 (conkeror-20131117.tar.xz) = 8d2fca65ec22b58d49305fd44553c4bfded7501154fc39b2d30348db05f12c72
-SIZE (conkeror-20131117.tar.xz) = 229356
+SHA256 (conkeror-20140911.tar.xz) = c5ac96c56ff7695f522162e2a4080e3c8c111a62131b6912718475c6ff2890d8
+SIZE (conkeror-20140911.tar.xz) = 240232
diff --git a/www/xpi-conkeror/pkg-plist b/www/xpi-conkeror/pkg-plist
index 4569f874750a..302818ad9125 100644
--- a/www/xpi-conkeror/pkg-plist
+++ b/www/xpi-conkeror/pkg-plist
@@ -93,6 +93,9 @@ share/applications/conkeror.desktop
 %%DATADIR%%/modules/client-redirect.jsx
 %%DATADIR%%/modules/command-line.js
 %%DATADIR%%/modules/commands.js
+%%DATADIR%%/modules/compat/Map.js
+%%DATADIR%%/modules/compat/Promise.jsm
+%%DATADIR%%/modules/completers.js
 %%DATADIR%%/modules/conkeror.js
 %%DATADIR%%/modules/content-buffer-input.js
 %%DATADIR%%/modules/content-buffer.js
@@ -120,6 +123,7 @@ share/applications/conkeror.desktop
 %%DATADIR%%/modules/hints.js
 %%DATADIR%%/modules/history.js
 %%DATADIR%%/modules/hook.js
+%%DATADIR%%/modules/http-request-hook.js
 %%DATADIR%%/modules/index-webjump.js
 %%DATADIR%%/modules/input.js
 %%DATADIR%%/modules/interactive.js
@@ -133,7 +137,6 @@ share/applications/conkeror.desktop
 %%DATADIR%%/modules/media.js
 %%DATADIR%%/modules/mime-type-override.js
 %%DATADIR%%/modules/mime.js
-%%DATADIR%%/modules/minibuffer-completion.js
 %%DATADIR%%/modules/minibuffer-read-file.js
 %%DATADIR%%/modules/minibuffer-read-mime-type.js
 %%DATADIR%%/modules/minibuffer-read-option.js
@@ -192,6 +195,7 @@ share/applications/conkeror.desktop
 %%DATADIR%%/modules/timer.js
 %%DATADIR%%/modules/universal-argument.js
 %%DATADIR%%/modules/user-agent.js
+%%DATADIR%%/modules/user-agent-policy.jsx
 %%DATADIR%%/modules/user-variable.js
 %%DATADIR%%/modules/utils.js
 %%DATADIR%%/modules/walnut.js
@@ -221,38 +225,37 @@ share/applications/conkeror.desktop
 %%DATADIR%%/style/gesso/theme.json
 %%DATADIR%%/style/mono/conkeror--mono.css
 %%DATADIR%%/style/mono/theme.json
-@dirrm %%DATADIR%%/style/default
-@dirrm %%DATADIR%%/style/gesso
-@dirrm %%DATADIR%%/style/mono
-@dirrm %%DATADIR%%/style
-@dirrm %%DATADIR%%/search-engines
-@dirrm %%DATADIR%%/modules/page-modes
-@dirrm %%DATADIR%%/modules/extensions
-@dirrm %%DATADIR%%/modules/bindings/default/content-buffer
-@dirrm %%DATADIR%%/modules/bindings/default
-@dirrm %%DATADIR%%/modules/bindings
-@dirrm %%DATADIR%%/modules
-@dirrm %%DATADIR%%/locale/sv-SE
-@dirrm %%DATADIR%%/locale/en-US
-@dirrm %%DATADIR%%/locale
-@dirrm %%DATADIR%%/help
-@dirrm %%DATADIR%%/defaults/preferences
-@dirrm %%DATADIR%%/defaults
-@dirrm %%DATADIR%%/contrib/art
-@dirrm %%DATADIR%%/contrib/config
-@dirrm %%DATADIR%%/contrib/modules
-@dirrm %%DATADIR%%/contrib/xrev/defaults/preferences
-@dirrm %%DATADIR%%/contrib/xrev/defaults
-@dirrm %%DATADIR%%/contrib/xrev/content
-@dirrm %%DATADIR%%/contrib/xrev/chrome
-@dirrm %%DATADIR%%/contrib/xrev
-@dirrm %%DATADIR%%/contrib
-@dirrm %%DATADIR%%/content
-@dirrm %%DATADIR%%/components
-@dirrm %%DATADIR%%/chrome
-@dirrm %%DATADIR%%/branding/content
-@dirrm %%DATADIR%%/branding
-@dirrm %%DATADIR%%
-@dirrm libexec/conkeror
-@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
-@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
+@dir %%DATADIR%%/style/default
+@dir %%DATADIR%%/style/gesso
+@dir %%DATADIR%%/style/mono
+@dir %%DATADIR%%/style
+@dir %%DATADIR%%/search-engines
+@dir %%DATADIR%%/modules/page-modes
+@dir %%DATADIR%%/modules/extensions
+@dir %%DATADIR%%/modules/compat
+@dir %%DATADIR%%/modules/bindings/default/content-buffer
+@dir %%DATADIR%%/modules/bindings/default
+@dir %%DATADIR%%/modules/bindings
+@dir %%DATADIR%%/modules
+@dir %%DATADIR%%/locale/sv-SE
+@dir %%DATADIR%%/locale/en-US
+@dir %%DATADIR%%/locale
+@dir %%DATADIR%%/help
+@dir %%DATADIR%%/defaults/preferences
+@dir %%DATADIR%%/defaults
+@dir %%DATADIR%%/contrib/art
+@dir %%DATADIR%%/contrib/config
+@dir %%DATADIR%%/contrib/modules
+@dir %%DATADIR%%/contrib/xrev/defaults/preferences
+@dir %%DATADIR%%/contrib/xrev/defaults
+@dir %%DATADIR%%/contrib/xrev/content
+@dir %%DATADIR%%/contrib/xrev/chrome
+@dir %%DATADIR%%/contrib/xrev
+@dir %%DATADIR%%/contrib
+@dir %%DATADIR%%/content
+@dir %%DATADIR%%/components
+@dir %%DATADIR%%/chrome
+@dir %%DATADIR%%/branding/content
+@dir %%DATADIR%%/branding
+@dir %%DATADIR%%
+@dir libexec/conkeror