From owner-freebsd-gecko@FreeBSD.ORG Tue Oct 2 18:28:32 2012 Return-Path: Delivered-To: freebsd-gecko@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 9723A1065670 for ; Tue, 2 Oct 2012 18:28:32 +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 26D988FC0A for ; Tue, 2 Oct 2012 18:28:31 +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 q92ISUYQ056146 for ; Tue, 2 Oct 2012 18:28:30 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id q92ISOHc056074 for freebsd-gecko@freebsd.org; Tue, 2 Oct 2012 18:28:24 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Tue, 2 Oct 2012 18:28:24 GMT Message-Id: <201210021828.q92ISOHc056074@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 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [SVN-Commit] r1057 - trunk/Mk X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.5 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: Tue, 02 Oct 2012 18:28:32 -0000 Author: jbeich Date: Tue Oct 2 18:28:24 2012 New Revision: 1057 Log: force conflict if incompatible libxul version is installed Modified: trunk/Mk/bsd.gecko.mk Modified: trunk/Mk/bsd.gecko.mk ============================================================================== --- trunk/Mk/bsd.gecko.mk Tue Oct 2 11:10:39 2012 (r1056) +++ trunk/Mk/bsd.gecko.mk Tue Oct 2 18:28:24 2012 (r1057) @@ -79,8 +79,8 @@ _GECKO_ALL= libxul libxul19 -libxul_PLIST= ${LOCALBASE}/lib/libxul/libxul.so -libxul19_PLIST= ${LOCALBASE}/lib/libxul/libxul.so +libxul_PLIST= libxul>=10 +libxul19_PLIST= libxul=1.9.2.28_1 # keep in sync with www/libxul19 .for gecko in ${_GECKO_ALL} ${gecko}_PORTSDIR?= www