[66382] trunk/dports/www/firefox-x11

jeremyhu at macports.org jeremyhu at macports.org
Sat Apr 10 13:46:59 PDT 2010


Revision: 66382
          http://trac.macports.org/changeset/66382
Author:   jeremyhu at macports.org
Date:     2010-04-10 13:46:58 -0700 (Sat, 10 Apr 2010)
Log Message:
-----------
firefox-x11: Bump to 3.6.3

Modified Paths:
--------------
    trunk/dports/www/firefox-x11/Portfile

Removed Paths:
-------------
    trunk/dports/www/firefox-x11/files/browser-xulrunner-stub.patch
    trunk/dports/www/firefox-x11/files/configure.patch
    trunk/dports/www/firefox-x11/files/gdk-Status.patch
    trunk/dports/www/firefox-x11/files/icon-Makefile.patch
    trunk/dports/www/firefox-x11/files/make-install.patch
    trunk/dports/www/firefox-x11/files/netwerk-wifi-src-Makefile.patch
    trunk/dports/www/firefox-x11/files/nsFilePicker.patch
    trunk/dports/www/firefox-x11/files/plugins.patch
    trunk/dports/www/firefox-x11/files/sydneyaudio.patch
    trunk/dports/www/firefox-x11/files/system-nss.patch
    trunk/dports/www/firefox-x11/files/xpcom-Makefile.patch
    trunk/dports/www/firefox-x11/files/xulrunner-app-Makefile.patch

Modified: trunk/dports/www/firefox-x11/Portfile
===================================================================
--- trunk/dports/www/firefox-x11/Portfile	2010-04-10 20:45:41 UTC (rev 66381)
+++ trunk/dports/www/firefox-x11/Portfile	2010-04-10 20:46:58 UTC (rev 66382)
@@ -2,12 +2,12 @@
 # $Id$
 
 PortSystem      1.0
+PortGroup       archcheck 1.0
 
 name            firefox-x11
 set component   firefox
 categories      www x11
-version         3.5.6
-revision        0
+version         3.6.3
 platforms       darwin
 maintainers     jeremyhu openmaintainer
 description     Mozilla.org's popular stand-alone web browser, Beta and Release Candidates
@@ -29,11 +29,11 @@
 distname        ${component}-${version}.source
 use_bzip2       yes
 
-checksums           md5     54d73156dfedc6e4981f2a3c46817f9a \
-                    sha1    fc1de4ddb9c20c7ba9e297737f926e9d8e32eed4 \
-                    rmd160  1002ff196eb8e281c06ef451154b64a903104664
+checksums           md5     5e4541ab23084b7b14ba228291ce2688 \
+                    sha1    f3bcd808356d16bdb26bfcf1a64a251488c4fd02 \
+                    rmd160  de556e8606bbc61cb7d20fe6f308f0c5e8b9dd77
 
-worksrcdir      mozilla-1.9.1
+worksrcdir      mozilla-1.9.2
 
 depends_build \
 	port:findutils \
@@ -41,7 +41,7 @@
 	port:autoconf213
 
 depends_lib \
-	port:xulrunner
+	port:xulrunner-devel
 
 use_autoconf yes
 autoconf.cmd autoconf213
@@ -85,7 +85,7 @@
 	--enable-image-encoder=all \
 	--enable-canvas \
 	--enable-jsd \
-	--enable-xpctools \
+	--disable-xpctools \
 	--enable-crypto \
 	--enable-pango \
 	--enable-svg \
@@ -109,11 +109,29 @@
 	--disable-mochitest \
 	--disable-necko-wifi
 
