- Add firefox-devel at version 1.1a2

Note: you must run firefox as root to register chrome before you can run
	as normal user.

Repocopied by:	marcus


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

36 files changed, 152 insertions, 300 deletions

diff --git a/www/firefox-devel/Makefile b/www/firefox-devel/Makefile
index e5a783ba6..57a43c502 100644
--- a/www/firefox-devel/Makefile
+++ b/www/firefox-devel/Makefile
@@ -3,7 +3,7 @@
 # Whom:				Alan Eldridge <alane@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/www/firefox/Makefile,v 1.8 2005/06/28 05:40:11 adamw Exp $
+#   $MCom: ports/www/firefox/Makefile,v 1.9 2005/07/14 00:03:59 ahze Exp $
 #
 
 PORTNAME=	firefox
@@ -49,11 +49,13 @@ EXTRACT_AFTER_ARGS=	| ${TAR} -xf - --exclude */CVS/* \
 			--exclude MANIFEST
 
 FIREFOX=	${PORTNAME}
+FF_SUFX=	-devel
+FF=		${FIREFOX}${FF_SUFX}
 FF_VER=		1.0+
 #FF_VER=	${PORTVERSION}
 
-FIREFOX_ICON=	${FIREFOX}.xpm
-FIREFOX_ICON_SRC=	${PREFIX}/lib/${FIREFOX}/chrome/icons/default/default.xpm
+FIREFOX_ICON=	${FF}.xpm
+FIREFOX_ICON_SRC=	${PREFIX}/lib/${FF}/chrome/icons/default/default.xpm
 
 PKGCONFIG_FILES=firefox-gtkmozembed firefox-js firefox-xpcom \
 		firefox-nspr firefox-nss firefox-plugin
@@ -64,8 +66,8 @@ JPI_LIST?=\
 	${LOCALBASE}/diablo-jdk1.3.1/jre/plugin/${ARCH}/ns600/libjavaplugin_oji.so \
 	${LOCALBASE}/jdk1.3.1/jre/plugin/${ARCH}/ns600/libjavaplugin_oji.so
 
-SYSTEM_PREFS=		${FAKEDIR}/lib/${FIREFOX}-${FF_VER}/defaults/pref/firefox.js
-SCRIPTS_DIR=		${FAKEDIR}/lib/${FIREFOX}-${FF_VER}
+SYSTEM_PREFS=		${FAKEDIR}/lib/${FF}/defaults/pref/firefox.js
+SCRIPTS_DIR=		${FAKEDIR}/lib/${FF}
 MOZ_PIS_SCRIPTS=	S50cleanhome
 MOZ_PIS_DIR=		${SCRIPTS_DIR}/init.d
 CPPFLAGS+=	-I${X11BASE}/include -I${LOCALBASE}/include
@@ -130,17 +132,19 @@ post-extract::
 		-e 's|@PERL@|${PERL5}|'			\
 		<${FILESDIR}/mozconfig.in >${WRKSRC}/.mozconfig
 	@${SED} -e 's|@FIREFOX_ICON@|${FIREFOX_ICON}|' \
-		<${FILESDIR}/firefox.desktop.in >${WRKDIR}/firefox.desktop
+		<${FILESDIR}/firefox.desktop.in >${WRKDIR}/${FF}.desktop
 
 post-patch:
-	@${SED} -e 's|%%MOZDIR%%|${PREFIX}/lib/${FIREFOX}|g ; \
+	@${REINPLACE_CMD} -e 's|%%FIREFOX%%|${FF}|' \
+		${WRKSRC}/config/autoconf.mk.in
+	@${SED} -e 's|%%MOZDIR%%|${PREFIX}/lib/${FF}|g ; \
 		s|%%PREFIX%%|${PREFIX}|g ; \
 		s|%%X11BASE%%|${X11BASE}|g' \
 		< ${MASTERDIR}/pkg-install.in > ${PKGINSTALL}
-	@${SED} -e 's|%%MOZDIR%%|${PREFIX}/lib/${FIREFOX}|g' \
+	@${SED} -e 's|%%MOZDIR%%|${PREFIX}/lib/${FF}|g' \
 		< ${MASTERDIR}/pkg-deinstall.in > ${PKGDEINSTALL}
 .for ii in ${MOZ_PIS_SCRIPTS}
-	@${SED} -e 's|%%MOZILLA%%|${FIREFOX}|g ; \
+	@${SED} -e 's|%%MOZILLA%%|${FF}|g ; \
 		s|%%PREFIX%%|${PREFIX}|g ; \
 		s|%%X11BASE%%|${X11BASE}|g' \
 		< ${FILESDIR}/moz_pis_${ii} > ${WRKDIR}/moz_pis_${ii}
@@ -177,17 +181,18 @@ pre-install:
 	@${RM} -rf ${FAKEDIR} ${PLIST}
 	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} \
 		Makefile ${MAKE_ARGS} install
-	@${INSTALL_PROGRAM} ${WRKSRC}/rdf/chrome/tools/chromereg/regchrome ${FAKEDIR}/lib/${FIREFOX}-${FF_VER}
 	@${MKDIR} ${SCRIPTS_DIR}
 	@${MKDIR} ${MOZ_PIS_DIR}
-	${ECHO_CMD} 'share/applications/firefox.desktop' >> ${PLIST}
+	${ECHO_CMD} 'share/applications/${FF}.desktop' >> ${PLIST}
 	${ECHO_CMD} 'share/pixmaps/${FIREFOX_ICON}' >> ${PLIST}
 	${REINPLACE_CMD} -e 's|${FAKEDIR}|${PREFIX}|g; \
-		s|${FIREFOX}-${FF_VER}|${FIREFOX}|' \
+		s|${FIREFOX}|${FF}|; \
+		s|-devel||; \
+		s|$${progbase}-bin|${FIREFOX}-bin|' \
 		${FAKEDIR}/bin/firefox \
 		${FAKEDIR}/bin/firefox-config
-	${ECHO_CMD} bin/firefox >> ${PLIST}
-	${ECHO_CMD} bin/firefox-config >> ${PLIST}
+	${ECHO_CMD} bin/${FF} >> ${PLIST}
+	${ECHO_CMD} bin/${FF}-config >> ${PLIST}
 .for ii in ${MOZ_PIS_SCRIPTS}
 	${INSTALL_SCRIPT} ${WRKDIR}/moz_pis_${ii} ${MOZ_PIS_DIR}/${ii}
 .endfor
@@ -197,35 +202,35 @@ pre-install:
 	${ECHO_CMD} "pref(\"browser.link.open_external\", 3);" \
 		>> ${SYSTEM_PREFS}
 .endif # !defined(WITHOUT_NEWTAB)
-	cd ${FAKEDIR}/lib/${FIREFOX}-${FF_VER} && ${FIND} -s * -type f -o -type l | \
-		${SED} -e 's|^|lib/${FIREFOX}/|' >> ${PLIST} \
+	cd ${FAKEDIR}/lib/${FF} && ${FIND} -s * -type f -o -type l | \
+		${SED} -e 's|^|lib/${FF}/|' >> ${PLIST} \
 		&& ${FIND} -d * -type d | \
-		${SED} -e 's|^|@dirrm lib/${FIREFOX}/|' >> ${PLIST}
-	${ECHO_CMD} @dirrm lib/firefox >> ${PLIST}
+		${SED} -e 's|^|@dirrm lib/${FF}/|' >> ${PLIST}
+	${ECHO_CMD} @dirrm lib/${FF} >> ${PLIST}
 	for pcfile in ${PKGCONFIG_FILES}; do \
-		${REINPLACE_CMD} -e 's|${FIREFOX}-${FF_VER}|${FIREFOX}|g; \
+		${REINPLACE_CMD} -e 's|${FF}|${FF}|g; \
 			s|${FAKEDIR}|${PREFIX}|' \
 			${FAKEDIR}/lib/pkgconfig/$${pcfile}.pc ; \
-		${ECHO_CMD} libdata/pkgconfig/$${pcfile}.pc >> ${PLIST} ; \
+		${ECHO_CMD} libdata/pkgconfig/$${pcfile}${FF_SUFX}.pc >> ${PLIST} ; \
 	done
-	cd ${FAKEDIR}/include/${FIREFOX}-${FF_VER} && ${FIND} -s * -type f -o -type l | \
-		${SED} -e 's|^|include/${FIREFOX}/|' >> ${PLIST} \
+	cd ${FAKEDIR}/include/${FF} && ${FIND} -s * -type f -o -type l | \
+		${SED} -e 's|^|include/${FF}/|' >> ${PLIST} \
 		&& ${FIND} -d * -type d | \
-		${SED} -e 's|^|@dirrm include/${FIREFOX}/|' >> ${PLIST}
-	${ECHO_CMD} @dirrm include/${FIREFOX} >> ${PLIST}
-	${ECHO_CMD} lib/browser_plugins/.${PORTNAME}.keep >> ${PLIST}
+		${SED} -e 's|^|@dirrm include/${FF}/|' >> ${PLIST}
+	${ECHO_CMD} @dirrm include/${FF} >> ${PLIST}
+	${ECHO_CMD} lib/browser_plugins/.${FF}.keep >> ${PLIST}
 	${ECHO_CMD} "@unexec ${RMDIR} %D/lib/browser_plugins 2>/dev/null || ${TRUE}" >> ${PLIST}
 	${ECHO_CMD} "@unexec ${RMDIR} %D/share/applications 2>/dev/null || ${TRUE}" >> ${PLIST}
 	${ECHO_CMD} "@exec ${LOCALBASE}/bin/update-desktop-database > /dev/null || ${TRUE}" >> ${PLIST}
 	${ECHO_CMD} "@unexec ${LOCALBASE}/bin/update-desktop-database > /dev/null || ${TRUE}" >> ${PLIST}
 
 do-install:
-	${MKDIR} ${PREFIX}/lib/${FIREFOX}
-	${CHMOD} 755 ${PREFIX}/lib/${FIREFOX}
-	${INSTALL_SCRIPT} ${FAKEDIR}/bin/firefox ${PREFIX}/bin
-	${INSTALL_SCRIPT} ${FAKEDIR}/bin/firefox-config ${PREFIX}/bin
+	${MKDIR} ${PREFIX}/lib/${FF}
+	${CHMOD} 755 ${PREFIX}/lib/${FF}
+	${INSTALL_SCRIPT} ${FAKEDIR}/bin/firefox ${PREFIX}/bin/${FF}
+	${INSTALL_SCRIPT} ${FAKEDIR}/bin/firefox-config ${PREFIX}/bin/${FF}-config
 	${MKDIR} ${PREFIX}/lib/browser_plugins
-	${TOUCH} -f ${PREFIX}/lib/browser_plugins/.${PORTNAME}.keep
+	${TOUCH} -f ${PREFIX}/lib/browser_plugins/.${FF}.keep
 	if [ ! -L ${PREFIX}/lib/browser_plugins/libjavaplugin_oji.so ]; then \
 		for jpi in ${JPI_LIST}; do \
 			if [ -f $${jpi} ]; then \
@@ -237,22 +242,22 @@ do-install:
 	fi
 	for pcfile in ${PKGCONFIG_FILES}; do \
 		${INSTALL_DATA} ${FAKEDIR}/lib/pkgconfig/$${pcfile}.pc \
-			${PREFIX}/libdata/pkgconfig/$${pcfile}.pc ; \
+			${PREFIX}/libdata/pkgconfig/$${pcfile}${FF_SUFX}.pc ; \
 	done
-	-${RM} -fr ${PREFIX}/include/${FIREFOX}
-	${MKDIR} ${PREFIX}/include/${FIREFOX}
-	${CHMOD} 755 ${PREFIX}/include/${FIREFOX}
-	cd ${FAKEDIR}/include/${FIREFOX}-${FF_VER} && ${FIND} . | \
-		${CPIO} -pdm -L -R ${LIBOWN}:${LIBGRP} ${PREFIX}/include/${FIREFOX}
-	cd ${FAKEDIR}/lib/${FIREFOX}-${FF_VER} && ${FIND} . | \
-		${CPIO} -pdm -L -R ${LIBOWN}:${LIBGRP} ${PREFIX}/lib/${FIREFOX}
+	-${RM} -fr ${PREFIX}/include/${FF}
+	${MKDIR} ${PREFIX}/include/${FF}
+	${CHMOD} 755 ${PREFIX}/include/${FF}
+	cd ${FAKEDIR}/include/${FF} && ${FIND} . | \
+		${CPIO} -pdm -L -R ${LIBOWN}:${LIBGRP} ${PREFIX}/include/${FF}
+	cd ${FAKEDIR}/lib/${FF} && ${FIND} . | \
+		${CPIO} -pdm -L -R ${LIBOWN}:${LIBGRP} ${PREFIX}/lib/${FF}
 
 post-install:
 .if !defined(PACKAGE_BUILDING)
 	@${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
 .endif
 	${MKDIR} ${PREFIX}/share/applications ${PREFIX}/share/pixmaps
-	${INSTALL_DATA} ${WRKDIR}/firefox.desktop ${PREFIX}/share/applications
+	${INSTALL_DATA} ${WRKDIR}/${FF}.desktop ${PREFIX}/share/applications/
 	${INSTALL_DATA} ${WRKSRC}/other-licenses/branding/firefox/default.xpm ${FIREFOX_ICON_SRC}
 	${LN} -sf ${FIREFOX_ICON_SRC} ${PREFIX}/share/pixmaps/${FIREFOX_ICON}
 	@-update-desktop-database
diff --git a/www/firefox-devel/files/firefox.desktop.in b/www/firefox-devel/files/firefox.desktop.in
index c1b7a2e59..33764a099 100644
--- a/www/firefox-devel/files/firefox.desktop.in
+++ b/www/firefox-devel/files/firefox.desktop.in
@@ -182,7 +182,7 @@ Comment[vi]=Duyệt web
 Comment[wa]=Naivyî avå les waibes
 Comment[zh_CN]=浏览 Web
 Comment[zh_TW]=瀏覽網頁
-Exec=firefox %U
+Exec=firefox-devel %U
 Icon=@FIREFOX_ICON@
 StartupNotify=false
 Terminal=false
diff --git a/www/firefox-devel/files/firefox.rb b/www/firefox-devel/files/firefox.rb
deleted file mode 100644
index 6094c2457..000000000
--- a/www/firefox-devel/files/firefox.rb
+++ /dev/null
@@ -1,95 +0,0 @@
-#!/usr/bin/env ruby
-=begin -*-mode: ruby-*-
-
-  MoZiLLa.in
-
-  Copyright (c) 2002, Alan Eldridge
-  All rights reserved.
-  
-  Redistribution and use in source and binary forms, with or without
-  modification, are permitted provided that the following conditions 
-  are met:
-  
-  * Redistributions of source code must retain the above copyright
-  notice, this list of conditions and the following disclaimer.
-  
-  * Redistributions in binary form must reproduce the above copyright
-  notice, this list of conditions and the following disclaimer in the
-  documentation and/or other materials provided with the distribution.
-  
-  * Neither the name of the copyright owner nor the names of its
-  contributors may be used to endorse or promote products derived
-  from this software without specific prior written permission.
-  
-  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-  AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-  ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-  LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-  SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-  INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-  CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-  POSSIBILITY OF SUCH DAMAGE.
-
-  $Id: firefox.rb,v 1.3 2005-06-02 01:05:36 ahze Exp $
-
-  2002-12-16 Alan Eldridge <alane@geeksrus.net>
-
-=end
-
-X11BIN = "/usr/X11R6/bin"
-NAME = File::basename($0, ".rb")
-APP_PATH = File::join(X11BIN, NAME)
-
-if !File::executable?(APP_PATH)
-  raise "File '#{APP_PATH}' not found. Giving up." 
-elsif ($display = ENV["DISPLAY"]) == nil
-  raise "Environment variable DISPLAY not found. Giving up."
-end 
-
-if ARGV.size > 0
-  if ARGV[0] == "--debug"
-    ARGV.shift
-  else
-    $stdin.reopen(File::open("/dev/null", "r"))
-    $stdout.reopen(File::open("/dev/null", "w"))
-    $stderr.reopen(File::open("/dev/null", "w"))
-  end
-end
-
-if ARGV.size < 1
-  $url = nil
-else
-  $url = ARGV.pop
-  $url.sub!(/^ghelp:/, "file:") 
-end
-
-IO::popen("xwininfo -display #{$display} -root -tree") {
-  |io|
-  if NAME != "firefox"
-    $windows = io.grep(%r<"Mozilla"\s+"navigator:\s*browser">)
-  else
-    $windows = io.grep(%r<Firefox-bin.*>)
-  end
-}
-
-if $windows.size > 0
-  $id = $windows.map { 
-    |s| s.strip.split.first 
-  }.sort.first
-  $args = [ "-id", $id, "-raise", "-remote" ]
-  $args.push($url ? "\"openURL(#{$url},new-window)\"" : 
-	    "\"xfeDoCommand(openBrowser)\"")
-else
-  $args = ARGV
-  $args.push("\"#{$url}\"") if $url
-end
-
-fork {
-  exec(([APP_PATH] + $args).join(" "))
-}
-exit!
-
-#EOF
diff --git a/www/firefox-devel/files/mozconfig.in b/www/firefox-devel/files/mozconfig.in
index 6f68afc27..fab66b550 100644
--- a/www/firefox-devel/files/mozconfig.in
+++ b/www/firefox-devel/files/mozconfig.in
@@ -1,6 +1,6 @@
 # .mozconfig.in -*-shell-script-*-
 # $FreeBSD$
-#   $MCom$
+#   $MCom: ports/www/firefox/files/mozconfig.in,v 1.5 2005/06/28 05:40:11 adamw Exp $
 ######################################################################
 # standard opts from README
 ac_add_options --enable-application=browser
diff --git a/www/firefox-devel/files/patch-Double.cpp b/www/firefox-devel/files/patch-Double.cpp
index 4c7810bc0..a6d97a2bd 100644
--- a/www/firefox-devel/files/patch-Double.cpp
+++ b/www/firefox-devel/files/patch-Double.cpp
@@ -1,5 +1,5 @@
 $FreeBSD$
-  $MCom$
+  $MCom: ports/www/firefox/files/patch-Double.cpp,v 1.5 2005/06/28 05:40:11 adamw Exp $
 
 --- extensions/transformiix/source/base/Double.cpp.orig	Thu Jan 30 09:26:46 2003
 +++ extensions/transformiix/source/base/Double.cpp	Sun Nov 16 01:46:42 2003
diff --git a/www/firefox-devel/files/patch-build_unix_run-mozilla.sh b/www/firefox-devel/files/patch-build_unix_run-mozilla.sh
index 2fa7436c5..0358a5ed8 100644
--- a/www/firefox-devel/files/patch-build_unix_run-mozilla.sh
+++ b/www/firefox-devel/files/patch-build_unix_run-mozilla.sh
@@ -1,5 +1,5 @@
 $FreeBSD$
-  $MCom$
+  $MCom: ports/www/firefox/files/patch-build_unix_run-mozilla.sh,v 1.5 2005/06/28 05:40:11 adamw Exp $
 
 --- build/unix/run-mozilla.sh.orig	Mon Dec 15 12:27:28 2003
 +++ build/unix/run-mozilla.sh	Wed Feb 11 14:24:17 2004
diff --git a/www/firefox-devel/files/patch-config-mkdepend-imakemdep.h b/www/firefox-devel/files/patch-config-mkdepend-imakemdep.h
index 677778417..5094a2dd4 100644
--- a/www/firefox-devel/files/patch-config-mkdepend-imakemdep.h
+++ b/www/firefox-devel/files/patch-config-mkdepend-imakemdep.h
@@ -1,5 +1,5 @@
 $FreeBSD$
-  $MCom$
+  $MCom: ports/www/firefox/files/patch-config-mkdepend-imakemdep.h,v 1.5 2005/06/28 05:40:11 adamw Exp $
 
 --- config/mkdepend/imakemdep.h	Fri Sep  4 21:22:25 1998
 +++ config/mkdepend/imakemdep.h	Thu Oct 16 22:43:25 2003
diff --git a/www/firefox-devel/files/patch-config-rules.mk b/www/firefox-devel/files/patch-config-rules.mk
index a3482d2eb..6e9a470fd 100644
--- a/www/firefox-devel/files/patch-config-rules.mk
+++ b/www/firefox-devel/files/patch-config-rules.mk
@@ -1,5 +1,5 @@
 $FreeBSD$
-  $MCom$
+  $MCom: ports/www/firefox/files/patch-config-rules.mk,v 1.5 2005/06/28 05:40:11 adamw Exp $
 
 --- config/rules.mk.orig	Tue Aug 26 13:28:47 2003
 +++ config/rules.mk	Sun Feb  1 15:11:41 2004
diff --git a/www/firefox-devel/files/patch-config_autoconf.mk.in b/www/firefox-devel/files/patch-config_autoconf.mk.in
new file mode 100644
index 000000000..62548420f
--- /dev/null
+++ b/www/firefox-devel/files/patch-config_autoconf.mk.in
@@ -0,0 +1,18 @@
+--- config/autoconf.mk.in.orig	Thu Jul 14 00:50:06 2005
++++ config/autoconf.mk.in	Thu Jul 14 00:50:40 2005
+@@ -50,13 +50,13 @@
+ prefix		= @prefix@
+ exec_prefix	= @exec_prefix@
+ bindir		= @bindir@
+-includedir	= @includedir@/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
++includedir	= @includedir@/%%FIREFOX%%
+ libdir		= @libdir@
+ datadir		= @datadir@
+ mandir		= @mandir@
+ idldir		= @datadir@/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
+ 
+-mozappdir	= $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
++mozappdir	= $(libdir)/%%FIREFOX%%
+ mredir		= $(libdir)/mre/mre-$(MOZ_APP_VERSION)
+ mrelibdir	= $(mredir)/lib
+ 
diff --git a/www/firefox-devel/files/patch-config::mkdepend::Makefile.in b/www/firefox-devel/files/patch-config_mkdepend_Makefile.in
index bace012a2..bace012a2 100644
--- a/www/firefox-devel/files/patch-config::mkdepend::Makefile.in
+++ b/www/firefox-devel/files/patch-config_mkdepend_Makefile.in
diff --git a/www/firefox-devel/files/patch-extensions_typeaheadfind_src_nsTypeAheadFind.cpp b/www/firefox-devel/files/patch-extensions_typeaheadfind_src_nsTypeAheadFind.cpp
index 8defc5751..70f918689 100644
--- a/www/firefox-devel/files/patch-extensions_typeaheadfind_src_nsTypeAheadFind.cpp
+++ b/www/firefox-devel/files/patch-extensions_typeaheadfind_src_nsTypeAheadFind.cpp
@@ -1,5 +1,5 @@
 $FreeBSD$
-  $MCom$
+  $MCom: ports/www/firefox/files/patch-extensions_typeaheadfind_src_nsTypeAheadFind.cpp,v 1.5 2005/06/28 05:40:11 adamw Exp $
 
 --- extensions/typeaheadfind/src/nsTypeAheadFind.cpp.orig	Wed Nov 19 01:20:47 2003
 +++ extensions/typeaheadfind/src/nsTypeAheadFind.cpp	Tue Feb 10 02:52:26 2004
diff --git a/www/firefox-devel/files/patch-extensions_typeaheadfind_src_nsTypeAheadFind.h b/www/firefox-devel/files/patch-extensions_typeaheadfind_src_nsTypeAheadFind.h
index 4dcb7ee29..bb1abe575 100644
--- a/www/firefox-devel/files/patch-extensions_typeaheadfind_src_nsTypeAheadFind.h
+++ b/www/firefox-devel/files/patch-extensions_typeaheadfind_src_nsTypeAheadFind.h
@@ -1,5 +1,5 @@
 $FreeBSD$
-  $MCom$
+  $MCom: ports/www/firefox/files/patch-extensions_typeaheadfind_src_nsTypeAheadFind.h,v 1.5 2005/06/28 05:40:11 adamw Exp $
 
 --- extensions/typeaheadfind/src/nsTypeAheadFind.h.orig	Fri May 23 22:00:33 2003
 +++ extensions/typeaheadfind/src/nsTypeAheadFind.h	Mon Feb  9 22:21:43 2004
diff --git a/www/firefox-devel/files/patch-nspr-unix.c b/www/firefox-devel/files/patch-nspr-unix.c
index 1687c4a2e..f0985f79b 100644
--- a/www/firefox-devel/files/patch-nspr-unix.c
+++ b/www/firefox-devel/files/patch-nspr-unix.c
@@ -1,5 +1,5 @@
 $FreeBSD$
-  $MCom$
+  $MCom: ports/www/firefox/files/patch-nspr-unix.c,v 1.5 2005/06/28 05:40:11 adamw Exp $
 
 --- nsprpub/pr/src/md/unix/unix.c.orig	Sat May 31 18:06:04 2003
 +++ nsprpub/pr/src/md/unix/unix.c	Sat May 31 18:04:43 2003
diff --git a/www/firefox-devel/files/patch-xpcom-reflect-xptcall-src-md-unix-Makefile.in b/www/firefox-devel/files/patch-xpcom-reflect-xptcall-src-md-unix-Makefile.in
index 9aa586995..6a2fb14bc 100644
--- a/www/firefox-devel/files/patch-xpcom-reflect-xptcall-src-md-unix-Makefile.in
+++ b/www/firefox-devel/files/patch-xpcom-reflect-xptcall-src-md-unix-Makefile.in
@@ -1,5 +1,5 @@
 $FreeBSD$
-  $MCom$
+  $MCom: ports/www/firefox/files/patch-xpcom-reflect-xptcall-src-md-unix-Makefile.in,v 1.5 2005/06/28 05:40:11 adamw Exp $
 
 --- xpcom/reflect/xptcall/src/md/unix/Makefile.in.orig	Thu Aug 14 21:00:23 2003
 +++ xpcom/reflect/xptcall/src/md/unix/Makefile.in	Sun Feb  1 15:06:40 2004
diff --git a/www/firefox-devel/files/patch-xptcall-alpha b/www/firefox-devel/files/patch-xptcall-alpha
index 75f2dbec2..b7a706e7f 100644
--- a/www/firefox-devel/files/patch-xptcall-alpha
+++ b/www/firefox-devel/files/patch-xptcall-alpha
@@ -1,5 +1,5 @@
 $FreeBSD$
-  $MCom$
+  $MCom: ports/www/firefox/files/patch-xptcall-alpha,v 1.5 2005/06/28 05:40:11 adamw Exp $
 
 --- xpcom/reflect/xptcall/src/md/unix/xptcinvoke_freebsd_alpha.cpp.orig	Tue May 27 01:37:25 2003
 +++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_freebsd_alpha.cpp	Tue May 27 01:37:00 2003
diff --git a/www/firefox-devel/files/patch-xptcall-sparc64 b/www/firefox-devel/files/patch-xptcall-sparc64
index 39b49cbc1..726c08bd9 100644
--- a/www/firefox-devel/files/patch-xptcall-sparc64
+++ b/www/firefox-devel/files/patch-xptcall-sparc64
@@ -1,5 +1,5 @@
 $FreeBSD$
-  $MCom$
+  $MCom: ports/www/firefox/files/patch-xptcall-sparc64,v 1.5 2005/06/28 05:40:11 adamw Exp $
 
 --- /dev/null	Mon May 26 13:22:00 2003
 +++ xpcom/reflect/xptcall/src/md/unix/xptcstubs_sparc64_freebsd.cpp	Mon May 26 04:12:55 2003
diff --git a/www/firefox-devel/pkg-deinstall.in b/www/firefox-devel/pkg-deinstall.in
index 1dd7fabdc..16182ca82 100644
--- a/www/firefox-devel/pkg-deinstall.in
+++ b/www/firefox-devel/pkg-deinstall.in
@@ -1,7 +1,7 @@
 #!/bin/sh
 #
 # $FreeBSD$
-#   $MCom$
+#   $MCom: ports/www/firefox/pkg-deinstall.in,v 1.5 2005/06/28 05:40:11 adamw Exp $
 #
 # Date created:			Mon Nov 29, 2003
 # Whom:				Thierry Thomas (<thierry@pompo.net>)
diff --git a/www/firefox-devel/pkg-install.in b/www/firefox-devel/pkg-install.in
index 79c111484..54d0ece87 100644
--- a/www/firefox-devel/pkg-install.in
+++ b/www/firefox-devel/pkg-install.in
@@ -1,7 +1,7 @@
 #!/bin/sh
 #
 # $FreeBSD$
-#   $MCom$
+#   $MCom: ports/www/firefox/pkg-install.in,v 1.5 2005/06/28 05:40:11 adamw Exp $
 #
 # Date created:			Mon Nov 29, 2003
 # Whom:				Thierry Thomas (<thierry@pompo.net>)
@@ -15,7 +15,6 @@ PATH=/bin:/usr/bin:/usr/local/bin
 
 MOZDIR=%%MOZDIR%%
 REGXPCOM=${MOZDIR}/regxpcom
-REGCHROME=${MOZDIR}/regchrome
 FIREFOX=${MOZDIR}/firefox-bin
 
 echo "===> Building Chrome's registry..."
@@ -28,7 +27,6 @@ rm -rf ${MOZDIR}/extensions
 
 cd ${MOZDIR} || exit 1
 ./run-mozilla.sh ${REGXPCOM} || true
-./run-mozilla.sh ${REGCHROME} || true
 ./run-mozilla.sh ${FIREFOX} -register > /dev/null 2>&1
 
 exit 0
diff --git a/www/firefox3-devel/Makefile b/www/firefox3-devel/Makefile
index e5a783ba6..57a43c502 100644
--- a/www/firefox3-devel/Makefile
+++ b/www/firefox3-devel/Makefile
@@ -3,7 +3,7 @@
 # Whom:				Alan Eldridge <alane@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/www/firefox/Makefile,v 1.8 2005/06/28 05:40:11 adamw Exp $
+#   $MCom: ports/www/firefox/Makefile,v 1.9 2005/07/14 00:03:59 ahze Exp $
 #
 
 PORTNAME=	firefox
@@ -49,11 +49,13 @@ EXTRACT_AFTER_ARGS=	| ${TAR} -xf - --exclude */CVS/* \
 			--exclude MANIFEST
 
 FIREFOX=	${PORTNAME}
+FF_SUFX=	-devel
+FF=		${FIREFOX}${FF_SUFX}
 FF_VER=		1.0+
 #FF_VER=	${PORTVERSION}
 
-FIREFOX_ICON=	${FIREFOX}.xpm
-FIREFOX_ICON_SRC=	${PREFIX}/lib/${FIREFOX}/chrome/icons/default/default.xpm
+FIREFOX_ICON=	${FF}.xpm
+FIREFOX_ICON_SRC=	${PREFIX}/lib/${FF}/chrome/icons/default/default.xpm
 
 PKGCONFIG_FILES=firefox-gtkmozembed firefox-js firefox-xpcom \
 		firefox-nspr firefox-nss firefox-plugin
@@ -64,8 +66,8 @@ JPI_LIST?=\
 	${LOCALBASE}/diablo-jdk1.3.1/jre/plugin/${ARCH}/ns600/libjavaplugin_oji.so \
 	${LOCALBASE}/jdk1.3.1/jre/plugin/${ARCH}/ns600/libjavaplugin_oji.so
 
-SYSTEM_PREFS=		${FAKEDIR}/lib/${FIREFOX}-${FF_VER}/defaults/pref/firefox.js
-SCRIPTS_DIR=		${FAKEDIR}/lib/${FIREFOX}-${FF_VER}
+SYSTEM_PREFS=		${FAKEDIR}/lib/${FF}/defaults/pref/firefox.js
+SCRIPTS_DIR=		${FAKEDIR}/lib/${FF}
 MOZ_PIS_SCRIPTS=	S50cleanhome
 MOZ_PIS_DIR=		${SCRIPTS_DIR}/init.d
 CPPFLAGS+=	-I${X11BASE}/include -I${LOCALBASE}/include
@@ -130,17 +132,19 @@ post-extract::
 		-e 's|@PERL@|${PERL5}|'			\
 		<${FILESDIR}/mozconfig.in >${WRKSRC}/.mozconfig
 	@${SED} -e 's|@FIREFOX_ICON@|${FIREFOX_ICON}|' \
-		<${FILESDIR}/firefox.desktop.in >${WRKDIR}/firefox.desktop
+		<${FILESDIR}/firefox.desktop.in >${WRKDIR}/${FF}.desktop
 
 post-patch:
-	@${SED} -e 's|%%MOZDIR%%|${PREFIX}/lib/${FIREFOX}|g ; \
+	@${REINPLACE_CMD} -e 's|%%FIREFOX%%|${FF}|' \
+		${WRKSRC}/config/autoconf.mk.in
+	@${SED} -e 's|%%MOZDIR%%|${PREFIX}/lib/${FF}|g ; \
 		s|%%PREFIX%%|${PREFIX}|g ; \
 		s|%%X11BASE%%|${X11BASE}|g' \
 		< ${MASTERDIR}/pkg-install.in > ${PKGINSTALL}
-	@${SED} -e 's|%%MOZDIR%%|${PREFIX}/lib/${FIREFOX}|g' \
+	@${SED} -e 's|%%MOZDIR%%|${PREFIX}/lib/${FF}|g' \
 		< ${MASTERDIR}/pkg-deinstall.in > ${PKGDEINSTALL}
 .for ii in ${MOZ_PIS_SCRIPTS}
-	@${SED} -e 's|%%MOZILLA%%|${FIREFOX}|g ; \
+	@${SED} -e 's|%%MOZILLA%%|${FF}|g ; \
 		s|%%PREFIX%%|${PREFIX}|g ; \
 		s|%%X11BASE%%|${X11BASE}|g' \
 		< ${FILESDIR}/moz_pis_${ii} > ${WRKDIR}/moz_pis_${ii}
@@ -177,17 +181,18 @@ pre-install:
 	@${RM} -rf ${FAKEDIR} ${PLIST}
 	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} \
 		Makefile ${MAKE_ARGS} install
-	@${INSTALL_PROGRAM} ${WRKSRC}/rdf/chrome/tools/chromereg/regchrome ${FAKEDIR}/lib/${FIREFOX}-${FF_VER}
 	@${MKDIR} ${SCRIPTS_DIR}
 	@${MKDIR} ${MOZ_PIS_DIR}
-	${ECHO_CMD} 'share/applications/firefox.desktop' >> ${PLIST}
+	${ECHO_CMD} 'share/applications/${FF}.desktop' >> ${PLIST}
 	${ECHO_CMD} 'share/pixmaps/${FIREFOX_ICON}' >> ${PLIST}
 	${REINPLACE_CMD} -e 's|${FAKEDIR}|${PREFIX}|g; \
-		s|${FIREFOX}-${FF_VER}|${FIREFOX}|' \
+		s|${FIREFOX}|${FF}|; \
+		s|-devel||; \
+		s|$${progbase}-bin|${FIREFOX}-bin|' \
 		${FAKEDIR}/bin/firefox \
 		${FAKEDIR}/bin/firefox-config
-	${ECHO_CMD} bin/firefox >> ${PLIST}
-	${ECHO_CMD} bin/firefox-config >> ${PLIST}
+	${ECHO_CMD} bin/${FF} >> ${PLIST}
+	${ECHO_CMD} bin/${FF}-config >> ${PLIST}
 .for ii in ${MOZ_PIS_SCRIPTS}
 	${INSTALL_SCRIPT} ${WRKDIR}/moz_pis_${ii} ${MOZ_PIS_DIR}/${ii}
 .endfor
@@ -197,35 +202,35 @@ pre-install:
 	${ECHO_CMD} "pref(\"browser.link.open_external\", 3);" \
 		>> ${SYSTEM_PREFS}
 .endif # !defined(WITHOUT_NEWTAB)
-	cd ${FAKEDIR}/lib/${FIREFOX}-${FF_VER} && ${FIND} -s * -type f -o -type l | \
-		${SED} -e 's|^|lib/${FIREFOX}/|' >> ${PLIST} \
+	cd ${FAKEDIR}/lib/${FF} && ${FIND} -s * -type f -o -type l | \
+		${SED} -e 's|^|lib/${FF}/|' >> ${PLIST} \
 		&& ${FIND} -d * -type d | \
-		${SED} -e 's|^|@dirrm lib/${FIREFOX}/|' >> ${PLIST}
-	${ECHO_CMD} @dirrm lib/firefox >> ${PLIST}
+		${SED} -e 's|^|@dirrm lib/${FF}/|' >> ${PLIST}
+	${ECHO_CMD} @dirrm lib/${FF} >> ${PLIST}
 	for pcfile in ${PKGCONFIG_FILES}; do \
-		${REINPLACE_CMD} -e 's|${FIREFOX}-${FF_VER}|${FIREFOX}|g; \
+		${REINPLACE_CMD} -e 's|${FF}|${FF}|g; \
 			s|${FAKEDIR}|${PREFIX}|' \
 			${FAKEDIR}/lib/pkgconfig/$${pcfile}.pc ; \
-		${ECHO_CMD} libdata/pkgconfig/$${pcfile}.pc >> ${PLIST} ; \
+		${ECHO_CMD} libdata/pkgconfig/$${pcfile}${FF_SUFX}.pc >> ${PLIST} ; \
 	done
-	cd ${FAKEDIR}/include/${FIREFOX}-${FF_VER} && ${FIND} -s * -type f -o -type l | \
-		${SED} -e 's|^|include/${FIREFOX}/|' >> ${PLIST} \
+	cd ${FAKEDIR}/include/${FF} && ${FIND} -s * -type f -o -type l | \
+		${SED} -e 's|^|include/${FF}/|' >> ${PLIST} \
 		&& ${FIND} -d * -type d | \
-		${SED} -e 's|^|@dirrm include/${FIREFOX}/|' >> ${PLIST}
-	${ECHO_CMD} @dirrm include/${FIREFOX} >> ${PLIST}
-	${ECHO_CMD} lib/browser_plugins/.${PORTNAME}.keep >> ${PLIST}
+		${SED} -e 's|^|@dirrm include/${FF}/|' >> ${PLIST}
+	${ECHO_CMD} @dirrm include/${FF} >> ${PLIST}
+	${ECHO_CMD} lib/browser_plugins/.${FF}.keep >> ${PLIST}
 	${ECHO_CMD} "@unexec ${RMDIR} %D/lib/browser_plugins 2>/dev/null || ${TRUE}" >> ${PLIST}
 	${ECHO_CMD} "@unexec ${RMDIR} %D/share/applications 2>/dev/null || ${TRUE}" >> ${PLIST}
 	${ECHO_CMD} "@exec ${LOCALBASE}/bin/update-desktop-database > /dev/null || ${TRUE}" >> ${PLIST}
 	${ECHO_CMD} "@unexec ${LOCALBASE}/bin/update-desktop-database > /dev/null || ${TRUE}" >> ${PLIST}
 
 do-install:
-	${MKDIR} ${PREFIX}/lib/${FIREFOX}
-	${CHMOD} 755 ${PREFIX}/lib/${FIREFOX}
-	${INSTALL_SCRIPT} ${FAKEDIR}/bin/firefox ${PREFIX}/bin
-	${INSTALL_SCRIPT} ${FAKEDIR}/bin/firefox-config ${PREFIX}/bin
+	${MKDIR} ${PREFIX}/lib/${FF}
+	${CHMOD} 755 ${PREFIX}/lib/${FF}
+	${INSTALL_SCRIPT} ${FAKEDIR}/bin/firefox ${PREFIX}/bin/${FF}
+	${INSTALL_SCRIPT} ${FAKEDIR}/bin/firefox-config ${PREFIX}/bin/${FF}-config
 	${MKDIR} ${PREFIX}/lib/browser_plugins
-	${TOUCH} -f ${PREFIX}/lib/browser_plugins/.${PORTNAME}.keep
+	${TOUCH} -f ${PREFIX}/lib/browser_plugins/.${FF}.keep
 	if [ ! -L ${PREFIX}/lib/browser_plugins/libjavaplugin_oji.so ]; then \
 		for jpi in ${JPI_LIST}; do \
 			if [ -f $${jpi} ]; then \
@@ -237,22 +242,22 @@ do-install:
 	fi
 	for pcfile in ${PKGCONFIG_FILES}; do \
 		${INSTALL_DATA} ${FAKEDIR}/lib/pkgconfig/$${pcfile}.pc \
-			${PREFIX}/libdata/pkgconfig/$${pcfile}.pc ; \
+			${PREFIX}/libdata/pkgconfig/$${pcfile}${FF_SUFX}.pc ; \
 	done
-	-${RM} -fr ${PREFIX}/include/${FIREFOX}
-	${MKDIR} ${PREFIX}/include/${FIREFOX}
-	${CHMOD} 755 ${PREFIX}/include/${FIREFOX}
-	cd ${FAKEDIR}/include/${FIREFOX}-${FF_VER} && ${FIND} . | \
-		${CPIO} -pdm -L -R ${LIBOWN}:${LIBGRP} ${PREFIX}/include/${FIREFOX}
-	cd ${FAKEDIR}/lib/${FIREFOX}-${FF_VER} && ${FIND} . | \
-		${CPIO} -pdm -L -R ${LIBOWN}:${LIBGRP} ${PREFIX}/lib/${FIREFOX}
+	-${RM} -fr ${PREFIX}/include/${FF}
+	${MKDIR} ${PREFIX}/include/${FF}
+	${CHMOD} 755 ${PREFIX}/include/${FF}
+	cd ${FAKEDIR}/include/${FF} && ${FIND} . | \
+		${CPIO} -pdm -L -R ${LIBOWN}:${LIBGRP} ${PREFIX}/include/${FF}
+	cd ${FAKEDIR}/lib/${FF} && ${FIND} . | \
+		${CPIO} -pdm -L -R ${LIBOWN}:${LIBGRP} ${PREFIX}/lib/${FF}
 
 post-install:
 .if !defined(PACKAGE_BUILDING)
 	@${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
 .endif
 	${MKDIR} ${PREFIX}/share/applications ${PREFIX}/share/pixmaps
-	${INSTALL_DATA} ${WRKDIR}/firefox.desktop ${PREFIX}/share/applications
+	${INSTALL_DATA} ${WRKDIR}/${FF}.desktop ${PREFIX}/share/applications/
 	${INSTALL_DATA} ${WRKSRC}/other-licenses/branding/firefox/default.xpm ${FIREFOX_ICON_SRC}
 	${LN} -sf ${FIREFOX_ICON_SRC} ${PREFIX}/share/pixmaps/${FIREFOX_ICON}
 	@-update-desktop-database
diff --git a/www/firefox3-devel/files/firefox.desktop.in b/www/firefox3-devel/files/firefox.desktop.in
index c1b7a2e59..33764a099 100644
--- a/www/firefox3-devel/files/firefox.desktop.in
+++ b/www/firefox3-devel/files/firefox.desktop.in
@@ -182,7 +182,7 @@ Comment[vi]=Duyệt web
 Comment[wa]=Naivyî avå les waibes
 Comment[zh_CN]=浏览 Web
 Comment[zh_TW]=瀏覽網頁
-Exec=firefox %U
+Exec=firefox-devel %U
 Icon=@FIREFOX_ICON@
 StartupNotify=false
 Terminal=false
diff --git a/www/firefox3-devel/files/firefox.rb b/www/firefox3-devel/files/firefox.rb
deleted file mode 100644
index 6094c2457..000000000
--- a/www/firefox3-devel/files/firefox.rb
+++ /dev/null
@@ -1,95 +0,0 @@
-#!/usr/bin/env ruby
-=begin -*-mode: ruby-*-
-
-  MoZiLLa.in
-
-  Copyright (c) 2002, Alan Eldridge
-  All rights reserved.
-  
-  Redistribution and use in source and binary forms, with or without
-  modification, are permitted provided that the following conditions 
-  are met:
-  
-  * Redistributions of source code must retain the above copyright
-  notice, this list of conditions and the following disclaimer.
-  
-  * Redistributions in binary form must reproduce the above copyright
-  notice, this list of conditions and the following disclaimer in the
-  documentation and/or other materials provided with the distribution.
-  
-  * Neither the name of the copyright owner nor the names of its
-  contributors may be used to endorse or promote products derived
-  from this software without specific prior written permission.
-  
-  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-  AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-  ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-  LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-  SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-  INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-  CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-  POSSIBILITY OF SUCH DAMAGE.
-
-  $Id: firefox.rb,v 1.3 2005-06-02 01:05:36 ahze Exp $
-
-  2002-12-16 Alan Eldridge <alane@geeksrus.net>
-
-=end
-
-X11BIN = "/usr/X11R6/bin"
-NAME = File::basename($0, ".rb")
-APP_PATH = File::join(X11BIN, NAME)
-
-if !File::executable?(APP_PATH)
-  raise "File '#{APP_PATH}' not found. Giving up." 
-elsif ($display = ENV["DISPLAY"]) == nil
-  raise "Environment variable DISPLAY not found. Giving up."
-end 
-
-if ARGV.size > 0
-  if ARGV[0] == "--debug"
-    ARGV.shift
-  else
-    $stdin.reopen(File::open("/dev/null", "r"))
-    $stdout.reopen(File::open("/dev/null", "w"))
-    $stderr.reopen(File::open("/dev/null", "w"))
-  end
-end
-
-if ARGV.size < 1
-  $url = nil
-else
-  $url = ARGV.pop
-  $url.sub!(/^ghelp:/, "file:") 
-end
-
-IO::popen("xwininfo -display #{$display} -root -tree") {
-  |io|
-  if NAME != "firefox"
-    $windows = io.grep(%r<"Mozilla"\s+"navigator:\s*browser">)
-  else
-    $windows = io.grep(%r<Firefox-bin.*>)
-  end
-}
-
-if $windows.size > 0
-  $id = $windows.map { 
-    |s| s.strip.split.first 
-  }.sort.first
-  $args = [ "-id", $id, "-raise", "-remote" ]
-  $args.push($url ? "\"openURL(#{$url},new-window)\"" : 
-	    "\"xfeDoCommand(openBrowser)\"")
-else
-  $args = ARGV
-  $args.push("\"#{$url}\"") if $url
-end
-
-fork {
-  exec(([APP_PATH] + $args).join(" "))
-}
-exit!
-
-#EOF
diff --git a/www/firefox3-devel/files/mozconfig.in b/www/firefox3-devel/files/mozconfig.in
index 6f68afc27..fab66b550 100644
--- a/www/firefox3-devel/files/mozconfig.in
+++ b/www/firefox3-devel/files/mozconfig.in
@@ -1,6 +1,6 @@
 # .mozconfig.in -*-shell-script-*-
 # $FreeBSD$
-#   $MCom$
+#   $MCom: ports/www/firefox/files/mozconfig.in,v 1.5 2005/06/28 05:40:11 adamw Exp $
 ######################################################################
 # standard opts from README
 ac_add_options --enable-application=browser
diff --git a/www/firefox3-devel/files/patch-Double.cpp b/www/firefox3-devel/files/patch-Double.cpp
index 4c7810bc0..a6d97a2bd 100644
--- a/www/firefox3-devel/files/patch-Double.cpp
+++ b/www/firefox3-devel/files/patch-Double.cpp
@@ -1,5 +1,5 @@
 $FreeBSD$
-  $MCom$
+  $MCom: ports/www/firefox/files/patch-Double.cpp,v 1.5 2005/06/28 05:40:11 adamw Exp $
 
 --- extensions/transformiix/source/base/Double.cpp.orig	Thu Jan 30 09:26:46 2003
 +++ extensions/transformiix/source/base/Double.cpp	Sun Nov 16 01:46:42 2003
diff --git a/www/firefox3-devel/files/patch-build_unix_run-mozilla.sh b/www/firefox3-devel/files/patch-build_unix_run-mozilla.sh
index 2fa7436c5..0358a5ed8 100644
--- a/www/firefox3-devel/files/patch-build_unix_run-mozilla.sh
+++ b/www/firefox3-devel/files/patch-build_unix_run-mozilla.sh
@@ -1,5 +1,5 @@
 $FreeBSD$
-  $MCom$
+  $MCom: ports/www/firefox/files/patch-build_unix_run-mozilla.sh,v 1.5 2005/06/28 05:40:11 adamw Exp $
 
 --- build/unix/run-mozilla.sh.orig	Mon Dec 15 12:27:28 2003
 +++ build/unix/run-mozilla.sh	Wed Feb 11 14:24:17 2004
diff --git a/www/firefox3-devel/files/patch-config-mkdepend-imakemdep.h b/www/firefox3-devel/files/patch-config-mkdepend-imakemdep.h
index 677778417..5094a2dd4 100644
--- a/www/firefox3-devel/files/patch-config-mkdepend-imakemdep.h
+++ b/www/firefox3-devel/files/patch-config-mkdepend-imakemdep.h
@@ -1,5 +1,5 @@
 $FreeBSD$
-  $MCom$
+  $MCom: ports/www/firefox/files/patch-config-mkdepend-imakemdep.h,v 1.5 2005/06/28 05:40:11 adamw Exp $
 
 --- config/mkdepend/imakemdep.h	Fri Sep  4 21:22:25 1998
 +++ config/mkdepend/imakemdep.h	Thu Oct 16 22:43:25 2003
diff --git a/www/firefox3-devel/files/patch-config-rules.mk b/www/firefox3-devel/files/patch-config-rules.mk
index a3482d2eb..6e9a470fd 100644
--- a/www/firefox3-devel/files/patch-config-rules.mk
+++ b/www/firefox3-devel/files/patch-config-rules.mk
@@ -1,5 +1,5 @@
 $FreeBSD$
-  $MCom$
+  $MCom: ports/www/firefox/files/patch-config-rules.mk,v 1.5 2005/06/28 05:40:11 adamw Exp $
 
 --- config/rules.mk.orig	Tue Aug 26 13:28:47 2003
 +++ config/rules.mk	Sun Feb  1 15:11:41 2004
diff --git a/www/firefox3-devel/files/patch-config_autoconf.mk.in b/www/firefox3-devel/files/patch-config_autoconf.mk.in
new file mode 100644
index 000000000..62548420f
--- /dev/null
+++ b/www/firefox3-devel/files/patch-config_autoconf.mk.in
@@ -0,0 +1,18 @@
+--- config/autoconf.mk.in.orig	Thu Jul 14 00:50:06 2005
++++ config/autoconf.mk.in	Thu Jul 14 00:50:40 2005
+@@ -50,13 +50,13 @@
+ prefix		= @prefix@
+ exec_prefix	= @exec_prefix@
+ bindir		= @bindir@
+-includedir	= @includedir@/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
++includedir	= @includedir@/%%FIREFOX%%
+ libdir		= @libdir@
+ datadir		= @datadir@
+ mandir		= @mandir@
+ idldir		= @datadir@/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
+ 
+-mozappdir	= $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
++mozappdir	= $(libdir)/%%FIREFOX%%
+ mredir		= $(libdir)/mre/mre-$(MOZ_APP_VERSION)
+ mrelibdir	= $(mredir)/lib
+ 
diff --git a/www/firefox3-devel/files/patch-config::mkdepend::Makefile.in b/www/firefox3-devel/files/patch-config_mkdepend_Makefile.in
index bace012a2..bace012a2 100644
--- a/www/firefox3-devel/files/patch-config::mkdepend::Makefile.in
+++ b/www/firefox3-devel/files/patch-config_mkdepend_Makefile.in
diff --git a/www/firefox3-devel/files/patch-extensions_typeaheadfind_src_nsTypeAheadFind.cpp b/www/firefox3-devel/files/patch-extensions_typeaheadfind_src_nsTypeAheadFind.cpp
index 8defc5751..70f918689 100644
--- a/www/firefox3-devel/files/patch-extensions_typeaheadfind_src_nsTypeAheadFind.cpp
+++ b/www/firefox3-devel/files/patch-extensions_typeaheadfind_src_nsTypeAheadFind.cpp
@@ -1,5 +1,5 @@
 $FreeBSD$
-  $MCom$
+  $MCom: ports/www/firefox/files/patch-extensions_typeaheadfind_src_nsTypeAheadFind.cpp,v 1.5 2005/06/28 05:40:11 adamw Exp $
 
 --- extensions/typeaheadfind/src/nsTypeAheadFind.cpp.orig	Wed Nov 19 01:20:47 2003
 +++ extensions/typeaheadfind/src/nsTypeAheadFind.cpp	Tue Feb 10 02:52:26 2004
diff --git a/www/firefox3-devel/files/patch-extensions_typeaheadfind_src_nsTypeAheadFind.h b/www/firefox3-devel/files/patch-extensions_typeaheadfind_src_nsTypeAheadFind.h
index 4dcb7ee29..bb1abe575 100644
--- a/www/firefox3-devel/files/patch-extensions_typeaheadfind_src_nsTypeAheadFind.h
+++ b/www/firefox3-devel/files/patch-extensions_typeaheadfind_src_nsTypeAheadFind.h
@@ -1,5 +1,5 @@
 $FreeBSD$
-  $MCom$
+  $MCom: ports/www/firefox/files/patch-extensions_typeaheadfind_src_nsTypeAheadFind.h,v 1.5 2005/06/28 05:40:11 adamw Exp $
 
 --- extensions/typeaheadfind/src/nsTypeAheadFind.h.orig	Fri May 23 22:00:33 2003
 +++ extensions/typeaheadfind/src/nsTypeAheadFind.h	Mon Feb  9 22:21:43 2004
diff --git a/www/firefox3-devel/files/patch-nspr-unix.c b/www/firefox3-devel/files/patch-nspr-unix.c
index 1687c4a2e..f0985f79b 100644
--- a/www/firefox3-devel/files/patch-nspr-unix.c
+++ b/www/firefox3-devel/files/patch-nspr-unix.c
@@ -1,5 +1,5 @@
 $FreeBSD$
-  $MCom$
+  $MCom: ports/www/firefox/files/patch-nspr-unix.c,v 1.5 2005/06/28 05:40:11 adamw Exp $
 
 --- nsprpub/pr/src/md/unix/unix.c.orig	Sat May 31 18:06:04 2003
 +++ nsprpub/pr/src/md/unix/unix.c	Sat May 31 18:04:43 2003
diff --git a/www/firefox3-devel/files/patch-xpcom-reflect-xptcall-src-md-unix-Makefile.in b/www/firefox3-devel/files/patch-xpcom-reflect-xptcall-src-md-unix-Makefile.in
index 9aa586995..6a2fb14bc 100644
--- a/www/firefox3-devel/files/patch-xpcom-reflect-xptcall-src-md-unix-Makefile.in
+++ b/www/firefox3-devel/files/patch-xpcom-reflect-xptcall-src-md-unix-Makefile.in
@@ -1,5 +1,5 @@
 $FreeBSD$
-  $MCom$
+  $MCom: ports/www/firefox/files/patch-xpcom-reflect-xptcall-src-md-unix-Makefile.in,v 1.5 2005/06/28 05:40:11 adamw Exp $
 
 --- xpcom/reflect/xptcall/src/md/unix/Makefile.in.orig	Thu Aug 14 21:00:23 2003
 +++ xpcom/reflect/xptcall/src/md/unix/Makefile.in	Sun Feb  1 15:06:40 2004
diff --git a/www/firefox3-devel/files/patch-xptcall-alpha b/www/firefox3-devel/files/patch-xptcall-alpha
index 75f2dbec2..b7a706e7f 100644
--- a/www/firefox3-devel/files/patch-xptcall-alpha
+++ b/www/firefox3-devel/files/patch-xptcall-alpha
@@ -1,5 +1,5 @@
 $FreeBSD$
-  $MCom$
+  $MCom: ports/www/firefox/files/patch-xptcall-alpha,v 1.5 2005/06/28 05:40:11 adamw Exp $
 
 --- xpcom/reflect/xptcall/src/md/unix/xptcinvoke_freebsd_alpha.cpp.orig	Tue May 27 01:37:25 2003
 +++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_freebsd_alpha.cpp	Tue May 27 01:37:00 2003
diff --git a/www/firefox3-devel/files/patch-xptcall-sparc64 b/www/firefox3-devel/files/patch-xptcall-sparc64
index 39b49cbc1..726c08bd9 100644
--- a/www/firefox3-devel/files/patch-xptcall-sparc64
+++ b/www/firefox3-devel/files/patch-xptcall-sparc64
@@ -1,5 +1,5 @@
 $FreeBSD$
-  $MCom$
+  $MCom: ports/www/firefox/files/patch-xptcall-sparc64,v 1.5 2005/06/28 05:40:11 adamw Exp $
 
 --- /dev/null	Mon May 26 13:22:00 2003
 +++ xpcom/reflect/xptcall/src/md/unix/xptcstubs_sparc64_freebsd.cpp	Mon May 26 04:12:55 2003
diff --git a/www/firefox3-devel/pkg-deinstall.in b/www/firefox3-devel/pkg-deinstall.in
index 1dd7fabdc..16182ca82 100644
--- a/www/firefox3-devel/pkg-deinstall.in
+++ b/www/firefox3-devel/pkg-deinstall.in
@@ -1,7 +1,7 @@
 #!/bin/sh
 #
 # $FreeBSD$
-#   $MCom$
+#   $MCom: ports/www/firefox/pkg-deinstall.in,v 1.5 2005/06/28 05:40:11 adamw Exp $
 #
 # Date created:			Mon Nov 29, 2003
 # Whom:				Thierry Thomas (<thierry@pompo.net>)
diff --git a/www/firefox3-devel/pkg-install.in b/www/firefox3-devel/pkg-install.in
index 79c111484..54d0ece87 100644
--- a/www/firefox3-devel/pkg-install.in
+++ b/www/firefox3-devel/pkg-install.in
@@ -1,7 +1,7 @@
 #!/bin/sh
 #
 # $FreeBSD$
-#   $MCom$
+#   $MCom: ports/www/firefox/pkg-install.in,v 1.5 2005/06/28 05:40:11 adamw Exp $
 #
 # Date created:			Mon Nov 29, 2003
 # Whom:				Thierry Thomas (<thierry@pompo.net>)
@@ -15,7 +15,6 @@ PATH=/bin:/usr/bin:/usr/local/bin
 
 MOZDIR=%%MOZDIR%%
 REGXPCOM=${MOZDIR}/regxpcom
-REGCHROME=${MOZDIR}/regchrome
 FIREFOX=${MOZDIR}/firefox-bin
 
 echo "===> Building Chrome's registry..."
@@ -28,7 +27,6 @@ rm -rf ${MOZDIR}/extensions
 
 cd ${MOZDIR} || exit 1
 ./run-mozilla.sh ${REGXPCOM} || true
-./run-mozilla.sh ${REGCHROME} || true
 ./run-mozilla.sh ${FIREFOX} -register > /dev/null 2>&1
 
 exit 0