[49179] trunk/dports/www

jeremyhu at macports.org jeremyhu at macports.org
Sat Apr 4 20:36:27 PDT 2009


Revision: 49179
          http://trac.macports.org/changeset/49179
Author:   jeremyhu at macports.org
Date:     2009-04-04 20:36:26 -0700 (Sat, 04 Apr 2009)
Log Message:
-----------
New port: firefox-x11-devel 3.1b3 - can be installed simultaneously with firefox-x11

Added Paths:
-----------
    trunk/dports/www/firefox-x11-devel/
    trunk/dports/www/firefox-x11-devel/Portfile
    trunk/dports/www/firefox-x11-devel/files/
    trunk/dports/www/firefox-x11-devel/files/configure.patch
    trunk/dports/www/firefox-x11-devel/files/gfxPangoFonts.patch
    trunk/dports/www/firefox-x11-devel/files/icon-Makefile.patch
    trunk/dports/www/firefox-x11-devel/files/make-install.patch
    trunk/dports/www/firefox-x11-devel/files/nsFilePicker.patch
    trunk/dports/www/firefox-x11-devel/files/patch-dylib_file.diff
    trunk/dports/www/firefox-x11-devel/files/patch-pthread.diff
    trunk/dports/www/firefox-x11-devel/files/plugins.patch
    trunk/dports/www/firefox-x11-devel/files/share-applications-firefox.desktop
    trunk/dports/www/firefox-x11-devel/files/sydneyaudio.patch
    trunk/dports/www/firefox-x11-devel/files/system-nss.patch
    trunk/dports/www/firefox-x11-devel/files/xpcom-Makefile.patch

