diff -Naur mozilla.old/.mozconfig mozilla.new/.mozconfig
--- mozilla.old/.mozconfig	Thu Jan  1 09:00:00 1970
+++ mozilla.new/.mozconfig	Fri Oct 25 03:00:10 2002
@@ -0,0 +1,16 @@
+ac_add_options --with-pthreads
+ac_add_options --with-system-jpeg=@PREFIX@
+ac_add_options --with-system-zlib=@PREFIX@
+ac_add_options --with-system-png=@PREFIX@
+ac_add_options --disable-tests
+ac_add_options --disable-debug
+ac_add_options --disable-short-wchar
+ac_add_options --enable-optimize
+ac_add_options --enable-strip
+ac_add_options --enable-xft
+ac_add_options --enable-crypto
+ac_add_options --enable-mathml
+ac_add_options --enable-extensions=all
+ac_add_options --with-default-mozilla-five-home=@PREFIX@/lib/mozilla
+mk_add_options MOZ_MAKE_FLAGS=-j4
+
diff -Naur mozilla.old/Makefile.in mozilla.new/Makefile.in
--- mozilla.old/Makefile.in	Fri May 31 09:39:07 2002
+++ mozilla.new/Makefile.in	Mon Oct 21 01:16:30 2002
@@ -346,10 +346,10 @@
 
 freetype:
 ifdef MOZ_ENABLE_XFT
-ifndef MOZ_XFT_SYSTEM_FREETYPE2
+#ifndef MOZ_XFT_SYSTEM_FREETYPE2
 	$(MAKE) -C other-licenses/freetype
 	$(MAKE) -C other-licenses/freetype install
-endif
+#endif
 endif
 
 expat:
diff -Naur mozilla.old/build/unix/mozilla-config.in mozilla.new/build/unix/mozilla-config.in
--- mozilla.old/build/unix/mozilla-config.in	Thu Apr 25 11:51:15 2002
+++ mozilla.new/build/unix/mozilla-config.in	Mon Oct 21 02:32:11 2002
@@ -55,7 +55,7 @@
       echo_exec_prefix=yes
       ;;
     --version)
-      echo -1
+      echo "%MOZILLA_VERSION%"
       exit 0
       ;;
     --cflags)
diff -Naur mozilla.old/config/autoconf.mk.in mozilla.new/config/autoconf.mk.in
--- mozilla.old/config/autoconf.mk.in	Sun Jun 23 04:05:08 2002
+++ mozilla.new/config/autoconf.mk.in	Fri Oct 25 03:08:30 2002
@@ -30,14 +30,14 @@
 prefix		= @prefix@
 exec_prefix	= @exec_prefix@
 bindir		= @bindir@
-includedir	= @includedir@/mozilla-$(MOZILLA_VERSION)
+includedir	= @includedir@/mozilla
 libdir		= @libdir@
 datadir		= @datadir@
 mandir		= @mandir@
-idldir		= @datadir@/idl/mozilla-$(MOZILLA_VERSION)
+idldir		= @datadir@/idl/mozilla
 
-mozappdir	= $(libdir)/mozilla-$(MOZILLA_VERSION)
-mredir		= $(libdir)/mre/mre-$(MOZILLA_VERSION)
+mozappdir	= $(libdir)/mozilla
+mredir		= $(libdir)/mre
 mrelibdir	= $(mredir)/lib
 
 DIST		= $(DEPTH)/dist
diff -Naur mozilla.old/config/rules.mk mozilla.new/config/rules.mk
--- mozilla.old/config/rules.mk	Wed Jul 24 14:43:51 2002
+++ mozilla.new/config/rules.mk	Mon Oct 21 01:16:30 2002
@@ -449,7 +449,7 @@
 ifdef IS_COMPONENT
 EXTRA_DSO_LDOPTS	+= -bundle
 else
-EXTRA_DSO_LDOPTS	+= -dynamiclib -install_name @executable_path/\$@ -compatibility_version 1 -current_version 1
+EXTRA_DSO_LDOPTS	+= -dynamiclib -install_name @PREFIX@/lib/mozilla/\$@ -compatibility_version 1 -current_version 1
 endif
 endif
 
