<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[49179] trunk/dports/www</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.macports.org/changeset/49179">49179</a></dd>
<dt>Author</dt> <dd>jeremyhu@macports.org</dd>
<dt>Date</dt> <dd>2009-04-04 20:36:26 -0700 (Sat, 04 Apr 2009)</dd>
</dl>

<h3>Log Message</h3>
<pre>New port: firefox-x11-devel 3.1b3 - can be installed simultaneously with firefox-x11</pre>

<h3>Added Paths</h3>
<ul>
<li>trunk/dports/www/firefox-x11-devel/</li>
<li><a href="#trunkdportswwwfirefoxx11develPortfile">trunk/dports/www/firefox-x11-devel/Portfile</a></li>
<li>trunk/dports/www/firefox-x11-devel/files/</li>
<li><a href="#trunkdportswwwfirefoxx11develfilesconfigurepatch">trunk/dports/www/firefox-x11-devel/files/configure.patch</a></li>
<li><a href="#trunkdportswwwfirefoxx11develfilesgfxPangoFontspatch">trunk/dports/www/firefox-x11-devel/files/gfxPangoFonts.patch</a></li>
<li><a href="#trunkdportswwwfirefoxx11develfilesiconMakefilepatch">trunk/dports/www/firefox-x11-devel/files/icon-Makefile.patch</a></li>
<li><a href="#trunkdportswwwfirefoxx11develfilesmakeinstallpatch">trunk/dports/www/firefox-x11-devel/files/make-install.patch</a></li>
<li><a href="#trunkdportswwwfirefoxx11develfilesnsFilePickerpatch">trunk/dports/www/firefox-x11-devel/files/nsFilePicker.patch</a></li>
<li><a href="#trunkdportswwwfirefoxx11develfilespatchdylib_filediff">trunk/dports/www/firefox-x11-devel/files/patch-dylib_file.diff</a></li>
<li><a href="#trunkdportswwwfirefoxx11develfilespatchpthreaddiff">trunk/dports/www/firefox-x11-devel/files/patch-pthread.diff</a></li>
<li><a href="#trunkdportswwwfirefoxx11develfilespluginspatch">trunk/dports/www/firefox-x11-devel/files/plugins.patch</a></li>
<li><a href="#trunkdportswwwfirefoxx11develfilesshareapplicationsfirefoxdesktop">trunk/dports/www/firefox-x11-devel/files/share-applications-firefox.desktop</a></li>
<li><a href="#trunkdportswwwfirefoxx11develfilessydneyaudiopatch">trunk/dports/www/firefox-x11-devel/files/sydneyaudio.patch</a></li>
<li><a href="#trunkdportswwwfirefoxx11develfilessystemnsspatch">trunk/dports/www/firefox-x11-devel/files/system-nss.patch</a></li>
<li><a href="#trunkdportswwwfirefoxx11develfilesxpcomMakefilepatch">trunk/dports/www/firefox-x11-devel/files/xpcom-Makefile.patch</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportswwwfirefoxx11develPortfile"></a>
<div class="addfile"><h4>Added: trunk/dports/www/firefox-x11-devel/Portfile (0 => 49179)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -0,0 +1,247 @@
</span><ins>+# -*- 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@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=&quot;default,spellcheck&quot; \
+        --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 &quot;s:XP_MACOSX:__APPLE__:g&quot; ${worksrcpath}/xpcom/base/nsStackWalk.cpp 
+
+    # https://bugzilla.mozilla.org/show_bug.cgi?id=484353
+    reinplace &quot;s:nsWildCard.cpp:nsWildCard_jar.cpp:g&quot; ${worksrcpath}/modules/libjar/objs.mk
+
+    # https://bugzilla.mozilla.org/show_bug.cgi?id=486034
+    # find -xtype -&gt; gfind -xtype
+    reinplace &quot;s:find:gfind:g&quot; ${worksrcpath}/toolkit/mozapps/installer/packager.mk
+
+    if {[file exists ${prefix}/lib/pkgconfig/x11.pc]} {
+        reinplace &quot;s:/usr/X11R6:${prefix}:&quot; ${worksrcpath}/modules/plugin/base/src/nsPluginsDirUnix.cpp
+    }
+
+    # Set the right install_name on the libs
+    reinplace &quot;s:@executable_path:${prefix}/lib/${name}:g&quot; ${worksrcpath}/config/rules.mk
+    reinplace &quot;s:@executable_path:${prefix}/lib/${name}:g&quot; ${worksrcpath}/config/config.mk
+    reinplace &quot;s:@executable_path:${prefix}/lib/${name}:g&quot; ${worksrcpath}/nsprpub/configure.in
+    reinplace &quot;s:@executable_path:${prefix}/lib/${name}:g&quot; ${worksrcpath}/nsprpub/configure
+    reinplace &quot;s:@executable_path:${prefix}/lib/${name}:g&quot; ${worksrcpath}/security/coreconf/Darwin.mk
+    reinplace &quot;s:@executable_path:${prefix}/lib/${name}:g&quot; ${worksrcpath}/security/nss/lib/freebl/config.mk
+
+    # Fix the correct library filenames for loading at runtime
+    reinplace &quot;s:libatk-1.0.so.0:${prefix}/lib/libatk-1.0.dylib:&quot; ${worksrcpath}/accessible/src/atk/nsAppRootAccessible.cpp
+
+    reinplace &quot;s:libgssapi_krb5.so.2:${prefix}/heimdal/lib/libgssapi.2.dylib:&quot; ${worksrcpath}/extensions/auth/nsAuthGSSAPI.cpp
+
+    reinplace &quot;s:libgnomeui-2.so.0:${prefix}/lib/libgnomeui-2.dylib:&quot; ${worksrcpath}/modules/libpr0n/decoders/icon/gtk/nsIconChannel.cpp
+    reinplace &quot;s:libgnome-2.so.0:${prefix}/lib/libgnome-2.dylib:&quot; ${worksrcpath}/modules/libpr0n/decoders/icon/gtk/nsIconChannel.cpp
+    reinplace &quot;s:libgnomevfs-2.so.0:${prefix}/lib/libgnomevfs-2.dylib:&quot; ${worksrcpath}/modules/libpr0n/decoders/icon/gtk/nsIconChannel.cpp
+
+    reinplace &quot;s:libgconf-2.so.4:${prefix}/lib/libgconf-2.dylib:&quot; ${worksrcpath}/extensions/pref/system-pref/src/gconf/nsSystemPrefService.cpp
+
+    reinplace &quot;s:libcups.so.2:/usr/lib/libcups.2.dylib:&quot; ${worksrcpath}/gfx/src/psshared/nsCUPSShim.cpp
+
+    reinplace &quot;s:libgnomeui-2.so.0:${prefix}/lib/libgnomeui-2.dylib:&quot; ${worksrcpath}/toolkit/xre/nsNativeAppSupportUnix.cpp
+    reinplace &quot;s:libgnome-2.so.0:${prefix}/lib/libgnome-2.dylib:&quot; ${worksrcpath}/toolkit/xre/nsNativeAppSupportUnix.cpp
+
+    reinplace &quot;s:libgtk-x11-2.0.so.0:${prefix}/lib/libgtk-x11-2.0.dylib:&quot; ${worksrcpath}/widget/src/gtk2/nsBidiKeyboard.cpp
+    reinplace &quot;s:libXss.so.1:${prefix}/lib/libXss.1.0.0.dylib:&quot; ${worksrcpath}/widget/src/gtk2/nsIdleServiceGTK.cpp
+    reinplace &quot;s:libXinerama.so.1:${prefix}/lib/libXinerama.1.dylib:&quot; ${worksrcpath}/widget/src/gtk2/nsScreenManagerGtk.cpp
+    reinplace &quot;s:libesd.so.0:${prefix}/lib/libesd.0.dylib:&quot; ${worksrcpath}/widget/src/gtk2/nsSound.cpp
+    reinplace &quot;s:libcanberra.so.0:${prefix}/lib/libcanberra.0.dylib:&quot; ${worksrcpath}/widget/src/gtk2/nsSound.cpp
+    reinplace &quot;s:libgtk-x11-2.0.dylib:${prefix}/lib/libgtk-x11-2.0.dylib:&quot; ${worksrcpath}/widget/src/gtk2/nsFilePicker.cpp
+}
+
+configure.env \
+        MOZCONFIG=&quot;${worksrcpath}/browser/config/mozconfig&quot; \
+        MOZILLA_FIVE_HOME=&quot;${prefix}/lib/${name}&quot;
+
+build.args-append \
+        includedir=&quot;${prefix}/include/${name}&quot; \
+        idldir=&quot;${prefix}/share/idl/${name}&quot; \
+        installdir=&quot;${prefix}/lib/${name}&quot; \
+        sdkdir=&quot;${prefix}/lib/${name}&quot;
+
+destroot.args-append \
+        includedir=&quot;${prefix}/include/${name}&quot; \
+        idldir=&quot;${prefix}/share/idl/${name}&quot; \
+        installdir=&quot;${prefix}/lib/${name}&quot; \
+        sdkdir=&quot;${prefix}/lib/${name}&quot;
+
+# 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 &quot;&gt;(\\d+(?:\\.\\d+)*).&lt;&quot;
</ins></span></pre></div>
<a id="trunkdportswwwfirefoxx11develfilesconfigurepatch"></a>
<div class="addfile"><h4>Added: trunk/dports/www/firefox-x11-devel/files/configure.patch (0 => 49179)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -0,0 +1,16 @@
</span><ins>+--- configure.orig        2009-03-19 21:02:35.000000000 -0700
++++ configure        2009-03-19 21:03:53.000000000 -0700
+@@ -5807,11 +5807,10 @@ case &quot;$host&quot; in
+     ;;

