- Switch OPTIONS=SMB ... back to only ports that support it.

- Fix build of thunderbird


git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@5132 df743ca5-7f9a-e211-a948-0013205c9059

7 files changed, 17 insertions, 16 deletions

diff --git a/www/firefox/Makefile b/www/firefox/Makefile
index e6d52c39f..237468a0c 100644
--- a/www/firefox/Makefile
+++ b/www/firefox/Makefile
@@ -3,7 +3,7 @@
 # Whom:				Alan Eldridge <alane@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/www/firefox/Makefile,v 1.13 2005/11/12 02:06:57 ahze Exp $
+#   $MCom: ports/www/firefox/Makefile,v 1.14 2005/11/14 04:12:08 ahze Exp $
 #
 
 PORTNAME=	firefox
@@ -46,7 +46,8 @@ SCRIPTS_DIR=		${FAKEDIR}/lib/${FF}
 MOZ_PIS_SCRIPTS=	S50cleanhome
 MOZ_PIS_DIR=		${SCRIPTS_DIR}/init.d
 
-OPTIONS=	NEWTAB "Open external links in a new tab" on
+OPTIONS=	NEWTAB "Open external links in a new tab" on \
+		SMB "Enable smb:// URI support using gnomevfs" off
 
 .include <bsd.port.pre.mk>
 .include "${.CURDIR}/../mozilla/Makefile.common"
diff --git a/www/firefox10/Makefile b/www/firefox10/Makefile
index e6d52c39f..237468a0c 100644
--- a/www/firefox10/Makefile
+++ b/www/firefox10/Makefile
@@ -3,7 +3,7 @@
 # Whom:				Alan Eldridge <alane@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/www/firefox/Makefile,v 1.13 2005/11/12 02:06:57 ahze Exp $
+#   $MCom: ports/www/firefox/Makefile,v 1.14 2005/11/14 04:12:08 ahze Exp $
 #
 
 PORTNAME=	firefox
@@ -46,7 +46,8 @@ SCRIPTS_DIR=		${FAKEDIR}/lib/${FF}
 MOZ_PIS_SCRIPTS=	S50cleanhome
 MOZ_PIS_DIR=		${SCRIPTS_DIR}/init.d
 
-OPTIONS=	NEWTAB "Open external links in a new tab" on
+OPTIONS=	NEWTAB "Open external links in a new tab" on \
+		SMB "Enable smb:// URI support using gnomevfs" off
 
 .include <bsd.port.pre.mk>
 .include "${.CURDIR}/../mozilla/Makefile.common"
diff --git a/www/mozilla/Makefile b/www/mozilla/Makefile
index 160c5fbb7..d8c882fc9 100644
--- a/www/mozilla/Makefile
+++ b/www/mozilla/Makefile
@@ -3,7 +3,7 @@
 # Whom:			eivind/dima/jseger
 #
 # $FreeBSD$
-#    $MCom: ports/www/mozilla/Makefile,v 1.25 2005/11/13 19:07:58 ahze Exp $
+#    $MCom: ports/www/mozilla/Makefile,v 1.26 2005/11/14 00:58:39 ahze Exp $
 #
 
 PORTNAME=	mozilla
@@ -44,7 +44,8 @@ OPTIONS=CALENDAR "Enable the Calendar module" off \
 	LDAP "Enable LDAP support for Mailnews" on \
 	CHATZILLA "Enable the Chatzilla IRC module" on \
 	XMLTERM "Enable the XMLTerm module" on \
-	JAVASCRIPT_DEBUGGER "Enable DTD and JavaScript debuggers" off
+	JAVASCRIPT_DEBUGGER "Enable DTD and JavaScript debuggers" off \
+	SMB "Enable smb:// URI support using gnomevfs" off
 
 .include <bsd.port.pre.mk>
 .include "${.CURDIR}/Makefile.common"
diff --git a/www/mozilla/Makefile.common b/www/mozilla/Makefile.common
index 8cf3aab11..99e5a56ac 100644
--- a/www/mozilla/Makefile.common
+++ b/www/mozilla/Makefile.common
@@ -1,5 +1,5 @@
 # $FreeBSD$