+# xpctools and necko-wifi broke in 3.6b1
+
 # Force 32-bit, inline-asm
 if {$build_arch == "x86_64"} {
     configure.build_arch i386
+
+    # Yes, this is ugly... but the real fix is in the works
+    # https://bugzilla.mozilla.org/show_bug.cgi?id=529878
+    configure.cc ${configure.cc} -arch i386
+    configure.cxx ${configure.cxx} -arch i386
+
+    # Take this out when we ship >1.8.1
+    configure.ldflags-append -arch i386
 } elseif {$build_arch == "ppc64"} {
     configure.build_arch ppc
+
+    # Yes, this is ugly... but the real fix is in the works
+    # https://bugzilla.mozilla.org/show_bug.cgi?id=529878
+    configure.cc ${configure.cc} -arch ppc
+    configure.cxx ${configure.cxx} -arch ppc
+
+    # Take this out when we ship >1.8.1
+    configure.ldflags-append -arch ppc
 }
 
 variant debug description {build with debugging symbols} {
@@ -165,7 +183,7 @@
 	--enable-libxul
 
     depends_lib-delete \
-	port:xulrunner
+	port:xulrunner-devel
 
     depends_lib-append \
 	port:heimdal \
@@ -175,46 +193,34 @@
 	port:libcanberra \
 	port:findutils \
 	port:gtk2 \
-	port:xorg-libXt
-}
+	port:xorg-libXt \
+	port:libnotify
 
-post-extract {
-    # https://bugzilla.mozilla.org/show_bug.cgi?id=484353
-    move ${worksrcpath}/modules/libjar/nsWildCard.cpp ${worksrcpath}/modules/libjar/nsWildCard_jar.cpp
+    archcheck.files-append \
+        heimdal/lib/libkrb5.dylib \
+        lib/libcanberra.dylib \
+        lib/libgconf-2.dylib \
+        lib/libgtk-x11-2.0.dylib \
+        lib/liblcms.dylib \
+        lib/libnotify.dylib \
+        lib/libXt.dylib
 }
 
-# Upstream bugs (http://bugzilla.mozilla.org)
-# #485827 (xpcom-Makefile, in mozilla-1.9.2)
-# #486782 (configure, in mozilla-1.9.2)
-# #485862 (system-nss, in mozilla-1.9.2)
-# #486036 (make-install, in mozilla-1.9.2)
-# #485863 (icon-Makefile, in mozilla-1.9.2)
-# #492119 (nsFilePicker)
-# #486892 (plugins, in mozilla-1.9.2)
-# #486890 (sydneyaudio, 3.1b3 and later, in mozilla-1.9.2)
-# #487367 (browser-xulrunner-stub, in mozilla-1.9.2)
-# #484457 (gdk-Status, in mozilla-1.9.2)
-# #487371 (xulrunner-app-Makefile, in mozilla-1.9.2)
-# #492138 #490995 (netwerk-wifi-src-Makefile, in mozilla-1.9.2)
-# Previous firefox-x11 port, not sure if still needed, but safe to keep: patch-dylib_file.diff
-patchfiles configure.patch xpcom-Makefile.patch system-nss.patch make-install.patch patch-dylib_file.diff icon-Makefile.patch nsFilePicker.patch plugins.patch sydneyaudio.patch browser-xulrunner-stub.patch gdk-Status.patch xulrunner-app-Makefile.patch netwerk-wifi-src-Makefile.patch
+patchfiles patch-dylib_file.diff 527612.patch 549746.patch 
 
 post-patch {
     # https://bugzilla.mozilla.org/show_bug.cgi?id=485857
     reinplace "s:XP_MACOSX:__APPLE__:g" ${worksrcpath}/xpcom/base/nsStackWalk.cpp 
 
-    # https://bugzilla.mozilla.org/show_bug.cgi?id=484353
-    reinplace "s:nsWildCard.cpp:nsWildCard_jar.cpp:g" ${worksrcpath}/modules/libjar/objs.mk
-
     # https://bugzilla.mozilla.org/show_bug.cgi?id=486034
     # find -xtype -> gfind -xtype
     reinplace "s:find:gfind:g" ${worksrcpath}/toolkit/mozapps/installer/packager.mk
 
-    if {[file exists ${prefix}/lib/pkgconfig/x11.pc]} {
-        reinplace "s:/usr/X11R6:${prefix}:" ${worksrcpath}/modules/plugin/base/src/nsPluginsDirUnix.cpp
-    }
+     # Don't use the system X11
+     reinplace "s:/usr/X11R6:${prefix}:" ${worksrcpath}/modules/plugin/base/src/nsPluginsDirUnix.cpp
 
     # Set the right install_name on the libs
+    reinplace "s:@executable_path:${prefix}/lib/${pkg_name}:g" ${worksrcpath}/config/config.mk
     reinplace "s:@executable_path:${prefix}/lib/${pkg_name}:g" ${worksrcpath}/config/rules.mk
     reinplace "s:@executable_path:${prefix}/lib/${pkg_name}:g" ${worksrcpath}/js/src/config/config.mk
     reinplace "s:@executable_path:${prefix}/lib/${pkg_name}:g" ${worksrcpath}/js/src/config/rules.mk
@@ -247,6 +253,9 @@
     reinplace "s:libcanberra.so.0:${prefix}/lib/libcanberra.0.dylib:" ${worksrcpath}/widget/src/gtk2/nsSound.cpp
     reinplace "s:libgtk-x11-2.0.dylib:${prefix}/lib/libgtk-x11-2.0.dylib:" ${worksrcpath}/widget/src/gtk2/nsFilePicker.cpp
 
+    reinplace "s:libXss.so.1:${prefix}/lib/libXss.1.0.0.dylib:" ${worksrcpath}/widget/src/qt/nsIdleServiceQt.cpp
+    reinplace "s:libesd.so.0:${prefix}/lib/libesd.0.dylib:" ${worksrcpath}/widget/src/qt/nsSound.cpp
+
     # Set our system plugins path
     reinplace "s:/usr/lib/mozilla/plugins:${prefix}/lib/nsplugins:" ${worksrcpath}/xpcom/io/nsAppFileLocationProvider.cpp
 
@@ -287,10 +296,7 @@
 
 	# Workaround to get root certs loaded, so https:// works
     	ln -s ${prefix}/lib/nss/libnssckbi.dylib ${destroot}${prefix}/lib/${pkg_name}/libnssckbi.dylib
-    } else {
-	# https://bugzilla.mozilla.org/show_bug.cgi?id=486064
-	system "cat ${worksrcpath}/dist/include/gfx/gfxtypes.h ${worksrcpath}/dist/include/thebes/gfxTypes.h > ${destroot}${prefix}/include/${pkg_name}/unstable/gfxtypes.h"
-    }
+    } 
 }
 
 livecheck.type  regex

