5 files changed, 61 insertions, 23 deletions

diff --git a/www/Makefile b/www/Makefile
index ed70971fb10a..d603211e5026 100644
--- a/www/Makefile
+++ b/www/Makefile
@@ -101,7 +101,6 @@
     SUBDIR += codeigniter
     SUBDIR += comclear
     SUBDIR += commonist
-    SUBDIR += conkeror
     SUBDIR += contenido
     SUBDIR += coppermine
     SUBDIR += crawl
@@ -1671,6 +1670,7 @@
     SUBDIR += xpi-clearfields
     SUBDIR += xpi-close-all-tabs
     SUBDIR += xpi-colorfultabs
+    SUBDIR += xpi-conkeror
     SUBDIR += xpi-cookiesafe
     SUBDIR += xpi-cssviewer
     SUBDIR += xpi-customizegoogle
diff --git a/www/xpi-conkeror/Makefile b/www/xpi-conkeror/Makefile
index 5679ab66d6a8..0464b5d983a3 100644
--- a/www/xpi-conkeror/Makefile
+++ b/www/xpi-conkeror/Makefile
@@ -6,30 +6,50 @@
 #
 
 PORTNAME=	conkeror
-PORTVERSION=	0.42
-PORTREVISION=	2
-DISTVERSIONPREFIX=	firefox-
+PORTVERSION=	20090821
 CATEGORIES=	www
-MASTER_SITES=	MOZDEV
-PKGNAMEPREFIX?=
+MASTER_SITES=	http://mirror.4bit.ws/ \
+		${MASTER_SITE_LOCAL} \
+		${MASTER_SITE_FREEBSD}
+MASTER_SITE_SUBDIR=	dhn
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	wahjava@gmail.com
 COMMENT=	A completely keyboard driven browser based on firefox
 
-RUN_DEPENDS=	${CONK_APP}:${PORTSDIR}/www/${CONK_APP}
+WRKSRC=	${WRKDIR}/conkeror
+USE_GECKO=	libxul
 
-CONK_ARGS=	-chrome chrome://conkeror/content
-CONK_APP?=	${PKGNAMEPREFIX}firefox
-CONK_EXEC?=	${PKGNAMEPREFIX}${PORTNAME}
-USE_XPI=	${CONK_APP}
-PLIST_FILES=	bin/${CONK_EXEC}
-XPI_ID=		{a79fe89b-6662-4ff4-8e88-09950ad4dfde}
-XPI_FILES=	chrome/conkeror.jar components/nsCrank.js install.rdf chrome.manifest
-XPI_DIRS=	chrome components
+BUILD_ID=echo -n `whoami`@`hostname`_`date +%s`
+
+post-patch:
+	cd ${WRKSRC} && \
+		${REINPLACE_CMD} -e "s/%%PREFIX%%/${PREFIX:S/\//\\\//g}/g" \
+			${WRKSRC}/conkeror && \
+		${MV} debian/conkeror.desktop . && \
+		${RM} -rf debian tests && \
+		${MKDIR} share  && \
+		${MV} branding chrome components content \
+			contrib defaults locale modules search-engines help style share
+
+do-build:
+	${MAKE} -C ${WRKSRC}
+
+do-install:
+	${MKDIR} ${PREFIX}/libexec/conkeror
+	${MKDIR} ${DESKTOPDIR}
+	cd ${WRKSRC}/share && ${COPYTREE_SHARE} . ${DATADIR}
+	${SED} -e "s/BuildID=git/BuildID=$$(${BUILD_ID})/g" \
+		-e "s/^Version=\(.*\)$$/Version=\1 (FreeBSD-${OSREL})/g" \
+		<${WRKSRC}/application.ini >${DATADIR}/application.ini
+	${REINPLACE_CMD} -e "s/\\\$$CONKEROR_VERSION\\$$/`${GREP} \
+		'^Version=' ${WRKSRC}/application.ini |${SED} \
+		-e 's/^Version=//'` (FreeBSD-${OSREL})/g" ${DATADIR}/components/application.js
+	${INSTALL_SCRIPT} ${WRKSRC}/conkeror ${PREFIX}/bin/
+	${INSTALL_DATA} ${WRKSRC}/conkeror.desktop ${DESKTOPDIR}
+	${INSTALL_PROGRAM} ${WRKSRC}/conkeror-spawn-helper ${PREFIX}/libexec/conkeror/
+	${LN} -sf ${PREFIX}/libexec/conkeror/conkeror-spawn-helper ${DATADIR}/
 
 post-install:
-	@${ECHO_CMD} exec `${WHICH} ${CONK_APP}` ${CONK_ARGS} > ${PREFIX}/bin/${CONK_EXEC}
-	@${CHMOD} 555 ${PREFIX}/bin/${CONK_EXEC}
+	@-update-desktop-database
 
-.include "${.CURDIR}/../xpi-adblock/Makefile.xpi"
 .include <bsd.port.mk>
diff --git a/www/xpi-conkeror/distinfo b/www/xpi-conkeror/distinfo
index 7d36582f552d..253bdf167d4a 100644
--- a/www/xpi-conkeror/distinfo
+++ b/www/xpi-conkeror/distinfo
@@ -1,3 +1,3 @@
-MD5 (xpi/conkeror-firefox-0.42.xpi) = db3fd94485ced11e6a6685064a0c2e8e
-SHA256 (xpi/conkeror-firefox-0.42.xpi) = 64bd54093b96ba5897a1180d3aeb56e48a6edf9b83750c5fb5675bfdb0d272de
-SIZE (xpi/conkeror-firefox-0.42.xpi) = 62867
+MD5 (conkeror-20090821.tar.gz) = c6563dfec0802cf7e28f826edbdf953a
+SHA256 (conkeror-20090821.tar.gz) = a6e5a66ee2f8997e2d4ea769a2d6df0226e8f4c726f20535b45bc75b0098feb9
+SIZE (conkeror-20090821.tar.gz) = 238630
diff --git a/www/xpi-conkeror/files/patch-conkeror b/www/xpi-conkeror/files/patch-conkeror
new file mode 100644
index 000000000000..f16e2ae74aed
--- /dev/null
+++ b/www/xpi-conkeror/files/patch-conkeror
@@ -0,0 +1,18 @@
+
+$FreeBSD$
+
+--- 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
++fi
++
diff --git a/www/xpi-conkeror/pkg-descr b/www/xpi-conkeror/pkg-descr
index 2d3792ce2c5b..4ad588bc0228 100644
--- a/www/xpi-conkeror/pkg-descr
+++ b/www/xpi-conkeror/pkg-descr
@@ -5,4 +5,4 @@ means all the keybindings and to-die-for features of
 Emacs that can be imitated by a javascript/XUL web
 browser Just Work.
 
-WWW: http://conkeror.mozdev.org/
+WWW: http://conkeror.org/