<!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>[49442] trunk/dports/www/firefox-x11-devel</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/49442">49442</a></dd>
<dt>Author</dt> <dd>jeremyhu@macports.org</dd>
<dt>Date</dt> <dd>2009-04-09 15:44:39 -0700 (Thu, 09 Apr 2009)</dd>
</dl>

<h3>Log Message</h3>
<pre>firefox-x11-devel: Fix path to gre.d</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportswwwfirefoxx11develPortfile">trunk/dports/www/firefox-x11-devel/Portfile</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportswwwfirefoxx11develfilesbrowserxulrunnerstubpatch">trunk/dports/www/firefox-x11-devel/files/browser-xulrunner-stub.patch</a></li>
<li><a href="#trunkdportswwwfirefoxx11develfilesxulrunnerappMakefilepatch">trunk/dports/www/firefox-x11-devel/files/xulrunner-app-Makefile.patch</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportswwwfirefoxx11develPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/www/firefox-x11-devel/Portfile (49441 => 49442)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/www/firefox-x11-devel/Portfile        2009-04-09 22:15:51 UTC (rev 49441)
+++ trunk/dports/www/firefox-x11-devel/Portfile        2009-04-09 22:44:39 UTC (rev 49442)
</span><span class="lines">@@ -6,7 +6,7 @@
</span><span class="cx"> name            firefox-x11-devel
</span><span class="cx"> categories      www x11
</span><span class="cx"> version         3.1b3
</span><del>-revision        1
</del><ins>+revision        2
</ins><span class="cx"> platforms       darwin
</span><span class="cx"> maintainers     jeremyhu openmaintainer
</span><span class="cx"> description     Mozilla.org's popular stand-alone web browser, Beta and Release Candidates
</span><span class="lines">@@ -55,6 +55,7 @@
</span><span class="cx"> configure.cxxflags-append -I/Developer/Headers/FlatCarbon
</span><span class="cx"> 
</span><span class="cx"> configure.args \
</span><ins>+        --with-xulrunner-stub-name=xulrunner-stub \
</ins><span class="cx">         --disable-static \
</span><span class="cx">         --enable-shared \
</span><span class="cx">         --disable-official-branding \
</span><span class="lines">@@ -160,9 +161,10 @@
</span><span class="cx"> # #478871 (gfxPangoFonts)
</span><span class="cx"> # NOTFILED (nsFilePicker)
</span><span class="cx"> # #486892 (plugins)
</span><del>-# #486890 (sydneyaudio)
</del><ins>+# #486890 (sydneyaudio, 3.1b3 and later)
+# #487367 (browser-xulrunner-stub)
</ins><span class="cx"> # Previous firefox-x11 port (patch-dylib_file.diff patch-pthread.diff)
</span><del>-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
</del><ins>+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 browser-xulrunner-stub.patch
</ins><span class="cx"> 
</span><span class="cx"> post-patch {
</span><span class="cx">     # https://bugzilla.mozilla.org/show_bug.cgi?id=485857
</span><span class="lines">@@ -212,6 +214,11 @@
</span><span class="cx"> 
</span><span class="cx">     # Set our system plugins path
</span><span class="cx">     reinplace &quot;s:/usr/lib/mozilla/plugins:${prefix}/lib/nsplugins:&quot; ${worksrcpath}/xpcom/io/nsAppFileLocationProvider.cpp
</span><ins>+
+    reinplace &quot;s:/etc/gre\.:${prefix}/etc/gre.:g&quot; \
+        ${worksrcpath}/xpcom/build/nsXPCOMPrivate.h \
+        ${worksrcpath}/xulrunner/app/nsRegisterGREUnix.cpp \
+        ${worksrcpath}/xulrunner/installer/Makefile.in
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> configure.env \
</span><span class="lines">@@ -252,6 +259,9 @@
</span><span class="cx"> 
</span><span class="cx">     ## Workaround to get root certs loaded, so https:// works
</span><span class="cx">     #ln -s ${prefix}/lib/nss/libnssckbi.dylib ${destroot}${prefix}/lib/${name}/libnssckbi.dylib
</span><ins>+
+    # https://bugzilla.mozilla.org/show_bug.cgi?id=486064
+    system &quot;cat ${worksrcpath}/dist/include/gfx/gfxtypes.h ${worksrcpath}/dist/include/thebes/gfxTypes.h &gt; ${destroot}${prefix}/include/${name}/unstable/gfxtypes.h&quot;
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> livecheck.check regex
</span></span></pre></div>
<a id="trunkdportswwwfirefoxx11develfilesbrowserxulrunnerstubpatch"></a>
<div class="addfile"><h4>Added: trunk/dports/www/firefox-x11-devel/files/browser-xulrunner-stub.patch (0 => 49442)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/www/firefox-x11-devel/files/browser-xulrunner-stub.patch                                (rev 0)
+++ trunk/dports/www/firefox-x11-devel/files/browser-xulrunner-stub.patch        2009-04-09 22:44:39 UTC (rev 49442)
</span><span class="lines">@@ -0,0 +1,11 @@
</span><ins>+--- 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

</ins></span></pre></div>
<a id="trunkdportswwwfirefoxx11develfilesxulrunnerappMakefilepatch"></a>
<div class="addfile"><h4>Added: trunk/dports/www/firefox-x11-devel/files/xulrunner-app-Makefile.patch (0 => 49442)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/www/firefox-x11-devel/files/xulrunner-app-Makefile.patch                                (rev 0)
+++ trunk/dports/www/firefox-x11-devel/files/xulrunner-app-Makefile.patch        2009-04-09 22:44:39 UTC (rev 49442)
</span><span class="lines">@@ -0,0 +1,48 @@
</span><ins>+--- xulrunner/app/Makefile.in.orig        2009-04-07 22:17:16.000000000 -0700
++++ xulrunner/app/Makefile.in        2009-04-07 22:22:16.000000000 -0700
+@@ -87,12 +87,16 @@ CPPSRCS = nsXULRunnerApp.cpp
+ ifeq ($(OS_ARCH),WINNT)
+ 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 (cocoa,$(MOZ_WIDGET_TOOLKIT))
+ LIBS += $(DIST)/bin/XUL
+ else
+ EXTRA_DSO_LIBS += xul
+@@ -202,8 +206,8 @@ LDFLAGS += /HEAP:0x40000
+ endif
+ endif

+-ifneq (,$(filter-out OS2 WINNT Darwin BeOS,$(OS_ARCH)))
+-
++ifneq (,$(filter-out OS2 WINNT BeOS,$(OS_ARCH)))
++ifneq (cocoa, $(MOZ_WIDGET_TOOLKIT))
+ xulrunner:: mozilla.in Makefile.in Makefile $(DEPTH)/config/autoconf.mk
+         cat $&lt; | sed -e &quot;s|%MOZAPPDIR%|$(mozappdir)|&quot; \
+                 -e &quot;s|%MOZ_USER_DIR%|.mozilla/xulrunner|&quot; \
+@@ -218,6 +222,7 @@ install:: xulrunner

+ GARBAGE += xulrunner
+ endif
++endif

+ ifneq (,$(filter gtk gtk2,$(MOZ_WIDGET_TOOLKIT)))

</ins></span></pre>
</div>
</div>

</body>
</html>