diff -Naur mozilla.old/configure mozilla.new/configure
--- mozilla.old/configure	Sat Aug 10 05:05:10 2002
+++ mozilla.new/configure	Mon Oct 21 01:16:30 2002
@@ -4525,34 +4525,34 @@
 
 *-darwin*) 
     _PEDANTIC=
-    CFLAGS="$CFLAGS -fpascal-strings -traditional-cpp -fno-common"
-    CXXFLAGS="$CXXFLAGS -fpascal-strings -traditional-cpp -fno-common"
+    CFLAGS="$CFLAGS -no-cpp-precomp -fno-common"
+    CXXFLAGS="$CXXFLAGS -no-cpp-precomp -fno-common"
     DLL_SUFFIX=".dylib"
     DSO_LDOPTS=''
     STRIP="$STRIP -x -S"
     case "${target_cpu}" in
     powerpc*)
-        cat >> confdefs.h <<\EOF
-#define XP_MACOSX 1
-EOF
-
-        cat >> confdefs.h <<\EOF
-#define TARGET_CARBON 1
-EOF
-
-        cat >> confdefs.h <<\EOF
-#define TARGET_API_MAC_CARBON 1
-EOF
-
-        no_x=yes
+#        cat >> confdefs.h <<\EOF
+##define XP_MACOSX 1
+#EOF
+#
+#        cat >> confdefs.h <<\EOF
+##define TARGET_CARBON 1
+#EOF
+#
+#        cat >> confdefs.h <<\EOF
+##define TARGET_API_MAC_CARBON 1
+#EOF
+#
+#        no_x=yes
         MACOSX=1
-        _PLATFORM_DEFAULT_TOOLKIT='mac'
+#        _PLATFORM_DEFAULT_TOOLKIT='mac'
         DSO_LDOPTS="$DSO_LDOPTS -arch ppc"
-        TK_LIBS='-framework Carbon /System/Library/Frameworks/Carbon.framework/Carbon'
-        TK_CFLAGS="-I/Developer/Headers/FlatCarbon -F/System/Library/Frameworks"
-        CFLAGS="$CFLAGS $TK_CFLAGS"
-        CXXFLAGS="$CXXFLAGS $TK_CFLAGS"
-        MOZ_ENABLE_POSTSCRIPT=
+#        TK_LIBS='-framework Carbon /System/Library/Frameworks/Carbon.framework/Carbon'
+#        TK_CFLAGS="-I/Developer/Headers/FlatCarbon -F/System/Library/Frameworks"
+#        CFLAGS="$CFLAGS $TK_CFLAGS"
+#        CXXFLAGS="$CXXFLAGS $TK_CFLAGS"
+#        MOZ_ENABLE_POSTSCRIPT=
         ;;
     esac
     ;;
@@ -14139,9 +14139,9 @@
 #define XP_UNIX 1
 EOF
 
-  cat >> confdefs.h <<\EOF
-#define UNIX_EMBED 1
-EOF
+#  cat >> confdefs.h <<\EOF
+##define UNIX_EMBED 1
+#EOF
 
   cat >> confdefs.h <<\EOF
 #define UNIX_LDAP 1
@@ -15066,8 +15066,8 @@
 
 # if we're building Xft, we need our private copy of freetype
 if test "$MOZ_ENABLE_XFT"; then
-    ac_configure_args="$_SUBDIR_CONFIG_ARGS --prefix=$MOZ_BUILD_ROOT/dist"
-    if test -z "$MOZ_XFT_SYSTEM_FREETYPE2"; then
+    ac_configure_args="$_SUBDIR_CONFIG_ARGS --prefix=$MOZ_BUILD_ROOT/dist --includedir=$MOZ_BUILD_ROOT/dist/include --libdir=$MOZ_BUILD_ROOT/dist/lib --bindir=$MOZ_BUILD_ROOT/dist/bin"
+#    if test -z "$MOZ_XFT_SYSTEM_FREETYPE2"; then
         
 if test "$no_recursion" != yes; then
 
@@ -15166,8 +15166,8 @@
   done
 fi
 
-    fi
-    ac_configure_args="$ac_configure_args --includedir=$MOZ_BUILD_ROOT/dist/include/expat-1.95"
+#    fi
+    ac_configure_args="$ac_configure_args --prefix=$MOZ_BUILD_ROOT/dist --includedir=$MOZ_BUILD_ROOT/dist/include/expat-1.95 --libdir=$MOZ_BUILD_ROOT/dist/lib"
     
 if test "$no_recursion" != yes; then
 