Added: trunk/dports/www/firefox-x11-devel/Portfile
===================================================================
--- trunk/dports/www/firefox-x11-devel/Portfile	                        (rev 0)
+++ trunk/dports/www/firefox-x11-devel/Portfile	2009-04-05 03:36:26 UTC (rev 49179)
@@ -0,0 +1,247 @@
+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
+# $Id: Portfile 49115 2009-04-04 05:08:33Z jeremyhu at macports.org $
+
+PortSystem      1.0
+
+name            firefox-x11-devel
+categories      www x11
+version         3.1b3
+platforms       darwin
+maintainers     jeremyhu openmaintainer
+description     Mozilla.org's popular stand-alone web browser, Beta and Release Candidates
+
+long_description \
+    Firefox empowers you to browse faster, more safely and more \
+    efficiently than with any other browser.
+
+universal_variant no
+
+homepage        http://www.mozilla.com/firefox/
+master_sites    http://mozilla.isc.org/pub/mozilla.org/firefox/releases/${version}/source/ \
+                http://www.mirrorservice.org/sites/releases.mozilla.org/pub/mozilla.org/firefox/releases/${version}/source/ \
+                http://mirror.internode.on.net/pub/mozilla/firefox/releases/${version}/source/ \
+                http://kyoto-mz-dl.sinet.ad.jp/pub/mozilla.org/firefox/releases/${version}/source/ \
+                http://mirror.yandex.ru/mozilla/firefox/releases/${version}/source/ \
+                http://mozilla.c3sl.ufpr.br/releases/firefox/releases/${version}/source/ \
+                http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${version}/source/
+distname        firefox-${version}-source
+use_bzip2       yes
+
+checksums           md5     61cd1a7fc587f6d2a33c564033198e2c \
+                    sha1    19bcce6ed27c7db3aed339be9d5352113cb81ee1 \
+                    rmd160  78dce5b94c9b86fc488f6f458907c0131a62fbe5
+
+worksrcdir      mozilla-1.9.1
+
+depends_build \
+	port:findutils \
+	port:pkgconfig
+
+depends_lib \
+	port:heimdal \
+	port:lcms \
+	port:gconf \
+	port:esound \
+	port:libcanberra
+
+#	port:nss \
+#	port:nspr
+#	port:xulrunner can replace nss and nspr once it's used to build firefox
+
+#-DXP_UNIX -DXP_MACOSX -UNO_X11
+configure.cppflags-append -I/Developer/Headers/FlatCarbon
+configure.cflags-append -I/Developer/Headers/FlatCarbon
+configure.cxxflags-append -I/Developer/Headers/FlatCarbon
+
+configure.args \
+	--disable-static \
+	--enable-shared \
+	--disable-official-branding \
+	--with-branding=browser/branding/unofficial \
+	--with-distribution-id=org.macports \
+	--enable-default-toolkit=cairo-gtk2 \
+	--x-includes=${prefix}/include \
+	--x-libraries=${prefix}/lib \
+	--with-system-bzip2=${prefix} \
+	--with-system-jpeg=${prefix} \
+	--with-system-zlib=${prefix} \
+	--enable-system-lcms \
+	--enable-system-cairo \
+	--enable-system-sqlite \
+	--with-default-mozilla-five-home=${prefix}/lib/${name} \
+	--enable-oji \
+	--enable-plugins \
+	--enable-mathml \
+	--enable-extensions="default,spellcheck" \
+	--enable-permissions \
+	--enable-cookie \
+	--enable-image-decoders=all \
+	--enable-image-encoder=all \
+	--enable-canvas \
+	--enable-jsd \
+	--enable-xpctools \
+	--enable-crypto \
+	--enable-pango \
+	--enable-svg \
+	--enable-svg-renderer=cairo \
+	--enable-xinerama \
+	--with-pthreads \
+	--disable-gnomevfs \
+	--disable-gnomeui \
+	--enable-postscript \
+	--enable-safe-browsing \
+	--disable-crashreporter \
+	--enable-optimize='-O2' \
+	--disable-prebinding \
+	--enable-strip \
+	--enable-install-strip \
+	--disable-debug \
+	--disable-installer \
+	--disable-updater \
+	--disable-pedantic \
+	--disable-tests \
+	--disable-mochitest \
+	--enable-libxul
+
+#	--with-system-nspr \
+#	--with-nspr-prefix=${prefix} \
+#	--with-system-nss \
+#	--with-nss-prefix=${prefix} \
+#	--with-libxul-sdk=${prefix}/lib/xulrunner
+
+variant debug description {build with debugging symbols} {
+    configure.args-delete   --disable-debug \
+                            --disable-mochitest \
+                            --enable-optimize='-O2' \
+                            --enable-strip \
+                            --enable-install-strip
+
+    configure.args-append   --enable-debug='-ggdb3' \
+                            --enable-mochitest \
+                            --disable-optimize \
+                            --disable-strip \
+                            --disable-install-strip
+}
+
+variant gnome description {use gnome libraries where appropriate} {
+    depends_lib-append \
+	port:gnome-vfs \
+	port:libgnomeui \
+	port:libgnome \
+	port:gnome-icon-theme
+
+    configure.args-delete --disable-gnomevfs \
+                          --disable-gnomeui
+
+    configure.args-append --enable-gnomevfs \
+                          --enable-gnomeui
+}
+
+post-extract {
+    # https://bugzilla.mozilla.org/show_bug.cgi?id=484353
+    move ${worksrcpath}/modules/libjar/nsWildCard.cpp ${worksrcpath}/modules/libjar/nsWildCard_jar.cpp
+}
+
+# Upstream bugs (http://bugzilla.mozilla.org)
+# #485827 (xpcom-Makefile)
+# #485856 (configure)
+# #485862 (system-nss)
+# #486036 (make-install)
+# #485863 (icon-Makefile)
+# #478871 (gfxPangoFonts)
+# NOTFILED (nsFilePicker)
+# #486892 (plugins)
+# #486890 (sydneyaudio)
+# Previous firefox-x11 port (patch-dylib_file.diff patch-pthread.diff)
+patchfiles configure.patch xpcom-Makefile.patch system-nss.patch make-install.patch patch-dylib_file.diff  patch-pthread.diff icon-Makefile.patch nsFilePicker.patch plugins.patch gfxPangoFonts.patch sydneyaudio.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
+    }
+
+    # Set the right install_name on the libs
+    reinplace "s:@executable_path:${prefix}/lib/${name}:g" ${worksrcpath}/config/rules.mk
+    reinplace "s:@executable_path:${prefix}/lib/${name}:g" ${worksrcpath}/config/config.mk
+    reinplace "s:@executable_path:${prefix}/lib/${name}:g" ${worksrcpath}/nsprpub/configure.in
+    reinplace "s:@executable_path:${prefix}/lib/${name}:g" ${worksrcpath}/nsprpub/configure
+    reinplace "s:@executable_path:${prefix}/lib/${name}:g" ${worksrcpath}/security/coreconf/Darwin.mk
+    reinplace "s:@executable_path:${prefix}/lib/${name}:g" ${worksrcpath}/security/nss/lib/freebl/config.mk
+
+    # Fix the correct library filenames for loading at runtime
+    reinplace "s:libatk-1.0.so.0:${prefix}/lib/libatk-1.0.dylib:" ${worksrcpath}/accessible/src/atk/nsAppRootAccessible.cpp
+
+    reinplace "s:libgssapi_krb5.so.2:${prefix}/heimdal/lib/libgssapi.2.dylib:" ${worksrcpath}/extensions/auth/nsAuthGSSAPI.cpp
+
+    reinplace "s:libgnomeui-2.so.0:${prefix}/lib/libgnomeui-2.dylib:" ${worksrcpath}/modules/libpr0n/decoders/icon/gtk/nsIconChannel.cpp
+    reinplace "s:libgnome-2.so.0:${prefix}/lib/libgnome-2.dylib:" ${worksrcpath}/modules/libpr0n/decoders/icon/gtk/nsIconChannel.cpp
+    reinplace "s:libgnomevfs-2.so.0:${prefix}/lib/libgnomevfs-2.dylib:" ${worksrcpath}/modules/libpr0n/decoders/icon/gtk/nsIconChannel.cpp
+
+    reinplace "s:libgconf-2.so.4:${prefix}/lib/libgconf-2.dylib:" ${worksrcpath}/extensions/pref/system-pref/src/gconf/nsSystemPrefService.cpp
+
+    reinplace "s:libcups.so.2:/usr/lib/libcups.2.dylib:" ${worksrcpath}/gfx/src/psshared/nsCUPSShim.cpp
+
+    reinplace "s:libgnomeui-2.so.0:${prefix}/lib/libgnomeui-2.dylib:" ${worksrcpath}/toolkit/xre/nsNativeAppSupportUnix.cpp
+    reinplace "s:libgnome-2.so.0:${prefix}/lib/libgnome-2.dylib:" ${worksrcpath}/toolkit/xre/nsNativeAppSupportUnix.cpp
+
+    reinplace "s:libgtk-x11-2.0.so.0:${prefix}/lib/libgtk-x11-2.0.dylib:" ${worksrcpath}/widget/src/gtk2/nsBidiKeyboard.cpp
+    reinplace "s:libXss.so.1:${prefix}/lib/libXss.1.0.0.dylib:" ${worksrcpath}/widget/src/gtk2/nsIdleServiceGTK.cpp
+    reinplace "s:libXinerama.so.1:${prefix}/lib/libXinerama.1.dylib:" ${worksrcpath}/widget/src/gtk2/nsScreenManagerGtk.cpp
+    reinplace "s:libesd.so.0:${prefix}/lib/libesd.0.dylib:" ${worksrcpath}/widget/src/gtk2/nsSound.cpp
+    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
+}
+
+configure.env \
+	MOZCONFIG="${worksrcpath}/browser/config/mozconfig" \
+	MOZILLA_FIVE_HOME="${prefix}/lib/${name}"
+
+build.args-append \
+	includedir="${prefix}/include/${name}" \
+	idldir="${prefix}/share/idl/${name}" \
+	installdir="${prefix}/lib/${name}" \
+	sdkdir="${prefix}/lib/${name}"
+
+destroot.args-append \
+	includedir="${prefix}/include/${name}" \
+	idldir="${prefix}/share/idl/${name}" \
+	installdir="${prefix}/lib/${name}" \
+	sdkdir="${prefix}/lib/${name}"
+
+# AC_X_PATH blindly asks xmkmf where X11 is, and it always uses /usr/X11R6.
+# This block helps us link correctly when we are +system_x11 and x11prefix
+# is somewhere non-standard and should cause AC_X_PATH to let us setup our
+# CPPFLAGS and LDFLAGS without interference
+pre-configure {
+    if { ![file exists ${prefix}/lib/pkgconfig/x11.pc] } {
+        configure.cppflags-append -I${x11prefix}/include
+        configure.ldflags-append  -L${x11prefix}/lib
+    }
+}
+
+post-destroot   {
+    file mkdir ${destroot}${prefix}/share/applications
+
+    copy \
+        ${filespath}/share-applications-firefox.desktop \
+        ${destroot}${prefix}/share/applications/firefox-devel.desktop
+
+    move ${destroot}${prefix}/bin/firefox ${destroot}${prefix}/bin/firefox-devel
+
+    ## Workaround to get root certs loaded, so https:// works
+    #ln -s ${prefix}/lib/nss/libnssckbi.dylib ${destroot}${prefix}/lib/${name}/libnssckbi.dylib
+}
+
+livecheck.check regex
+livecheck.url   http://releases.mozilla.org/pub/mozilla.org/firefox/releases
+livecheck.regex ">(\\d+(?:\\.\\d+)*).<"