+ *-darwin*)
+-    HOST_CFLAGS=&quot;$HOST_CFLAGS -DXP_UNIX -DXP_MACOSX -DNO_X11&quot;
+-    HOST_NSPR_MDCPUCFG='\&quot;md/_darwin.cfg\&quot;'
++    HOST_CFLAGS=&quot;$HOST_CFLAGS -DXP_UNIX -DXP_MACOSX&quot;
++    HOST_CXXFLAGS=&quot;$HOST_CXXFLAGS -DXP_UNIX -DXP_MACOSX&quot;
+     HOST_OPTIMIZE_FLAGS=&quot;${HOST_OPTIMIZE_FLAGS=-O3}&quot;
+     MOZ_FIX_LINK_PATHS='-Wl,-executable_path,$(LIBXUL_DIST)/bin'
+-    LIBXUL_LIBS='$(XPCOM_FROZEN_LDOPTS) $(LIBXUL_DIST)/bin/XUL -lobjc'
+     ;;

+ *-linux*|*-kfreebsd*-gnu)
</ins></span></pre></div>
<a id="trunkdportswwwfirefoxx11develfilesgfxPangoFontspatch"></a>
<div class="addfile"><h4>Added: trunk/dports/www/firefox-x11-devel/files/gfxPangoFonts.patch (0 => 49179)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -0,0 +1,31 @@
</span><ins>+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-&gt;context_substitute = gfx_pango_font_map_context_substitute;
+-    fcfontmap_class-&gt;create_font = gfx_pango_font_map_create_font;
++    if (pango_version() &lt; PANGO_VERSION_ENCODE(1,23,0)) {
++        // Since gfx has the implementation of fontmap-&gt;get_resolution,
++        // fontset-&gt;get_font and fontset-&gt;foreach, these callback
++        // aren't necesscarry if pango &gt;= 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-&gt;fontset_key_substitute =
++            (void (*)(PangoFcFontMap*, PangoFcFontsetKey*, FcPattern*))
++                gfx_pango_font_map_context_substitute;
++        fcfontmap_class-&gt;create_font = 
++            (PangoFcFont* (*)(PangoFcFontMap*, PangoFcFontKey*))
++                gfx_pango_font_map_create_font;
++#else
++        fcfontmap_class-&gt;context_substitute = gfx_pango_font_map_context_substitute;
++        fcfontmap_class-&gt;create_font = gfx_pango_font_map_create_font;
++#endif
++    }
+ }