diff -Naur mozilla.old/directory/c-sdk/config/config.mk mozilla.new/directory/c-sdk/config/config.mk
--- mozilla.old/directory/c-sdk/config/config.mk	Wed Mar 27 06:51:57 2002
+++ mozilla.new/directory/c-sdk/config/config.mk	Mon Oct 21 01:16:30 2002
@@ -60,10 +60,10 @@
 
 NFSPWD		= $(MOD_DEPTH)/config/nfspwd
 
-CFLAGS		= $(CC_ONLY_FLAGS) $(OPTIMIZER) $(OS_CFLAGS)\
-		  $(XP_DEFINE) $(DEFINES) $(INCLUDES) $(XCFLAGS)
-CCCFLAGS	= $(CCC_ONLY_FLAGS) $(OPTIMIZER) $(OS_CFLAGS)\
-		  $(XP_DEFINE) $(DEFINES) $(INCLUDES) $(XCFLAGS)
+CFLAGS		= $(CC_ONLY_FLAGS) $(OPTIMIZER) $(XP_DEFINE)\
+		  $(DEFINES) $(INCLUDES) $(XCFLAGS) $(OS_CFLAGS)
+CCCFLAGS	= $(CCC_ONLY_FLAGS) $(OPTIMIZER) $(XP_DEFINE)\
+		  $(DEFINES) $(INCLUDES) $(XCFLAGS) $(OS_CFLAGS)
 # For purify
 NOMD_CFLAGS	= $(CC_ONLY_FLAGS) $(OPTIMIZER) $(NOMD_OS_CFLAGS)\
 		  $(XP_DEFINE) $(DEFINES) $(INCLUDES) $(XCFLAGS)
diff -Naur mozilla.old/directory/c-sdk/configure mozilla.new/directory/c-sdk/configure
--- mozilla.old/directory/c-sdk/configure	Wed Jun 19 06:34:56 2002
+++ mozilla.new/directory/c-sdk/configure	Mon Oct 21 01:16:30 2002
@@ -3347,7 +3347,7 @@
 
         CPU_ARCH=ppc
     fi
-    DSO_LDOPTS='-dynamiclib -compatibility_version 1 -current_version 1 -all_load -install_name @executable_path/$@'
+    DSO_LDOPTS='-dynamiclib -compatibility_version 1 -current_version 1 -all_load -install_name @PREFIX@/lib/mozilla/$@'
     # Use the standard preprocessor (cpp)
     CFLAGS="$CFLAGS -no-cpp-precomp"
     MKSHLIB='$(CC) -arch $(CPU_ARCH) $(DSO_LDOPTS) -o $@'