Added: trunk/dports/www/firefox-x11-devel/files/configure.patch
===================================================================
--- trunk/dports/www/firefox-x11-devel/files/configure.patch	                        (rev 0)
+++ trunk/dports/www/firefox-x11-devel/files/configure.patch	2009-04-05 03:36:26 UTC (rev 49179)
@@ -0,0 +1,16 @@
+--- configure.orig	2009-03-19 21:02:35.000000000 -0700
++++ configure	2009-03-19 21:03:53.000000000 -0700
+@@ -5807,11 +5807,10 @@ case "$host" in
+     ;;
+ 
+ *-darwin*)
+-    HOST_CFLAGS="$HOST_CFLAGS -DXP_UNIX -DXP_MACOSX -DNO_X11"
+-    HOST_NSPR_MDCPUCFG='\"md/_darwin.cfg\"'
++    HOST_CFLAGS="$HOST_CFLAGS -DXP_UNIX -DXP_MACOSX"
++    HOST_CXXFLAGS="$HOST_CXXFLAGS -DXP_UNIX -DXP_MACOSX"
+     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)

Added: trunk/dports/www/firefox-x11-devel/files/gfxPangoFonts.patch
===================================================================
--- trunk/dports/www/firefox-x11-devel/files/gfxPangoFonts.patch	                        (rev 0)
+++ trunk/dports/www/firefox-x11-devel/files/gfxPangoFonts.patch	2009-04-05 03:36:26 UTC (rev 49179)
@@ -0,0 +1,31 @@
+diff --git a/gfx/thebes/src/gfxPangoFonts.cpp b/gfx/thebes/src/gfxPangoFonts.cpp
+--- gfx/thebes/src/gfxPangoFonts.cpp
++++ gfx/thebes/src/gfxPangoFonts.cpp
+@@ -1838,8 +1838,25 @@
+ 
+     // context_substitute and get_font are not likely to be used but
+     //   implemented because the class makes them available.
+-    fcfontmap_class->context_substitute = gfx_pango_font_map_context_substitute;
+-    fcfontmap_class->create_font = gfx_pango_font_map_create_font;
++    if (pango_version() < PANGO_VERSION_ENCODE(1,23,0)) {
++        // Since gfx has the implementation of fontmap->get_resolution,
++        // fontset->get_font and fontset->foreach, these callback
++        // aren't necesscarry if pango >= 1.23
++#if PANGO_VERSION_CHECK(1,23,0)
++        // From 1.23, these callback defines are changed.
++        // fontset_key_subtitute (from 1.23) and context_substitue (until 1.22)
++        // is same offset
++        fcfontmap_class->fontset_key_substitute =
++            (void (*)(PangoFcFontMap*, PangoFcFontsetKey*, FcPattern*))
++                gfx_pango_font_map_context_substitute;
++        fcfontmap_class->create_font = 
++            (PangoFcFont* (*)(PangoFcFontMap*, PangoFcFontKey*))
++                gfx_pango_font_map_create_font;
++#else
++        fcfontmap_class->context_substitute = gfx_pango_font_map_context_substitute;
++        fcfontmap_class->create_font = gfx_pango_font_map_create_font;
++#endif
++    }
+ }
+ 
+ /**

Added: trunk/dports/www/firefox-x11-devel/files/icon-Makefile.patch
===================================================================
--- trunk/dports/www/firefox-x11-devel/files/icon-Makefile.patch	                        (rev 0)
+++ trunk/dports/www/firefox-x11-devel/files/icon-Makefile.patch	2009-04-05 03:36:26 UTC (rev 49179)
@@ -0,0 +1,11 @@
+--- 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
+ 

Added: trunk/dports/www/firefox-x11-devel/files/make-install.patch
===================================================================
--- trunk/dports/www/firefox-x11-devel/files/make-install.patch	                        (rev 0)
+++ trunk/dports/www/firefox-x11-devel/files/make-install.patch	2009-04-05 03:36:26 UTC (rev 49179)
@@ -0,0 +1,14 @@
+--- 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
++ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
+ 	$(error "make install" is not supported on this platform. Use "make package" instead.)
+ endif
+ 	$(NSINSTALL) -D $(DESTDIR)$(installdir)

Added: trunk/dports/www/firefox-x11-devel/files/nsFilePicker.patch
===================================================================
--- trunk/dports/www/firefox-x11-devel/files/nsFilePicker.patch	                        (rev 0)
+++ trunk/dports/www/firefox-x11-devel/files/nsFilePicker.patch	2009-04-05 03:36:26 UTC (rev 49179)
@@ -0,0 +1,14 @@
+--- 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;
+     }

Added: trunk/dports/www/firefox-x11-devel/files/patch-dylib_file.diff
===================================================================
--- trunk/dports/www/firefox-x11-devel/files/patch-dylib_file.diff	                        (rev 0)
+++ trunk/dports/www/firefox-x11-devel/files/patch-dylib_file.diff	2009-04-05 03:36:26 UTC (rev 49179)
@@ -0,0 +1,13 @@
+--- config/config.mk	2006-01-06 16:01:22.000000000 -0500
++++ config/config.mk	2007-08-21 13:51:05.000000000 -0400
+@@ -697,6 +697,10 @@
+ else
+ XCODE_PRODUCT_DIR = build
+ endif # HAS_XCODE_2_1=1
++# Tell the Darwin linker how to find shared libraries that are not yet installed.
++ifneq (,$(findstring -lplds4,$(EXTRA_DSO_LDOPTS)))
++EXTRA_DSO_LDOPTS += $(foreach library, $(patsubst -l%, $(LIB_PREFIX)%$(DLL_SUFFIX), $(filter -l%, $(NSPR_LIBS))), -dylib_file @executable_path/$(library):$(DIST)/bin/$(library))
++endif
+ endif # OS_ARCH=Darwin
+ 
+ 

Added: trunk/dports/www/firefox-x11-devel/files/patch-pthread.diff
===================================================================
--- trunk/dports/www/firefox-x11-devel/files/patch-pthread.diff	                        (rev 0)
+++ trunk/dports/www/firefox-x11-devel/files/patch-pthread.diff	2009-04-05 03:36:26 UTC (rev 49179)
@@ -0,0 +1,11 @@
+--- nsprpub/pr/include/md/_pth.h.orig	2005-07-21 20:22:53.000000000 +0200
++++ nsprpub/pr/include/md/_pth.h	2007-11-05 09:01:53.000000000 +0100
+@@ -98,7 +98,7 @@
+ #else
+ #define _PT_PTHREAD_MUTEX_IS_LOCKED(m)    (EBUSY == pthread_mutex_trylock(&(m)))
+ #endif
+-#if defined(DARWIN)
++#if defined(DARWIN) && !defined(__DARWIN_UNIX03)
+ #define _PT_PTHREAD_CONDATTR_INIT(x)      0
+ #else
+ #define _PT_PTHREAD_CONDATTR_INIT         pthread_condattr_init

Added: trunk/dports/www/firefox-x11-devel/files/plugins.patch
===================================================================
--- trunk/dports/www/firefox-x11-devel/files/plugins.patch	                        (rev 0)
+++ trunk/dports/www/firefox-x11-devel/files/plugins.patch	2009-04-05 03:36:26 UTC (rev 49179)
@@ -0,0 +1,25 @@
+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
+ 

Added: trunk/dports/www/firefox-x11-devel/files/share-applications-firefox.desktop
===================================================================
--- trunk/dports/www/firefox-x11-devel/files/share-applications-firefox.desktop	                        (rev 0)
+++ trunk/dports/www/firefox-x11-devel/files/share-applications-firefox.desktop	2009-04-05 03:36:26 UTC (rev 49179)
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=Firefox Web Browser
+Comment=Browse the World Wide Web
+Exec=firefox
+Icon=web-browser.png
+Terminal=false
+Type=Application
+Categories=Application;Network
+StartupNotify=true

Added: trunk/dports/www/firefox-x11-devel/files/sydneyaudio.patch
===================================================================
--- trunk/dports/www/firefox-x11-devel/files/sydneyaudio.patch	                        (rev 0)
+++ trunk/dports/www/firefox-x11-devel/files/sydneyaudio.patch	2009-04-05 03:36:26 UTC (rev 49179)
@@ -0,0 +1,12 @@
+--- 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,9 @@ EXTRA_DSO_LDOPTS += \
+ 	-lcrypto \
+ 	$(TK_LIBS) \
+ 	$(NULL)
++endif
+ 
++ifeq ($(OS_ARCH),Darwin)
+ ifdef MOZ_SYDNEYAUDIO
+ EXTRA_DSO_LDOPTS += \
+ 	-framework CoreAudio \

Added: trunk/dports/www/firefox-x11-devel/files/system-nss.patch
===================================================================
--- trunk/dports/www/firefox-x11-devel/files/system-nss.patch	                        (rev 0)
+++ trunk/dports/www/firefox-x11-devel/files/system-nss.patch	2009-04-05 03:36:26 UTC (rev 49179)
@@ -0,0 +1,13 @@
+https://bugzilla.mozilla.org/show_bug.cgi?id=485862
+
+--- config/autoconf.mk.in.orig	2009-03-29 22:07:24.000000000 -0700
++++ config/autoconf.mk.in	2009-03-29 22:07:54.000000000 -0700
+@@ -278,7 +278,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) $(LCMS_CFLAGS)
++OS_INCLUDES	= $(NSPR_CFLAGS) $(NSS_CFLAGS) $(JPEG_CFLAGS) $(PNG_CFLAGS) $(ZLIB_CFLAGS) $(LCMS_CFLAGS)
+ OS_LIBS		= @LIBS@
+ ACDEFINES	= @MOZ_DEFINES@
+ 

Added: trunk/dports/www/firefox-x11-devel/files/xpcom-Makefile.patch
===================================================================
--- trunk/dports/www/firefox-x11-devel/files/xpcom-Makefile.patch	                        (rev 0)
+++ trunk/dports/www/firefox-x11-devel/files/xpcom-Makefile.patch	2009-04-05 03:36:26 UTC (rev 49179)
@@ -0,0 +1,11 @@
+--- 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))
++ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
+ EXTRA_DSO_LDOPTS += $(DIST)/bin/XUL
+ DEPENDENT_LIBS_LIST += XUL
+ else
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090404/4ca0cf15/attachment-0001.html>


More information about the macports-changes mailing list