[SVN-Commit] r533 - 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: Thu Mar 24 07:59:38 2011
New Revision: 533

Log:
- Re-add MOZILLA_NAME to fix desktop entry [1]
- Fix leftover from Firefox 3.x in MOZ_PLUGIN_PATH [2]
- Bump PORTREVISION

Submitted by:	Denny Lin <dennylin93 AT hs.ntnu.edu.tw> [1],
		Jan Henrik Sylvester <me AT janh.de> [2]

Modified:
   branches/experimental/www/firefox/Makefile
   branches/experimental/www/firefox/files/patch-build_unix_run-mozilla.sh
   trunk/www/firefox/Makefile
   trunk/www/firefox/files/patch-build_unix_run-mozilla.sh

Modified: branches/experimental/www/firefox/Makefile
==============================================================================
--- branches/experimental/www/firefox/Makefile	Thu Mar 24 03:38:34 2011	(r532)
+++ branches/experimental/www/firefox/Makefile	Thu Mar 24 07:59:38 2011	(r533)
@@ -2,11 +2,12 @@
 # Date created:			2002/10/21
 # Whom:				Alan Eldridge <alane at FreeBSD.org>
 #
-# $FreeBSD: ports/www/firefox/Makefile,v 1.237 2011/03/04 23:31:14 beat Exp $
+# $FreeBSD: ports/www/firefox/Makefile,v 1.238 2011/03/22 15:24:49 beat Exp $
 #
 
 PORTNAME=	firefox
 DISTVERSION=	4.0
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	www ipv6
 MASTER_SITES=	${MASTER_SITE_MOZILLA}
@@ -22,6 +23,7 @@
 USE_GECKO=	gecko
 MOZ_PKGCONFIG_FILES=	# empty
 USE_MOZILLA=	-png -nss -dbm -jpeg -xft
+MOZILLA_NAME=	Firefox
 MOZ_TOOLKIT=	cairo-gtk2
 GECKO_PLIST_PRE_DIRS=	lib/${MOZILLA}/bin lib/${MOZILLA}/idl \
 			lib/${MOZILLA}/include lib/${MOZILLA}/lib

Modified: branches/experimental/www/firefox/files/patch-build_unix_run-mozilla.sh
==============================================================================
--- branches/experimental/www/firefox/files/patch-build_unix_run-mozilla.sh	Thu Mar 24 03:38:34 2011	(r532)
+++ branches/experimental/www/firefox/files/patch-build_unix_run-mozilla.sh	Thu Mar 24 07:59:38 2011	(r533)
@@ -4,7 +4,7 @@
  export MOZILLA_FIVE_HOME LD_LIBRARY_PATH
  export SHLIB_PATH LIBPATH LIBRARY_PATH ADDON_PATH DYLD_LIBRARY_PATH
  
-+MOZ_PLUGIN_PATH=%%LOCALBASE%%/lib/browser_plugins/symlinks/gecko19:%%LOCALBASE%%/lib/npapi/symlinks/firefox3
++MOZ_PLUGIN_PATH=%%LOCALBASE%%/lib/browser_plugins/symlinks/gecko19:%%LOCALBASE%%/lib/npapi/symlinks/firefox
 +export MOZ_PLUGIN_PATH
 +
  if [ $moz_debug -eq 1 ]

Modified: trunk/www/firefox/Makefile
==============================================================================
--- trunk/www/firefox/Makefile	Thu Mar 24 03:38:34 2011	(r532)
+++ trunk/www/firefox/Makefile	Thu Mar 24 07:59:38 2011	(r533)
@@ -2,11 +2,12 @@
 # Date created:			2002/10/21
 # Whom:				Alan Eldridge <alane at FreeBSD.org>
 #
-# $FreeBSD: ports/www/firefox/Makefile,v 1.237 2011/03/04 23:31:14 beat Exp $
+# $FreeBSD: ports/www/firefox/Makefile,v 1.238 2011/03/22 15:24:49 beat Exp $
 #
 
 PORTNAME=	firefox
 DISTVERSION=	4.0
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	www ipv6
 MASTER_SITES=	${MASTER_SITE_MOZILLA}
@@ -22,6 +23,7 @@
 USE_GECKO=	gecko
 MOZ_PKGCONFIG_FILES=	# empty
 USE_MOZILLA=	-png -nss -dbm -jpeg -xft
+MOZILLA_NAME=	Firefox
 MOZ_TOOLKIT=	cairo-gtk2
 GECKO_PLIST_PRE_DIRS=	lib/${MOZILLA}/bin lib/${MOZILLA}/idl \
 			lib/${MOZILLA}/include lib/${MOZILLA}/lib

Modified: trunk/www/firefox/files/patch-build_unix_run-mozilla.sh
==============================================================================
--- trunk/www/firefox/files/patch-build_unix_run-mozilla.sh	Thu Mar 24 03:38:34 2011	(r532)
+++ trunk/www/firefox/files/patch-build_unix_run-mozilla.sh	Thu Mar 24 07:59:38 2011	(r533)
@@ -4,7 +4,7 @@
  export MOZILLA_FIVE_HOME LD_LIBRARY_PATH
  export SHLIB_PATH LIBPATH LIBRARY_PATH ADDON_PATH DYLD_LIBRARY_PATH
  
-+MOZ_PLUGIN_PATH=%%LOCALBASE%%/lib/browser_plugins/symlinks/gecko19:%%LOCALBASE%%/lib/npapi/symlinks/firefox3
++MOZ_PLUGIN_PATH=%%LOCALBASE%%/lib/browser_plugins/symlinks/gecko19:%%LOCALBASE%%/lib/npapi/symlinks/firefox
 +export MOZ_PLUGIN_PATH
 +
  if [ $moz_debug -eq 1 ]