diff -Naur mozilla.old/fink/chrome.d/default mozilla.new/fink/chrome.d/default
--- mozilla.old/fink/chrome.d/default	Thu Jan  1 09:00:00 1970
+++ mozilla.new/fink/chrome.d/default	Wed Oct 23 02:51:10 2002
@@ -0,0 +1,2 @@
+skin,install,select,modern/1.0
+locale,install,select,en-US
diff -Naur mozilla.old/fink/mozilla mozilla.new/fink/mozilla
--- mozilla.old/fink/mozilla	Thu Jan  1 09:00:00 1970
+++ mozilla.new/fink/mozilla	Mon Oct 21 01:16:30 2002
@@ -0,0 +1,99 @@
+#!/bin/sh
+#
+# The contents of this file are subject to the Netscape Public
+# License Version 1.1 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of
+# the License at http://www.mozilla.org/NPL/
+#
+# Software distributed under the License is distributed on an "AS
+# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# rights and limitations under the License.
+#
+# The Original Code is mozilla.org code.
+#
+# The Initial Developer of the Original Code is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation. All
+# Rights Reserved.
+#
+# Contributor(s): 
+#
+
+## 
+## Usage:
+##
+## $ mozilla
+##
+## This script is meant to run a mozilla program from the mozilla
+## rpm installation.
+##
+## The script will setup all the environment voodoo needed to make
+## mozilla work.
+
+##
+## Variables
+##
+MOZ_PROGRAM="@PREFIX@/lib/mozilla/mozilla-bin"
+
+##
+## Set MOZILLA_FIVE_HOME
+##
+MOZILLA_FIVE_HOME="@PREFIX@/lib/mozilla"
+export MOZILLA_FIVE_HOME
+
+##
+## Set DYLD_LIBRARY_PATH
+##
+DYLD_LIBRARY_PATH=@PREFIX@/lib/mozilla:$DYLD_LIBRARY_PATH
+export DYLD_LIBRARY_PATH
+
+# If there is no command line argument at all then try to open a new
+# window in an already running instance.
+
+if [ -z "$1" ]; then
+  $MOZ_PROGRAM -remote "openurl(about:blank,new-window)" 2>/dev/null 1>/dev/null
+  RETURN_VAL=$?
+  if [ "$RETURN_VAL" -eq "2" ]; then
+    $MOZ_PROGRAM ${1+"$@"}
+    RETURN_VAL=$?
+  fi
+  exit $RETURN_VAL
+fi
+
+# If there's a command line argument but it doesn't begin with a -
+# it's probably a url.  Try to send it to a running instance.
+
+USE_EXIST=0
+opt="$1"
+case "$opt" in
+  -*) ;;
+  *) USE_EXIST=1 ;;
+esac
+
+if [ "${USE_EXIST}" -eq "1" ]; then
+  # check to make sure that the command contains at least a :/ in it.
+  echo $opt | grep -e ':/' 2>/dev/null > /dev/null
+  RETURN_VAL=$?
+  if [ "$RETURN_VAL" -eq "1" ]; then
+    # does it begin with a / ?
+    echo $opt | grep -e '^/' 2>/dev/null > /dev/null
+    RETURN_VAL=$?
+    if [ "$RETURN_VAL" -eq "0" ]; then
+      opt="file:$opt"
+    elif [ -e `pwd`/$opt ]; then
+      opt="`pwd`/$opt"
+    else
+      opt="http://$opt"
+    fi
+  fi
+  $MOZ_PROGRAM -remote "openurl($opt,new-window)" 2>/dev/null >/dev/null
+  RETURN_VAL=$?
+  if [ "$RETURN_VAL" -eq "2" ]; then
+    $MOZ_PROGRAM ${1+"$@"}
+    RETURN_VAL=$?
+  fi
+  exit $RETURN_VAL
+fi
+
+$MOZ_PROGRAM ${1+"$@"}
diff -Naur mozilla.old/fink/mozilla-address.desktop mozilla.new/fink/mozilla-address.desktop
--- mozilla.old/fink/mozilla-address.desktop	Thu Jan  1 09:00:00 1970
+++ mozilla.new/fink/mozilla-address.desktop	Mon Oct 21 01:16:30 2002
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Name=Mozilla Addressbook
+Comment=Addressbook from Mozilla Mailnews
+Exec=mozilla -addressbook
+Icon=gnome-calendar.png
+Terminal=false
+MultipleArgs=false
+Type=Application
diff -Naur mozilla.old/fink/mozilla-chatzilla.desktop mozilla.new/fink/mozilla-chatzilla.desktop
--- mozilla.old/fink/mozilla-chatzilla.desktop	Thu Jan  1 09:00:00 1970
+++ mozilla.new/fink/mozilla-chatzilla.desktop	Mon Oct 21 01:16:30 2002
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Name=Chatzilla
+Comment=IRC client
+Exec=mozilla -chat
+Icon=gnome-irc.png
+Terminal=false
+MultipleArgs=false
+Type=Application
diff -Naur mozilla.old/fink/mozilla-editor.desktop mozilla.new/fink/mozilla-editor.desktop
--- mozilla.old/fink/mozilla-editor.desktop	Thu Jan  1 09:00:00 1970
+++ mozilla.new/fink/mozilla-editor.desktop	Mon Oct 21 01:16:30 2002
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Name=Mozilla Editor
+Comment=HTML Composer
+Exec=mozilla -edit
+Icon=gnome-word.png
+Terminal=false
+MultipleArgs=false
+Type=Application
diff -Naur mozilla.old/fink/mozilla-mail-composer.desktop mozilla.new/fink/mozilla-mail-composer.desktop
--- mozilla.old/fink/mozilla-mail-composer.desktop	Thu Jan  1 09:00:00 1970
+++ mozilla.new/fink/mozilla-mail-composer.desktop	Mon Oct 21 01:16:30 2002
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Name=Mozilla Mail Composer
+Comment=Mozilla Mail Composer
+Exec=mozilla -compose
+Icon=mozilla-mail-composer.gif
+Terminal=false
+MultipleArgs=false
+Type=Application
diff -Naur mozilla.old/fink/mozilla-mail.desktop mozilla.new/fink/mozilla-mail.desktop
--- mozilla.old/fink/mozilla-mail.desktop	Thu Jan  1 09:00:00 1970
+++ mozilla.new/fink/mozilla-mail.desktop	Mon Oct 21 01:16:30 2002
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Name=Mozilla Mail
+Comment=Mozilla Mail
+Exec=mozilla -mail
+Icon=mozilla-mail.gif
+Terminal=false
+MultipleArgs=false
+Type=Application
diff -Naur mozilla.old/fink/mozilla-news.desktop mozilla.new/fink/mozilla-news.desktop
--- mozilla.old/fink/mozilla-news.desktop	Thu Jan  1 09:00:00 1970
+++ mozilla.new/fink/mozilla-news.desktop	Mon Oct 21 01:16:30 2002
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Name=Mozilla News
+Comment=Mozilla Mail
+Exec=mozilla -news
+Icon=gnome-news.png
+Terminal=false
+MultipleArgs=false
+Type=Application
diff -Naur mozilla.old/fink/mozilla.desktop mozilla.new/fink/mozilla.desktop
--- mozilla.old/fink/mozilla.desktop	Thu Jan  1 09:00:00 1970
+++ mozilla.new/fink/mozilla.desktop	Mon Oct 21 01:16:30 2002
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Name=Mozilla
+Comment=Mozilla Web Browser
+Exec=mozilla 
+Icon=mozilla.png
+Terminal=false
+MultipleArgs=false
+Type=Application
diff -Naur mozilla.old/fink/prefs.js mozilla.new/fink/prefs.js
--- mozilla.old/fink/prefs.js	Thu Jan  1 09:00:00 1970
+++ mozilla.new/fink/prefs.js	Mon Oct 21 01:16:30 2002
@@ -0,0 +1,17 @@
+// XIM style
+pref("xim.input_style", "over-the-spot");
+
+// TryeType
+pref("font.FreeType2.enable", true);
+pref("font.freetype2.shared-library", "@PREFIX@/lib/mozilla/libfreetype.6.so");
+pref("font.FreeType2.autohinted", false);
+pref("font.FreeType2.unhinted", false);
+pref("font.antialias.min",        10);
+pref("font.directory.truetype.1", "/usr/X11R6/lib/X11/fonts/TTF");
+pref("font.directory.truetype.2", "@PREFIX@/share/fonts/truetype");
+
+// AA with Bitmap scaling.
+pref("font.scale.aa_bitmap.enable", true);
+pref("font.scale.aa_bitmap.always", false);
+pref("font.scale.aa_bitmap.min", 6);
+
diff -Naur mozilla.old/fink/update-mozilla-chrome mozilla.new/fink/update-mozilla-chrome
--- mozilla.old/fink/update-mozilla-chrome	Thu Jan  1 09:00:00 1970
+++ mozilla.new/fink/update-mozilla-chrome	Fri Oct 25 01:08:06 2002
@@ -0,0 +1,22 @@
+#!/bin/sh -e
+
+ulimit -s unlimited || true
+
+MOZILLA_FIVE_HOME=@PREFIX@/lib/mozilla
+CHROME_DIR=@PREFIX@/var/lib/mozilla/chrome.d
+
+TMPFILE=`tempfile`
+cat ${CHROME_DIR}/* >>${TMPFILE}
+mv ${TMPFILE} ${MOZILLA_FIVE_HOME}/chrome/installed-chrome.txt
+chmod 644 ${MOZILLA_FIVE_HOME}/chrome/installed-chrome.txt
+
+rm -rf ${MOZILLA_FIVE_HOME}/chrome/overlayinfo
+rm -f  ${MOZILLA_FIVE_HOME}/chrome/*.rdf
+rm -f  ${MOZILLA_FIVE_HOME}/component.reg
+rm -f  ${MOZILLA_FIVE_HOME}/components/*.dat
+
+sudo -H ${MOZILLA_FIVE_HOME}/regxpcom || true
+sudo -H ${MOZILLA_FIVE_HOME}/regchrome || true
+
+exit 0
+
diff -Naur mozilla.old/gfx/src/gtk/Makefile.in mozilla.new/gfx/src/gtk/Makefile.in
--- mozilla.old/gfx/src/gtk/Makefile.in	Tue May  7 21:02:50 2002
+++ mozilla.new/gfx/src/gtk/Makefile.in	Mon Oct 21 01:16:30 2002
@@ -177,6 +177,8 @@
 ifdef MOZ_ENABLE_FREETYPE2
 DEFINES         += -DMOZ_ENABLE_FREETYPE2
 INCLUDES        += $(FT2_CFLAGS)
+CC		+= $(FT2_CFLAGS)
+CXX		+= $(FT2_CFLAGS)
 # due to runtime linking with PR_LoadLibrary
 # EXTRA_DSO_LDOPTS does not need $(FT2_LIBS)
 endif
diff -Naur mozilla.old/modules/libpref/src/nsPrefService.cpp mozilla.new/modules/libpref/src/nsPrefService.cpp
--- mozilla.old/modules/libpref/src/nsPrefService.cpp	Thu Jul 18 14:08:54 2002
+++ mozilla.new/modules/libpref/src/nsPrefService.cpp	Mon Oct 21 01:16:30 2002
@@ -531,6 +531,7 @@
 #elif defined(XP_BEOS)
       "beos.js"
 #endif
+      , "fink.js"
   };
 
   rv = NS_GetSpecialDirectory(NS_APP_PREF_DEFAULTS_50_DIR, getter_AddRefs(defaultPrefDir));
diff -Naur mozilla.old/nsprpub/configure mozilla.new/nsprpub/configure
--- mozilla.old/nsprpub/configure	Wed Jun 19 06:34:50 2002
+++ mozilla.new/nsprpub/configure	Mon Oct 21 01:16:30 2002
@@ -3224,7 +3224,7 @@
 
         CPU_ARCH=ppc
     fi
-    DSO_LDOPTS='-dynamiclib -compatibility_version 1 -current_version 1 -all_load -install_name @executable_path/$@'
+    DSO_LDOPTS='-dynamiclib -compatibility_version 1 -current_version 1 -all_load -install_name @PREFIX@/lib/mozilla/$@'
     # Use the standard preprocessor (cpp)
     CFLAGS="$CFLAGS -no-cpp-precomp"
     MKSHLIB='$(CC) -arch $(CPU_ARCH) $(DSO_LDOPTS) -o $@'
diff -Naur mozilla.old/other-licenses/Xft/fontconfig/src/Makefile.in mozilla.new/other-licenses/Xft/fontconfig/src/Makefile.in
--- mozilla.old/other-licenses/Xft/fontconfig/src/Makefile.in	Fri Apr 26 04:03:35 2002
+++ mozilla.new/other-licenses/Xft/fontconfig/src/Makefile.in	Mon Oct 21 01:16:30 2002
@@ -46,3 +46,5 @@
 ifdef MOZ_XFT_SYSTEM_FREETYPE2
 CFLAGS		+= $(FT2_CFLAGS)
 endif
+
+CFLAGS := -I$(MOZ_BUILD_ROOT)/dist/include/expat-1.95 $(CFLAGS)
diff -Naur mozilla.old/other-licenses/expat/xmlwf/Makefile.in mozilla.new/other-licenses/expat/xmlwf/Makefile.in
--- mozilla.old/other-licenses/expat/xmlwf/Makefile.in	Mon Feb 25 15:53:11 2002
+++ mozilla.new/other-licenses/expat/xmlwf/Makefile.in	Mon Oct 21 01:16:30 2002
@@ -23,7 +23,7 @@
 LIBDIR= ../lib/.libs
 INCDIR= ../lib
 
-LDFLAGS= @LDFLAGS@ -static
+LDFLAGS= @LDFLAGS@
 CFLAGS= @CFLAGS@ -I$(INCDIR)
 CC = @CC@
 
diff -Naur mozilla.old/other-licenses/freetype/builds/unix/configure mozilla.new/other-licenses/freetype/builds/unix/configure
--- mozilla.old/other-licenses/freetype/builds/unix/configure	Fri Apr 26 04:00:54 2002
+++ mozilla.new/other-licenses/freetype/builds/unix/configure	Mon Oct 21 01:16:30 2002
@@ -5715,7 +5715,7 @@
     # FIXME: Relying on posixy $() will cause problems for
     #        cross-compilation, but unfortunately the echo tests do not
     #        yet detect zsh echo's removal of \ escapes.
-    archive_cmds='$nonopt $(test "x$module" = xyes && echo -bundle || echo -dynamiclib) $allow_undefined_flag -o $lib $libobjs $deplibs$linker_flags -install_name $rpath/$soname $verstring'
+    archive_cmds='$nonopt $(test .$module = .yes && echo -bundle || echo -dynamiclib) $allow_undefined_flag -o $lib $libobjs $deplibs$linker_flags $(test .$module != .yes && echo -install_name $rpath/$soname $verstring)'
     # We need to add '_' to the symbols in $export_symbols first
     #archive_expsym_cmds="$archive_cmds"' && strip -s $export_symbols'
     hardcode_direct=yes
diff -Naur mozilla.old/other-licenses/freetype/builds/unix/unix-cc.in mozilla.new/other-licenses/freetype/builds/unix/unix-cc.in
--- mozilla.old/other-licenses/freetype/builds/unix/unix-cc.in	Mon Feb 25 15:57:25 2002
+++ mozilla.new/other-licenses/freetype/builds/unix/unix-cc.in	Mon Oct 21 01:16:30 2002
@@ -76,6 +76,6 @@
 # Library linking
 #
 LINK_LIBRARY = $(LIBTOOL) --mode=link $(CCraw) -o $@ $(OBJECTS_LIST) \
-                          -rpath $(libdir) -version-info $(version_info)
+                          -rpath $(libdir) -version-info $(version_info) -module
 
 # EOF
diff -Naur mozilla.old/other-licenses/freetype/include/freetype/config/ftoption.h mozilla.new/other-licenses/freetype/include/freetype/config/ftoption.h
--- mozilla.old/other-licenses/freetype/include/freetype/config/ftoption.h	Fri Apr 26 03:57:53 2002
+++ mozilla.new/other-licenses/freetype/include/freetype/config/ftoption.h	Mon Oct 21 01:16:30 2002
@@ -311,7 +311,7 @@
   /* embedded bitmaps in all formats using the SFNT module (namely         */
   /* TrueType & OpenType).                                                 */
   /*                                                                       */