-#    $MCom: ports/www/mozilla/Makefile.common,v 1.3 2005/11/14 00:58:39 ahze Exp $
+#    $MCom: ports/www/mozilla/Makefile.common,v 1.4 2005/11/14 04:12:09 ahze Exp $
 
 BUILD_DEPENDS+=	zip:${PORTSDIR}/archivers/zip
 LIB_DEPENDS+=	jpeg.9:${PORTSDIR}/graphics/jpeg \
@@ -10,8 +10,7 @@ LIB_DEPENDS+=	jpeg.9:${PORTSDIR}/graphics/jpeg \
 
 OPTIONS+=	DEBUG "Build a debugging image" off \
 		LOGGING "Enable additional log messages" off \
-		OPTIMIZED_CFLAGS "Enable some additional optimizations" off \
-		SMB "Enable smb:// URI support using gnomevfs" off
+		OPTIMIZED_CFLAGS "Enable some additional optimizations" off
 
 MAINTAINER?=	gnome@FreeBSD.org
 
diff --git a/www/mozilla/files/mozconfig-generic.in b/www/mozilla/files/mozconfig-generic.in
index 5ca8408d2..40976ba26 100644
--- a/www/mozilla/files/mozconfig-generic.in
+++ b/www/mozilla/files/mozconfig-generic.in
@@ -1,11 +1,9 @@
 # $FreeBSD$
-#   $MCom: ports/www/mozilla/files/mozconfig-generic.in,v 1.1 2005/11/13 19:07:58 ahze Exp $
+#   $MCom: ports/www/mozilla/files/mozconfig-generic.in,v 1.2 2005/11/14 00:58:39 ahze Exp $
 ######################################################################
 # standard opts from README
 ac_add_options --enable-crypto
 ac_add_options --disable-tests
-ac_add_options --disable-mailnews
-ac_add_options --disable-composer
 ac_add_options --enable-default-toolkit=gtk2
 ac_add_options --enable-xft
 ######################################################################
diff --git a/www/mozilla/files/mozconfig.in b/www/mozilla/files/mozconfig.in
index 5a067b531..6a6f30d34 100644
--- a/www/mozilla/files/mozconfig.in
+++ b/www/mozilla/files/mozconfig.in
@@ -1,5 +1,5 @@
 # $FreeBSD$
-#    $MCom$
+#    $MCom: ports/www/mozilla/files/mozconfig.in,v 1.1 2005/11/13 19:07:58 ahze Exp $
 export MOZ_INTERNAL_LIBART_LGPL=1
 mk_add_options MOZ_INTERNAL_LIBART_LGPL=1
 
@@ -11,7 +11,7 @@ else
 fi
 	ac_add_options --enable-mailnews
 else
-	ac_add_options --enable-mailnews
+	ac_add_options --disable-mailnews
 fi # end WITHOUT_MAILNEWS
 
 if test -z "$WITH_JAVASCRIPT_DEBUGGER" ; then
diff --git a/www/seamonkey/Makefile b/www/seamonkey/Makefile
index 8ab70ce7f..82673ed59 100644
--- a/www/seamonkey/Makefile
+++ b/www/seamonkey/Makefile
@@ -3,7 +3,7 @@
 # Whom:			eivind/dima/jseger
 #
 # $FreeBSD$
-#    $MCom: ports/www/seamonkey/Makefile,v 1.27 2005/11/11 09:03:26 ahze Exp $
+#    $MCom: ports/www/seamonkey/Makefile,v 1.28 2005/11/14 04:12:10 ahze Exp $
 #
 
 PORTNAME?=	seamonkey
@@ -44,7 +44,8 @@ OPTIONS=MAILNEWS "Enable Mail and News modules" on \
 	COMPOSER "Enable the HTML Composer module" on \
 	LDAP "Enable LDAP support for Mailnews" on \
 	CHATZILLA "Enable the Chatzilla IRC module" on \
-	JAVASCRIPT_DEBUGGER "Enable DTD and JavaScript debuggers" off
+	JAVASCRIPT_DEBUGGER "Enable DTD and JavaScript debuggers" off \
+	SMB "Enable smb:// URI support using gnomevfs" off
 
 .include <bsd.port.pre.mk>
 .include "${.CURDIR}/../mozilla/Makefile.common"