[SVN-Commit] r113 - in branches/experimental/www/firefox3-devel: . files

[svn-freebsd-gecko at chruetertee.ch]

Author: beat
Date: Fri Sep 18 00:25:34 2009
New Revision: 113

Log:
- Update to 3.6 Alpha 2

Modified:
   branches/experimental/www/firefox3-devel/Makefile
   branches/experimental/www/firefox3-devel/distinfo
   branches/experimental/www/firefox3-devel/files/patch-toolkit_mozapps_update_src_updater_updater.cpp

Modified: branches/experimental/www/firefox3-devel/Makefile
==============================================================================
--- branches/experimental/www/firefox3-devel/Makefile	Thu Sep 17 23:36:36 2009	(r112)
+++ branches/experimental/www/firefox3-devel/Makefile	Fri Sep 18 00:25:34 2009	(r113)
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	firefox
-DISTVERSION=	3.6a1
+DISTVERSION=	3.6a2
 PORTEPOCH=	1
 CATEGORIES=	www ipv6
 MASTER_SITES=	${MASTER_SITE_MOZILLA}
@@ -67,7 +67,7 @@
 EXTRA_PATCHES=	${FILESDIR}/libsydney_oss
 .endif
 
-WRKSRC:=	${WRKSRC}-central
+WRKSRC:=	${WRKSRC}-1.9.2
 
 GECKO_PTHREAD_LIBS!=${CC} -dumpspecs | ${GREP} -m 1 '%{\!pg: %{pthread:' | ${SED} -e 's|^.*%{\!pg: %{pthread:|| ; s|}.*$$||' || ${TRUE}
 

Modified: branches/experimental/www/firefox3-devel/distinfo
==============================================================================
--- branches/experimental/www/firefox3-devel/distinfo	Thu Sep 17 23:36:36 2009	(r112)
+++ branches/experimental/www/firefox3-devel/distinfo	Fri Sep 18 00:25:34 2009	(r113)
@@ -1,3 +1,3 @@
-MD5 (firefox-3.6a1.source.tar.bz2) = 15c4223c101c62d03a469f76593a343f
-SHA256 (firefox-3.6a1.source.tar.bz2) = 3e51fe3594bcf6f425740e9dcde930cff0f1e95f7ce2b60207fa6abc74cf29cc
-SIZE (firefox-3.6a1.source.tar.bz2) = 44933567
+MD5 (firefox-3.6a2.source.tar.bz2) = 5d66259f7402d6bed307537e086d94c5
+SHA256 (firefox-3.6a2.source.tar.bz2) = 7228bf571db555be1f21cd13370221b192b707c9c198a94ee12eb025fb4bb465
+SIZE (firefox-3.6a2.source.tar.bz2) = 45084671

Modified: branches/experimental/www/firefox3-devel/files/patch-toolkit_mozapps_update_src_updater_updater.cpp
==============================================================================
--- branches/experimental/www/firefox3-devel/files/patch-toolkit_mozapps_update_src_updater_updater.cpp	Thu Sep 17 23:36:36 2009	(r112)
+++ branches/experimental/www/firefox3-devel/files/patch-toolkit_mozapps_update_src_updater_updater.cpp	Fri Sep 18 00:25:34 2009	(r113)
@@ -1,15 +1,15 @@
---- toolkit/mozapps/update/src/updater/updater.cpp.orig	2009-08-10 15:02:48.000000000 +0200
-+++ toolkit/mozapps/update/src/updater/updater.cpp	2009-08-11 11:02:01.000000000 +0200
-@@ -509,7 +509,7 @@
+--- toolkit/mozapps/update/src/updater/updater.cpp.orig	2009-09-16 04:41:19.000000000 +0200
++++ toolkit/mozapps/update/src/updater/updater.cpp	2009-09-18 01:49:47.000000000 +0200
+@@ -511,7 +511,7 @@
    struct stat ss;
  
    AutoFile sfile = NS_tfopen(spath, NS_T("rb"));
 -  if (sfile == NULL || fstat(fileno(sfile), &ss)) {
 +  if (sfile == NULL || fstat(fileno((FILE*)sfile), &ss)) {
-     LOG(("copy_file: failed to open or stat: %p," LOG_S ",%d\n", sfile, spath, errno));
+     LOG(("copy_file: failed to open or stat: %p," LOG_S ",%d\n", sfile.get(), spath, errno));
      return READ_ERROR;
    }
-@@ -1607,7 +1607,7 @@
+@@ -1660,7 +1660,7 @@
      return READ_ERROR;
  
    struct stat ms;