-#define TT_CONFIG_OPTION_EMBEDDED_BITMAPS
+#undef TT_CONFIG_OPTION_EMBEDDED_BITMAPS
 
 
   /*************************************************************************/
@@ -375,7 +375,7 @@
   /* By undefining this, you will only compile the code necessary to load  */
   /* TrueType glyphs without hinting.                                      */
   /*                                                                       */
-#undef TT_CONFIG_OPTION_BYTECODE_INTERPRETER
+#define TT_CONFIG_OPTION_BYTECODE_INTERPRETER
 
 
   /*************************************************************************/
diff -Naur mozilla.old/security/coreconf/Darwin.mk mozilla.new/security/coreconf/Darwin.mk
--- mozilla.old/security/coreconf/Darwin.mk	Wed Jun 12 09:22:41 2002
+++ mozilla.new/security/coreconf/Darwin.mk	Mon Oct 21 01:16:31 2002
@@ -57,7 +57,7 @@
 # definitions so that the linker can catch multiply-defined symbols.
 # Also, common symbols are not allowed with Darwin dynamic libraries.
 
-OS_CFLAGS	= $(DSO_CFLAGS) $(OS_REL_CFLAGS) -Wmost -fpascal-strings -traditional-cpp -fno-common -pipe -DDARWIN -DHAVE_STRERROR -DHAVE_BSD_FLOCK
+OS_CFLAGS	= $(DSO_CFLAGS) $(OS_REL_CFLAGS) -Wmost -no-cpp-precomp -fno-common -pipe -DDARWIN -DHAVE_STRERROR -DHAVE_BSD_FLOCK
 
 ifdef BUILD_OPT
 OPTIMIZER	= -O2
