Index: head/www/xpi-conkeror/Makefile
===================================================================
--- head/www/xpi-conkeror/Makefile	(revision 405868)
+++ head/www/xpi-conkeror/Makefile	(revision 405869)
@@ -1,67 +1,64 @@
 # Created by: Andrew Pantyukhin <infofarmer@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	conkeror
-PORTVERSION=	20140911
+PORTVERSION=	20150730
 CATEGORIES=	www
 MASTER_SITES=	http://distfiles.pirateparty.in/ashish/ \
 		LOCAL/ashish
 
 MAINTAINER=	ashish@FreeBSD.org
 COMMENT=	Keyboard-oriented, customizable web browser based on Mozilla XULRunner
 
 LICENSE=	GPLv1 GPLv2 MPL
 LICENSE_COMB=	multi
 
 OPTIONS_SINGLE+=	XULRUNNER
 OPTIONS_SINGLE_XULRUNNER=	FIREFOX LIBXUL
 FIREFOX_DESC?=	Use XULRunner from Firefox port
 LIBXUL_DESC?=	Use XULRunner from LibXUL port
 OPTIONS_DEFAULT+=	LIBXUL
 
-USES=		desktop-file-utils tar:xz
+USES=		desktop-file-utils tar:xz gmake
 
 LIBXUL_USES=	gecko
-FIREFOX_USES=	gecko:firefox,32
+FIREFOX_USES=	gecko:firefox,32+
+ALL_TARGET=	# empty
 
-.include <bsd.port.options.mk>
-
 BUILD_ID=	${ECHO_CMD} -n `whoami`@`hostname`_`date +%s`
 
 post-patch:
 		cd ${WRKSRC} && \
-			${MV} debian/conkeror.desktop . && \
+			${MV} contrib/conkeror.desktop . && \
 			${MV} contrib/man/conkeror.1 . && \
-			${RM} -rf contrib/debian contrib/man debian tests && \
+			${RM} -rf contrib/debian contrib/dist contrib/man debian tests && \
 			${RM} -f contrib/build.sh contrib/install.sh contrib/mketags.sh \
 			contrib/testrun.sh contrib/run-conkeror && \
 			${MKDIR} share  && \
 			${MV} branding chrome components content \
 			contrib defaults locale modules search-engines help \
 			style share && \
 			${MV} COPYING CREDITS Info.plist chrome.manifest \
 			content-policy.manifest share
-.if ${PORT_OPTIONS:MFIREFOX}
+		${REINPLACE_CMD} -e "s,%%DATADIR%%,${DATADIR},g" ${WRKSRC}/conkeror
+
+post-patch-FIREFOX-on:
 		${REINPLACE_CMD} -e "s/xulrunner/firefox/g" ${WRKSRC}/conkeror
 		${REINPLACE_CMD} -e "s/XULRUNNER/FIREFOX/g" ${WRKSRC}/conkeror
 		${REINPLACE_CMD} -e 's/exec $${FIREFOX}/exec $${FIREFOX} -app/' ${WRKSRC}/conkeror
-.endif
-
-do-build:
-		${MAKE} -C ${WRKSRC}
 
 do-install:
 		${MKDIR} ${STAGEDIR}${PREFIX}/libexec/conkeror
 		${MKDIR} ${STAGEDIR}${DATADIR}
 		${MKDIR} ${STAGEDIR}${DESKTOPDIR}
 		cd ${WRKSRC}/share && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}
 		${SED} -e "s/BuildID=git/BuildID=$$(${BUILD_ID})/g" \
 			-e "s/^Version=\(.*\)$$/Version=\1 (FreeBSD-${OSREL})/g" \
 			<${WRKSRC}/application.ini >${STAGEDIR}${DATADIR}/application.ini
 		${INSTALL_SCRIPT} ${WRKSRC}/conkeror ${STAGEDIR}${PREFIX}/bin/
 		${INSTALL_DATA} ${WRKSRC}/conkeror.desktop ${STAGEDIR}${DESKTOPDIR}
 		${INSTALL_PROGRAM} ${WRKSRC}/conkeror-spawn-helper ${STAGEDIR}${PREFIX}/libexec/conkeror/
 		${LN} -sf ${PREFIX}/libexec/conkeror/conkeror-spawn-helper ${STAGEDIR}${DATADIR}/
 		${INSTALL_MAN} ${WRKSRC}/conkeror.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
 
 .include <bsd.port.mk>
