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

source_changes at macosforge.org source_changes at macosforge.org
Mon Sep 3 17:28:10 PDT 2007 

Revision: 28578
          http://trac.macosforge.org/projects/macports/changeset/28578
Author:   rhwood at macports.org
Date:     2007-09-03 17:28:10 -0700 (Mon, 03 Sep 2007)

Log Message:
-----------
Upgrade to 2.0.0.6 with changes per ticket:11903

Modified Paths:
--------------
    trunk/dports/www/firefox-x11/Portfile
    trunk/dports/www/firefox-x11/files/patch-browser-app-profile-firefox.js

Added Paths:
-----------
    trunk/dports/www/firefox-x11/files/patch-build-unix-mozilla-xpcom.pc
    trunk/dports/www/firefox-x11/files/patch-dylib_file
    trunk/dports/www/firefox-x11/files/patch-layout-build-Makefile.in
    trunk/dports/www/firefox-x11/files/patch-xpcom-build-Makefile

Modified: trunk/dports/www/firefox-x11/Portfile
===================================================================
--- trunk/dports/www/firefox-x11/Portfile	2007-09-03 23:51:48 UTC (rev 28577)
+++ trunk/dports/www/firefox-x11/Portfile	2007-09-04 00:28:10 UTC (rev 28578)
@@ -4,8 +4,7 @@
 
 name		firefox-x11
 categories	www x11
-version		1.5.0.1
-revision	3
+version		2.0.0.6
 platforms	darwin
 maintainers	rhwood openmaintainer at macports.org
 description	Mozilla.org's popular stand-alone browser
@@ -19,7 +18,7 @@
 homepage	http://www.mozilla.com/firefox/
 master_sites	http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${version}/source/
 distname	firefox-${version}-source
-checksums	rmd160 6e332fb1a7e80ab56d3d6e3de3d203c8c58217bf
+checksums	rmd160 5132a3b88de5416df27cdf9b9a64bec9dc42fffa
 use_bzip2	yes
 worksrcdir	mozilla
 
@@ -31,13 +30,15 @@
 		port:gnome-icon-theme
 depends_build	port:pkgconfig
 
-patchfiles	patch-browser-app-mozilla.in \
-		patch-browser-components-build-Makefile.in \
-		patch-browser-app-profile-firefox.js
+patchfiles	patch-browser-app-profile-firefox.js \
+                patch-xpcom-build-Makefile \
+		patch-dylib_file \
+		patch-layout-build-Makefile.in \
+		patch-build-unix-mozilla-xpcom.pc \
+		patch-browser-app-mozilla.in
 
 configure.args	--enable-application=browser \
 		--enable-official-branding \
-		--enable-optimize \
 		--disable-static \
 		--enable-shared \
 		--enable-default-toolkit=gtk2 \
@@ -56,6 +57,11 @@
 		--with-system-jpeg=${prefix} \
 		--with-system-zlib=${prefix} \
 		--with-system-png=${prefix}
