From owner-svn-ports-all@freebsd.org  Sun Aug  9 16:25:54 2015
Return-Path: <owner-svn-ports-all@freebsd.org>
Delivered-To: svn-ports-all@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 1C3CE99DB1F;
 Sun,  9 Aug 2015 16:25:54 +0000 (UTC)
 (envelope-from jbeich@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2001:1900:2254:2068::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 0BE23DD2;
 Sun,  9 Aug 2015 16:25:54 +0000 (UTC)
 (envelope-from jbeich@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.70])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t79GPrgH014998;
 Sun, 9 Aug 2015 16:25:53 GMT (envelope-from jbeich@FreeBSD.org)
Received: (from jbeich@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id t79GPrwP014996;
 Sun, 9 Aug 2015 16:25:53 GMT (envelope-from jbeich@FreeBSD.org)
Message-Id: <201508091625.t79GPrwP014996@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: Sun, 9 Aug 2015 16:25:53 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r393803 - in head: Mk www/firefox
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 09 Aug 2015 16:25:54 -0000

Author: jbeich
Date: Sun Aug  9 16:25:52 2015
New Revision: 393803
URL: https://svnweb.freebsd.org/changeset/ports/393803

Log:
  www/firefox: remove broken LOGGING option
  
  NSPR logging is now always enabled as upstream partially
  removed support for disabling it.
  
  PR:		202165
  Reported by:	rsmith@xs4all.nl
  MFH:		2015Q3
  X-MFH-With:	r393690

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

Modified: head/Mk/bsd.gecko.mk
==============================================================================
--- head/Mk/bsd.gecko.mk	Sun Aug  9 16:18:20 2015	(r393802)
+++ head/Mk/bsd.gecko.mk	Sun Aug  9 16:25:52 2015	(r393803)
@@ -378,10 +378,12 @@ STRIP=
 MOZ_OPTIONS+=	--disable-dtrace
 .endif
 
-.if ${PORT_OPTIONS:MLOGGING} || ${PORT_OPTIONS:MDEBUG}
+.if ${MOZILLA_VER:R:R} < 40
+. if ${PORT_OPTIONS:MLOGGING} || ${PORT_OPTIONS:MDEBUG}
 MOZ_OPTIONS+=	--enable-logging
-.else
+. else
 MOZ_OPTIONS+=	--disable-logging
+. endif
 .endif
 
 .if ${PORT_OPTIONS:MPROFILE}

Modified: head/www/firefox/Makefile
==============================================================================
--- head/www/firefox/Makefile	Sun Aug  9 16:18:20 2015	(r393802)
+++ head/www/firefox/Makefile	Sun Aug  9 16:25:52 2015	(r393803)
@@ -49,6 +49,7 @@ MOZ_OPTIONS=	--program-transform-name='s
 		--enable-application=browser \
 		--enable-official-branding
 
+OPTIONS_EXCLUDE=	LOGGING
 OPTIONS_DEFAULT=	GTK2
 
 OPTIONS_SINGLE+=	TOOLKIT