Deleted: trunk/dports/www/firefox-x11/files/browser-xulrunner-stub.patch
===================================================================
--- trunk/dports/www/firefox-x11/files/browser-xulrunner-stub.patch	2010-04-10 20:45:41 UTC (rev 66381)
+++ trunk/dports/www/firefox-x11/files/browser-xulrunner-stub.patch	2010-04-10 20:46:58 UTC (rev 66382)
@@ -1,11 +0,0 @@
---- browser/app/Makefile.in.orig	2009-04-07 21:38:10.000000000 -0700
-+++ browser/app/Makefile.in	2009-04-07 21:40:05.000000000 -0700
-@@ -418,7 +418,7 @@ endif
- else
- ifdef LIBXUL_SDK
- libs::
--	cp $(LIBXUL_DIST)/bin/xulrunner-stub$(BIN_SUFFIX) $(DIST)/bin/firefox$(BIN_SUFFIX)
-+	cp $(LIBXUL_DIST)/bin/$(XULRUNNER_STUB_NAME)$(BIN_SUFFIX) $(DIST)/bin/firefox$(BIN_SUFFIX)
- endif
- endif
- 

Deleted: trunk/dports/www/firefox-x11/files/configure.patch
===================================================================
--- trunk/dports/www/firefox-x11/files/configure.patch	2010-04-10 20:45:41 UTC (rev 66381)
+++ trunk/dports/www/firefox-x11/files/configure.patch	2010-04-10 20:46:58 UTC (rev 66382)
@@ -1,140 +0,0 @@
-diff --git a/config/autoconf.mk.in b/config/autoconf.mk.in
---- config/autoconf.mk.in
-+++ config/autoconf.mk.in
-@@ -76,16 +76,18 @@ LIBXUL_DIST	= @LIBXUL_DIST@
- XULRUNNER_STUB_NAME = @XULRUNNER_STUB_NAME@
- 
- MOZ_CHROME_FILE_FORMAT	= @MOZ_CHROME_FILE_FORMAT@
- 
- MOZ_WIDGET_TOOLKIT	= @MOZ_WIDGET_TOOLKIT@
- MOZ_GFX_TOOLKIT		= @MOZ_GFX_TOOLKIT@
- MOZ_GFX_OPTIMIZE_MOBILE = @MOZ_GFX_OPTIMIZE_MOBILE@
- 
-+MOZ_FS_LAYOUT = @MOZ_FS_LAYOUT@
-+
- MOZ_DFB			= @MOZ_DFB@
- MOZ_X11			= @MOZ_X11@
- 
- MOZ_PANGO = @MOZ_PANGO@
- 
- MOZ_JS_LIBS		   = @MOZ_JS_LIBS@
- 
- MOZ_DEBUG	= @MOZ_DEBUG@
-diff --git a/configure.in b/configure.in
---- configure.in
-+++ configure.in
-@@ -1562,17 +1562,16 @@ case "$host" in
-     esac
-     ;;
- 
- *-darwin*)
-     HOST_CFLAGS="$HOST_CFLAGS -DXP_UNIX -DXP_MACOSX -DNO_X11"
-     HOST_NSPR_MDCPUCFG='\"md/_darwin.cfg\"'
-     HOST_OPTIMIZE_FLAGS="${HOST_OPTIMIZE_FLAGS=-O3}"
-     MOZ_FIX_LINK_PATHS='-Wl,-executable_path,$(LIBXUL_DIST)/bin'
--    LIBXUL_LIBS='$(XPCOM_FROZEN_LDOPTS) $(LIBXUL_DIST)/bin/XUL -lobjc'
-     ;;
- 
- *-linux*|*-kfreebsd*-gnu)
-     HOST_CFLAGS="$HOST_CFLAGS -DXP_UNIX"
-     HOST_NSPR_MDCPUCFG='\"md/_linux.cfg\"'
-     HOST_OPTIMIZE_FLAGS="${HOST_OPTIMIZE_FLAGS=-O3}"
-     ;;
- 
-@@ -1704,25 +1703,24 @@ case "$target" in
-     esac
-     ;;
- 
- *-darwin*) 
-     MKSHLIB='$(CXX) $(CXXFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -o $@'
-     MKCSHLIB='$(CC) $(CFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -o $@'
-     MOZ_OPTIMIZE_FLAGS="-O2"
-     _PEDANTIC=
--    CFLAGS="$CFLAGS -fpascal-strings -fno-common"
--    CXXFLAGS="$CXXFLAGS -fpascal-strings -fno-common"
-+    CFLAGS="$CFLAGS -fpascal-strings -fno-common -I${MACOS_SDK_DIR}/Developer/Headers/FlatCarbon"
-+    CXXFLAGS="$CXXFLAGS -fpascal-strings -fno-common -I${MACOS_SDK_DIR}/Developer/Headers/FlatCarbon"
-     DLL_SUFFIX=".dylib"
-     DSO_LDOPTS=''
-     STRIP="$STRIP -x -S"
-     _PLATFORM_DEFAULT_TOOLKIT='cairo-cocoa'
-     MOZ_ENABLE_POSTSCRIPT=
-     TARGET_NSPR_MDCPUCFG='\"md/_darwin.cfg\"'
--    LDFLAGS="$LDFLAGS -framework Cocoa"
-     # The ExceptionHandling framework is needed for Objective-C exception
-     # logging code in nsObjCExceptions.h. Currently we only use that in debug
-     # builds.
-     MOZ_DEBUG_LDFLAGS="$MOZ_DEBUG_LDFLAGS -framework ExceptionHandling"
-     # set MACOSX to generate lib/mac/MoreFiles/Makefile
-     MACOSX=1
- 
-     dnl DTrace and -dead_strip don't interact well. See bug 403132.
-@@ -4678,16 +4676,18 @@ MOZ_ARG_HEADER(Toolkit Options)
-     fi
- 
- AC_DEFINE_UNQUOTED(MOZ_DEFAULT_TOOLKIT,"$MOZ_WIDGET_TOOLKIT")
- 
- dnl ========================================================
- dnl = Enable the toolkit as needed                         =
- dnl ========================================================
- 
-+MOZ_FS_LAYOUT="unix"
-+
- case "$MOZ_WIDGET_TOOLKIT" in
- photon)
- 	MOZ_ENABLE_PHOTON=1
- 	AC_DEFINE(MOZ_WIDGET_PHOTON)
-     ;;
- 
- cairo-windows)
-     MOZ_WIDGET_TOOLKIT=windows
-@@ -4754,28 +4754,30 @@ cairo-os2)
-     TK_LIBS='$(MOZ_CAIRO_LIBS)'
-     ;;
- 
- cairo-mac|cairo-cocoa)
-     if test "$MOZ_WIDGET_TOOLKIT" = "cairo-cocoa"; then
-         MOZ_WIDGET_TOOLKIT=cocoa
-         AC_DEFINE(MOZ_WIDGET_COCOA)
-         MOZ_ENABLE_COCOA=1
-+        LDFLAGS="$LDFLAGS -framework Cocoa"
-     else
-         MOZ_WIDGET_TOOLKIT=mac
-     fi
-+    MOZ_FS_LAYOUT="bundle"
-     MOZ_GFX_TOOLKIT=cairo
-     MOZ_USER_DIR="Mozilla"
-     AC_DEFINE(XP_MACOSX)
-     AC_DEFINE(TARGET_CARBON)
-     AC_DEFINE(TARGET_API_MAC_CARBON)
-     TK_LIBS='-framework Carbon -framework CoreAudio -framework AudioToolbox -framework AudioUnit -framework AddressBook'
--    TK_CFLAGS="-I${MACOS_SDK_DIR}/Developer/Headers/FlatCarbon"
-     CFLAGS="$CFLAGS $TK_CFLAGS"
-     CXXFLAGS="$CXXFLAGS $TK_CFLAGS"
-+    LIBXUL_LIBS='$(XPCOM_FROZEN_LDOPTS) $(LIBXUL_DIST)/bin/XUL -lobjc'
-     ;;
- esac
- 
- if test "$MOZ_ENABLE_XREMOTE"; then
-     AC_DEFINE(MOZ_ENABLE_XREMOTE)
- fi
- 
- if test "$COMPILE_ENVIRONMENT"; then
-@@ -4788,16 +4790,17 @@ if test "$COMPILE_ENVIRONMENT"; then
-     fi
- 
-     PKG_CHECK_MODULES(MOZ_GTK2, gtk+-2.0 >= $GTK2_VERSION gtk+-unix-print-2.0 glib-2.0 gobject-2.0 $GDK_PACKAGES)
-   fi
- 
- fi # COMPILE_ENVIRONMENT
- 
- AC_SUBST(MOZ_DEFAULT_TOOLKIT)
-+AC_SUBST(MOZ_FS_LAYOUT)
- 
- dnl ========================================================
- dnl = startup-notification support module
- dnl ========================================================
- 
- if test "$MOZ_ENABLE_GTK2"
- then
-     MOZ_ENABLE_STARTUP_NOTIFICATION=

