From owner-freebsd-gecko@FreeBSD.ORG Fri Jul 6 16:33:27 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 C6972106564A for ; Fri, 6 Jul 2012 16:33:27 +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 4522E8FC0A for ; Fri, 6 Jul 2012 16:33:27 +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 q66GXQnl081235 for ; Fri, 6 Jul 2012 16:33:26 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id q66GXLFU080331 for freebsd-gecko@freebsd.org; Fri, 6 Jul 2012 16:33:21 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Fri, 6 Jul 2012 16:33:21 GMT Message-Id: <201207061633.q66GXLFU080331@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] r844 - in branches/experimental: Mk www/firefox-nightly www/firefox36 www/kompozer www/seamonkey 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, 06 Jul 2012 16:33:27 -0000 Author: jbeich Date: Fri Jul 6 16:33:20 2012 New Revision: 844 Log: nuke USE_GECKO_OPTIONS Modified: branches/experimental/Mk/bsd.gecko.mk branches/experimental/www/firefox-nightly/Makefile branches/experimental/www/firefox36/Makefile branches/experimental/www/kompozer/Makefile branches/experimental/www/seamonkey/Makefile Modified: branches/experimental/Mk/bsd.gecko.mk ============================================================================== --- branches/experimental/Mk/bsd.gecko.mk Fri Jul 6 16:33:11 2012 (r843) +++ branches/experimental/Mk/bsd.gecko.mk Fri Jul 6 16:33:20 2012 (r844) @@ -552,23 +552,13 @@ CFLAGS+= ${PTHREAD_CFLAGS} LIBS+= ${PTHREAD_LIBS} -L${LOCALBASE}/lib -liconv -_USE_GECKO_OPTIONS_DEFAULT= dbus debug logging optimized_cflags +OPTIONS_DEFINE+=DBUS DEBUG LOGGING OPTIMIZED_CFLAGS LIGHTNING_DESC?=Enable calendar extension LOGGING_DESC?= Enable additional log messages PGO_DESC?= Enable Profile-Guided Optimization # move to bsd.options.desc.mk SMB?= Enable smb:// URI support using gnomevfs -.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 hunspell jpeg nspr nss png sqlite vpx zip Modified: branches/experimental/www/firefox-nightly/Makefile ============================================================================== --- branches/experimental/www/firefox-nightly/Makefile Fri Jul 6 16:33:11 2012 (r843) +++ branches/experimental/www/firefox-nightly/Makefile Fri Jul 6 16:33:20 2012 (r844) @@ -29,7 +29,6 @@ USE_GECKO= gecko MOZ_PKGCONFIG_FILES= # empty USE_MOZILLA= -nspr -sqlite -USE_GECKO_OPTIONS=+gstreamer MOZILLA_NAME= Nightly MOZILLA_SUFX= -nightly MOZILLA= ${PORTNAME}${MOZILLA_SUFX} @@ -59,7 +58,7 @@ OPTIONS_SINGLE+= AUDIO OPTIONS_SINGLE_AUDIO= ALSA OSS PULSEAUDIO -OPTIONS_DEFINE= PGO +OPTIONS_DEFINE= GSTREAMER PGO .if ${USE_MOZILLA:M-nss} OBJDIR_BUILD= yes Modified: branches/experimental/www/firefox36/Makefile ============================================================================== --- branches/experimental/www/firefox36/Makefile Fri Jul 6 16:33:11 2012 (r843) +++ branches/experimental/www/firefox36/Makefile Fri Jul 6 16:33:20 2012 (r844) @@ -26,7 +26,6 @@ MOZ_PKGCONFIG_FILES= # empty USE_MOZILLA= -event -ffi -vpx MOZ_CHROME= jar -USE_GECKO_OPTIONS=+smb MOZILLA_NAME= Firefox${MOZILLA_SUFX} MOZILLA_SUFX= 3 MOZILLA= ${PORTNAME}${MOZILLA_SUFX} @@ -51,6 +50,7 @@ --disable-necko-wifi OPTIONS_DEFAULT=DBUS +OPTIONS_DEFINE= SMB .include Modified: branches/experimental/www/kompozer/Makefile ============================================================================== --- branches/experimental/www/kompozer/Makefile Fri Jul 6 16:33:11 2012 (r843) +++ branches/experimental/www/kompozer/Makefile Fri Jul 6 16:33:20 2012 (r844) @@ -27,7 +27,6 @@ USE_MOZILLA= -event -ffi -hunspell -sqlite -vpx MOZ_CHROME= jar MOZ_TOOLKIT= gtk2 -USE_GECKO_OPTIONS=-dbus MOZ_EXTENSIONS= wallet,xml-rpc,xmlextras,pref,universalchardet,spellcheck MOZ_OPTIONS= --with-default-mozilla-five-home=${PREFIX}/lib/${MOZILLA} \ ${CONFIGURE_TARGET} \ @@ -45,6 +44,8 @@ .include +OPTIONS_DEFINE:=${OPTIONS_DEFINE:NDBUS} + .if ${ARCH} == amd64 CONFIGURE_TARGET=x86_64-portbld-freebsd${OSREL} .endif Modified: branches/experimental/www/seamonkey/Makefile ============================================================================== --- branches/experimental/www/seamonkey/Makefile Fri Jul 6 16:33:11 2012 (r843) +++ branches/experimental/www/seamonkey/Makefile Fri Jul 6 16:33:20 2012 (r844) @@ -47,14 +47,13 @@ --disable-necko-wifi USE_MOZILLA= # empty -USE_GECKO_OPTIONS=+smb MOZILLA_PLIST_DIRS= bin lib MOZ_PKGCONFIG_FILES= NOT_FOR_ARCHS= ia64 OPTIONS_DEFAULT=DBUS MAILNEWS COMPOSER LDAP CHATZILLA -OPTIONS_DEFINE= CHATZILLA COMPOSER LDAP LIGHTNING MAILNEWS +OPTIONS_DEFINE= CHATZILLA COMPOSER LDAP LIGHTNING MAILNEWS SMB CHATZILLA_DESC?=Enable the Chatzilla IRC module COMPOSER_DESC?= Enable the HTML Composer module