[SVN-Commit] r645 - branches/experimental/www/firefox branches/experimental/www/firefox/files trunk/www/firefox trunk/www/firefox/files

[svn-freebsd-gecko at chruetertee.ch]

Author: beat
Date: Fri Sep 30 15:12:41 2011
New Revision: 645

Log:
- Update to 7.0.1
- Fix system-wide plugin directory detection as Firefox 7 no longer uses
  run-mozilla.sh to start an therefore our patch to set MOZ_PLUGIN_PATH
  is useless. [1]

Submitted by:	poyopoyo AT puripuri.plala.or.jp [1]

Added:
   branches/experimental/www/firefox/files/patch-xpcom-io-nsAppFileLocationProvider.cpp
   trunk/www/firefox/files/patch-xpcom-io-nsAppFileLocationProvider.cpp
Modified:
   branches/experimental/www/firefox/Makefile
   branches/experimental/www/firefox/distinfo
   trunk/www/firefox/Makefile
   trunk/www/firefox/distinfo

Modified: branches/experimental/www/firefox/Makefile
==============================================================================
--- branches/experimental/www/firefox/Makefile	Fri Sep 30 13:37:23 2011	(r644)
+++ branches/experimental/www/firefox/Makefile	Fri Sep 30 15:12:41 2011	(r645)
@@ -2,12 +2,11 @@
 # Date created:			2002/10/21
 # Whom:				Alan Eldridge <alane at FreeBSD.org>
 #
-# $FreeBSD: ports/www/firefox/Makefile,v 1.250 2011/09/28 16:19:48 beat Exp $
+# $FreeBSD: ports/www/firefox/Makefile,v 1.251 2011/09/30 15:07:49 beat Exp $
 #
 
 PORTNAME=	firefox
-DISTVERSION=	7.0
-PORTREVISION=	1
+DISTVERSION=	7.0.1
 PORTEPOCH=	1
 CATEGORIES=	www ipv6
 MASTER_SITES=	${MASTER_SITE_MOZILLA}
@@ -126,7 +125,8 @@
 	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \
 		${WRKSRC}/security/manager/ssl/src/Makefile.in \
 		${WRKSRC}/js/src/config/mkdepend/Makefile.in \
-		${WRKSRC}/js/src/config/config.mk
+		${WRKSRC}/js/src/config/config.mk \
+		${WRKSRC}/xpcom/io/nsAppFileLocationProvider.cpp
 	@${REINPLACE_CMD} -e 's|-lc_r|${PTHREAD_LIBS}|g ; \
 		s|-lpthread|${PTHREAD_LIBS}|g ; \
 		s|echo aout|echo elf|g ; \

Modified: branches/experimental/www/firefox/distinfo
==============================================================================
--- branches/experimental/www/firefox/distinfo	Fri Sep 30 13:37:23 2011	(r644)
+++ branches/experimental/www/firefox/distinfo	Fri Sep 30 15:12:41 2011	(r645)
@@ -1,2 +1,2 @@
-SHA256 (firefox-7.0.source.tar.bz2) = 82d46cff57d9cae41f8d3b764808d8348a8d8c65b189f2591aa721d6346deaba
-SIZE (firefox-7.0.source.tar.bz2) = 69282568
+SHA256 (firefox-7.0.1.source.tar.bz2) = 81ecf63fca67186094d49dd5a6fe7f5dbd143a39f872ad126de38f246334fc04
+SIZE (firefox-7.0.1.source.tar.bz2) = 69278554