Deleted: trunk/dports/www/firefox-x11/files/gdk-Status.patch
===================================================================
--- trunk/dports/www/firefox-x11/files/gdk-Status.patch	2010-04-10 20:45:41 UTC (rev 66381)
+++ trunk/dports/www/firefox-x11/files/gdk-Status.patch	2010-04-10 20:46:58 UTC (rev 66382)
@@ -1,15 +0,0 @@
---- gfx/thebes/src/gfxPlatformGtk.cpp.orig	2009-04-07 16:13:18.000000000 -0700
-+++ gfx/thebes/src/gfxPlatformGtk.cpp	2009-04-07 16:14:29.000000000 -0700
-@@ -63,6 +63,12 @@
- #include <gdk/gdkx.h>
- #include "gfxXlibSurface.h"
- #include "cairo-xlib.h"
-+
-+/* Undefine the Status from Xlib since it will conflict with system headers on OSX */
-+#if defined(__APPLE__) && defined(Status)
-+#undef Status
-+#endif
-+
- #endif /* MOZ_X11 */
- 
- #ifdef MOZ_DFB

Deleted: trunk/dports/www/firefox-x11/files/icon-Makefile.patch
===================================================================
--- trunk/dports/www/firefox-x11/files/icon-Makefile.patch	2010-04-10 20:45:41 UTC (rev 66381)
+++ trunk/dports/www/firefox-x11/files/icon-Makefile.patch	2010-04-10 20:46:58 UTC (rev 66382)
@@ -1,11 +0,0 @@
---- modules/libpr0n/decoders/icon/Makefile.in.orig	2009-03-31 12:55:07.000000000 -0700
-+++ modules/libpr0n/decoders/icon/Makefile.in	2009-03-31 12:55:47.000000000 -0700
-@@ -67,7 +67,7 @@ ifeq ($(OS_ARCH),OS2)
- PLATFORM = os2
- endif
- 
--ifeq ($(OS_ARCH),Darwin)
-+ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
- PLATFORM = mac
- endif
- 