@@ -66,7 +66,7 @@
 ARCH		= darwin
 
 # May override this with -bundle to create a loadable module.
-DSO_LDOPTS	= -dynamiclib -compatibility_version 1 -current_version 1 -install_name @executable_path/$(notdir $@)
+DSO_LDOPTS	= -dynamiclib -compatibility_version 1 -current_version 1 -install_name @PREFIX@/lib/mozilla/$(notdir $@)
 
 MKSHLIB		= $(CC) -arch $(CPU_ARCH) $(DSO_LDOPTS)
 DLL_SUFFIX	= dylib
diff -Naur mozilla.old/security/nss/cmd/platlibs.mk mozilla.new/security/nss/cmd/platlibs.mk
--- mozilla.old/security/nss/cmd/platlibs.mk	Fri Apr  5 12:30:35 2002
+++ mozilla.new/security/nss/cmd/platlibs.mk	Mon Oct 21 01:16:31 2002
@@ -177,7 +177,7 @@
 endif
 
 ifeq ($(OS_ARCH), Darwin)
-EXTRA_SHARED_LIBS += -dylib_file @executable_path/libsoftokn3.dylib:$(DIST)/lib/libsoftokn3.dylib
+EXTRA_SHARED_LIBS += -dylib_file @PREFIX@/lib/mozilla/libsoftokn3.dylib:$(DIST)/lib/libsoftokn3.dylib
 endif
 
 # $(PROGRAM) has NO explicit dependencies on $(EXTRA_SHARED_LIBS)
