From owner-freebsd-gecko@FreeBSD.ORG Tue May 6 18:54:11 2014 Return-Path: Delivered-To: freebsd-gecko@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id A6A77EDB for ; Tue, 6 May 2014 18:54:11 +0000 (UTC) Received: from trillian.chruetertee.ch (trillian.chruetertee.ch [217.150.244.247]) (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 39EC66A7 for ; Tue, 6 May 2014 18:54:10 +0000 (UTC) Received: from trillian.chruetertee.ch (trillian [217.150.244.247]) by trillian.chruetertee.ch (8.14.4/8.14.3) with ESMTP id s46Is1bA058174 for ; Tue, 6 May 2014 18:54:01 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id s46IruLp057756 for freebsd-gecko@freebsd.org; Tue, 6 May 2014 18:53:56 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Tue, 6 May 2014 18:53:56 GMT Message-Id: <201405061853.s46IruLp057756@trillian.chruetertee.ch> X-Authentication-Warning: trillian.chruetertee.ch: www set sender to svn-freebsd-gecko@chruetertee.ch using -f From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org Subject: [SVN-Commit] r1584 - in trunk/Mk: . Uses MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Reply-To: freebsd-gecko@freebsd.org X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 06 May 2014 18:54:11 -0000 Author: beat Date: Tue May 6 18:53:56 2014 New Revision: 1584 Log: - Sync bsd.gecko.mk with ports - Fix SeaMonkey version detection Modified: trunk/Mk/Uses/gecko.mk trunk/Mk/bsd.gecko.mk Modified: trunk/Mk/Uses/gecko.mk ============================================================================== --- trunk/Mk/Uses/gecko.mk Wed Apr 30 13:39:25 2014 (r1583) +++ trunk/Mk/Uses/gecko.mk Tue May 6 18:53:56 2014 (r1584) @@ -1,4 +1,4 @@ -# $FreeBSD: head/Mk/Uses/gecko.mk 350689 2014-04-09 12:37:53Z bapt $ +# $FreeBSD: head/Mk/Uses/gecko.mk 352640 2014-04-29 20:35:24Z beat $ # # Handle dependency of different gecko based applications # @@ -59,7 +59,7 @@ .if exists(${LOCALBASE}/bin/seamonkey) _GECKO_INSTALLED_VER!= ${LOCALBASE}/bin/seamonkey --version 2>/dev/null -_GECKO_INSTALLED_VER:= ${_GECKO_INSTALLED_VER:M[0-9][0-9]*:C/([0-9][0-9]).*/\1/g} +_GECKO_INSTALLED_VER:= ${_GECKO_INSTALLED_VER:M[0-9]*:C/[0-9].([0-9][0-9]).*/\1/g} .endif # Dependence lines for different Seamonkey versions Modified: trunk/Mk/bsd.gecko.mk ============================================================================== --- trunk/Mk/bsd.gecko.mk Wed Apr 30 13:39:25 2014 (r1583) +++ trunk/Mk/bsd.gecko.mk Tue May 6 18:53:56 2014 (r1584) @@ -4,7 +4,7 @@ # Date created: 12 Nov 2005 # Whom: Michael Johnson # -# $FreeBSD: head/Mk/bsd.gecko.mk 342632 2014-02-05 05:23:30Z beat $ +# $FreeBSD: head/Mk/bsd.gecko.mk 352986 2014-05-05 09:45:36Z bapt $ # # 4 column tabs prevent hair loss and tooth decay! @@ -452,7 +452,7 @@ MOZCONFIG_SED?= ${SED} ${MOZ_SED_ARGS} .if ${ARCH} == amd64 -CONFIGURE_TARGET=x86_64-unknown-${OPSYS:L}${OSREL} +CONFIGURE_TARGET=x86_64-unknown-${OPSYS:tl}${OSREL} . if ${USE_MOZILLA:M-nss} USE_BINUTILS= # intel-gcm.s CFLAGS+= -B${LOCALBASE}/bin