Deleted: trunk/dports/www/firefox-x11/files/make-install.patch
===================================================================
--- trunk/dports/www/firefox-x11/files/make-install.patch	2010-04-10 20:45:41 UTC (rev 66381)
+++ trunk/dports/www/firefox-x11/files/make-install.patch	2010-04-10 20:46:58 UTC (rev 66382)
@@ -1,14 +0,0 @@
---- toolkit/mozapps/installer/packager.mk.bak	2009-03-30 17:04:13.000000000 -0700
-+++ toolkit/mozapps/installer/packager.mk	2009-03-30 17:05:06.000000000 -0700
-@@ -410,7 +410,10 @@ make-package: stage-package
- # dist/sdk/lib -> prefix/lib/appname-devel-version/lib
- # prefix/lib/appname-devel-version/* symlinks to the above directories
- install:: stage-package
--ifneq (,$(filter WINNT Darwin,$(OS_ARCH)))
-+ifneq (,$(filter WINNT,$(OS_ARCH)))
-+	$(error "make install" is not supported on this platform. Use "make package" instead.)
-+endif
-+ifeq (bundle,$(MOZ_FS_LAYOUT))
- 	$(error "make install" is not supported on this platform. Use "make package" instead.)
- endif
- 	$(NSINSTALL) -D $(DESTDIR)$(installdir)

