Changeset 82863

Timestamp:

08/20/11 21:50:59 (4 years ago)

Author:

jeremyhu@…

Message:

firefox-x11-devel: Bump to current trunk

Location:

trunk/dports/www/firefox-x11-devel

Files:

• Portfile (modified) (6 diffs)
• files/PR-623797.patch (deleted)
• files/egrep.patch (added)
• files/patch-dylib_file.diff (modified) (1 diff)
• files/plugin-instance-nococoa.patch (deleted)

trunk/dports/www/firefox-x11-devel/Portfile

@@ -8 +8 @@
 set component   firefox
 categories      www x11
-version         5.0.1
+version         9.0_alpha20110820
 platforms       darwin
 maintainers     jeremyhu openmaintainer
@@ -21 +21 @@
 homepage        http://www.mozilla.com/${component}/
 
-master_sites    http://releases.mozilla.org/pub/mozilla.org/${component}/releases/${version}/source/
-distname        ${component}-${version}.source
-dist_subdir     ${component}
-
-use_bzip2       yes
-
-checksums           md5     6d1f43e402cec84459a3d7f950bd5192 \
-                    sha1    c93b3513e160d87535a9d61c5e06a6a701e9cd3e \
-                    rmd160  d80a2d64a4a712e530b6f91661eae41f6d1e491e
-
-worksrcdir      mozilla-release
+fetch.type      hg
+hg.url          http://hg.mozilla.org/mozilla-central
+hg.tag          6dc468c41136
+
+worksrcdir      mozilla-central
 
 depends_build \
@@ -164 +158 @@
 }
 
-# plugin-instance-nococoa.patch : https://bugzilla.mozilla.org/show_bug.cgi?id=587370
-patchfiles patch-dylib_file.diff plugin-instance-nococoa.patch
+patchfiles patch-dylib_file.diff egrep.patch
 
 post-patch {
@@ -180 +173 @@
 
     # Don't use the system X11
-    reinplace "s:/usr/X11R6:${prefix}:" ${worksrcpath}/modules/plugin/base/src/nsPluginsDirUnix.cpp
+    reinplace "s:/usr/X11R6:${prefix}:" ${worksrcpath}/dom/plugins/base/nsPluginsDirUnix.cpp
+    reinplace "s/libXt.so.6:libXext.so/libXt.dylib:libXext.dylib/" ${worksrcpath}/dom/plugins/base/nsPluginsDirUnix.cpp
 
     # Set the right install_name on the libs
@@ -219 +213 @@
     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}/dom/plugins/PluginModuleChild.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
@@ -229 +221 @@
     reinplace "s:/etc/gre\.:${prefix}/etc/gre.:g" \
         ${worksrcpath}/xpcom/build/nsXPCOMPrivate.h
+}
+
+pre-configure {
+    system "cd ${worksrcpath}/js/src && ${autoconf.cmd}"
 }
 

trunk/dports/www/firefox-x11-devel/files/patch-dylib_file.diff

@@ -1 @@
---- config/config.mk.orig       2008-08-14 03:00:34.000000000 -0700
-+++ config/config.mk    2009-05-25 20:11:09.000000000 -0700
-@@ -704,6 +704,12 @@
- else
- XCODE_PRODUCT_DIR = build
- endif # HAS_XCODE_2_1=1
+--- config/config.mk.orig       2011-08-20 18:12:22.000000000 -0700
++++ config/config.mk    2011-08-20 18:56:24.000000000 -0700
+@@ -601,6 +601,12 @@ ifeq (2,$(MOZ_OPTIMIZE))
+ PBBUILD_SETTINGS += GCC_MODEL_TUNING= OPTIMIZATION_CFLAGS="$(MOZ_OPTIMIZE_FLAGS)"
+ endif # MOZ_OPTIMIZE=2
+ endif # MOZ_OPTIMIZE
 +# Tell the Darwin linker how to find shared libraries that are not yet installed.
 +ifneq (,$(findstring -lplds4,$(EXTRA_DSO_LDOPTS)))