svn commit: r473124 - head/www/xpi-conkeror

[Rene Ladan]

Author: rene
Date: Sat Jun 23 10:43:57 2018
New Revision: 473124
URL: https://svnweb.freebsd.org/changeset/ports/473124

Log:
  www/xpi-conkeror: always use xulrunner from Firefox

Modified:
  head/www/xpi-conkeror/Makefile

Modified: head/www/xpi-conkeror/Makefile
==============================================================================
--- head/www/xpi-conkeror/Makefile	Sat Jun 23 10:41:05 2018	(r473123)
+++ head/www/xpi-conkeror/Makefile	Sat Jun 23 10:43:57 2018	(r473124)
@@ -3,7 +3,7 @@
 
 PORTNAME=	conkeror
 PORTVERSION=	20150730
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www
 MASTER_SITES=	http://distfiles.pirateparty.in/ashish/ \
 		LOCAL/ashish
@@ -14,15 +14,8 @@ COMMENT=	Keyboard-oriented, customizable web browser b
 LICENSE=	GPLv1 GPLv2 MPL11
 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 gmake
 
-LIBXUL_USES=	gecko
 FIREFOX_USES=	gecko:firefox,32+
 ALL_TARGET=	# empty
 
@@ -43,7 +36,6 @@ post-patch:
 			content-policy.manifest share
 		${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