From owner-freebsd-gecko@FreeBSD.ORG Mon May 27 22:06:11 2013 Return-Path: Delivered-To: freebsd-gecko@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 1FB18D38 for ; Mon, 27 May 2013 22:06:11 +0000 (UTC) (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: from trillian.chruetertee.ch (trillian.chruetertee.ch [217.150.245.56]) by mx1.freebsd.org (Postfix) with ESMTP id A376F71 for ; Mon, 27 May 2013 22:06:10 +0000 (UTC) Received: from trillian.chruetertee.ch (trillian [217.150.245.56]) by trillian.chruetertee.ch (8.14.4/8.14.3) with ESMTP id r4RM661J078300 for ; Mon, 27 May 2013 22:06:06 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id r4RM6040077833 for freebsd-gecko@freebsd.org; Mon, 27 May 2013 22:06:00 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Mon, 27 May 2013 22:06:00 GMT Message-Id: <201305272206.r4RM6040077833@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] r1261 - trunk/www/linux-firefox MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: freebsd-gecko@freebsd.org List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 27 May 2013 22:06:11 -0000 Author: jbeich Date: Mon May 27 22:06:00 2013 New Revision: 1261 Log: abort linux-firefox build to prevent broken updates Modified: trunk/www/linux-firefox/Makefile Modified: trunk/www/linux-firefox/Makefile ============================================================================== --- trunk/www/linux-firefox/Makefile Mon May 27 17:07:11 2013 (r1260) +++ trunk/www/linux-firefox/Makefile Mon May 27 22:06:00 2013 (r1261) @@ -10,7 +10,6 @@ MAINTAINER= gecko@FreeBSD.org COMMENT= Web browser based on the browser portion of Mozilla -# gecko version must be exactly same EXTRACT_DEPENDS=${NONEXISTENT}:${PORTSDIR}/www/linux-seamonkey:extract CONFLICTS= linux-firefox-24.* linux-firefox-1[07].* @@ -21,10 +20,23 @@ .include "${.CURDIR}/../linux-seamonkey/Makefile.common" +# XXX remove after linux_base-c6 and linux-c6-gtk2 become default +# using seamonkey gre for linux_base-f10 compat post-extract: replace-gre -replace-gre: - # using seamonkey gre for linux_base-f10 compat +replace-gre: version-compat-check + @${ECHO_MSG} "===> GRE versions are compatible, replacing with" \ + "$$(${MAKE} -V PKGNAME -C ${PORTSDIR}/www/linux-seamonkey)" cd $$(${MAKE} -V WRKSRC -C ${PORTSDIR}/www/linux-seamonkey); \ ${CP} lib* dependentlibs.list ${WRKSRC} +version-compat-check: + @${ECHO_MSG} "===> Checking GRE version is compatible with" \ + "$$(${MAKE} -V PKGNAME -C ${PORTSDIR}/www/linux-seamonkey)" + @ff_gre_version=$$(${AWK} -F= '/Milestone/ { print $$2 }' ${WRKSRC}/platform.ini); \ + sm_gre_version=$$(${AWK} -F= '/Milestone/ { print $$2 }' $$(${MAKE} -V WRKSRC -C ${PORTSDIR}/www/linux-seamonkey)/platform.ini); \ + if [ $$ff_gre_version != $$sm_gre_version ]; then \ + ${ECHO_MSG} "===> GRE versions aren't compatible, aborting"; \ + exit 1; \ + fi + .include