svn commit: r393803 - in head: Mk www/firefox

[Jan Beich]

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 at 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