diff -Naur mozilla.old/.mozconfig mozilla.new/.mozconfig
--- mozilla.old/.mozconfig	Thu Jan  1 09:00:00 1970
+++ mozilla.new/.mozconfig	Fri Jun 21 02:29:32 2002
@@ -0,0 +1,13 @@
+ac_add_options	--libdir=@PREFIX@/lib/mozilla
+ac_add_options	--includedir=@PREFIX@/include/mozilla
+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	--enable-xft
+ac_add_options	--enable-crypto
+ac_add_options	--disable-tests
+ac_add_options	--disable-debug
+ac_add_options	--enable-optimize
+ac_add_options	--with-default-mozilla-five-home=@PREFIX@/lib/mozilla
+
diff -Naur mozilla.old/configure mozilla.new/configure
--- mozilla.old/configure	Tue May 28 04:29:00 2002
+++ mozilla.new/configure	Thu Jun 20 04:24:06 2002
@@ -4519,47 +4519,47 @@
 #define DARWIN 1
 EOF
 
-    cat >> confdefs.h <<\EOF
-#define TARGET_CARBON 1
-EOF
-
-    cat >> confdefs.h <<\EOF
-#define TARGET_API_MAC_CARBON 1
-EOF
+#    cat >> confdefs.h <<\EOF
+##define TARGET_CARBON 1
+#EOF
+
+#    cat >> confdefs.h <<\EOF
+##define TARGET_API_MAC_CARBON 1
+#EOF
 
     _PEDANTIC=
-    CFLAGS="$CFLAGS -fpascal-strings -traditional-cpp -fno-common"
-    CXXFLAGS="$CXXFLAGS -fpascal-strings -traditional-cpp -fno-common"
+    CFLAGS="$CFLAGS -fpascal-strings -no-cpp-precomp -fno-common"
+    CXXFLAGS="$CXXFLAGS -fpascal-strings -no-cpp-precomp -fno-common"
     DLL_SUFFIX=".dylib"
     DSO_LDOPTS='-compatibility_version 1 -current_version 1'
     STRIP="$STRIP -x -S"
     case "${target_cpu}" in
     powerpc*)
-        cat >> confdefs.h <<\EOF
-#define NO_X11 1
-EOF
+#        cat >> confdefs.h <<\EOF
+##define NO_X11 1
+#EOF
+
+#        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
 
-        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
+#        no_x=yes
         MACOSX=1
-        _PLATFORM_DEFAULT_TOOLKIT='mac'
-        DSO_LDOPTS="$DSO_LDOPTS -arch ppc -install_name @executable_path/\$@"
-        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=
+#        _PLATFORM_DEFAULT_TOOLKIT='mac'
+        DSO_LDOPTS="$DSO_LDOPTS -arch ppc -install_name @PREFIX@/lib/mozilla/\$@"
+#        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
     ;;
@@ -6110,7 +6110,7 @@
 
 echo "$ac_t""$ac_cv_have_usable_wchar_option" 1>&6
 
-    if test "$ac_cv_have_usable_wchar_option" = "yes"; then
+    if test "$ac_cv_have_usable_wchar_option" = "yes" -a "$OS_ARCH" = "Darwin"; then
         cat >> confdefs.h <<\EOF
 #define HAVE_CPP_2BYTE_WCHAR_T 1
 EOF
@@ -13696,9 +13696,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
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 Apr 10 11:31:58 2002
+++ mozilla.new/directory/c-sdk/config/config.mk	Thu Jun 20 19:19:41 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 Apr 10 11:31:53 2002
+++ mozilla.new/directory/c-sdk/configure	Thu Jun 20 01:52:17 2002
@@ -3346,7 +3346,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/mozilla mozilla.new/fink/mozilla
--- mozilla.old/fink/mozilla	Thu Jan  1 09:00:00 1970
+++ mozilla.new/fink/mozilla	Fri Jun 21 00:01:39 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	Fri Jun 21 00:01:39 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	Fri Jun 21 00:01:39 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	Fri Jun 21 00:01:39 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	Fri Jun 21 00:01:39 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	Fri Jun 21 00:01:39 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	Fri Jun 21 00:01:39 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	Fri Jun 21 00:01:39 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/gfx/src/gtk/Makefile.in mozilla.new/gfx/src/gtk/Makefile.in
--- mozilla.old/gfx/src/gtk/Makefile.in	Wed Apr 10 11:46:14 2002
+++ mozilla.new/gfx/src/gtk/Makefile.in	Thu Jun 20 23:34:56 2002
@@ -179,6 +179,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/nsprpub/configure mozilla.new/nsprpub/configure
--- mozilla.old/nsprpub/configure	Sat Apr 27 12:01:49 2002
+++ mozilla.new/nsprpub/configure	Thu Jun 20 01:51:34 2002
@@ -3227,7 +3227,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/Xft/Makefile.in mozilla.new/other-licenses/Xft/Xft/Makefile.in
--- mozilla.old/other-licenses/Xft/Xft/Makefile.in	Wed Apr 10 12:18:15 2002
+++ mozilla.new/other-licenses/Xft/Xft/Makefile.in	Thu Jun 20 23:35:32 2002
@@ -44,4 +44,6 @@
 
 ifdef MOZ_XFT_SYSTEM_FREETYPE2
 CFLAGS		+= $(FT2_CFLAGS)
+CC		+= $(FT2_CFLAGS)
+CXX		+= $(FT2_CFLAGS)
 endif
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	Wed Apr 10 12:18:27 2002
+++ mozilla.new/other-licenses/Xft/fontconfig/src/Makefile.in	Thu Jun 20 23:36:03 2002
@@ -43,4 +43,6 @@
 
 ifdef MOZ_XFT_SYSTEM_FREETYPE2
 CFLAGS		+= $(FT2_CFLAGS)
+CC		+= $(FT2_CFLAGS)
+CXX		+= $(FT2_CFLAGS)
 endif
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	Wed Apr 10 12:18:39 2002
+++ mozilla.new/other-licenses/expat/xmlwf/Makefile.in	Thu Jun 20 02:05:29 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/security/coreconf/Darwin.mk mozilla.new/security/coreconf/Darwin.mk
--- mozilla.old/security/coreconf/Darwin.mk	Wed Apr 10 12:23:08 2002
+++ mozilla.new/security/coreconf/Darwin.mk	Thu Jun 20 04:24:50 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 -fpascal-strings -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	Wed Apr 10 12:24:11 2002
+++ mozilla.new/security/nss/cmd/platlibs.mk	Thu Jun 20 02:35:37 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	Wed Apr 10 12:29:02 2002
+++ mozilla.new/security/nss/lib/smime/config.mk	Thu Jun 20 03:35:51 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	Wed Apr 10 12:29:13 2002
+++ mozilla.new/security/nss/lib/ssl/config.mk	Thu Jun 20 03:36:09 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