Deleted: trunk/dports/www/firefox-x11/files/netwerk-wifi-src-Makefile.patch
===================================================================
--- trunk/dports/www/firefox-x11/files/netwerk-wifi-src-Makefile.patch	2010-04-10 20:45:41 UTC (rev 66381)
+++ trunk/dports/www/firefox-x11/files/netwerk-wifi-src-Makefile.patch	2010-04-10 20:46:58 UTC (rev 66382)
@@ -1,11 +0,0 @@
---- netwerk/wifi/src/Makefile.in	2009-11-03 16:51:19.000000000 -0800
-+++ netwerk/wifi/src/Makefile.in	2009-11-03 16:56:34.000000000 -0800
-@@ -57,7 +57,7 @@ CPPSRCS	=	nsWifiMonitor.cpp \
- 		nsWifiAccessPoint.cpp \
- 		$(NULL)
- 
--ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa)
-+ifeq ($(OS_ARCH),Darwin)
- CPPSRCS += nsWifiScannerMac.cpp
- CMMSRCS = osx_corewlan.mm
- else

Deleted: trunk/dports/www/firefox-x11/files/nsFilePicker.patch
===================================================================
--- trunk/dports/www/firefox-x11/files/nsFilePicker.patch	2010-04-10 20:45:41 UTC (rev 66381)
+++ trunk/dports/www/firefox-x11/files/nsFilePicker.patch	2010-04-10 20:46:58 UTC (rev 66382)
@@ -1,14 +0,0 @@
---- widget/src/gtk2/nsFilePicker.cpp.bak	2009-04-03 18:35:03.000000000 -0700
-+++ widget/src/gtk2/nsFilePicker.cpp	2009-04-03 18:38:58.000000000 -0700
-@@ -203,7 +203,11 @@ nsFilePicker::LoadSymbolsGTK24()
-     _gtk_file_chooser_get_filename = (_gtk_file_chooser_get_filename_fn)func;
-   } else {
-     // XXX hmm, this seems to fail when gtk 2.4 is already loaded...
-+#ifdef __APPLE__
-+    mGTK24 = PR_LoadLibrary("libgtk-x11-2.0.dylib");
-+#else
-     mGTK24 = LoadVersionedLibrary("gtk-2", ".4");
-+#endif
-     if (!mGTK24) {
-       return NS_ERROR_NOT_AVAILABLE;
-     }

Deleted: trunk/dports/www/firefox-x11/files/plugins.patch
===================================================================
--- trunk/dports/www/firefox-x11/files/plugins.patch	2010-04-10 20:45:41 UTC (rev 66381)
+++ trunk/dports/www/firefox-x11/files/plugins.patch	2010-04-10 20:46:58 UTC (rev 66382)
@@ -1,25 +0,0 @@
-diff --git a/modules/plugin/base/src/nsPluginsDirUnix.cpp b/modules/plugin/base/src/nsPluginsDirUnix.cpp
---- modules/plugin/base/src/nsPluginsDirUnix.cpp
-+++ modules/plugin/base/src/nsPluginsDirUnix.cpp
-@@ -74,16 +74,21 @@
- #define LOCAL_PLUGIN_DLL_ALT_SUFFIX ".so"
- #elif defined(_AIX)
- #define DEFAULT_X11_PATH "/usr/lib"
- #define LOCAL_PLUGIN_DLL_ALT_SUFFIX ".a"
- #elif defined(SOLARIS)
- #define DEFAULT_X11_PATH "/usr/openwin/lib/"
- #elif defined(LINUX)
- #define DEFAULT_X11_PATH "/usr/X11R6/lib/"
-+#elif defined(__APPLE__)
-+#define DEFAULT_X11_PATH "/usr/X11R6/lib"
-+#undef LOCAL_PLUGIN_DLL_SUFFIX
-+#define LOCAL_PLUGIN_DLL_SUFFIX ".dylib"
-+#define LOCAL_PLUGIN_DLL_ALT_SUFFIX ".so"
- #else
- #define DEFAULT_X11_PATH ""
- #endif
- 
- #if defined(MOZ_WIDGET_GTK2)
- 
- #define PLUGIN_MAX_LEN_OF_TMP_ARR 512
- 

Deleted: trunk/dports/www/firefox-x11/files/sydneyaudio.patch
===================================================================
--- trunk/dports/www/firefox-x11/files/sydneyaudio.patch	2010-04-10 20:45:41 UTC (rev 66381)
+++ trunk/dports/www/firefox-x11/files/sydneyaudio.patch	2010-04-10 20:46:58 UTC (rev 66382)
@@ -1,13 +0,0 @@
---- toolkit/library/Makefile.in.orig	2009-04-04 19:40:25.000000000 -0700
-+++ toolkit/library/Makefile.in	2009-04-04 19:47:10.000000000 -0700
-@@ -205,7 +205,10 @@ EXTRA_DSO_LDOPTS += \
- 	-lcrypto \
- 	$(TK_LIBS) \
- 	$(NULL)
-+endif
- 
-+ifeq ($(OS_ARCH),Darwin)
- ifdef MOZ_SYDNEYAUDIO
- EXTRA_DSO_LDOPTS += \
-+	-framework Carbon \
- 	-framework CoreAudio \

Deleted: trunk/dports/www/firefox-x11/files/system-nss.patch
===================================================================
--- trunk/dports/www/firefox-x11/files/system-nss.patch	2010-04-10 20:45:41 UTC (rev 66381)
+++ trunk/dports/www/firefox-x11/files/system-nss.patch	2010-04-10 20:46:58 UTC (rev 66382)
@@ -1,11 +0,0 @@
---- config/autoconf.mk.in.orig	2009-05-08 15:28:11.000000000 -0700
-+++ config/autoconf.mk.in	2009-05-08 15:31:04.000000000 -0700
-@@ -282,7 +282,7 @@ OS_LDFLAGS	= @LDFLAGS@
- OS_COMPILE_CFLAGS = $(OS_CPPFLAGS) @COMPILE_CFLAGS@
- OS_COMPILE_CXXFLAGS = $(OS_CPPFLAGS) @COMPILE_CXXFLAGS@
- 
--OS_INCLUDES	= $(NSPR_CFLAGS) $(JPEG_CFLAGS) $(PNG_CFLAGS) $(ZLIB_CFLAGS)
-+OS_INCLUDES	= $(NSPR_CFLAGS) $(NSS_CFLAGS) $(JPEG_CFLAGS) $(PNG_CFLAGS) $(ZLIB_CFLAGS)
- OS_LIBS		= @LIBS@
- ACDEFINES	= @MOZ_DEFINES@
- 

Deleted: trunk/dports/www/firefox-x11/files/xpcom-Makefile.patch
===================================================================
--- trunk/dports/www/firefox-x11/files/xpcom-Makefile.patch	2010-04-10 20:45:41 UTC (rev 66381)
+++ trunk/dports/www/firefox-x11/files/xpcom-Makefile.patch	2010-04-10 20:46:58 UTC (rev 66382)
@@ -1,11 +0,0 @@
---- xpcom/stub/Makefile.in.orig	2009-03-29 20:11:15.000000000 -0700
-+++ xpcom/stub/Makefile.in	2009-03-29 20:11:48.000000000 -0700
-@@ -107,7 +107,7 @@ else
- DEPENDENT_LIBS_LIST += $(LIB_PREFIX)mozjs$(DLL_SUFFIX)
- endif
- 
--ifeq (Darwin,$(OS_ARCH))
-+ifeq (bundle,$(MOZ_FS_LAYOUT))
- EXTRA_DSO_LDOPTS += $(DIST)/bin/XUL
- DEPENDENT_LIBS_LIST += XUL
- else

Deleted: trunk/dports/www/firefox-x11/files/xulrunner-app-Makefile.patch
===================================================================
--- trunk/dports/www/firefox-x11/files/xulrunner-app-Makefile.patch	2010-04-10 20:45:41 UTC (rev 66381)
+++ trunk/dports/www/firefox-x11/files/xulrunner-app-Makefile.patch	2010-04-10 20:46:58 UTC (rev 66382)
@@ -1,48 +0,0 @@
---- xulrunner/app/Makefile.in.orig	2009-04-23 18:47:13.000000000 -0700
-+++ xulrunner/app/Makefile.in	2009-05-08 15:41:22.000000000 -0700
-@@ -87,12 +87,16 @@ CPPSRCS = nsXULRunnerApp.cpp
- ifneq (,$(filter WINNT WINCE,$(OS_ARCH)))
- CPPSRCS += nsRegisterGREWin.cpp
- else
--ifneq (,$(filter OS2 Darwin,$(OS_ARCH)))
-+ifeq (OS2,$(OS_ARCH))
-+CPPSRCS += nsRegisterGREVoid.cpp
-+else
-+ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
- CPPSRCS += nsRegisterGREVoid.cpp
- else
- CPPSRCS += nsRegisterGREUnix.cpp
- endif
- endif
-+endif
- 
- LOCAL_INCLUDES += \
-         -I$(topsrcdir)/toolkit/xre \
-@@ -104,7 +108,7 @@ TK_LIBS := -framework Cocoa $(TK_LIBS)
- endif
- 
- ifndef MOZ_ENABLE_LIBXUL
--ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
-+ifeq (bundle,$(MOZ_FS_LAYOUT))
- LIBS += $(DIST)/bin/XUL
- else
- EXTRA_DSO_LIBS += xul
-@@ -206,8 +210,8 @@ LDFLAGS += /HEAP:0x40000
- endif
- endif
- 
--ifneq (,$(filter-out OS2 WINCE WINNT Darwin BeOS,$(OS_ARCH)))
--
-+ifneq (,$(filter-out OS2 WINCE WINNT BeOS,$(OS_ARCH)))
-+ifeq (unix, $(MOZ_FS_LAYOUT))
- xulrunner:: $(topsrcdir)/build/unix/mozilla.in $(GLOBAL_DEPS)
- 	cat $< | sed -e "s|%MOZAPPDIR%|$(installdir)|" \
-                 -e "s|%MOZ_USER_DIR%|.mozilla/xulrunner|" \
-@@ -222,6 +226,7 @@ install:: xulrunner
- 
- GARBAGE += xulrunner
- endif
-+endif
- 
- ifneq (,$(filter gtk gtk2,$(MOZ_WIDGET_TOOLKIT)))
- 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100410/75c72fab/attachment.html>


More information about the macports-changes mailing list