+ /**
</ins></span></pre></div>
<a id="trunkdportswwwfirefoxx11develfilesiconMakefilepatch"></a>
<div class="addfile"><h4>Added: trunk/dports/www/firefox-x11-devel/files/icon-Makefile.patch (0 => 49179)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -0,0 +1,11 @@
</span><ins>+--- 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

</ins></span></pre></div>
<a id="trunkdportswwwfirefoxx11develfilesmakeinstallpatch"></a>
<div class="addfile"><h4>Added: trunk/dports/www/firefox-x11-devel/files/make-install.patch (0 => 49179)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -0,0 +1,14 @@
</span><ins>+--- 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 -&gt; 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 &quot;make install&quot; is not supported on this platform. Use &quot;make package&quot; instead.)
++endif
++ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
+         $(error &quot;make install&quot; is not supported on this platform. Use &quot;make package&quot; instead.)
+ endif
+         $(NSINSTALL) -D $(DESTDIR)$(installdir)
</ins></span></pre></div>
<a id="trunkdportswwwfirefoxx11develfilesnsFilePickerpatch"></a>
<div class="addfile"><h4>Added: trunk/dports/www/firefox-x11-devel/files/nsFilePicker.patch (0 => 49179)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -0,0 +1,14 @@
</span><ins>+--- 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(&quot;libgtk-x11-2.0.dylib&quot;);
++#else
+     mGTK24 = LoadVersionedLibrary(&quot;gtk-2&quot;, &quot;.4&quot;);
++#endif
+     if (!mGTK24) {
+       return NS_ERROR_NOT_AVAILABLE;
+     }
</ins></span></pre></div>
<a id="trunkdportswwwfirefoxx11develfilespatchdylib_filediff"></a>
<div class="addfile"><h4>Added: trunk/dports/www/firefox-x11-devel/files/patch-dylib_file.diff (0 => 49179)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -0,0 +1,13 @@
</span><ins>+--- 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


</ins></span></pre></div>
<a id="trunkdportswwwfirefoxx11develfilespatchpthreaddiff"></a>
<div class="addfile"><h4>Added: trunk/dports/www/firefox-x11-devel/files/patch-pthread.diff (0 => 49179)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -0,0 +1,11 @@
</span><ins>+--- 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(&amp;(m)))
+ #endif
+-#if defined(DARWIN)
++#if defined(DARWIN) &amp;&amp; !defined(__DARWIN_UNIX03)
+ #define _PT_PTHREAD_CONDATTR_INIT(x)      0
+ #else
+ #define _PT_PTHREAD_CONDATTR_INIT         pthread_condattr_init
</ins></span></pre></div>
<a id="trunkdportswwwfirefoxx11develfilespluginspatch"></a>
<div class="addfile"><h4>Added: trunk/dports/www/firefox-x11-devel/files/plugins.patch (0 => 49179)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -0,0 +1,25 @@
</span><ins>+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 &quot;.so&quot;
+ #elif defined(_AIX)
+ #define DEFAULT_X11_PATH &quot;/usr/lib&quot;
+ #define LOCAL_PLUGIN_DLL_ALT_SUFFIX &quot;.a&quot;
+ #elif defined(SOLARIS)
+ #define DEFAULT_X11_PATH &quot;/usr/openwin/lib/&quot;
+ #elif defined(LINUX)
+ #define DEFAULT_X11_PATH &quot;/usr/X11R6/lib/&quot;
++#elif defined(__APPLE__)
++#define DEFAULT_X11_PATH &quot;/usr/X11R6/lib&quot;
++#undef LOCAL_PLUGIN_DLL_SUFFIX
++#define LOCAL_PLUGIN_DLL_SUFFIX &quot;.dylib&quot;
++#define LOCAL_PLUGIN_DLL_ALT_SUFFIX &quot;.so&quot;
+ #else
+ #define DEFAULT_X11_PATH &quot;&quot;
+ #endif

+ #if defined(MOZ_WIDGET_GTK2)

+ #define PLUGIN_MAX_LEN_OF_TMP_ARR 512

</ins></span></pre></div>
<a id="trunkdportswwwfirefoxx11develfilesshareapplicationsfirefoxdesktop"></a>
<div class="addfile"><h4>Added: trunk/dports/www/firefox-x11-devel/files/share-applications-firefox.desktop (0 => 49179)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -0,0 +1,10 @@
</span><ins>+[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
</ins></span></pre></div>
<a id="trunkdportswwwfirefoxx11develfilessydneyaudiopatch"></a>
<div class="addfile"><h4>Added: trunk/dports/www/firefox-x11-devel/files/sydneyaudio.patch (0 => 49179)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -0,0 +1,12 @@
</span><ins>+--- 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 \
</ins></span></pre></div>
<a id="trunkdportswwwfirefoxx11develfilessystemnsspatch"></a>
<div class="addfile"><h4>Added: trunk/dports/www/firefox-x11-devel/files/system-nss.patch (0 => 49179)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -0,0 +1,13 @@
</span><ins>+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@

</ins></span></pre></div>
<a id="trunkdportswwwfirefoxx11develfilesxpcomMakefilepatch"></a>
<div class="addfile"><h4>Added: trunk/dports/www/firefox-x11-devel/files/xpcom-Makefile.patch (0 => 49179)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -0,0 +1,11 @@
</span><ins>+--- 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
</ins></span></pre>
</div>
</div>

</body>
</html>