diff -Naur mozilla.old/security/nss/lib/smime/config.mk mozilla.new/security/nss/lib/smime/config.mk
--- mozilla.old/security/nss/lib/smime/config.mk	Sat Feb 16 08:38:43 2002
+++ mozilla.new/security/nss/lib/smime/config.mk	Mon Oct 21 01:16:31 2002
@@ -60,7 +60,7 @@
 	$(NULL)
 
 ifeq ($(OS_ARCH), Darwin)
-EXTRA_SHARED_LIBS += -dylib_file @executable_path/libsoftokn3.dylib:$(DIST)/lib/libsoftokn3.dylib
+EXTRA_SHARED_LIBS += -dylib_file @PREFIX@/lib/mozilla/libsoftokn3.dylib:$(DIST)/lib/libsoftokn3.dylib
 endif
 
 endif
diff -Naur mozilla.old/security/nss/lib/ssl/config.mk mozilla.new/security/nss/lib/ssl/config.mk
--- mozilla.old/security/nss/lib/ssl/config.mk	Fri Feb 22 13:23:22 2002
+++ mozilla.new/security/nss/lib/ssl/config.mk	Mon Oct 21 01:16:31 2002
@@ -64,7 +64,7 @@
 endif
 
 ifeq ($(OS_ARCH), Darwin)
