From 78da95113b67bb4179808e765bf69ecd19acb95a Mon Sep 17 00:00:00 2001
From: Jan Beich <jbeich@FreeBSD.org>
Date: Wed, 22 Nov 2017 06:28:56 +0000
Subject: [PATCH] Oops, back out r454668

BUNDLE_LIBS is used by every XUL app that cannot share libxul.so
---
 Mk/bsd.gecko.mk     | 4 ++++
 www/libxul/Makefile | 1 -
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/Mk/bsd.gecko.mk b/Mk/bsd.gecko.mk
index f65d2dd7d6cc..90562cac7b84 100644
--- a/Mk/bsd.gecko.mk
+++ b/Mk/bsd.gecko.mk
@@ -89,6 +89,10 @@ CPE_VENDOR?=mozilla
 USE_PERL5=	build
 USE_XORG=	x11 xcomposite xdamage xext xfixes xrender xt
 
+.if ${MOZILLA} != "libxul"
+BUNDLE_LIBS=	yes
+.endif
+
 .if ${MOZILLA_VER:R:R} >= 49
 USES+=		compiler:c++14-lang
 CPPFLAGS+=	-D_GLIBCXX_USE_C99 -D_GLIBCXX_USE_C99_MATH_TR1 \
diff --git a/www/libxul/Makefile b/www/libxul/Makefile
index 95d867324d9d..9eef0d6f76cb 100644
--- a/www/libxul/Makefile
+++ b/www/libxul/Makefile
@@ -46,7 +46,6 @@ SHEBANG_FILES=	xpcom/idl-parser/xpidl/xpidl.py \
 MAKE_ENV=	SKIP_GRE_REGISTRATION=1 mozappdir=${PREFIX}/lib/${MOZILLA}
 LDFLAGS+=	-Wl,-rpath,${PREFIX}/lib/${MOZ_RPATH}
 USE_LDCONFIG=	${PREFIX}/lib/${MOZILLA}
-BUNDLE_LIBS=	yes
 
 MOZ_OPTIONS?=	--enable-application=xulrunner
 MOZ_CHANNEL=	esr