Author: jbeich
Date: Mon Jul 9 17:46:35 2012
New Revision: 865
Log:
move a few common options to bsd.gecko.mk
Modified:
branches/experimental/Mk/bsd.gecko.mk
branches/experimental/mail/thunderbird-esr/Makefile
branches/experimental/mail/thunderbird/Makefile
branches/experimental/mail/thunderbird3/Makefile
branches/experimental/www/firefox-esr/Makefile
branches/experimental/www/firefox-nightly/Makefile
branches/experimental/www/firefox/Makefile
branches/experimental/www/firefox36/Makefile
branches/experimental/www/kompozer/Makefile
branches/experimental/www/libxul/Makefile
branches/experimental/www/libxul19/Makefile
branches/experimental/www/seamonkey/Makefile
Modified: branches/experimental/Mk/bsd.gecko.mk
==============================================================================
--- branches/experimental/Mk/bsd.gecko.mk Mon Jul 9 17:46:24 2012
(r864)
+++ branches/experimental/Mk/bsd.gecko.mk Mon Jul 9 17:46:35 2012
(r865)
@@ -633,12 +633,13 @@
.endif
.endfor
-# Standard options from README
+# Standard options
MOZ_CHROME?= omni
MOZ_TOOLKIT?= cairo-gtk2
MOZ_OPTIONS+= --disable-tests \
--enable-chrome-format=${MOZ_CHROME} \
--enable-default-toolkit=${MOZ_TOOLKIT} \
+ --with-default-mozilla-five-home=${PREFIX}/lib/${MOZILLA} \
--with-pthreads
# Configure options for install
MOZ_OPTIONS+= --x-includes=${LOCALBASE}/include \
@@ -662,6 +663,8 @@
--disable-freetypetest \
--disable-installer \
--disable-md \
+ --disable-necko-wifi \
+ --disable-updater \
--disable-pedantic
MOZ_MK_OPTIONS+= XP_UNIX=1 \
PERL=${PERL}
Modified: branches/experimental/mail/thunderbird-esr/Makefile
==============================================================================
--- branches/experimental/mail/thunderbird-esr/Makefile Mon Jul 9 17:46:24
2012 (r864)
+++ branches/experimental/mail/thunderbird-esr/Makefile Mon Jul 9 17:46:35
2012 (r865)
@@ -42,10 +42,8 @@
MOZ_PROTOCOLS= http,ftp,file,viewsource,res,data,wyciwyg,websocket
MOZ_OPTIONS= --program-transform-name='s/thunderbird/${MOZILLA}/' \
- --with-default-mozilla-five-home=${PREFIX}/lib/${MOZILLA} \
--enable-single-profile --disable-profilesharing \
- --enable-application=mail --enable-official-branding \
- --disable-updater --disable-necko-wifi
+ --enable-application=mail --enable-official-branding
MOZ_MK_OPTIONS= MOZ_MOZ_THUNDERBIRD=1 MAIL_PKG_SHARED=1
MOZ_EXPORT= MOZ_THUNDERBIRD=1 MAIL_PKG_SHARED=1
MOZ_PKGCONFIG_FILES=
Modified: branches/experimental/mail/thunderbird/Makefile
==============================================================================
--- branches/experimental/mail/thunderbird/Makefile Mon Jul 9 17:46:24
2012 (r864)
+++ branches/experimental/mail/thunderbird/Makefile Mon Jul 9 17:46:35
2012 (r865)
@@ -42,10 +42,8 @@
MOZ_PROTOCOLS= http,ftp,file,viewsource,res,data,wyciwyg,websocket
MOZ_OPTIONS= --program-transform-name='s/thunderbird/${MOZILLA}/' \
- --with-default-mozilla-five-home=${PREFIX}/lib/${MOZILLA} \
--enable-single-profile --disable-profilesharing \
- --enable-application=mail --enable-official-branding \
- --disable-updater --disable-necko-wifi
+ --enable-application=mail --enable-official-branding
MOZ_MK_OPTIONS= MOZ_MOZ_THUNDERBIRD=1 MAIL_PKG_SHARED=1
MOZ_EXPORT= MOZ_THUNDERBIRD=1 MAIL_PKG_SHARED=1
MOZ_PKGCONFIG_FILES=
Modified: branches/experimental/mail/thunderbird3/Makefile
==============================================================================
--- branches/experimental/mail/thunderbird3/Makefile Mon Jul 9 17:46:24
2012 (r864)
+++ branches/experimental/mail/thunderbird3/Makefile Mon Jul 9 17:46:35
2012 (r865)
@@ -36,11 +36,9 @@
MOZILLA_SUFX= 3
MOZILLA= ${PORTNAME}${MOZILLA_SUFX}
MOZ_OPTIONS= --program-transform-name='s/thunderbird/${MOZILLA}/' \
- --with-default-mozilla-five-home=${PREFIX}/lib/${MOZILLA} \
--enable-single-profile --disable-profilesharing \
--enable-application=mail --enable-official-branding \
- --enable-image-decoders=default,-xbm \
- --disable-updater --disable-necko-wifi
+ --enable-image-decoders=default,-xbm
MOZ_MK_OPTIONS= MOZ_MOZ_THUNDERBIRD=1 MAIL_PKG_SHARED=1
MOZ_EXPORT= MOZ_THUNDERBIRD=1 MAIL_PKG_SHARED=1
MOZILLA_PLIST_DIRS= bin lib
Modified: branches/experimental/www/firefox-esr/Makefile
==============================================================================
--- branches/experimental/www/firefox-esr/Makefile Mon Jul 9 17:46:24
2012 (r864)
+++ branches/experimental/www/firefox-esr/Makefile Mon Jul 9 17:46:35
2012 (r865)
@@ -47,11 +47,8 @@
FIREFOX_ICON= ${MOZILLA}.png
FIREFOX_ICON_SRC=
${PREFIX}/lib/${MOZILLA}/chrome/icons/default/default48.png
MOZ_OPTIONS= --program-transform-name='s/firefox/${MOZILLA}/' \
- --with-default-mozilla-five-home=${PREFIX}/lib/${MOZILLA} \
--enable-application=browser \
- --enable-official-branding \
- --disable-updater \
- --disable-necko-wifi
+ --enable-official-branding
OPTIONS_DEFAULT=DBUS GTK2 LOGGING OSS
OPTIONS_DEFINE= PGO
Modified: branches/experimental/www/firefox-nightly/Makefile
==============================================================================
--- branches/experimental/www/firefox-nightly/Makefile Mon Jul 9 17:46:24
2012 (r864)
+++ branches/experimental/www/firefox-nightly/Makefile Mon Jul 9 17:46:35
2012 (r865)
@@ -48,11 +48,8 @@
FIREFOX_ICON= ${MOZILLA}.png
FIREFOX_ICON_SRC=
${PREFIX}/lib/${MOZILLA}/chrome/icons/default/default48.png
MOZ_OPTIONS= --program-transform-name='s/firefox/${MOZILLA}/' \
- --with-default-mozilla-five-home=${PREFIX}/lib/${MOZILLA} \
--disable-webrtc \
- --enable-application=browser \
- --disable-updater \
- --disable-necko-wifi
+ --enable-application=browser
OPTIONS_DEFAULT=DBUS GTK2 LOGGING GSTREAMER OSS
OPTIONS_DEFINE= GSTREAMER PGO
Modified: branches/experimental/www/firefox/Makefile
==============================================================================
--- branches/experimental/www/firefox/Makefile Mon Jul 9 17:46:24 2012
(r864)
+++ branches/experimental/www/firefox/Makefile Mon Jul 9 17:46:35 2012
(r865)
@@ -47,11 +47,8 @@
FIREFOX_ICON= ${MOZILLA}.png
FIREFOX_ICON_SRC=
${PREFIX}/lib/${MOZILLA}/chrome/icons/default/default48.png
MOZ_OPTIONS= --program-transform-name='s/firefox/${MOZILLA}/' \
- --with-default-mozilla-five-home=${PREFIX}/lib/${MOZILLA} \
--enable-application=browser \
- --enable-official-branding \
- --disable-updater \
- --disable-necko-wifi
+ --enable-official-branding
OPTIONS_DEFAULT=DBUS GTK2 LOGGING OSS
OPTIONS_DEFINE= GSTREAMER PGO
Modified: branches/experimental/www/firefox36/Makefile
==============================================================================
--- branches/experimental/www/firefox36/Makefile Mon Jul 9 17:46:24
2012 (r864)
+++ branches/experimental/www/firefox36/Makefile Mon Jul 9 17:46:35
2012 (r865)
@@ -41,13 +41,10 @@
FIREFOX_ICON= ${MOZILLA}.png
FIREFOX_ICON_SRC=
${PREFIX}/lib/${MOZILLA}/chrome/icons/default/default48.png
MOZ_OPTIONS= --program-transform-name='s/firefox/${MOZILLA}/' \
- --with-default-mozilla-five-home=${PREFIX}/lib/${MOZILLA} \
--enable-application=browser \
--enable-official-branding \
--enable-libxul \
- --disable-ipc \
- --disable-updater \
- --disable-necko-wifi
+ --disable-ipc
OPTIONS_DEFAULT=DBUS LOGGING OSS
Modified: branches/experimental/www/kompozer/Makefile
==============================================================================
--- branches/experimental/www/kompozer/Makefile Mon Jul 9 17:46:24 2012
(r864)
+++ branches/experimental/www/kompozer/Makefile Mon Jul 9 17:46:35 2012
(r865)
@@ -28,8 +28,7 @@
MOZ_CHROME= jar
MOZ_TOOLKIT= gtk2
MOZ_EXTENSIONS=
wallet,xml-rpc,xmlextras,pref,universalchardet,spellcheck
-MOZ_OPTIONS= --with-default-mozilla-five-home=${PREFIX}/lib/${MOZILLA} \
- ${CONFIGURE_TARGET} \
+MOZ_OPTIONS= ${CONFIGURE_TARGET} \
--enable-xinerama \
--disable-xprint \
--enable-application=composer
Modified: branches/experimental/www/libxul/Makefile
==============================================================================
--- branches/experimental/www/libxul/Makefile Mon Jul 9 17:46:24 2012
(r864)
+++ branches/experimental/www/libxul/Makefile Mon Jul 9 17:46:35 2012
(r865)
@@ -41,9 +41,6 @@
USE_LDCONFIG= ${PREFIX}/lib/${MOZILLA}
PORT_MOZCONFIG= ${WRKSRC}/xulrunner/config/mozconfig
-MOZ_OPTIONS?= --with-default-mozilla-five-home=${PREFIX}/lib/${MOZILLA} \
- --disable-updater \
- --disable-necko-wifi
MOZ_EXTENSIONS= default,cookie,permissions
OPTIONS_DEFAULT=DBUS GTK2 LOGGING OSS
USE_GECKO= gecko
Modified: branches/experimental/www/libxul19/Makefile
==============================================================================
--- branches/experimental/www/libxul19/Makefile Mon Jul 9 17:46:24 2012
(r864)
+++ branches/experimental/www/libxul19/Makefile Mon Jul 9 17:46:35 2012
(r865)
@@ -34,10 +34,7 @@
USE_LDCONFIG= ${PREFIX}/lib/${MOZILLA}
PORT_MOZCONFIG= ${WRKSRC}/xulrunner/config/mozconfig
-MOZ_OPTIONS?= --with-default-mozilla-five-home=${PREFIX}/lib/${MOZILLA} \
- --disable-ipc \
- --disable-updater \
- --disable-necko-wifi
+MOZ_OPTIONS?= --disable-ipc
MOZ_EXTENSIONS= default,cookie,permissions
OPTIONS_DEFAULT=DBUS LOGGING OSS
USE_GECKO= gecko
Modified: branches/experimental/www/seamonkey/Makefile
==============================================================================
--- branches/experimental/www/seamonkey/Makefile Mon Jul 9 17:46:24
2012 (r864)
+++ branches/experimental/www/seamonkey/Makefile Mon Jul 9 17:46:35
2012 (r865)
@@ -39,10 +39,7 @@
MOZ_EXTENSIONS= default
MOZ_OPTIONS+= --program-transform-name='s/seamonkey/${MOZILLA}/' \
- --with-default-mozilla-five-home=${PREFIX}/lib/${MOZILLA} \
- --enable-application=suite \
- --disable-updater \
- --disable-necko-wifi
+ --enable-application=suite
USE_MOZILLA= # empty
MOZILLA_PLIST_DIRS= bin lib
_______________________________________________
freebsd-gecko@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-gecko
To unsubscribe, send any mail to "freebsd-gecko-unsubscr...@freebsd.org"
