From owner-freebsd-gecko@FreeBSD.ORG Fri Jun 8 14:13:53 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 5D5461065673 for ; Fri, 8 Jun 2012 14:13:53 +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 C38108FC08 for ; Fri, 8 Jun 2012 14:13:52 +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 q58EDphK087467 for ; Fri, 8 Jun 2012 14:13:51 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id q58EDkll086961 for freebsd-gecko@freebsd.org; Fri, 8 Jun 2012 14:13:46 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Fri, 8 Jun 2012 14:13:46 GMT Message-Id: <201206081413.q58EDkll086961@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] r734 - in branches/experimental: Mk www/kompozer www/libxul 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: Fri, 08 Jun 2012 14:13:53 -0000 Author: jbeich Date: Fri Jun 8 14:13:46 2012 New Revision: 734 Log: make USE_GECKO_OPTIONS similar to USE_MOZILLA Modified: branches/experimental/Mk/bsd.gecko.mk branches/experimental/www/kompozer/Makefile branches/experimental/www/libxul/Makefile Modified: branches/experimental/Mk/bsd.gecko.mk ============================================================================== --- branches/experimental/Mk/bsd.gecko.mk Fri Jun 8 14:13:10 2012 (r733) +++ branches/experimental/Mk/bsd.gecko.mk Fri Jun 8 14:13:46 2012 (r734) @@ -555,18 +555,23 @@ CFLAGS+= ${PTHREAD_CFLAGS} LIBS+= ${PTHREAD_LIBS} -L${LOCALBASE}/lib -liconv -_USE_GECKO_OPTIONS_ALL= java dbus debug logging optimized_cflags - -.if !defined(USE_GECKO_OPTIONS) -USE_GECKO_OPTIONS= dbus debug logging optimized_cflags -.endif +_USE_GECKO_OPTIONS_DEFAULT= dbus debug logging optimized_cflags JAVA_DESC?= Enable JAVA xpcom LOGGING_DESC?= Enable additional log messages -OPTIONS_DEFINE+= ${USE_GECKO_OPTIONS:U} OPTIONS_DEFAULT+=DBUS +.for use in ${USE_GECKO_OPTIONS} +${use:S/-/_WITHOUT_/}= ${TRUE} +.endfor + +.for dep in ${_USE_GECKO_OPTIONS_DEFAULT} ${USE_GECKO_OPTIONS:M+*:S/+//} +.if !defined(_WITHOUT_${dep}) +OPTIONS_DEFINE+= ${dep:U} +.endif +.endfor + # Standard depends _ALL_DEPENDS= cairo dbm event ffi jpeg nspr nss png sqlite vpx zip Modified: branches/experimental/www/kompozer/Makefile ============================================================================== --- branches/experimental/www/kompozer/Makefile Fri Jun 8 14:13:10 2012 (r733) +++ branches/experimental/www/kompozer/Makefile Fri Jun 8 14:13:46 2012 (r734) @@ -25,7 +25,7 @@ MAKEFILE= client.mk ALL_TARGET= build_all USE_MOZILLA= -event -ffi -sqlite -vpx -USE_GECKO_OPTIONS=debug logging optimized_cflags +USE_GECKO_OPTIONS=-dbus MOZ_EXTENSIONS= wallet,xml-rpc,xmlextras,pref,universalchardet,spellcheck MOZ_OPTIONS= --with-default-mozilla-five-home=${PREFIX}/lib/${MOZILLA} \ --enable-application=composer \ Modified: branches/experimental/www/libxul/Makefile ============================================================================== --- branches/experimental/www/libxul/Makefile Fri Jun 8 14:13:10 2012 (r733) +++ branches/experimental/www/libxul/Makefile Fri Jun 8 14:13:46 2012 (r734) @@ -43,7 +43,7 @@ --disable-necko-wifi MOZ_EXTENSIONS= default,cookie,permissions OPTIONS= # Empty, used for generic gecko OPTIONS -USE_GECKO_OPTIONS= java debug logging optimized_cflags +USE_GECKO_OPTIONS=+java USE_GECKO= gecko MOZILLA_EXEC_NAME=xulrunner MOZ_TOOLKIT= cairo-gtk2