Index: head/www/xpi-conkeror/distinfo
===================================================================
--- head/www/xpi-conkeror/distinfo	(revision 405868)
+++ head/www/xpi-conkeror/distinfo	(revision 405869)
@@ -1,2 +1,2 @@
-SHA256 (conkeror-20140911.tar.xz) = c5ac96c56ff7695f522162e2a4080e3c8c111a62131b6912718475c6ff2890d8
-SIZE (conkeror-20140911.tar.xz) = 240232
+SHA256 (conkeror-20150730.tar.xz) = 7695fc4e429b2ba6c035ccddc8ecc72cc6a248297999451102c867d8df4c726d
+SIZE (conkeror-20150730.tar.xz) = 242640
Index: head/www/xpi-conkeror/files/patch-conkeror
===================================================================
--- head/www/xpi-conkeror/files/patch-conkeror	(revision 405868)
+++ head/www/xpi-conkeror/files/patch-conkeror	(revision 405869)
@@ -1,15 +1,15 @@
 --- conkeror.orig
 +++ conkeror
 @@ -0,0 +1,12 @@
 +#!/bin/sh
 +
 +XULRUNNER=$(which xulrunner)
 +
 +if [ -z "${XULRUNNER}" ]; then 
 +	echo Unable to locate xulrunner binary.
 +elif [ ! -x "${XULRUNNER}" ]; then
 +	echo ${XULRUNNER} is not executable.
 +else
-+	exec ${XULRUNNER} /usr/local/share/conkeror/application.ini "$@"
++	exec ${XULRUNNER} %%DATADIR%%/application.ini "$@"
 +fi
 +
