From owner-svn-ports-all@freebsd.org  Thu Aug 20 13:20:20 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 4CA1C9BE47E;
 Thu, 20 Aug 2015 13:20:20 +0000 (UTC)
 (envelope-from freebsd.contact@marino.st)
Received: from shepard.synsport.net (mail.synsport.com [208.69.230.148])
 (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 255F51F3A;
 Thu, 20 Aug 2015 13:20:19 +0000 (UTC)
 (envelope-from freebsd.contact@marino.st)
Received: from [192.168.0.23] (unknown [130.255.19.36])
 (using TLSv1 with cipher DHE-RSA-AES128-SHA (128/128 bits))
 (No client certificate requested)
 by shepard.synsport.net (Postfix) with ESMTP id 3C7BB43BEB;
 Thu, 20 Aug 2015 08:20:05 -0500 (CDT)
Subject: Re: svn commit: r394871 - in head: Mk mail/thunderbird
 mail/thunderbird/files www/firefox www/firefox-esr www/firefox-esr/files
 www/firefox/files www/libxul www/libxul/files www/seamonkey www/seamonkey...
To: Jan Beich <jbeich@FreeBSD.org>, ports-committers@freebsd.org,
 svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
References: <201508201316.t7KDGDPs042842@repo.freebsd.org>
Reply-To: marino@freebsd.org
From: John Marino <freebsd.contact@marino.st>
Message-ID: <55D5D3FC.9060001@marino.st>
Date: Thu, 20 Aug 2015 15:19:56 +0200
User-Agent: Mozilla/5.0 (Windows NT 6.3; WOW64; rv:38.0) Gecko/20100101
 Thunderbird/38.0.1
MIME-Version: 1.0
In-Reply-To: <201508201316.t7KDGDPs042842@repo.freebsd.org>
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 7bit
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: <https://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: <https://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 20 Aug 2015 13:20:20 -0000

On 8/20/2015 3:16 PM, Jan Beich wrote:
> Author: jbeich
> Date: Thu Aug 20 13:16:12 2015
> New Revision: 394871
> URL: https://svnweb.freebsd.org/changeset/ports/394871
> 
> Log:
>   gecko: use system jemalloc on 11.0-CURRENT again
>   
>   Requested by:	mi
> 
> 
> Modified: head/Mk/bsd.gecko.mk
> ==============================================================================
> --- head/Mk/bsd.gecko.mk	Thu Aug 20 13:15:18 2015	(r394870)
> +++ head/Mk/bsd.gecko.mk	Thu Aug 20 13:16:12 2015	(r394871)
> @@ -130,7 +130,12 @@ LDFLAGS+=		-L${LOCALBASE}/lib -Wl,-rpath
>  
>  # use jemalloc 3.0.0 API for stats/tuning
>  MOZ_EXPORT+=	MOZ_JEMALLOC3=1
> -.if ${OSVERSION} < 1000012 || ${MOZILLA_VER:R:R} >= 37
> +.if ${OSVERSION} >= 1100079
> +. if ${MOZILLA_VER:R:R} < 43
> +# system jemalloc 4.0.0 vs. bundled jemalloc 3.6.0-204-gb4acf73
> +EXTRA_PATCHES+=	${FILESDIR}/extra-patch-bug1125514
> +. endif
> +.elif ${OSVERSION} < 1000012 || ${MOZILLA_VER:R:R} >= 37
>  MOZ_OPTIONS+=	--enable-jemalloc
>  .endif
>  


By switching the comparison from < to >=, I think this just broke
DragonFly which does not support jemalloc on any version.  I would guess
the fix would be to check OPSYS before using OSVERSION.

Thanks,
John