Date: Mon, 18 Jun 2012 13:43:55 GMT From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org Subject: [SVN-Commit] r769 - in branches/experimental: Mk mail/thunderbird mail/thunderbird-beta mail/thunderbird-esr mail/thunderbird3 www/firefox www/firefox-beta www/firefox-esr www/firefox-nightly www/firefox36 www/libxul www/seamonkey www/seamonkey-beta Message-ID: <201206181343.q5IDht5e080174@trillian.chruetertee.ch>
next in thread | raw e-mail | index | archive | help
Author: jbeich
Date: Mon Jun 18 13:43:54 2012
New Revision: 769
Log:
setting MOZ_TOOLKIT should be an exception, not mandatory
Modified:
branches/experimental/Mk/bsd.gecko.mk
branches/experimental/mail/thunderbird-beta/Makefile
branches/experimental/mail/thunderbird-esr/Makefile
branches/experimental/mail/thunderbird/Makefile
branches/experimental/mail/thunderbird3/Makefile
branches/experimental/www/firefox-beta/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/libxul/Makefile
branches/experimental/www/seamonkey-beta/Makefile
branches/experimental/www/seamonkey/Makefile
Modified: branches/experimental/Mk/bsd.gecko.mk
==============================================================================
--- branches/experimental/Mk/bsd.gecko.mk Mon Jun 18 13:43:12 2012 (r768)
+++ branches/experimental/Mk/bsd.gecko.mk Mon Jun 18 13:43:54 2012 (r769)
@@ -485,7 +485,7 @@
# probably want to set MAKE_ENV+=${MOZ_EXPORT}
#
# MOZ_TOOLKIT A variable for the --enable-default-toolkit= in
-# CONFIGURE_ARGS. The default is gtk2.
+# CONFIGURE_ARGS. The default is cairo-gtk2.
#
# MOZ_EXTENSIONS A list of extensions to build
#
@@ -633,7 +633,7 @@
.endfor
# Standard options from README
-MOZ_TOOLKIT?= gtk2
+MOZ_TOOLKIT?= cairo-gtk2
MOZ_OPTIONS+= --disable-tests \
--enable-default-toolkit=${MOZ_TOOLKIT} \
--with-pthreads
Modified: branches/experimental/mail/thunderbird-beta/Makefile
==============================================================================
--- branches/experimental/mail/thunderbird-beta/Makefile Mon Jun 18 13:43:12 2012 (r768)
+++ branches/experimental/mail/thunderbird-beta/Makefile Mon Jun 18 13:43:54 2012 (r769)
@@ -26,7 +26,6 @@
USE_GECKO= gecko
CONFLICTS= thunderbird-10.*
USE_MOZILLA= -nss -dbm
-MOZ_TOOLKIT= cairo-gtk2
MAKE_JOBS_SAFE= yes
WANT_GNOME= yes
Modified: branches/experimental/mail/thunderbird-esr/Makefile
==============================================================================
--- branches/experimental/mail/thunderbird-esr/Makefile Mon Jun 18 13:43:12 2012 (r768)
+++ branches/experimental/mail/thunderbird-esr/Makefile Mon Jun 18 13:43:54 2012 (r769)
@@ -27,7 +27,6 @@
USE_GECKO= gecko
CONFLICTS= thunderbird-1[1-9].*
USE_MOZILLA= -nss -dbm
-MOZ_TOOLKIT= cairo-gtk2
MAKE_JOBS_SAFE= yes
WANT_GNOME= yes
Modified: branches/experimental/mail/thunderbird/Makefile
==============================================================================
--- branches/experimental/mail/thunderbird/Makefile Mon Jun 18 13:43:12 2012 (r768)
+++ branches/experimental/mail/thunderbird/Makefile Mon Jun 18 13:43:54 2012 (r769)
@@ -26,7 +26,6 @@
USE_GECKO= gecko
CONFLICTS= thunderbird-10.*
USE_MOZILLA= -nss -dbm
-MOZ_TOOLKIT= cairo-gtk2
MAKE_JOBS_SAFE= yes
WANT_GNOME= yes
Modified: branches/experimental/mail/thunderbird3/Makefile
==============================================================================
--- branches/experimental/mail/thunderbird3/Makefile Mon Jun 18 13:43:12 2012 (r768)
+++ branches/experimental/mail/thunderbird3/Makefile Mon Jun 18 13:43:54 2012 (r769)
@@ -22,7 +22,6 @@
LATEST_LINK= thunderbird3
USE_GECKO= gecko
USE_MOZILLA= -nss -dbm -event -ffi -vpx
-MOZ_TOOLKIT= cairo-gtk2
MAKE_JOBS_SAFE= yes
WANT_GNOME= yes
Modified: branches/experimental/www/firefox-beta/Makefile
==============================================================================
--- branches/experimental/www/firefox-beta/Makefile Mon Jun 18 13:43:12 2012 (r768)
+++ branches/experimental/www/firefox-beta/Makefile Mon Jun 18 13:43:54 2012 (r769)
@@ -30,7 +30,6 @@
MOZ_PKGCONFIG_FILES= # empty
USE_MOZILLA= -nss -dbm
MOZILLA_NAME= Firefox
-MOZ_TOOLKIT= cairo-gtk2
MAKE_JOBS_SAFE= yes
WANT_GNOME= yes
Modified: branches/experimental/www/firefox-esr/Makefile
==============================================================================
--- branches/experimental/www/firefox-esr/Makefile Mon Jun 18 13:43:12 2012 (r768)
+++ branches/experimental/www/firefox-esr/Makefile Mon Jun 18 13:43:54 2012 (r769)
@@ -31,7 +31,6 @@
MOZ_PKGCONFIG_FILES= # empty
USE_MOZILLA= -nss -dbm
MOZILLA_NAME= Firefox
-MOZ_TOOLKIT= cairo-gtk2
MAKE_JOBS_SAFE= yes
WANT_GNOME= yes
Modified: branches/experimental/www/firefox-nightly/Makefile
==============================================================================
--- branches/experimental/www/firefox-nightly/Makefile Mon Jun 18 13:43:12 2012 (r768)
+++ branches/experimental/www/firefox-nightly/Makefile Mon Jun 18 13:43:54 2012 (r769)
@@ -33,7 +33,6 @@
MOZILLA_NAME= Nightly
MOZILLA_SUFX= -nightly
MOZILLA= ${PORTNAME}${MOZILLA_SUFX}
-MOZ_TOOLKIT= cairo-gtk2
MAKE_JOBS_SAFE= yes
WANT_GNOME= yes
Modified: branches/experimental/www/firefox/Makefile
==============================================================================
--- branches/experimental/www/firefox/Makefile Mon Jun 18 13:43:12 2012 (r768)
+++ branches/experimental/www/firefox/Makefile Mon Jun 18 13:43:54 2012 (r769)
@@ -30,7 +30,6 @@
MOZ_PKGCONFIG_FILES= # empty
USE_MOZILLA= -nss -dbm
MOZILLA_NAME= Firefox
-MOZ_TOOLKIT= cairo-gtk2
MAKE_JOBS_SAFE= yes
WANT_GNOME= yes
Modified: branches/experimental/www/firefox36/Makefile
==============================================================================
--- branches/experimental/www/firefox36/Makefile Mon Jun 18 13:43:12 2012 (r768)
+++ branches/experimental/www/firefox36/Makefile Mon Jun 18 13:43:54 2012 (r769)
@@ -28,7 +28,6 @@
MOZILLA_NAME= Firefox${MOZILLA_SUFX}
MOZILLA_SUFX= 3
MOZILLA= ${PORTNAME}${MOZILLA_SUFX}
-MOZ_TOOLKIT= cairo-gtk2
MAKE_JOBS_SAFE= yes
WANT_GNOME= yes
Modified: branches/experimental/www/libxul/Makefile
==============================================================================
--- branches/experimental/www/libxul/Makefile Mon Jun 18 13:43:12 2012 (r768)
+++ branches/experimental/www/libxul/Makefile Mon Jun 18 13:43:54 2012 (r769)
@@ -46,7 +46,6 @@
USE_GECKO_OPTIONS=+java
USE_GECKO= gecko
MOZILLA_EXEC_NAME=xulrunner
-MOZ_TOOLKIT= cairo-gtk2
USE_MOZILLA= -nss -dbm
MOZ_PKGCONFIG_FILES= libxul-embedding libxul mozilla-js mozilla-nss \
mozilla-plugin
Modified: branches/experimental/www/seamonkey-beta/Makefile
==============================================================================
--- branches/experimental/www/seamonkey-beta/Makefile Mon Jun 18 13:43:12 2012 (r768)
+++ branches/experimental/www/seamonkey-beta/Makefile Mon Jun 18 13:43:54 2012 (r769)
@@ -46,7 +46,6 @@
USE_MOZILLA= -nss -dbm
USE_GECKO_OPTIONS=+smb
-MOZ_TOOLKIT= cairo-gtk2
MOZILLA_PLIST_DIRS= bin lib
MOZ_PKGCONFIG_FILES=
Modified: branches/experimental/www/seamonkey/Makefile
==============================================================================
--- branches/experimental/www/seamonkey/Makefile Mon Jun 18 13:43:12 2012 (r768)
+++ branches/experimental/www/seamonkey/Makefile Mon Jun 18 13:43:54 2012 (r769)
@@ -46,7 +46,6 @@
USE_MOZILLA= -nss -dbm
USE_GECKO_OPTIONS=+smb
-MOZ_TOOLKIT= cairo-gtk2
MOZILLA_PLIST_DIRS= bin lib
MOZ_PKGCONFIG_FILES=
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201206181343.q5IDht5e080174>