From owner-freebsd-gecko@FreeBSD.ORG Fri Sep 30 15:12:48 2011 Return-Path: Delivered-To: freebsd-gecko@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 95A8A1065670 for ; Fri, 30 Sep 2011 15:12:48 +0000 (UTC) (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: from trillian.chruetertee.ch (trillian.chruetertee.ch [217.150.245.56]) by mx1.freebsd.org (Postfix) with ESMTP id 1928E8FC1B for ; Fri, 30 Sep 2011 15:12:47 +0000 (UTC) Received: from trillian.chruetertee.ch (trillian [217.150.245.56]) by trillian.chruetertee.ch (8.14.4/8.14.3) with ESMTP id p8UFCkW1029353 for ; Fri, 30 Sep 2011 15:12:46 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id p8UFCfsT027905 for freebsd-gecko@freebsd.org; Fri, 30 Sep 2011 15:12:41 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Fri, 30 Sep 2011 15:12:41 GMT Message-Id: <201109301512.p8UFCfsT027905@trillian.chruetertee.ch> X-Authentication-Warning: trillian.chruetertee.ch: www set sender to svn-freebsd-gecko@chruetertee.ch using -f From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [SVN-Commit] r645 - branches/experimental/www/firefox branches/experimental/www/firefox/files trunk/www/firefox trunk/www/firefox/files X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: freebsd-gecko@freebsd.org List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 30 Sep 2011 15:12:48 -0000 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 # -# $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 # -# $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));