Update of /cvsroot/fink/dists/10.3/unstable/crypto/finkinfo
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19239
Modified Files:
firefox.info firefox.patch
Log Message:
new upstream--maintainer said to check in if it works on Panther, which
looks to be the case.
Index: firefox.info
===================================================================
RCS file: /cvsroot/fink/dists/10.3/unstable/crypto/finkinfo/firefox.info,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- firefox.info 23 May 2005 22:20:52 -0000 1.3
+++ firefox.info 14 Jul 2005 09:07:26 -0000 1.4
@@ -1,134 +1,134 @@
-Package: firefox
-Version: 1.0.4
-Revision: 1
-Description: Lightweight browser from mozilla.org
-License: OSI-Approved
-Maintainer: Hanspeter Niederstrasser <[EMAIL PROTECTED]>
-Depends: %N-shlibs (>= %v-%r), libpng3-shlibs, libjpeg-shlibs, glib2-shlibs
(>= 2.4.0-1), atk1-shlibs (>=1.6.0-1), pango1-xft2 (>= 1.4.0-1), gtk+2,
orbit-shlibs, libiconv, x11, gettext, libidl2-shlibs, pkgconfig
-BuildDepends: libpng3, libjpeg, glib2-dev (>= 2.4.0-1), atk1 (>=1.6.0-1),
pango1-xft2-dev (>= 1.4.0-1), gtk+2-dev, orbit-dev, libiconv-dev, x11-dev,
gettext-dev, libidl2
-Source:
http://ftp.mozilla.org/pub/mozilla.org/%n/releases/%v/source/%n-%v-source.tar.bz2
-SourceDirectory: mozilla
-Source-MD5: 0f5d0586750fde79ba98ecf3ee4425a7
-PatchScript: sed 's|@PREFIX@|%p|g' <%a/%n.patch | patch -p1
-GCC: 3.3
-CompileScript: <<
-./configure %c
-make -w
-<<
-InstallScript: <<
-#!/bin/sh
-
-make install DESTDIR=%d
-
-# Install NSS headers.
-/bin/cp -R -L dist/public/nss %i/include/firefox/nss
-
-# These folders are redundant.
-for f in %i/lib/firefox/chrome/*.jar; do
- rm -rf ${f/.jar/}
-done
-
-# Install the GNOME .desktop launcher.
-install -d -m 755 %i/share/applications
-install -c -m 644 fink/applications/* %i/share/applications/
-
-# install the Fink specific prefs file
-install -c -m 644 fink/prefs.js %i/lib/firefox/defaults/pref/fink.js
-<<
-DocFiles: LEGAL LICENSE README.txt
-SplitOff: <<
- Package: %N-dev
- Depends: %N (>= %v-%r), libidl2-shlibs, pkgconfig
- Conflicts: mozilla-dev
- BuildDependsOnly: true
- Description: Lightweight browser from mozilla.org
- DocFiles: LEGAL LICENSE README.txt
- Files: bin/firefox-config include lib/pkgconfig lib/firefox/xp*
share/aclocal share/idl
-<<
-SplitOff2: <<
- Package: %N-shlibs
- Depends: gtk+2
- Description: Lightweight browser from mozilla.org
- DocFiles: LEGAL LICENSE README.txt
- Files: lib/firefox/lib*.dylib
- Shlibs: <<
- %p/lib/firefox/libgkgfx.dylib 1.0.0 %n (>= 0.10.1-4)
- %p/lib/firefox/libgtkembedmoz.dylib 1.0.0 %n (>= 0.10.1-4)
- %p/lib/firefox/libgtkxtbin.dylib 1.0.0 %n (>= 0.10.1-4)
- %p/lib/firefox/libjsj.dylib 1.0.0 %n (>= 0.10.1-4)
- %p/lib/firefox/libmozjs.dylib 1.0.0 %n (>= 0.10.1-4)
- %p/lib/firefox/libnspr4.dylib 1.0.0 %n (>= 0.10.1-4)
- %p/lib/firefox/libnss3.dylib 1.0.0 %n (>= 0.10.1-4)
- %p/lib/firefox/libplc4.dylib 1.0.0 %n (>= 0.10.1-4)
- %p/lib/firefox/libplds4.dylib 1.0.0 %n (>= 0.10.1-4)
- %p/lib/firefox/libsmime3.dylib 1.0.0 %n (>= 0.10.1-4)
- %p/lib/firefox/libsoftokn3.dylib 1.0.0 %n (>= 0.10.1-4)
- %p/lib/firefox/libssl3.dylib 1.0.0 %n (>= 0.10.1-4)
- %p/lib/firefox/libxlibrgb.dylib 1.0.0 %n (>= 0.10.1-4)
- %p/lib/firefox/libxpcom.dylib 1.0.0 %n (>= 0.10.1-4)
- %p/lib/firefox/libxpcom_compat.dylib 1.0.0 %n (>= 0.10.1-4)
- %p/lib/firefox/libxpistub.dylib 1.0.0 %n (>= 0.10.1-4)
- <<
-<<
-PostInstScript: <<
-# register the default chrome and extensions into the browser database
- if [ configure = "$1" ]; then
- MOZILLA_FIVE_HOME=%p/lib/firefox
- export DYLD_LIBRARY_PATH=$MOZILLA_FIVE_HOME
- sudo -H %p/bin/firefox -register || true
- fi
-<<
-PreRmScript: <<
-# If removing, clear out those leftovers that were created by registering
- if [ upgrade != "$1" ]; then
- MOZILLA_FIVE_HOME=%p/lib/firefox
- rm -f ${MOZILLA_FIVE_HOME}/chrome/*.rdf
- rm -rf ${MOZILLA_FIVE_HOME}/chrome/overlayinfo
- rm -f ${MOZILLA_FIVE_HOME}/components/*.dat
- rm -f ${MOZILLA_FIVE_HOME}/components.ini
- rm -rf ${MOZILLA_FIVE_HOME}/extensions
- fi
-<<
-#PostRmScript: <<
-# If upgrading, clear out the registered chrome files from the previous
-# version. Not necessary since format is identical.
-# if [ upgrade = "$1" ]; then
-# MOZILLA_FIVE_HOME=%p/lib/firefox
-# rm -rf ${MOZILLA_FIVE_HOME}/chrome/overlayinfo
-# rm -f ${MOZILLA_FIVE_HOME}/chrome/*.rdf
-# rm -f ${MOZILLA_FIVE_HOME}/components.ini
-# rm -f ${MOZILLA_FIVE_HOME}/components/*.dat
-# fi
-#<<
-Homepage: http://www.mozilla.org/products/firefox/
-DescDetail: <<
-Firefox is a free, open-source web browser for Windows, Linux and
-MacOS X and is based on the Mozilla codebase. It is small, fast and easy
-to use, and offers many advantages over Internet Explorer, such as the
-ability to block pop-up windows.
-<<
-DescUsage: <<
-firefox
-
-There is an unresolved issue in upgrading from 1.0 to 1.0.x that leads
-to a bus error on start. If you get this crash on start, erase the file
-"~/.mozilla/firefox/randomstring.default/xpti.dat". Then restart
-Firefoxand everything should work. You do NOT need to erase your
-entire profile.
-<<
-#DescPackaging: <<
-#<<
-DescPort: <<
-GTK+2 build of the Mozilla Firefox browser for Mac OS X/X11. Compiled
-without built-in support for GNOME (except for an app launcher button).
-
-Patch includes fix for bug #257773, which allows building on OS X/X11
-w/out the need for setting missing LDFLAGS.
-
-Building with freetype2 is disabled because of incompatabilities with
-Xorg X11 (Apple's X11 and Xfree4.4 work though). FF1.1 should already
-have fixed this in the trunk.
-
-ac_add_options --enable-macos-target=10.3 in patch file (.mozconfig) is
-for the minimum OS version that this will compile in.
-<<
+Package: firefox
+Version: 1.0.5
+Revision: 1
+Description: Lightweight browser from mozilla.org
+License: OSI-Approved
+Maintainer: Hanspeter Niederstrasser <[EMAIL PROTECTED]>
+Depends: %N-shlibs (>= %v-%r), libpng3-shlibs, libjpeg-shlibs, glib2-shlibs
(>= 2.4.0-1), atk1-shlibs (>=1.6.0-1), pango1-xft2 (>= 1.4.0-1), gtk+2,
orbit-shlibs, libiconv, x11, libgettext3-shlibs, libidl2-shlibs, pkgconfig
+BuildDepends: libpng3, libjpeg, glib2-dev (>= 2.4.0-1), atk1 (>=1.6.0-1),
pango1-xft2-dev (>= 1.4.0-1), gtk+2-dev, orbit-dev, libiconv-dev, x11-dev,
libgettext3-dev, libidl2
+Source:
http://ftp.mozilla.org/pub/mozilla.org/%n/releases/%v/source/%n-%v-source.tar.bz2
+SourceDirectory: mozilla
+Source-MD5: b50fe116305b7f56b2105d464110228d
+PatchScript: sed 's|@PREFIX@|%p|g' <%a/%n.patch | patch -p1
+GCC: 3.3
+CompileScript: <<
+./configure %c
+make -w
+<<
+InstallScript: <<
+#!/bin/sh
+
+make install DESTDIR=%d
+
+# Install NSS headers.
+/bin/cp -R -L dist/public/nss %i/include/firefox/nss
+
+# These folders are redundant.
+for f in %i/lib/firefox/chrome/*.jar; do
+ rm -rf ${f/.jar/}
+done
+
+# Install the GNOME .desktop launcher.
+install -d -m 755 %i/share/applications
+install -c -m 644 fink/applications/* %i/share/applications/
+
+# install the Fink specific prefs file
+install -c -m 644 fink/prefs.js %i/lib/firefox/defaults/pref/fink.js
+<<
+DocFiles: LEGAL LICENSE README.txt
+SplitOff: <<
+ Package: %N-dev
+ Depends: %N (>= %v-%r), libidl2-shlibs, pkgconfig
+ Conflicts: mozilla-dev
+ BuildDependsOnly: true
+ Description: Lightweight browser from mozilla.org
+ DocFiles: LEGAL LICENSE README.txt
+ Files: bin/firefox-config include lib/pkgconfig lib/firefox/xp*
share/aclocal share/idl
+<<
+SplitOff2: <<
+ Package: %N-shlibs
+ Depends: gtk+2
+ Description: Lightweight browser from mozilla.org
+ DocFiles: LEGAL LICENSE README.txt
+ Files: lib/firefox/lib*.dylib
+ Shlibs: <<
+ %p/lib/firefox/libgkgfx.dylib 1.0.0 %n (>= 0.10.1-4)
+ %p/lib/firefox/libgtkembedmoz.dylib 1.0.0 %n (>= 0.10.1-4)
+ %p/lib/firefox/libgtkxtbin.dylib 1.0.0 %n (>= 0.10.1-4)
+ %p/lib/firefox/libjsj.dylib 1.0.0 %n (>= 0.10.1-4)
+ %p/lib/firefox/libmozjs.dylib 1.0.0 %n (>= 0.10.1-4)
+ %p/lib/firefox/libnspr4.dylib 1.0.0 %n (>= 0.10.1-4)
+ %p/lib/firefox/libnss3.dylib 1.0.0 %n (>= 0.10.1-4)
+ %p/lib/firefox/libplc4.dylib 1.0.0 %n (>= 0.10.1-4)
+ %p/lib/firefox/libplds4.dylib 1.0.0 %n (>= 0.10.1-4)
+ %p/lib/firefox/libsmime3.dylib 1.0.0 %n (>= 0.10.1-4)
+ %p/lib/firefox/libsoftokn3.dylib 1.0.0 %n (>= 0.10.1-4)
+ %p/lib/firefox/libssl3.dylib 1.0.0 %n (>= 0.10.1-4)
+ %p/lib/firefox/libxlibrgb.dylib 1.0.0 %n (>= 0.10.1-4)
+ %p/lib/firefox/libxpcom.dylib 1.0.0 %n (>= 0.10.1-4)
+ %p/lib/firefox/libxpcom_compat.dylib 1.0.0 %n (>= 0.10.1-4)
+ %p/lib/firefox/libxpistub.dylib 1.0.0 %n (>= 0.10.1-4)
+ <<
+<<
+PostInstScript: <<
+# register the default chrome and extensions into the browser database
+ if [ configure = "$1" ]; then
+ MOZILLA_FIVE_HOME=%p/lib/firefox
+ export DYLD_LIBRARY_PATH=$MOZILLA_FIVE_HOME
+ sudo -H %p/bin/firefox -register || true
+ fi
+<<
+PreRmScript: <<
+# If removing, clear out those leftovers that were created by registering
+ if [ upgrade != "$1" ]; then
+ MOZILLA_FIVE_HOME=%p/lib/firefox
+ rm -f ${MOZILLA_FIVE_HOME}/chrome/*.rdf
+ rm -rf ${MOZILLA_FIVE_HOME}/chrome/overlayinfo
+ rm -f ${MOZILLA_FIVE_HOME}/components/*.dat
+ rm -f ${MOZILLA_FIVE_HOME}/components.ini
+ rm -rf ${MOZILLA_FIVE_HOME}/extensions
+ fi
+<<
+#PostRmScript: <<
+# If upgrading, clear out the registered chrome files from the previous
+# version. Not necessary since format is identical.
+# if [ upgrade = "$1" ]; then
+# MOZILLA_FIVE_HOME=%p/lib/firefox
+# rm -rf ${MOZILLA_FIVE_HOME}/chrome/overlayinfo
+# rm -f ${MOZILLA_FIVE_HOME}/chrome/*.rdf
+# rm -f ${MOZILLA_FIVE_HOME}/components.ini
+# rm -f ${MOZILLA_FIVE_HOME}/components/*.dat
+# fi
+#<<
+Homepage: http://www.mozilla.org/products/firefox/
+DescDetail: <<
+Firefox is a free, open-source web browser for Windows, Linux and
+MacOS X and is based on the Mozilla codebase. It is small, fast and easy
+to use, and offers many advantages over Internet Explorer, such as the
+ability to block pop-up windows.
+<<
+DescUsage: <<
+firefox
+
+There is an unresolved issue in upgrading from 1.0 to 1.0.x that leads
+to a bus error on start. If you get this crash on start, erase the file
+"~/.mozilla/firefox/randomstring.default/xpti.dat". Then restart
+Firefoxand everything should work. You do NOT need to erase your
+entire profile.
+<<
+#DescPackaging: <<
+#<<
+DescPort: <<
+GTK+2 build of the Mozilla Firefox browser for Mac OS X/X11. Compiled
+without built-in support for GNOME (except for an app launcher button).
+
+Patch includes fix for bug #257773, which allows building on OS X/X11
+w/out the need for setting missing LDFLAGS.
+
+Building with freetype2 is disabled because of incompatabilities with
+Xorg X11 (Apple's X11 and Xfree4.4 work though). FF1.1 should already
+have fixed this in the trunk.
+
+ac_add_options --enable-macos-target=10.3 in patch file (.mozconfig) is
+for the minimum OS version that this will compile in.
+<<
Index: firefox.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.3/unstable/crypto/finkinfo/firefox.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- firefox.patch 23 May 2005 22:20:53 -0000 1.3
+++ firefox.patch 14 Jul 2005 09:07:26 -0000 1.4
@@ -1,394 +1,308 @@
-diff -ruN mozilla-1.0-orig/.mozconfig mozilla-1.0/.mozconfig
---- mozilla-1.0-orig/.mozconfig Wed Dec 31 18:00:00 1969
-+++ mozilla-1.0/.mozconfig Thu Dec 2 09:41:18 2004
-@@ -0,0 +1,45 @@
-+# sh
-+# Build configuration script
-+#
-+# See http://www.mozilla.org/build/unix.html for build instructions.
-+#
-+
-+. $topsrcdir/browser/config/mozconfig
-+
-+# Options for client.mk.
-+# environment variables to set
-+#mk_add_options MOZILLA_OFFICIAL=1
-+mk_add_options MOZ_MAKE_FLAGS=-j4
-+
-+# Options for 'configure' (same as command-line options).
-+ac_add_options --enable-default-toolkit=gtk2
-+ac_add_options --enable-xft
-+#ac_add_options --disable-xft
-+#ac_add_options --enable-freetype2
-+ac_add_options --disable-freetype2
-+ac_add_options --enable-xinerama
-+ac_add_options --with-pthreads
-+ac_add_options --disable-gnomevfs
-+
-+#ac_add_options --enable-official-branding
-+#ac_add_options --disable-shared
-+#ac_add_options --enable-static
-+#ac_add_options --enable-prebinding
-+ac_add_options --disable-prebinding
-+ac_add_options --disable-debug
-+ac_add_options --disable-tests
-+ac_add_options --enable-strip
-+ac_add_options --enable-optimize='-O2'
-+ac_add_options --enable-macos-target=10.3
-+ac_add_options [EMAIL PROTECTED]@/lib/firefox
-+ac_add_options [EMAIL PROTECTED]@
-+ac_add_options [EMAIL PROTECTED]@
-+ac_add_options [EMAIL PROTECTED]@
-+#ac_add_options [EMAIL PROTECTED]@/lib/freetype2
-+#ac_add_options [EMAIL PROTECTED]@/lib/freetype2/bin
-+
-+# SVG stuff
-+#ac_add_options --enable-svg
-+#ac_add_options --enable-svg-renderer-libart
-+#mk_add_options MOZ_INTERNAL_LIBART_LGPL=1
-+#MOZ_INTERNAL_LIBART_LGPL=1
-diff -ruN mozilla-1.0-orig/browser/components/build/Makefile.in
mozilla-1.0/browser/components/build/Makefile.in
---- mozilla-1.0-orig/browser/components/build/Makefile.in Thu Jul 15
15:43:54 2004
-+++ mozilla-1.0/browser/components/build/Makefile.in Mon Nov 29 11:48:53 2004
-@@ -75,6 +75,11 @@
- $(MOZ_COMPONENT_LIBS) \
- $(NULL)
-
-+# dependencies for gkgfx
-+ifeq ($(MOZ_WIDGET_TOOLKIT), gtk2)
-+EXTRA_DSO_LDOPTS += $(MOZ_GTK2_LIBS)
-+endif
-+
- # Need to link to CoreFoundation for Mac Migrators (PList reading code)
- ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
- EXTRA_DSO_LDOPTS += \
-diff -ruN mozilla-1.0-orig/browser/config/mozconfig
mozilla-1.0/browser/config/mozconfig
---- mozilla-1.0-orig/browser/config/mozconfig Wed Jul 7 03:31:10 2004
-+++ mozilla-1.0/browser/config/mozconfig Mon Nov 29 11:48:53 2004
-@@ -8,7 +8,7 @@
-
- ac_add_options --disable-ldap
- ac_add_options --disable-mailnews
--ac_add_options
--enable-extensions=cookie,xml-rpc,xmlextras,pref,transformiix,universalchardet,webservices,inspector,gnomevfs,negotiateauth
-+ac_add_options
--enable-extensions=cookie,xml-rpc,xmlextras,pref,transformiix,universalchardet,webservices,inspector,negotiateauth
- ac_add_options --enable-crypto
- ac_add_options --disable-composer
- ac_add_options --enable-single-profile
-diff -ruN mozilla-1.0-orig/browser/locales/en-US/profile/bookmarks.html
mozilla-1.0/browser/locales/en-US/profile/bookmarks.html
---- mozilla-1.0-orig/browser/locales/en-US/profile/bookmarks.html Mon Nov
1 17:54:10 2004
-+++ mozilla-1.0/browser/locales/en-US/profile/bookmarks.html Mon Nov 29
11:48:53 2004
-@@ -12,6 +12,7 @@
- <DL><p>
- <DT><A HREF="http://www.mozilla.org/products/firefox/central.html";
ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAHWSURBVHjaYvz//z8DJQAggJiQOe/fv2fv7Oz8rays/N+VkfG/iYnJfyD/1+rVq7ffu3dPFpsBAAHEAHIBCJ85c8bN2Nj4vwsDw/8zQLwKiO8CcRoQu0DxqlWrdsHUwzBAAIGJmTNnPgYa9j8UqhFElwPxf2MIDeIrKSn9FwSJoRkAEEAM0DD4DzMAyPi/G+QKY4hh5WAXGf8PDQ0FGwJ22d27CjADAAIIrLmjo+MXA9R2kAHvGBA2wwx6B8W7od6CeQcggKCmCEL8bgwxYCbUIGTDVkHDBia+CuotgACCueD3TDQN75D4xmAvCoK9ARMHBzAw0AECiBHkAlC0Mdy7x9ABNA3obAZXIAa6iKEcGlMVQHwWyjYuL2d4v2cPg8vZswx7gHyAAAK7AOif7SAbOqCmn4Ha3AHFsIDtgPq/vLz8P4MSkJ2W9h8ggBjevXvHDo4FQUQg/kdypqCg4H8lUIACnQ/SOBMYI8bAsAJFPcj1AAEEjwVQqLpAbXmH5BJjqI0gi9DTAAgDBBCcAVLkgmQ7yKCZxpCQxqUZhAECCJ4XgMl493ug21ZD+aDAXH0WLM4A9MZPXJkJIIAwTAR5pQMalaCABQUULttBGCCAGCnNzgABBgAMJ5THwGvJLAAAAABJRU5ErkJggg==";
LAST_CHARSET="ISO-8859-1" ID="rdf:#$GvPhC3">Getting Started</A>
- <DT><A HREF="http://fxfeeds.mozilla.org/"; LAST_MODIFIED="1094668003"
FEEDURL="http://fxfeeds.mozilla.org/rss20.xml"; ID="rdf:#$HvPhC3">Latest
Headlines</A>
-+ <DT><A HREF="http://fink.sourceforge.net/"; >Fink - Home</A>
- </DL><p>
- <HR>
- <DT><H3 ID="rdf:#$6wPhC3">Quick Searches</H3>
-diff -ruN mozilla-1.0-orig/config/add-chrome.pl
mozilla-1.0/config/add-chrome.pl
---- mozilla-1.0-orig/config/add-chrome.pl Fri Feb 20 16:14:12 2004
-+++ mozilla-1.0/config/add-chrome.pl Mon Nov 29 11:48:53 2004
-@@ -14,7 +14,7 @@
- my $jarFileName = $ARGV[4];
-
- my $win32 = ($^O =~ /((MS)?win32)|cygwin|os2/i) ? 1 : 0;
--my $macos = ($^O =~ /MacOS|darwin/i) ? 1 : 0;
-+my $macos = 0;
- my $unix = !($win32 || $macos) ? 1 : 0;
-
- sub foreignPlatformFile
-diff -ruN mozilla-1.0-orig/config/autoconf.mk.in
mozilla-1.0/config/autoconf.mk.in
---- mozilla-1.0-orig/config/autoconf.mk.in Sat Oct 30 23:29:54 2004
-+++ mozilla-1.0/config/autoconf.mk.in Mon Nov 29 11:48:53 2004
-@@ -32,14 +32,14 @@
- prefix = @prefix@
- exec_prefix = @exec_prefix@
- bindir = @bindir@
--includedir = @includedir@/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
-+includedir = @includedir@/$(MOZ_APP_NAME)
- libdir = @libdir@
- datadir = @datadir@
- mandir = @mandir@
--idldir = @datadir@/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
-+idldir = @datadir@/idl/$(MOZ_APP_NAME)
-
--mozappdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
--mredir = $(libdir)/mre/mre-$(MOZ_APP_VERSION)
-+mozappdir = $(libdir)/$(MOZ_APP_NAME)
-+mredir = $(libdir)/mre/mre
- mrelibdir = $(mredir)/lib
-
- DIST = $(DEPTH)/dist
-diff -ruN mozilla-1.0-orig/config/config.mk mozilla-1.0/config/config.mk
---- mozilla-1.0-orig/config/config.mk Mon Oct 11 23:11:11 2004
-+++ mozilla-1.0/config/config.mk Mon Nov 29 11:48:53 2004
-@@ -712,7 +712,7 @@
- ifeq ($(OS_ARCH),Darwin)
- ifdef USE_PREBINDING
- export LD_PREBIND=1
--export LD_SEG_ADDR_TABLE=$(shell cd $(topsrcdir);
pwd)/config/prebind-address-table
-+export LD_PREBIND_ALLOW_OVERLAP=1
- endif
- ifdef MACOS_SDK_DIR
- export NEXT_ROOT=$(MACOS_SDK_DIR)
-@@ -765,7 +765,7 @@
- # Tell the linker where NSS is, if we're building crypto
- ifeq ($(OS_ARCH),Darwin)
- ifeq (,$(findstring crypto,$(MOZ_META_COMPONENTS)))
--MOZ_COMPONENTLIB_EXTRA_LIBS = $(foreach library, $(patsubst -l%,
$(LIB_PREFIX)%$(DLL_SUFFIX), $(filter -l%, $(NSS_LIBS))), -dylib_file
@executable_path/$(library):$(DIST)/bin/$(library))
-+MOZ_COMPONENTLIB_EXTRA_LIBS = $(foreach library, $(patsubst -l%,
$(LIB_PREFIX)%$(DLL_SUFFIX), $(filter -l%, $(NSS_LIBS))), -dylib_file
@PREFIX@/lib/firefox/$(library):$(DIST)/bin/$(library))
- endif
- endif
- endif
-diff -ruN mozilla-1.0-orig/config/rules.mk mozilla-1.0/config/rules.mk
---- mozilla-1.0-orig/config/rules.mk Wed Aug 11 14:44:17 2004
-+++ mozilla-1.0/config/rules.mk Mon Nov 29 11:48:53 2004
-@@ -421,7 +421,7 @@
- ifdef IS_COMPONENT
- EXTRA_DSO_LDOPTS += -bundle
- else
--EXTRA_DSO_LDOPTS += -dynamiclib -install_name
@executable_path/$(SHARED_LIBRARY) -compatibility_version 1 -current_version 1
-+EXTRA_DSO_LDOPTS += -dynamiclib -install_name
\$(mozappdir)/$(SHARED_LIBRARY) -compatibility_version 1 -current_version 1
- endif
- endif
- endif
-diff -ruN mozilla-1.0-orig/configure mozilla-1.0/configure
---- mozilla-1.0-orig/configure Sun Oct 31 01:17:58 2004
-+++ mozilla-1.0/configure Mon Nov 29 11:48:53 2004
-@@ -4996,7 +4996,7 @@
- ;;
-
- *-darwin*)
-- HOST_CFLAGS="$HOST_CFLAGS -DXP_UNIX -DXP_MACOSX -DNO_X11"
-+ HOST_CFLAGS="$HOST_CFLAGS -DXP_UNIX"
- HOST_NSPR_MDCPUCFG='\"md/_darwin.cfg\"'
- HOST_OPTIMIZE_FLAGS="${HOST_OPTIMIZE_FLAGS=-O3}"
- ;;
-@@ -5227,8 +5227,8 @@
-
- *-darwin*)
- _PEDANTIC=
-- CFLAGS="$CFLAGS -fpascal-strings -no-cpp-precomp -fno-common"
-- CXXFLAGS="$CXXFLAGS -fpascal-strings -no-cpp-precomp -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"
-diff -ruN mozilla-1.0-orig/directory/c-sdk/config/config.mk
mozilla-1.0/directory/c-sdk/config/config.mk
---- mozilla-1.0-orig/directory/c-sdk/config/config.mk Sun Feb 23 09:54:18 2003
-+++ mozilla-1.0/directory/c-sdk/config/config.mk Mon Nov 29 11:48:53 2004
-@@ -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 -ruN mozilla-1.0-orig/directory/c-sdk/configure
mozilla-1.0/directory/c-sdk/configure
---- mozilla-1.0-orig/directory/c-sdk/configure Tue Sep 14 16:10:26 2004
-+++ mozilla-1.0/directory/c-sdk/configure Mon Nov 29 11:48:53 2004
-@@ -3401,7 +3401,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/firefox/$@'
- # Use the standard preprocessor (cpp)
- CFLAGS="$CFLAGS -no-cpp-precomp"
- MKSHLIB='$(CC) -arch $(CPU_ARCH) $(DSO_LDOPTS) -o $@'
-diff -ruN mozilla-1.0-orig/fink/applications/firefox.desktop
mozilla-1.0/fink/applications/firefox.desktop
---- mozilla-1.0-orig/fink/applications/firefox.desktop Wed Dec 31 18:00:00 1969
-+++ mozilla-1.0/fink/applications/firefox.desktop Mon Nov 29 11:48:53 2004
-@@ -0,0 +1,10 @@
-+[Desktop Entry]
-+Encoding=UTF-8
-+Name=Firefox Web Browser
-+Comment=Browse the World Wide Web
-+Exec=firefox
-+Icon=firefox.xpm
-+Terminal=false
-+Type=Application
-+Categories=Application;Network
-+StartupNotify=true
-diff -ruN mozilla-1.0-orig/fink/prefs.js mozilla-1.0/fink/prefs.js
---- mozilla-1.0-orig/fink/prefs.js Wed Dec 31 18:00:00 1969
-+++ mozilla-1.0/fink/prefs.js Thu Dec 2 09:41:47 2004
-@@ -0,0 +1,22 @@
-+pref("general.useragent.vendorComment", "Fink Community Edition");
-+
-+// TrueType
-+//pref("font.FreeType2.enable", true);
-+//pref("font.freetype2.shared-library", "@PREFIX@/lib/libfreetype.6.dylib");
-+//pref("font.freetype2.shared-library", "/usr/X11R6/lib/libfreetype.6.dylib");
-+//pref("font.freetype2.autohinted", true);
-+//pref("font.freetype2.unhinted", true);
-+//pref("font.antialias.min", 10);
-+//pref("font.embedded_bitmaps.max", 1000000);
-+//pref("font.scale.tt_bitmap.dark_text.min", 64);
-+//pref("font.scale.tt_bitmap.dark_text.gain", "0.0");
-+//pref("font.directory.truetype.1", "/Library/Fonts");
-+//pref("font.directory.truetype.2", "/Network/Library/Fonts");
-+//pref("font.directory.truetype.3", "/System/Library/Fonts");
-+//pref("font.directory.truetype.4", "/usr/X11R6/lib/X11/fonts/TTF");
-+//pref("font.directory.truetype.5", "@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 -ruN mozilla-1.0-orig/modules/libpref/src/nsPrefService.cpp
mozilla-1.0/modules/libpref/src/nsPrefService.cpp
---- mozilla-1.0-orig/modules/libpref/src/nsPrefService.cpp Mon Jul 26
02:52:43 2004
-+++ mozilla-1.0/modules/libpref/src/nsPrefService.cpp Mon Nov 29 11:48:53 2004
-@@ -747,6 +747,7 @@
- #elif defined(XP_BEOS)
- "beos.js"
- #endif
-+ , "fink.js"
- };
-
- rv = pref_LoadPrefsInDir(defaultPrefDir, specialFiles,
NS_ARRAY_LENGTH(specialFiles));
-diff -ruN mozilla-1.0-orig/nsprpub/configure mozilla-1.0/nsprpub/configure
---- mozilla-1.0-orig/nsprpub/configure Tue Sep 14 16:10:26 2004
-+++ mozilla-1.0/nsprpub/configure Mon Nov 29 11:48:53 2004
-@@ -3305,7 +3305,7 @@
-
- CPU_ARCH=ppc
- fi
-- DSO_LDOPTS='-dynamiclib -compatibility_version 1 -current_version 1
-all_load -install_name @executable_path/$@ -headerpad_max_install_names'
-+ DSO_LDOPTS='-dynamiclib -compatibility_version 1 -current_version 1
-all_load -install_name @PREFIX@/lib/firefox/$@ -headerpad_max_install_names'
- # Use the standard preprocessor (cpp)
- CFLAGS="$CFLAGS -no-cpp-precomp"
- MKSHLIB='$(CC) -arch $(CPU_ARCH) $(DSO_LDOPTS) -o $@'
-@@ -3320,9 +3320,6 @@
-
- # Add Mac OS X support for loading CFM & CFBundle plugins
- if test -f /System/Library/Frameworks/Carbon.framework/Carbon; then
-- cat >> confdefs.h <<\EOF
--#define XP_MACOSX 1
--EOF
-
- OS_TARGET=MacOSX
-
-@@ -4845,8 +4842,6 @@
-
-
- case $target in
--*-darwin*)
-- ;;
- *)
- echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
- echo "configure:4853: checking for dlopen in -ldl" >&5
-diff -ruN mozilla-1.0-orig/nsprpub/pr/include/md/_darwin.h
mozilla-1.0/nsprpub/pr/include/md/_darwin.h
---- mozilla-1.0-orig/nsprpub/pr/include/md/_darwin.h Wed Nov 26 19:30:44 2003
-+++ mozilla-1.0/nsprpub/pr/include/md/_darwin.h Mon Nov 29 11:48:53 2004
-@@ -55,7 +55,8 @@
-
- #undef HAVE_STACK_GROWING_UP
- #define HAVE_DLL
--#define USE_MACH_DYLD
-+/* #define USE_MACH_DYLD */
-+#define USE_DLFCN
- #define _PR_HAVE_SOCKADDR_LEN
- #define _PR_STAT_HAS_ST_ATIMESPEC
- #define _PR_NO_LARGE_FILES
-diff -ruN mozilla-1.0-orig/nsprpub/pr/src/Makefile.in
mozilla-1.0/nsprpub/pr/src/Makefile.in
---- mozilla-1.0-orig/nsprpub/pr/src/Makefile.in Mon Mar 22 18:40:17 2004
-+++ mozilla-1.0/nsprpub/pr/src/Makefile.in Mon Nov 29 11:48:53 2004
-@@ -199,9 +199,9 @@
- endif
- endif
-
--ifeq ($(OS_TARGET),MacOSX)
--OS_LIBS = -framework CoreServices -framework CoreFoundation
--endif
-+#ifeq ($(OS_TARGET),MacOSX)
-+#OS_LIBS = -framework CoreServices -framework CoreFoundation
-+#endif
-
- ifdef GC_LEAK_DETECTOR
- EXTRA_LIBS = -L$(dist_libdir) -lboehm
-diff -ruN mozilla-1.0-orig/nsprpub/pr/src/linking/prlink.c
mozilla-1.0/nsprpub/pr/src/linking/prlink.c
---- mozilla-1.0-orig/nsprpub/pr/src/linking/prlink.c Tue Jan 20 13:46:21 2004
-+++ mozilla-1.0/nsprpub/pr/src/linking/prlink.c Mon Nov 29 11:48:53 2004
-@@ -164,7 +164,8 @@
- #if defined(SUNOS4) || defined(DARWIN) || defined(NEXTSTEP) \
- || defined(WIN16) || defined(XP_OS2) \
- || ((defined(OPENBSD) || defined(NETBSD)) && !defined(__ELF__))
--#define NEED_LEADING_UNDERSCORE
-+/* On MacOSX 10.3, dlsym does not accept symbols with '_'.
-+/* #define NEED_LEADING_UNDERSCORE */
- #endif
-
- #ifdef XP_PC
-diff -ruN mozilla-1.0-orig/security/coreconf/Darwin.mk
mozilla-1.0/security/coreconf/Darwin.mk
---- mozilla-1.0-orig/security/coreconf/Darwin.mk Wed Nov 12 19:59:22 2003
-+++ mozilla-1.0/security/coreconf/Darwin.mk Mon Nov 29 11:48:53 2004
-@@ -68,7 +68,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 $@) -headerpad_max_install_names
-+DSO_LDOPTS = -dynamiclib -compatibility_version 1 -current_version 1
-install_name @PREFIX@/lib/firefox/$(notdir $@) -headerpad_max_install_names
-
- MKSHLIB = $(CC) -arch $(CPU_ARCH) $(DSO_LDOPTS)
- DLL_SUFFIX = dylib
-diff -ruN mozilla-1.0-orig/security/nss/cmd/platlibs.mk
mozilla-1.0/security/nss/cmd/platlibs.mk
---- mozilla-1.0-orig/security/nss/cmd/platlibs.mk Fri Oct 15 16:13:50 2004
-+++ mozilla-1.0/security/nss/cmd/platlibs.mk Mon Nov 29 11:48:53 2004
-@@ -207,7 +207,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/firefox/libsoftokn3.dylib:$(DIST)/lib/libsoftokn3.dylib
- endif
-
-
-diff -ruN mozilla-1.0-orig/security/nss/lib/smime/config.mk
mozilla-1.0/security/nss/lib/smime/config.mk
---- mozilla-1.0-orig/security/nss/lib/smime/config.mk Fri Oct 15 16:13:56 2004
-+++ mozilla-1.0/security/nss/lib/smime/config.mk Mon Nov 29 11:48:53 2004
-@@ -70,7 +70,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/firefox/libsoftokn3.dylib:$(DIST)/lib/libsoftokn3.dylib
- endif
-
- endif
-diff -ruN mozilla-1.0-orig/security/nss/lib/ssl/config.mk
mozilla-1.0/security/nss/lib/ssl/config.mk
---- mozilla-1.0-orig/security/nss/lib/ssl/config.mk Fri Oct 15 16:13:57 2004
-+++ mozilla-1.0/security/nss/lib/ssl/config.mk Mon Nov 29 11:48:53 2004
-@@ -75,7 +75,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/firefox/libsoftokn3.dylib:$(DIST)/lib/libsoftokn3.dylib
- endif
-
- ifeq ($(OS_TARGET),SunOS)
-diff -ruN mozilla-1.0-orig/themes/Makefile.in mozilla-1.0/themes/Makefile.in
---- mozilla-1.0-orig/themes/Makefile.in Sun May 16 13:16:49 2004
-+++ mozilla-1.0/themes/Makefile.in Mon Nov 29 11:48:53 2004
-@@ -54,7 +54,9 @@
-
- # select classic as the default skin
- libs::
-- echo skin,install,select,classic/1.0 >>
$(DIST)/bin/chrome/installed-chrome.txt
-+# fix later
-+# echo skin,install,select,classic/1.0 >>
$(DIST)/bin/chrome/installed-chrome.txt
-
- install::
-- echo skin,install,select,classic/1.0 >>
$(DESTDIR)$(mozappdir)/chrome/installed-chrome.txt
-+# fix later
-+# echo skin,install,select,classic/1.0 >>
$(DESTDIR)$(mozappdir)/chrome/installed-chrome.txt
+diff -ruN mozilla-orig/.mozconfig mozilla/.mozconfig
+--- mozilla-orig/.mozconfig 1969-12-31 18:00:00.000000000 -0600
++++ mozilla/.mozconfig 2005-06-16 10:33:34.000000000 -0500
+@@ -0,0 +1,45 @@
++# sh
++# Build configuration script
++#
++# See http://www.mozilla.org/build/unix.html for build instructions.
++#
++
++. $topsrcdir/browser/config/mozconfig
++
++# Options for client.mk.
++# environment variables to set
++#mk_add_options MOZILLA_OFFICIAL=1
++#mk_add_options MOZ_MAKE_FLAGS=-j4
++
++# Options for 'configure' (same as command-line options).
++ac_add_options --enable-default-toolkit=gtk2
++ac_add_options --enable-xft
++#ac_add_options --disable-xft
++#ac_add_options --enable-freetype2
++ac_add_options --disable-freetype2
++ac_add_options --enable-xinerama
++ac_add_options --with-pthreads
++ac_add_options --disable-gnomevfs
++
++#ac_add_options --enable-official-branding
++#ac_add_options --disable-shared
++#ac_add_options --enable-static
++#ac_add_options --enable-prebinding
++ac_add_options --disable-prebinding
++ac_add_options --disable-debug
++ac_add_options --disable-tests
++ac_add_options --enable-strip
++ac_add_options --enable-optimize='-O2'
++ac_add_options --enable-macos-target=10.3
++ac_add_options [EMAIL PROTECTED]@/lib/firefox
++ac_add_options [EMAIL PROTECTED]@
++ac_add_options [EMAIL PROTECTED]@
++ac_add_options [EMAIL PROTECTED]@
++#ac_add_options [EMAIL PROTECTED]@/lib/freetype2
++#ac_add_options [EMAIL PROTECTED]@/lib/freetype2/bin
++
++# SVG stuff
++#ac_add_options --enable-svg
++#ac_add_options --enable-svg-renderer-libart
++#mk_add_options MOZ_INTERNAL_LIBART_LGPL=1
++#MOZ_INTERNAL_LIBART_LGPL=1
+diff -ruN mozilla-orig/browser/components/build/Makefile.in
mozilla/browser/components/build/Makefile.in
+--- mozilla-orig/browser/components/build/Makefile.in 2004-07-15
15:43:54.000000000 -0500
++++ mozilla/browser/components/build/Makefile.in 2005-06-16
10:33:12.000000000 -0500
+@@ -75,6 +75,12 @@
+ $(MOZ_COMPONENT_LIBS) \
+ $(NULL)
+
++# fix for building on Mac/X11 (bug 257773)
++# dependencies for gkgfx
++ifeq ($(MOZ_WIDGET_TOOLKIT), gtk2)
++EXTRA_DSO_LDOPTS += $(MOZ_GTK2_LIBS)
++endif
++
+ # Need to link to CoreFoundation for Mac Migrators (PList reading code)
+ ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
+ EXTRA_DSO_LDOPTS += \
+diff -ruN mozilla-orig/browser/config/mozconfig
mozilla/browser/config/mozconfig
+--- mozilla-orig/browser/config/mozconfig 2004-07-07 03:31:10.000000000
-0500
++++ mozilla/browser/config/mozconfig 2005-06-16 10:33:34.000000000 -0500
+@@ -8,7 +8,7 @@
+
+ ac_add_options --disable-ldap
+ ac_add_options --disable-mailnews
+-ac_add_options
--enable-extensions=cookie,xml-rpc,xmlextras,pref,transformiix,universalchardet,webservices,inspector,gnomevfs,negotiateauth
++ac_add_options
--enable-extensions=cookie,xml-rpc,xmlextras,pref,transformiix,universalchardet,webservices,inspector,negotiateauth
+ ac_add_options --enable-crypto
+ ac_add_options --disable-composer
+ ac_add_options --enable-single-profile
+diff -ruN mozilla-orig/browser/locales/en-US/profile/bookmarks.html
mozilla/browser/locales/en-US/profile/bookmarks.html
+--- mozilla-orig/browser/locales/en-US/profile/bookmarks.html 2005-02-03
21:03:07.000000000 -0600
++++ mozilla/browser/locales/en-US/profile/bookmarks.html 2005-06-16
10:33:34.000000000 -0500
+@@ -12,6 +12,7 @@
+ <DL><p>
+ <DT><A HREF="http://www.mozilla.org/products/firefox/central.html";
ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAHWSURBVHjaYvz//z8DJQAggJiQOe/fv2fv7Oz8rays/N+VkfG/iYnJfyD/1+rVq7ffu3dPFpsBAAHEAHIBCJ85c8bN2Nj4vwsDw/8zQLwKiO8CcRoQu0DxqlWrdsHUwzBAAIGJmTNnPgYa9j8UqhFElwPxf2MIDeIrKSn9FwSJoRkAEEAM0DD4DzMAyPi/G+QKY4hh5WAXGf8PDQ0FGwJ22d27CjADAAIIrLmjo+MXA9R2kAHvGBA2wwx6B8W7od6CeQcggKCmCEL8bgwxYCbUIGTDVkHDBia+CuotgACCueD3TDQN75D4xmAvCoK9ARMHBzAw0AECiBHkAlC0Mdy7x9ABNA3obAZXIAa6iKEcGlMVQHwWyjYuL2d4v2cPg8vZswx7gHyAAAK7AOif7SAbOqCmn4Ha3AHFsIDtgPq/vLz8P4MSkJ2W9h8ggBjevXvHDo4FQUQg/kdypqCg4H8lUIACnQ/SOBMYI8bAsAJFPcj1AAEEjwVQqLpAbXmH5BJjqI0gi9DTAAgDBBCcAVLkgmQ7yKCZxpCQxqUZhAECCJ4XgMl493ug21ZD+aDAXH0WLM4A9MZPXJkJIIAwTAR5pQMalaCABQUULttBGCCAGCnNzgABBgAMJ5THwGvJLAAAAABJRU5ErkJggg==";
LAST_CHARSET="ISO-8859-1" ID="rdf:#$GvPhC3">Getting Started</A>
+ <DT><A HREF="http://fxfeeds.mozilla.org/"; LAST_MODIFIED="1094668003"
FEEDURL="http://fxfeeds.mozilla.org/rss20.xml"; ID="rdf:#$HvPhC3">Latest
Headlines</A>
++ <DT><A HREF="http://fink.sourceforge.net/"; >Fink - Home</A>
+ </DL><p>
+ <HR>
+ <DT><H3 ID="rdf:#$6wPhC3">Quick Searches</H3>
+diff -ruN mozilla-orig/config/add-chrome.pl mozilla/config/add-chrome.pl
+--- mozilla-orig/config/add-chrome.pl 2004-02-20 16:14:12.000000000 -0600
++++ mozilla/config/add-chrome.pl 2005-06-16 10:33:34.000000000 -0500
+@@ -14,7 +14,7 @@
+ my $jarFileName = $ARGV[4];
+
+ my $win32 = ($^O =~ /((MS)?win32)|cygwin|os2/i) ? 1 : 0;
+-my $macos = ($^O =~ /MacOS|darwin/i) ? 1 : 0;
++my $macos = 0;
+ my $unix = !($win32 || $macos) ? 1 : 0;
+
+ sub foreignPlatformFile
+diff -ruN mozilla-orig/config/autoconf.mk.in mozilla/config/autoconf.mk.in
+--- mozilla-orig/config/autoconf.mk.in 2004-10-30 23:29:54.000000000 -0500
++++ mozilla/config/autoconf.mk.in 2005-06-16 10:33:34.000000000 -0500
+@@ -32,14 +32,14 @@
+ prefix = @prefix@
+ exec_prefix = @exec_prefix@
+ bindir = @bindir@
+-includedir = @includedir@/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
++includedir = @includedir@/$(MOZ_APP_NAME)
+ libdir = @libdir@
+ datadir = @datadir@
+ mandir = @mandir@
+-idldir = @datadir@/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
++idldir = @datadir@/idl/$(MOZ_APP_NAME)
+
+-mozappdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
+-mredir = $(libdir)/mre/mre-$(MOZ_APP_VERSION)
++mozappdir = $(libdir)/$(MOZ_APP_NAME)
++mredir = $(libdir)/mre/mre
+ mrelibdir = $(mredir)/lib
+
+ DIST = $(DEPTH)/dist
+diff -ruN mozilla-orig/config/config.mk mozilla/config/config.mk
+--- mozilla-orig/config/config.mk 2004-10-11 23:11:11.000000000 -0500
++++ mozilla/config/config.mk 2005-06-16 10:33:34.000000000 -0500
+@@ -712,7 +712,7 @@
+ ifeq ($(OS_ARCH),Darwin)
+ ifdef USE_PREBINDING
+ export LD_PREBIND=1
+-export LD_SEG_ADDR_TABLE=$(shell cd $(topsrcdir);
pwd)/config/prebind-address-table
++export LD_PREBIND_ALLOW_OVERLAP=1
+ endif
+ ifdef MACOS_SDK_DIR
+ export NEXT_ROOT=$(MACOS_SDK_DIR)
+@@ -765,7 +765,7 @@
+ # Tell the linker where NSS is, if we're building crypto
+ ifeq ($(OS_ARCH),Darwin)
+ ifeq (,$(findstring crypto,$(MOZ_META_COMPONENTS)))
+-MOZ_COMPONENTLIB_EXTRA_LIBS = $(foreach library, $(patsubst -l%,
$(LIB_PREFIX)%$(DLL_SUFFIX), $(filter -l%, $(NSS_LIBS))), -dylib_file
@executable_path/$(library):$(DIST)/bin/$(library))
++MOZ_COMPONENTLIB_EXTRA_LIBS = $(foreach library, $(patsubst -l%,
$(LIB_PREFIX)%$(DLL_SUFFIX), $(filter -l%, $(NSS_LIBS))), -dylib_file
@PREFIX@/lib/firefox/$(library):$(DIST)/bin/$(library))
+ endif
+ endif
+ endif
+diff -ruN mozilla-orig/config/rules.mk mozilla/config/rules.mk
+--- mozilla-orig/config/rules.mk 2004-08-11 14:44:17.000000000 -0500
++++ mozilla/config/rules.mk 2005-06-16 10:33:34.000000000 -0500
+@@ -421,7 +421,7 @@
+ ifdef IS_COMPONENT
+ EXTRA_DSO_LDOPTS += -bundle
+ else
+-EXTRA_DSO_LDOPTS += -dynamiclib -install_name
@executable_path/$(SHARED_LIBRARY) -compatibility_version 1 -current_version 1
++EXTRA_DSO_LDOPTS += -dynamiclib -install_name
\$(mozappdir)/$(SHARED_LIBRARY) -compatibility_version 1 -current_version 1
+ endif
+ endif
+ endif
+diff -ruN mozilla-orig/configure mozilla/configure
+--- mozilla-orig/configure 2004-10-31 01:17:58.000000000 -0600
++++ mozilla/configure 2005-06-16 10:33:34.000000000 -0500
+@@ -4996,7 +4996,7 @@
+ ;;
+
+ *-darwin*)
+- HOST_CFLAGS="$HOST_CFLAGS -DXP_UNIX -DXP_MACOSX -DNO_X11"
++ HOST_CFLAGS="$HOST_CFLAGS -DXP_UNIX"
+ HOST_NSPR_MDCPUCFG='\"md/_darwin.cfg\"'
+ HOST_OPTIMIZE_FLAGS="${HOST_OPTIMIZE_FLAGS=-O3}"
+ ;;
+@@ -5227,8 +5227,8 @@
+
+ *-darwin*)
+ _PEDANTIC=
+- CFLAGS="$CFLAGS -fpascal-strings -no-cpp-precomp -fno-common"
+- CXXFLAGS="$CXXFLAGS -fpascal-strings -no-cpp-precomp -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"
+diff -ruN mozilla-orig/fink/applications/firefox.desktop
mozilla/fink/applications/firefox.desktop
+--- mozilla-orig/fink/applications/firefox.desktop 1969-12-31
18:00:00.000000000 -0600
++++ mozilla/fink/applications/firefox.desktop 2005-06-16 10:33:34.000000000
-0500
+@@ -0,0 +1,10 @@
++[Desktop Entry]
++Encoding=UTF-8
++Name=Firefox Web Browser
++Comment=Browse the World Wide Web
++Exec=firefox
++Icon=firefox.xpm
++Terminal=false
++Type=Application
++Categories=Application;Network
++StartupNotify=true
+diff -ruN mozilla-orig/fink/prefs.js mozilla/fink/prefs.js
+--- mozilla-orig/fink/prefs.js 1969-12-31 18:00:00.000000000 -0600
++++ mozilla/fink/prefs.js 2005-06-16 10:33:34.000000000 -0500
+@@ -0,0 +1,22 @@
++pref("general.useragent.vendorComment", "Fink Community Edition");
++
++// TrueType
++//pref("font.FreeType2.enable", true);
++//pref("font.freetype2.shared-library", "@PREFIX@/lib/libfreetype.6.dylib");
++//pref("font.freetype2.shared-library", "/usr/X11R6/lib/libfreetype.6.dylib");
++//pref("font.freetype2.autohinted", true);
++//pref("font.freetype2.unhinted", true);
++//pref("font.antialias.min", 10);
++//pref("font.embedded_bitmaps.max", 1000000);
++//pref("font.scale.tt_bitmap.dark_text.min", 64);
++//pref("font.scale.tt_bitmap.dark_text.gain", "0.0");
++//pref("font.directory.truetype.1", "/Library/Fonts");
++//pref("font.directory.truetype.2", "/Network/Library/Fonts");
++//pref("font.directory.truetype.3", "/System/Library/Fonts");
++//pref("font.directory.truetype.4", "/usr/X11R6/lib/X11/fonts/TTF");
++//pref("font.directory.truetype.5", "@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 -ruN mozilla-orig/modules/libpref/src/nsPrefService.cpp
mozilla/modules/libpref/src/nsPrefService.cpp
+--- mozilla-orig/modules/libpref/src/nsPrefService.cpp 2004-07-26
02:52:43.000000000 -0500
++++ mozilla/modules/libpref/src/nsPrefService.cpp 2005-06-16
10:33:34.000000000 -0500
+@@ -747,6 +747,7 @@
+ #elif defined(XP_BEOS)
+ "beos.js"
+ #endif
++ , "fink.js"
+ };
+
+ rv = pref_LoadPrefsInDir(defaultPrefDir, specialFiles,
NS_ARRAY_LENGTH(specialFiles));
+diff -ruN mozilla-orig/nsprpub/configure mozilla/nsprpub/configure
+--- mozilla-orig/nsprpub/configure 2004-09-14 16:10:26.000000000 -0500
++++ mozilla/nsprpub/configure 2005-06-16 10:33:34.000000000 -0500
+@@ -3320,9 +3320,6 @@
+
+ # Add Mac OS X support for loading CFM & CFBundle plugins
+ if test -f /System/Library/Frameworks/Carbon.framework/Carbon; then
+- cat >> confdefs.h <<\EOF
+-#define XP_MACOSX 1
+-EOF
+
+ OS_TARGET=MacOSX
+
+@@ -4845,8 +4842,6 @@
+
+
+ case $target in
+-*-darwin*)
+- ;;
+ *)
+ echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
+ echo "configure:4853: checking for dlopen in -ldl" >&5
+diff -ruN mozilla-orig/nsprpub/pr/include/md/_darwin.h
mozilla/nsprpub/pr/include/md/_darwin.h
+--- mozilla-orig/nsprpub/pr/include/md/_darwin.h 2003-11-26
19:30:44.000000000 -0600
++++ mozilla/nsprpub/pr/include/md/_darwin.h 2005-06-16 10:33:34.000000000
-0500
+@@ -55,7 +55,8 @@
+
+ #undef HAVE_STACK_GROWING_UP
+ #define HAVE_DLL
+-#define USE_MACH_DYLD
++/* #define USE_MACH_DYLD */
++#define USE_DLFCN
+ #define _PR_HAVE_SOCKADDR_LEN
+ #define _PR_STAT_HAS_ST_ATIMESPEC
+ #define _PR_NO_LARGE_FILES
+diff -ruN mozilla-orig/nsprpub/pr/src/Makefile.in
mozilla/nsprpub/pr/src/Makefile.in
+--- mozilla-orig/nsprpub/pr/src/Makefile.in 2004-03-22 18:40:17.000000000
-0600
++++ mozilla/nsprpub/pr/src/Makefile.in 2005-06-16 10:33:34.000000000 -0500
+@@ -199,9 +199,9 @@
+ endif
+ endif
+
+-ifeq ($(OS_TARGET),MacOSX)
+-OS_LIBS = -framework CoreServices -framework CoreFoundation
+-endif
++#ifeq ($(OS_TARGET),MacOSX)
++#OS_LIBS = -framework CoreServices -framework CoreFoundation
++#endif
+
+ ifdef GC_LEAK_DETECTOR
+ EXTRA_LIBS = -L$(dist_libdir) -lboehm
+diff -ruN mozilla-orig/nsprpub/pr/src/linking/prlink.c
mozilla/nsprpub/pr/src/linking/prlink.c
+--- mozilla-orig/nsprpub/pr/src/linking/prlink.c 2004-01-20
13:46:21.000000000 -0600
++++ mozilla/nsprpub/pr/src/linking/prlink.c 2005-06-16 10:33:34.000000000
-0500
+@@ -164,7 +164,8 @@
+ #if defined(SUNOS4) || defined(DARWIN) || defined(NEXTSTEP) \
+ || defined(WIN16) || defined(XP_OS2) \
+ || ((defined(OPENBSD) || defined(NETBSD)) && !defined(__ELF__))
+-#define NEED_LEADING_UNDERSCORE
++/* On MacOSX 10.3, dlsym does not accept symbols with '_'. */
++/* #define NEED_LEADING_UNDERSCORE */
+ #endif
+
+ #ifdef XP_PC
+diff -ruN mozilla-orig/themes/Makefile.in mozilla/themes/Makefile.in
+--- mozilla-orig/themes/Makefile.in 2004-05-16 13:16:49.000000000 -0500
++++ mozilla/themes/Makefile.in 2005-06-16 10:33:34.000000000 -0500
+@@ -54,7 +54,9 @@
+
+ # select classic as the default skin
+ libs::
+- echo skin,install,select,classic/1.0 >>
$(DIST)/bin/chrome/installed-chrome.txt
++# fix later
++# echo skin,install,select,classic/1.0 >>
$(DIST)/bin/chrome/installed-chrome.txt
+
+ install::
+- echo skin,install,select,classic/1.0 >>
$(DESTDIR)$(mozappdir)/chrome/installed-chrome.txt
++# fix later
++# echo skin,install,select,classic/1.0 >>
$(DESTDIR)$(mozappdir)/chrome/installed-chrome.txt
-------------------------------------------------------
This SF.Net email is sponsored by the 'Do More With Dual!' webinar happening
July 14 at 8am PDT/11am EDT. We invite you to explore the latest in dual
core and dual graphics technology at this free one hour event hosted by HP,
AMD, and NVIDIA. To register visit http://www.hp.com/go/dualwebinar
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits
