From owner-svn-ports-head@freebsd.org  Wed Nov 22 06:28:57 2017
Return-Path: <owner-svn-ports-head@freebsd.org>
Delivered-To: svn-ports-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id C705FDE225D;
 Wed, 22 Nov 2017 06:28:57 +0000 (UTC)
 (envelope-from jbeich@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 938DE6EE2B;
 Wed, 22 Nov 2017 06:28:57 +0000 (UTC)
 (envelope-from jbeich@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vAM6Suu0016165;
 Wed, 22 Nov 2017 06:28:56 GMT (envelope-from jbeich@FreeBSD.org)
Received: (from jbeich@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id vAM6Su8q016163;
 Wed, 22 Nov 2017 06:28:56 GMT (envelope-from jbeich@FreeBSD.org)
Message-Id: <201711220628.vAM6Su8q016163@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: jbeich set sender to
 jbeich@FreeBSD.org using -f
From: Jan Beich <jbeich@FreeBSD.org>
Date: Wed, 22 Nov 2017 06:28:56 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r454677 - in head: Mk www/libxul
X-SVN-Group: ports-head
X-SVN-Commit-Author: jbeich
X-SVN-Commit-Paths: in head: Mk www/libxul
X-SVN-Commit-Revision: 454677
X-SVN-Commit-Repository: ports
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-head>, 
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 22 Nov 2017 06:28:57 -0000

Author: jbeich
Date: Wed Nov 22 06:28:56 2017
New Revision: 454677
URL: https://svnweb.freebsd.org/changeset/ports/454677

Log:
  Oops, back out r454668
  
  BUNDLE_LIBS is used by every XUL app that cannot share libxul.so

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:28:01 2017	(r454676)
+++ head/Mk/bsd.gecko.mk	Wed Nov 22 06:28:56 2017	(r454677)
@@ -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 \

Modified: head/www/libxul/Makefile
==============================================================================
--- head/www/libxul/Makefile	Wed Nov 22 06:28:01 2017	(r454676)
+++ head/www/libxul/Makefile	Wed Nov 22 06:28:56 2017	(r454677)
@@ -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