Added: branches/experimental/www/firefox/files/patch-xpcom-io-nsAppFileLocationProvider.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/experimental/www/firefox/files/patch-xpcom-io-nsAppFileLocationProvider.cpp	Fri Sep 30 15:12:41 2011	(r645)
@@ -0,0 +1,11 @@
+--- xpcom/io/nsAppFileLocationProvider.cpp.orig	2011-09-30 15:52:07.000000000 +0200
++++ xpcom/io/nsAppFileLocationProvider.cpp	2011-09-30 15:52:40.000000000 +0200
+@@ -238,7 +238,7 @@
+ #if defined(HAVE_USR_LIB64_DIR) && defined(__LP64__)
+           "/usr/lib64/mozilla/plugins";
+ #else
+-          "/usr/lib/mozilla/plugins";
++          "%%LOCALBASE%%/lib/npapi/symlinks/firefox";
+ #endif
+         rv = NS_NewNativeLocalFile(nsDependentCString(sysLPlgDir),
+                                    PR_FALSE, getter_AddRefs(localFile));

Modified: trunk/www/firefox/Makefile
==============================================================================
--- trunk/www/firefox/Makefile	Fri Sep 30 13:37:23 2011	(r644)
+++ trunk/www/firefox/Makefile	Fri Sep 30 15:12:41 2011	(r645)
@@ -2,12 +2,11 @@
 # Date created:			2002/10/21
 # Whom:				Alan Eldridge <alane at FreeBSD.org>
 #
-# $FreeBSD: ports/www/firefox/Makefile,v 1.250 2011/09/28 16:19:48 beat Exp $
+# $FreeBSD: ports/www/firefox/Makefile,v 1.251 2011/09/30 15:07:49 beat Exp $
 #
 
 PORTNAME=	firefox
-DISTVERSION=	7.0
-PORTREVISION=	1
+DISTVERSION=	7.0.1
 PORTEPOCH=	1
 CATEGORIES=	www ipv6
 MASTER_SITES=	${MASTER_SITE_MOZILLA}
@@ -117,7 +116,8 @@
 	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \
 		${WRKSRC}/security/manager/ssl/src/Makefile.in \
 		${WRKSRC}/js/src/config/mkdepend/Makefile.in \
-		${WRKSRC}/js/src/config/config.mk
+		${WRKSRC}/js/src/config/config.mk \
+		${WRKSRC}/xpcom/io/nsAppFileLocationProvider.cpp
 	@${REINPLACE_CMD} -e 's|-lc_r|${PTHREAD_LIBS}|g ; \
 		s|-lpthread|${PTHREAD_LIBS}|g ; \
 		s|echo aout|echo elf|g ; \

Modified: trunk/www/firefox/distinfo
==============================================================================
--- trunk/www/firefox/distinfo	Fri Sep 30 13:37:23 2011	(r644)
+++ trunk/www/firefox/distinfo	Fri Sep 30 15:12:41 2011	(r645)
@@ -1,2 +1,2 @@
-SHA256 (firefox-7.0.source.tar.bz2) = 82d46cff57d9cae41f8d3b764808d8348a8d8c65b189f2591aa721d6346deaba
-SIZE (firefox-7.0.source.tar.bz2) = 69282568
+SHA256 (firefox-7.0.1.source.tar.bz2) = 81ecf63fca67186094d49dd5a6fe7f5dbd143a39f872ad126de38f246334fc04
+SIZE (firefox-7.0.1.source.tar.bz2) = 69278554

Added: trunk/www/firefox/files/patch-xpcom-io-nsAppFileLocationProvider.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ trunk/www/firefox/files/patch-xpcom-io-nsAppFileLocationProvider.cpp	Fri Sep 30 15:12:41 2011	(r645)
@@ -0,0 +1,11 @@
+--- xpcom/io/nsAppFileLocationProvider.cpp.orig	2011-09-30 15:52:07.000000000 +0200
++++ xpcom/io/nsAppFileLocationProvider.cpp	2011-09-30 15:52:40.000000000 +0200
+@@ -238,7 +238,7 @@
+ #if defined(HAVE_USR_LIB64_DIR) && defined(__LP64__)
+           "/usr/lib64/mozilla/plugins";
+ #else
+-          "/usr/lib/mozilla/plugins";
++          "%%LOCALBASE%%/lib/npapi/symlinks/firefox";
+ #endif
+         rv = NS_NewNativeLocalFile(nsDependentCString(sysLPlgDir),
+                                    PR_FALSE, getter_AddRefs(localFile));