From owner-freebsd-gecko@FreeBSD.ORG Mon Jun 18 20:32:17 2012 Return-Path: Delivered-To: freebsd-gecko@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B4BB51065670 for ; Mon, 18 Jun 2012 20:32:17 +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 285C68FC0A for ; Mon, 18 Jun 2012 20:32:16 +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 q5IKWFEI075053 for ; Mon, 18 Jun 2012 20:32:15 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id q5IKWAPs074581 for freebsd-gecko@freebsd.org; Mon, 18 Jun 2012 20:32:10 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Mon, 18 Jun 2012 20:32:10 GMT Message-Id: <201206182032.q5IKWAPs074581@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] r774 - in branches/experimental: Mk www/libxul www/libxul19 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: Mon, 18 Jun 2012 20:32:17 -0000 Author: jbeich Date: Mon Jun 18 20:32:10 2012 New Revision: 774 Log: libxul19: connect and conflict Modified: branches/experimental/Mk/bsd.gecko.mk branches/experimental/www/libxul/Makefile branches/experimental/www/libxul19/Makefile Modified: branches/experimental/Mk/bsd.gecko.mk ============================================================================== --- branches/experimental/Mk/bsd.gecko.mk Mon Jun 18 14:17:27 2012 (r773) +++ branches/experimental/Mk/bsd.gecko.mk Mon Jun 18 20:32:10 2012 (r774) @@ -14,7 +14,7 @@ # WITH_GECKO= libxul # # The valid backends are: -# libxul +# libxul libxul19 # # See below for more details. # ======================= /USERS ================================ @@ -80,9 +80,10 @@ # ${MOZSRC}/configure # .endif -_GECKO_ALL= libxul +_GECKO_ALL= libxul libxul19 libxul_PLIST= ${LOCALBASE}/lib/libxul/libxul.so +libxul19_PLIST= ${LOCALBASE}/lib/libxul/libxul.so .for gecko in ${_GECKO_ALL} ${gecko}_PORTSDIR?= www Modified: branches/experimental/www/libxul/Makefile ============================================================================== --- branches/experimental/www/libxul/Makefile Mon Jun 18 14:17:27 2012 (r773) +++ branches/experimental/www/libxul/Makefile Mon Jun 18 20:32:10 2012 (r774) @@ -21,7 +21,7 @@ LIB_DEPENDS= execinfo.1:${PORTSDIR}/devel/libexecinfo WRKSRC= ${WRKDIR}/mozilla-release -CONFLICTS= mozilla-[0-9]* +CONFLICTS= mozilla-[0-9]* libxul-1.9.* USE_AUTOTOOLS= autoconf213:env WANT_GNOME= yes Modified: branches/experimental/www/libxul19/Makefile ============================================================================== --- branches/experimental/www/libxul19/Makefile Mon Jun 18 14:17:27 2012 (r773) +++ branches/experimental/www/libxul19/Makefile Mon Jun 18 20:32:10 2012 (r774) @@ -16,7 +16,7 @@ COMMENT?= Mozilla runtime package that can be used to bootstrap XUL+XPCOM apps WRKSRC= ${WRKDIR}/mozilla-1.9.2 -CONFLICTS= mozilla-[0-9]* +CONFLICTS= mozilla-[0-9]* libxul-[0-9][0-9].* GECKO_PLIST_PRE_DIRS= lib/${MOZILLA}/bin lib/${MOZILLA}/idl \ lib/${MOZILLA}/include lib/${MOZILLA}/lib