svn commit: r454668 - in head: Mk www/libxul

[Jan Beich]

Author: jbeich
Date: Wed Nov 22 06:24:49 2017
New Revision: 454668
URL: https://svnweb.freebsd.org/changeset/ports/454668

Log:
  gecko: move BUNDLE_LIBS to www/libxul

Modified:
  head/Mk/bsd.gecko.mk   (contents, props changed)
  head/www/libxul/Makefile   (contents, props changed)

Modified: head/Mk/bsd.gecko.mk
==============================================================================
--- head/Mk/bsd.gecko.mk	Wed Nov 22 06:24:39 2017	(r454667)
+++ head/Mk/bsd.gecko.mk	Wed Nov 22 06:24:49 2017	(r454668)
@@ -89,10 +89,6 @@ 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 \

Modified: head/www/libxul/Makefile
==============================================================================
--- head/www/libxul/Makefile	Wed Nov 22 06:24:39 2017	(r454667)
+++ head/www/libxul/Makefile	Wed Nov 22 06:24:49 2017	(r454668)
@@ -39,6 +39,7 @@ 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