Index: head/www/xpi-conkeror/pkg-plist
===================================================================
--- head/www/xpi-conkeror/pkg-plist	(revision 405868)
+++ head/www/xpi-conkeror/pkg-plist	(revision 405869)
@@ -1,261 +1,227 @@
 bin/conkeror
 libexec/conkeror/conkeror-spawn-helper
 man/man1/conkeror.1.gz
 share/applications/conkeror.desktop
 %%DATADIR%%/COPYING
 %%DATADIR%%/CREDITS
 %%DATADIR%%/Info.plist
 %%DATADIR%%/chrome.manifest
 %%DATADIR%%/content-policy.manifest
 %%DATADIR%%/application.ini
 %%DATADIR%%/branding/brand.dtd
 %%DATADIR%%/branding/brand.properties
 %%DATADIR%%/branding/content/about.png
 %%DATADIR%%/chrome/chrome.manifest
 %%DATADIR%%/components/.autoreg
 %%DATADIR%%/components/application.js
 %%DATADIR%%/components/command-line.js
 %%DATADIR%%/components/content-policy.js
 %%DATADIR%%/components/download_helper.js
 %%DATADIR%%/components/download_manager_ui.js
 %%DATADIR%%/conkeror-spawn-helper
 %%DATADIR%%/content/annotated-textbox.xml
 %%DATADIR%%/content/blank.html
 %%DATADIR%%/content/conkeror.xul
 %%DATADIR%%/content/downloads.css
 %%DATADIR%%/content/help.css
 %%DATADIR%%/content/hints.css
 %%DATADIR%%/content/minibuffer-annotation.css
 %%DATADIR%%/content/minibuffer.css
 %%DATADIR%%/content/minibuffer.xul
 %%DATADIR%%/contrib/art/conker.svg
 %%DATADIR%%/contrib/art/nut.svg
 %%DATADIR%%/contrib/art/outline.svg
 %%DATADIR%%/contrib/config/common.js
 %%DATADIR%%/contrib/list-xulrunner-versions
 %%DATADIR%%/contrib/modules/mode-line-buttons.js
 %%DATADIR%%/contrib/xrev/application.ini
 %%DATADIR%%/contrib/xrev/chrome/chrome.manifest
 %%DATADIR%%/contrib/xrev/chrome.manifest
 %%DATADIR%%/contrib/xrev/content/main.xul
 %%DATADIR%%/contrib/xrev/content/xrev.js
 %%DATADIR%%/contrib/xrev/defaults/preferences/prefs.js
 %%DATADIR%%/defaults/preferences/debug.js
 %%DATADIR%%/defaults/preferences/default-modules.js
 %%DATADIR%%/defaults/preferences/download-manager.js
 %%DATADIR%%/defaults/preferences/gui.js
 %%DATADIR%%/defaults/preferences/history-frecency.js
 %%DATADIR%%/defaults/preferences/javascript-restrictions.js
 %%DATADIR%%/defaults/preferences/prefs.js
 %%DATADIR%%/defaults/preferences/uri.js
 %%DATADIR%%/help/back-forward.html
 %%DATADIR%%/help/help.html
 %%DATADIR%%/help/manual.css
 %%DATADIR%%/help/tutorial.html
 %%DATADIR%%/locale/en-US/gui_context_menu.properties
 %%DATADIR%%/locale/en-US/netErrorApp.dtd
 %%DATADIR%%/locale/sv-SE/gui_context_menu.properties
 %%DATADIR%%/locale/sv-SE/netErrorApp.dtd
 %%DATADIR%%/modules/array.js
 %%DATADIR%%/modules/bindings/default/basic-commands.js
 %%DATADIR%%/modules/bindings/default/bindings.js
 %%DATADIR%%/modules/bindings/default/caret.js
 %%DATADIR%%/modules/bindings/default/content-buffer/anchor.js
 %%DATADIR%%/modules/bindings/default/content-buffer/button.js
 %%DATADIR%%/modules/bindings/default/content-buffer/checkbox.js
 %%DATADIR%%/modules/bindings/default/content-buffer/element.js
 %%DATADIR%%/modules/bindings/default/content-buffer/embed.js
 %%DATADIR%%/modules/bindings/default/content-buffer/form.js
 %%DATADIR%%/modules/bindings/default/content-buffer/normal.js
 %%DATADIR%%/modules/bindings/default/content-buffer/richedit.js
 %%DATADIR%%/modules/bindings/default/content-buffer/select.js
 %%DATADIR%%/modules/bindings/default/content-buffer/text.js
 %%DATADIR%%/modules/bindings/default/content-buffer/textarea.js
 %%DATADIR%%/modules/bindings/default/content-buffer/zoom.js
 %%DATADIR%%/modules/bindings/default/download-buffer.js
 %%DATADIR%%/modules/bindings/default/formfill.js
 %%DATADIR%%/modules/bindings/default/global.js
 %%DATADIR%%/modules/bindings/default/help-buffer.js
 %%DATADIR%%/modules/bindings/default/hints.js
 %%DATADIR%%/modules/bindings/default/isearch.js
 %%DATADIR%%/modules/bindings/default/minibuffer.js
 %%DATADIR%%/modules/bindings/default/quote.js
 %%DATADIR%%/modules/bindings/default/special-buffer.js
 %%DATADIR%%/modules/bindings/default/text.js
 %%DATADIR%%/modules/bindings/default/universal-argument.js
 %%DATADIR%%/modules/block-content-focus-change.js
 %%DATADIR%%/modules/buffer.js
 %%DATADIR%%/modules/builtin-commands.js
 %%DATADIR%%/modules/cache.js
 %%DATADIR%%/modules/caret.js
 %%DATADIR%%/modules/casual-spelling.jsx
 %%DATADIR%%/modules/clicks-in-new-buffer.js
 %%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
 %%DATADIR%%/modules/content-handler.js
 %%DATADIR%%/modules/content-policy.js
 %%DATADIR%%/modules/cookie.js
 %%DATADIR%%/modules/coroutine.js
 %%DATADIR%%/modules/daemon.js
 %%DATADIR%%/modules/debug.js
 %%DATADIR%%/modules/dom.js
 %%DATADIR%%/modules/download-manager.js
 %%DATADIR%%/modules/element.js
 %%DATADIR%%/modules/env.js
 %%DATADIR%%/modules/extensions/adblockplus.js
 %%DATADIR%%/modules/extensions/dom-inspector.js
 %%DATADIR%%/modules/extensions/noscript.js
 %%DATADIR%%/modules/extensions/venkman.js
 %%DATADIR%%/modules/external-editor.js
 %%DATADIR%%/modules/eye-guide.js
 %%DATADIR%%/modules/favicon.js
 %%DATADIR%%/modules/follow-relationship.js
 %%DATADIR%%/modules/formfill.js
 %%DATADIR%%/modules/global-overlay-keymap.js
 %%DATADIR%%/modules/help.js
 %%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
 %%DATADIR%%/modules/io.js
 %%DATADIR%%/modules/isearch.js
 %%DATADIR%%/modules/keymap.js
 %%DATADIR%%/modules/keywords.js
 %%DATADIR%%/modules/labels.js
 %%DATADIR%%/modules/load-spec.js
 %%DATADIR%%/modules/login.js
 %%DATADIR%%/modules/media.js
 %%DATADIR%%/modules/mime-type-override.js
 %%DATADIR%%/modules/mime.js
 %%DATADIR%%/modules/minibuffer-read-file.js
 %%DATADIR%%/modules/minibuffer-read-mime-type.js
 %%DATADIR%%/modules/minibuffer-read-option.js
 %%DATADIR%%/modules/minibuffer-read.js
 %%DATADIR%%/modules/minibuffer.js
 %%DATADIR%%/modules/mode-line.js
 %%DATADIR%%/modules/mode.js
 %%DATADIR%%/modules/new-tabs.js
 %%DATADIR%%/modules/opensearch.js
 %%DATADIR%%/modules/page-modes/dailymotion.js
 %%DATADIR%%/modules/page-modes/duckduckgo.js
 %%DATADIR%%/modules/page-modes/facebook.js
 %%DATADIR%%/modules/page-modes/feedly.js
 %%DATADIR%%/modules/page-modes/github.js
 %%DATADIR%%/modules/page-modes/gmail.js
 %%DATADIR%%/modules/page-modes/gmane.js
 %%DATADIR%%/modules/page-modes/google-calendar.js
 %%DATADIR%%/modules/page-modes/google-gqueues.js
 %%DATADIR%%/modules/page-modes/google-images.js
 %%DATADIR%%/modules/page-modes/google-maps.js
 %%DATADIR%%/modules/page-modes/google-reader.js
 %%DATADIR%%/modules/page-modes/google-search-results.js
 %%DATADIR%%/modules/page-modes/google-video.js
 %%DATADIR%%/modules/page-modes/google-voice.js
 %%DATADIR%%/modules/page-modes/grooveshark.js
 %%DATADIR%%/modules/page-modes/key-kill.js
 %%DATADIR%%/modules/page-modes/newsblur.js
 %%DATADIR%%/modules/page-modes/reddit.js
 %%DATADIR%%/modules/page-modes/smbc.js
 %%DATADIR%%/modules/page-modes/stackexchange.js
 %%DATADIR%%/modules/page-modes/twitter.js
 %%DATADIR%%/modules/page-modes/wikipedia.js
 %%DATADIR%%/modules/page-modes/xkcd.js
 %%DATADIR%%/modules/page-modes/youtube-player.js
 %%DATADIR%%/modules/page-modes/youtube.js
 %%DATADIR%%/modules/permission-manager.js
 %%DATADIR%%/modules/pref.js
 %%DATADIR%%/modules/pretty-print.js
 %%DATADIR%%/modules/quote.js
 %%DATADIR%%/modules/rc.js
 %%DATADIR%%/modules/save.js
 %%DATADIR%%/modules/scroll.js
 %%DATADIR%%/modules/selectively-unstyle.js
 %%DATADIR%%/modules/services.js
 %%DATADIR%%/modules/session.js
 %%DATADIR%%/modules/source-code.js
 %%DATADIR%%/modules/spawn-process.js
 %%DATADIR%%/modules/special-buffer.js
 %%DATADIR%%/modules/ssl.js
 %%DATADIR%%/modules/string.js
 %%DATADIR%%/modules/stylesheet.js
 %%DATADIR%%/modules/suggest-file-name.js
 %%DATADIR%%/modules/tab-bar.js
 %%DATADIR%%/modules/text.js
 %%DATADIR%%/modules/theme.js
 %%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
 %%DATADIR%%/modules/webjump.js
 %%DATADIR%%/modules/window.js
 %%DATADIR%%/modules/zoom.js
 %%DATADIR%%/search-engines/answers.xml
 %%DATADIR%%/search-engines/creativecommons.xml
 %%DATADIR%%/search-engines/duckduckgo.xml
 %%DATADIR%%/search-engines/eBay.xml
 %%DATADIR%%/search-engines/google.xml
 %%DATADIR%%/search-engines/mozilla-bugzilla.xml
 %%DATADIR%%/search-engines/wikipedia.xml
 %%DATADIR%%/search-engines/wiktionary.xml
 %%DATADIR%%/search-engines/yahoo.xml
 %%DATADIR%%/style/default/content-buffer-input.css
 %%DATADIR%%/style/default/eye-guide.css
 %%DATADIR%%/style/default/minibuffer.css
 %%DATADIR%%/style/default/mode-line.css
 %%DATADIR%%/style/default/new-tabs.css
 %%DATADIR%%/style/default/tab-bar.css
 %%DATADIR%%/style/default/theme.json
 %%DATADIR%%/style/default/window--panel.css
 %%DATADIR%%/style/gesso/mode-line--gesso.css
 %%DATADIR%%/style/gesso/new-tabs--gesso.css
 %%DATADIR%%/style/gesso/tab-bar--gesso.css
 %%DATADIR%%/style/gesso/theme.json
 %%DATADIR%%/style/mono/conkeror--mono.css
 %%DATADIR%%/style/mono/theme.json
-@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