-EXTRA_SHARED_LIBS += -dylib_file @executable_path/libsoftokn3.dylib:$(DIST)/lib/libsoftokn3.dylib
+EXTRA_SHARED_LIBS += -dylib_file @PREFIX@/lib/mozilla/libsoftokn3.dylib:$(DIST)/lib/libsoftokn3.dylib
 endif
 
 endif
diff -Naur mozilla.old/xpfe/bootstrap/Makefile.in mozilla.new/xpfe/bootstrap/Makefile.in
--- mozilla.old/xpfe/bootstrap/Makefile.in	Thu Aug 15 08:52:19 2002
+++ mozilla.new/xpfe/bootstrap/Makefile.in	Mon Oct 21 01:16:31 2002
@@ -234,7 +234,7 @@
 endif
 
 ifeq ($(OS_ARCH),Darwin)
-EXTRA_DSO_LDOPTS := $(subst -dynamiclib -install_name @executable_path/\$@ -compatibility_version 1 -current_version 1,-execute,$(EXTRA_DSO_LDOPTS))
+EXTRA_DSO_LDOPTS := $(subst -dynamiclib -install_name @PREFIX@/lib/mozilla/\$@ -compatibility_version 1 -current_version 1,-execute,$(EXTRA_DSO_LDOPTS))
 
 ifdef BUILD_STATIC_LIBS
 LDFLAGS	+= -framework QuickTime $(TK_LIBS)