- Merge ports mozilla in to MC ports with xulrunner added to USE_GECKO

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

3 files changed, 8 insertions, 37 deletions

diff --git a/www/mozilla/Makefile b/www/mozilla/Makefile
index b2e81778c..fc0e0fae3 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.34 2006/01/31 20:36:54 marcus Exp $
+#    $MCom$
 #
 
 PORTNAME=	mozilla
@@ -38,6 +38,8 @@ MOZ_MK_OPTIONS+=MOZ_INTERNAL_LIBART_LGPL=1
 MOZ_OPTIONS+=	--enable-svg-renderer-libart --enable-svg \
 		--disable-plaintext-editor-only
 
+NOT_FOR_ARCHS=	ia64
+
 OPTIONS=CALENDAR "Enable the Calendar module" off \
 	MAILNEWS "Enable Mail and News modules" on \
 	COMPOSER "Enable the HTML Composer module" on \
diff --git a/www/mozilla/Makefile.common b/www/mozilla/Makefile.common
index 5058bcf8c..cea35c49f 100644
--- a/www/mozilla/Makefile.common
+++ b/www/mozilla/Makefile.common
@@ -4,7 +4,7 @@
 # Whom:			Michael Johnson <ahze@FreeBSD.org>
 #
 # $FreeBSD$
-#    $MCom: ports/www/mozilla/Makefile.common,v 1.17 2005/11/29 08:40:08 ahze Exp $
+#    $MCom$
 
 # This file contains some reusable components for mozilla ports. It's of
 # use primarily to apps from the mozilla project itself (such as Firefox,
@@ -185,7 +185,7 @@ WITH_OPTIMIZE?=	-O
 
 .if defined(WITH_SMB)
 USE_GNOME+=	gnomevfs2
-MOZ_OPTIONS+=	--disable-gnomevfs
+MOZ_OPTIONS+=	--enable-gnomevfs
 .endif
 
 .if defined(WITH_DEBUG)
diff --git a/www/mozilla/bsd.gecko.mk b/www/mozilla/bsd.gecko.mk
index b19476315..55353c9b6 100644
--- a/www/mozilla/bsd.gecko.mk
+++ b/www/mozilla/bsd.gecko.mk
@@ -2,7 +2,7 @@
 # ex:ts=4
 #
 # $FreeBSD$
-#    $MCom: ports/www/mozilla/bsd.gecko.mk,v 1.14 2006/01/29 20:11:48 ahze Exp $
+#    $MCom$
 #
 # 4 column tabs prevent hair loss and tooth decay!
 
@@ -64,7 +64,7 @@ Gecko_Pre_Include=			bsd.gecko.mk
 #  .endif
 
 .if ${OSVERSION} >= 500000
-_GECKO_ALL=	firefox seamonkey sunbird thunderbird xulrunner
+_GECKO_ALL=	firefox nvu seamonkey sunbird thunderbird xulrunner
 .endif
 _GECKO_ALL+=	mozilla
 
@@ -78,10 +78,6 @@ ${gecko}_DEPENDS?=	${PORTSDIR}/${${gecko}_PORTSDIR}/${gecko}
 ${gecko}_PLIST?=	${X11BASE}/lib/${gecko}/libgtkembedmoz.so
 .endfor
 
-# Defines
-GECKO_OPTIONSFILE?=	${PORT_DBDIR}/${UNIQUENAME}/gecko.options
-_GECKO_OPTIONSFILE!=	${ECHO_CMD} "${GECKO_OPTIONSFILE}"
-
 # Figure out which mozilla to use
 # Weed out bad options in USE_GECKO
 .for badgecko in ${USE_GECKO}
@@ -134,10 +130,9 @@ RUN_DEPENDS+=	${${GECKO}_PLIST}:${${GECKO}_DEPENDS}
 BROKEN="Unable to find a supported gecko, please check USE_GECKO"
 .endif
 
-pre-everything:: _gecko-pre-everything _gecko-config
+pre-everything:: _gecko-pre-everything
 
 _gecko-pre-everything::
-# remove me after testing .if defined(BATCH)
 	@${ECHO_CMD} ""
 .if !defined(_FOUND_WITH_GECKO) && defined(WITH_GECKO)
 	@${ECHO_CMD} " Warning: ${PORTNAME} does not support any gecko you"
@@ -154,32 +149,6 @@ _gecko-pre-everything::
 	@${ECHO_CMD} "   ${gecko} "
 .endfor
 	@${ECHO_CMD} ""
-# remove me after testing .endif
-
-_gecko-config:
-.if defined(GECKO_OPTIONS) ## !!!Remove me after testing!!!
-.if !defined(BATCH) && !defined(_FOUND_WITH_GECKO)
-. if !defined(USE_GECKO)
-	@${ECHO_MSG} "===> No options to configure"
-. else
-.  if ${GECKO_OPTIONSFILE} != ${_GECKO_OPTIONSFILE}
-	@${ECHO_MSG} "===> Using wrong configuration file ${_GECKO_OPTIONSFILE}"
-	@exit 1
-.  endif
-.  if !defined(INSTALL_AS_USER)
-	@${ECHO_MSG} "===>  Switching to root credentials to create `${DIRNAME} ${_GECKO_OPTIONSFILE}`"
-	@(${SU_CMD} "${SH} -c \"${MKDIR} `${DIRNAME} ${_GECKO_OPTIONSFILE}` 2> /dev/null\"") || \
-		(${ECHO_MSG} "===> Cannot create `${DIRNAME} ${_GECKO_OPTIONSFILE}`, check permissions"; exit 1)
-	@${ECHO_MSG} "===>  Returning to user credentials"
-.  else
-	@(${MKDIR} `${DIRNAME} ${_GECKO_OPTIONSFILE}` 2> /dev/null) || \
-		(${ECHO_MSG} "===> Cannot create `${DIRNAME} ${_GECKO_OPTIONSFILE}`, check permissions"; exit 1)
-.  endif
-
-	${SH} -c "${DIALOG} --radiolist \"Gecko selection for ${PKGNAME:C/-([^-]+)$/ \1/}\" 21 70 15 ${GECKO} Default on ${GOOD_USE_GECKO:S/${GECKO}//:S/$/ CHANGEME off/}" 2> /tmp/gecko.tacos
-. endif
-.endif
-.endif ## !!!Remove me after testing!!!
 
 #.endif # end it all
 .endif