+		
+variant debug {
+        configure.args-delete --disable-debug --enable-optimize='-O2' --enable-strip
+        configure.args-append --enable-debug --disable-optimize --disable-strip
+}
 
 post-destroot	{
 	file mkdir	${destroot}${prefix}/share/applications

Modified: trunk/dports/www/firefox-x11/files/patch-browser-app-profile-firefox.js
===================================================================
--- trunk/dports/www/firefox-x11/files/patch-browser-app-profile-firefox.js	2007-09-03 23:51:48 UTC (rev 28577)
+++ trunk/dports/www/firefox-x11/files/patch-browser-app-profile-firefox.js	2007-09-04 00:28:10 UTC (rev 28578)
@@ -4,9 +4,9 @@
  #endif
  #endif
  
-+// DarwinPorts-specific preferences
-+pref("general.useragent.vendorComment", "DarwinPorts Community Edition");
++// MacPorts-specific preferences
++pref("general.useragent.vendorComment", "MacPorts Community Edition");
 +
- pref("startup.homepage_override_url","chrome://browser-region/locale/region.properties");
  pref("general.startup.browser", true);
  
+ pref("browser.chromeURL","chrome://browser/content/");

Added: trunk/dports/www/firefox-x11/files/patch-build-unix-mozilla-xpcom.pc
===================================================================
--- trunk/dports/www/firefox-x11/files/patch-build-unix-mozilla-xpcom.pc	                        (rev 0)
+++ trunk/dports/www/firefox-x11/files/patch-build-unix-mozilla-xpcom.pc	2007-09-04 00:28:10 UTC (rev 28578)
@@ -0,0 +1,9 @@
+--- build/unix/mozilla-xpcom.pc.in~	2005-07-05 19:21:52.000000000 -0400
++++ build/unix/mozilla-xpcom.pc.in	2007-08-20 23:41:09.000000000 -0400
+@@ -8,5 +8,5 @@
+ Description: The Mozilla Cross Platform Component Library
+ Version: %MOZILLA_VERSION%
+ Requires: %NSPR_NAME% >= %NSPR_VERSION%
+-Libs: -L${libdir} -lxpcom
++Libs: -L${libdir} -lxpcom -lxpcom_core
+ Cflags: -I${includedir} -I${includedir}/xpcom -I${includedir}/string

Added: trunk/dports/www/firefox-x11/files/patch-dylib_file
===================================================================
--- trunk/dports/www/firefox-x11/files/patch-dylib_file	                        (rev 0)
+++ trunk/dports/www/firefox-x11/files/patch-dylib_file	2007-09-04 00:28:10 UTC (rev 28578)
@@ -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/files/patch-layout-build-Makefile.in
===================================================================
--- trunk/dports/www/firefox-x11/files/patch-layout-build-Makefile.in	                        (rev 0)
+++ trunk/dports/www/firefox-x11/files/patch-layout-build-Makefile.in	2007-09-04 00:28:10 UTC (rev 28578)
@@ -0,0 +1,22 @@
+--- /Users/mta/macports/dports/www/firefox-x11/save/layout_build_Makefile.in	2007-08-23 01:08:14.000000000 -0400
++++ layout/build/Makefile.in	2007-08-23 01:07:49.000000000 -0400
+@@ -224,13 +224,15 @@
+ 		    $(NULL)
+ endif
+ 
+-ifdef MOZ_ENABLE_GTK2
+-EXTRA_DSO_LDOPTS += $(MOZ_GTK2_LIBS) \
++ifneq (,$(MOZ_ENABLE_CANVAS)$(MOZ_SVG_RENDERER_CAIRO))
++EXTRA_DSO_LDOPTS += $(MOZ_CAIRO_LIBS) \
+ 		    $(NULL)
+ endif
+ 
+-ifneq (,$(MOZ_ENABLE_CANVAS)$(MOZ_SVG_RENDERER_CAIRO))
+-EXTRA_DSO_LDOPTS += $(MOZ_CAIRO_LIBS) \
++# MOZ_GTK2_LIBS must come after MOZ_CAIRO_LIBS to avoid multiply defined
++# symbols between libcairo.dylib and libmozcairo.a
++ifdef MOZ_ENABLE_GTK2
++EXTRA_DSO_LDOPTS += $(MOZ_GTK2_LIBS) \
+ 		    $(NULL)
+ endif
+ 

Added: trunk/dports/www/firefox-x11/files/patch-xpcom-build-Makefile
===================================================================
--- trunk/dports/www/firefox-x11/files/patch-xpcom-build-Makefile	                        (rev 0)
+++ trunk/dports/www/firefox-x11/files/patch-xpcom-build-Makefile	2007-09-04 00:28:10 UTC (rev 28578)
@@ -0,0 +1,15 @@
+--- save/xpcom_build_Makefile.in	2007-08-22 16:11:33.000000000 -0400
++++ xpcom/build/Makefile.in		2007-08-22 16:11:56.000000000 -0400
+@@ -139,6 +139,12 @@
+ EXTRA_DEPS += $(DIST)/lib/$(LIB_PREFIX)macmorefiles_s.$(LIB_SUFFIX)
+ endif
+ 
++# nsMacUtilsImpl needs CoreFoundation on Darwin, probably wrong, but 
++# that's the way it is.
++ifeq ($(OS_TARGET),Darwin)
++OS_LIBS		+= -framework CoreServices -framework CoreFoundation
++endif
++
+ # Force use of PIC
+ FORCE_USE_PIC	= 1 
+ 

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20070903/05ee2d75/attachment.html

More information about the macports-changes mailing list