* Update to 1.0

* Install a firefox desktop entry for the GNOME desktop [1]
* Fix the post-install plug-in repository generation when root is using
  a non-default shell [2]

Submitted by:	ahze [1]
		Clemens Fischer <ino-qc@spotteswoode.de.eu.org> [2]

36 files changed, 234 insertions, 90 deletions

diff --git a/www/firefox-devel/Makefile b/www/firefox-devel/Makefile
index 3de712b3d316..1e9c0c738f32 100644
--- a/www/firefox-devel/Makefile
+++ b/www/firefox-devel/Makefile
@@ -6,13 +6,12 @@
 #
 
 PORTNAME=	firefox
-PORTVERSION=	1.0.r2
-PORTREVISION=	1
+PORTVERSION=	1.0
 PORTEPOCH=	1
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_MOZILLA}
-MASTER_SITE_SUBDIR=	${PORTNAME}/releases/1.0rc2/source
-DISTNAME=	${PORTNAME}-1.0rc2-source
+MASTER_SITE_SUBDIR=	${PORTNAME}/releases/1.0/source
+DISTNAME=	${PORTNAME}-1.0-source
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Web browser based on the browser portion of Mozilla
@@ -35,7 +34,7 @@ PLIST=		${WRKDIR}/plist
 PLUGINSDIR=	${PREFIX}/lib/browser_plugins
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_GNOME=	gtk20 libidl
+USE_GNOME=	gtk20 libidl gnomehier
 USE_ICONV=	yes
 USE_PERL5_BUILD=yes
 USE_X_PREFIX=	yes
@@ -43,6 +42,9 @@ WRKSRC=		${WRKDIR}/mozilla
 PKGINSTALL=	${WRKDIR}/pkg-install
 PKGDEINSTALL=	${WRKDIR}/pkg-deinstall
 
+FIREFOX_ICON=	firefox.png
+FIREFOX_ICON_SRC=${WRKSRC}/other-licenses/branding/firefox/content/alert-exclam.png
+
 PKGCONFIG_FILES=mozilla-gtkmozembed mozilla-js mozilla-xpcom \
 		mozilla-nspr mozilla-nss mozilla-plugin
 
@@ -121,6 +123,8 @@ post-extract::
 		-e 's|@PREFIX@|${FAKEDIR}/lib/firefox|'	\
 		-e 's|@PERL@|${PERL5}|'			\
 		<${FILESDIR}/mozconfig.in >${WRKSRC}/.mozconfig
+	@${SED} -e 's|@FIREFOX_ICON@|${FIREFOX_ICON}|' \
+		<${FILESDIR}/firefox.desktop.in >${WRKDIR}/firefox.desktop
 
 post-patch:
 	@${PERL} -pi -e 's|%%PREFIX%%|${PREFIX}|g' \
@@ -191,6 +195,8 @@ pre-install:
 		"s:^:@unexec ${RMDIR} %D/:" -e "s:$$: || true:" >> ${PLIST}; \
 	${FIND} * -type d ! -empty | ${SORT} -r | ${SED} -e "s:^:@dirrm :" | \
 		${GREP} / >> ${PLIST}
+	${ECHO_CMD} 'share/gnome/pixmaps/${FIREFOX_ICON}' >> ${PLIST}
+	${ECHO_CMD} 'share/gnome/applications/firefox.desktop' >> ${PLIST}
 
 do-install:
 # This is the actual installation.  First, the contents of FAKEDIR are
@@ -228,5 +234,7 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/other-licenses/branding/firefox/default.xpm \
 		${LOCAL_PREFIX}/lib/${PORTNAME}-${REALVERSION}/chrome/icons/default/default.xpm
 .endif # defined(WITH_NEW_ICON)
+	${INSTALL_DATA} ${FIREFOX_ICON_SRC} ${PREFIX}/share/gnome/pixmaps/${FIREFOX_ICON}
+	${INSTALL_DATA} ${WRKDIR}/firefox.desktop ${PREFIX}/share/gnome/applications
 
 .include <bsd.port.post.mk>
diff --git a/www/firefox-devel/distinfo b/www/firefox-devel/distinfo
index 5d99d1c044eb..15627b0a7580 100644
--- a/www/firefox-devel/distinfo
+++ b/www/firefox-devel/distinfo
@@ -1,2 +1,2 @@
-MD5 (firefox-1.0rc2-source.tar.bz2) = aab6ffe0e57de39b20d1c8ccef057171
-SIZE (firefox-1.0rc2-source.tar.bz2) = 32659115
+MD5 (firefox-1.0-source.tar.bz2) = 49c16a71f4de014ea471be81e46b1da8
+SIZE (firefox-1.0-source.tar.bz2) = 32686249
diff --git a/www/firefox-devel/files/firefox.desktop.in b/www/firefox-devel/files/firefox.desktop.in
new file mode 100644
index 000000000000..229000828162
--- /dev/null
+++ b/www/firefox-devel/files/firefox.desktop.in
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Name=Firefox
+Comment=Firefox Web Browser
+Exec=firefox %U
+Icon=@FIREFOX_ICON@
+Terminal=false
+Type=Application
+Categories=Application;Network;
diff --git a/www/firefox-devel/pkg-install.in b/www/firefox-devel/pkg-install.in
index 8004a6516143..f548cac38445 100644
--- a/www/firefox-devel/pkg-install.in
+++ b/www/firefox-devel/pkg-install.in
@@ -7,7 +7,7 @@
 # Fix the chrome registry.
 
 umask 022
-PATH=/bin:/usr/bin
+PATH=/bin:/usr/bin:/usr/local/bin
 
 [ "x$1" = "x" ] && exit 1
 [ "x$2" != "xPOST-INSTALL" ] && exit 0
@@ -29,7 +29,7 @@ cd ${MOZDIR} || exit 1
 ./run-mozilla.sh ${REGCHROME} || true
 
 # Instantiate the extension space as root.
-su - root -c "%%X11BASE%%/bin/xinit %%MOZDIR%%/run-mozilla.sh ${FIREFOX} -install-global-extension -- %%X11BASE%%/bin/Xvfb :1001" > /dev/null 2>&1
-su - root -c "%%X11BASE%%/bin/xinit %%MOZDIR%%/run-mozilla.sh ${FIREFOX} -install-global-theme -- %%X11BASE%%/bin/Xvfb :1001" > /dev/null 2>&1
+su - root -c "env PATH=${PATH} %%X11BASE%%/bin/xinit %%MOZDIR%%/run-mozilla.sh ${FIREFOX} -install-global-extension -- %%X11BASE%%/bin/Xvfb :1001" > /dev/null 2>&1
+su - root -c "env PATH=${PATH} %%X11BASE%%/bin/xinit %%MOZDIR%%/run-mozilla.sh ${FIREFOX} -install-global-theme -- %%X11BASE%%/bin/Xvfb :1001" > /dev/null 2>&1
 
 exit 0
diff --git a/www/firefox-esr/Makefile b/www/firefox-esr/Makefile
index 3de712b3d316..1e9c0c738f32 100644
--- a/www/firefox-esr/Makefile
+++ b/www/firefox-esr/Makefile
@@ -6,13 +6,12 @@
 #
 
 PORTNAME=	firefox
-PORTVERSION=	1.0.r2
-PORTREVISION=	1
+PORTVERSION=	1.0
 PORTEPOCH=	1
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_MOZILLA}
-MASTER_SITE_SUBDIR=	${PORTNAME}/releases/1.0rc2/source
-DISTNAME=	${PORTNAME}-1.0rc2-source
+MASTER_SITE_SUBDIR=	${PORTNAME}/releases/1.0/source
+DISTNAME=	${PORTNAME}-1.0-source
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Web browser based on the browser portion of Mozilla
@@ -35,7 +34,7 @@ PLIST=		${WRKDIR}/plist
 PLUGINSDIR=	${PREFIX}/lib/browser_plugins
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_GNOME=	gtk20 libidl
+USE_GNOME=	gtk20 libidl gnomehier
 USE_ICONV=	yes
 USE_PERL5_BUILD=yes
 USE_X_PREFIX=	yes
@@ -43,6 +42,9 @@ WRKSRC=		${WRKDIR}/mozilla
 PKGINSTALL=	${WRKDIR}/pkg-install
 PKGDEINSTALL=	${WRKDIR}/pkg-deinstall
 
+FIREFOX_ICON=	firefox.png
+FIREFOX_ICON_SRC=${WRKSRC}/other-licenses/branding/firefox/content/alert-exclam.png
+
 PKGCONFIG_FILES=mozilla-gtkmozembed mozilla-js mozilla-xpcom \
 		mozilla-nspr mozilla-nss mozilla-plugin
 
@@ -121,6 +123,8 @@ post-extract::
 		-e 's|@PREFIX@|${FAKEDIR}/lib/firefox|'	\
 		-e 's|@PERL@|${PERL5}|'			\
 		<${FILESDIR}/mozconfig.in >${WRKSRC}/.mozconfig
+	@${SED} -e 's|@FIREFOX_ICON@|${FIREFOX_ICON}|' \
+		<${FILESDIR}/firefox.desktop.in >${WRKDIR}/firefox.desktop
 
 post-patch:
 	@${PERL} -pi -e 's|%%PREFIX%%|${PREFIX}|g' \
@@ -191,6 +195,8 @@ pre-install:
 		"s:^:@unexec ${RMDIR} %D/:" -e "s:$$: || true:" >> ${PLIST}; \
 	${FIND} * -type d ! -empty | ${SORT} -r | ${SED} -e "s:^:@dirrm :" | \
 		${GREP} / >> ${PLIST}
+	${ECHO_CMD} 'share/gnome/pixmaps/${FIREFOX_ICON}' >> ${PLIST}
+	${ECHO_CMD} 'share/gnome/applications/firefox.desktop' >> ${PLIST}
 
 do-install:
 # This is the actual installation.  First, the contents of FAKEDIR are
@@ -228,5 +234,7 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/other-licenses/branding/firefox/default.xpm \
 		${LOCAL_PREFIX}/lib/${PORTNAME}-${REALVERSION}/chrome/icons/default/default.xpm
 .endif # defined(WITH_NEW_ICON)
+	${INSTALL_DATA} ${FIREFOX_ICON_SRC} ${PREFIX}/share/gnome/pixmaps/${FIREFOX_ICON}
+	${INSTALL_DATA} ${WRKDIR}/firefox.desktop ${PREFIX}/share/gnome/applications
 
 .include <bsd.port.post.mk>
diff --git a/www/firefox-esr/distinfo b/www/firefox-esr/distinfo
index 5d99d1c044eb..15627b0a7580 100644
--- a/www/firefox-esr/distinfo
+++ b/www/firefox-esr/distinfo
@@ -1,2 +1,2 @@
-MD5 (firefox-1.0rc2-source.tar.bz2) = aab6ffe0e57de39b20d1c8ccef057171
-SIZE (firefox-1.0rc2-source.tar.bz2) = 32659115
+MD5 (firefox-1.0-source.tar.bz2) = 49c16a71f4de014ea471be81e46b1da8
+SIZE (firefox-1.0-source.tar.bz2) = 32686249
diff --git a/www/firefox-esr/files/firefox.desktop.in b/www/firefox-esr/files/firefox.desktop.in
new file mode 100644
index 000000000000..229000828162
--- /dev/null
+++ b/www/firefox-esr/files/firefox.desktop.in
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Name=Firefox
+Comment=Firefox Web Browser
+Exec=firefox %U
+Icon=@FIREFOX_ICON@
+Terminal=false
+Type=Application
+Categories=Application;Network;
diff --git a/www/firefox-esr/pkg-install.in b/www/firefox-esr/pkg-install.in
index 8004a6516143..f548cac38445 100644
--- a/www/firefox-esr/pkg-install.in
+++ b/www/firefox-esr/pkg-install.in
@@ -7,7 +7,7 @@
 # Fix the chrome registry.
 
 umask 022
-PATH=/bin:/usr/bin
+PATH=/bin:/usr/bin:/usr/local/bin
 
 [ "x$1" = "x" ] && exit 1
 [ "x$2" != "xPOST-INSTALL" ] && exit 0
@@ -29,7 +29,7 @@ cd ${MOZDIR} || exit 1
 ./run-mozilla.sh ${REGCHROME} || true
 
 # Instantiate the extension space as root.
-su - root -c "%%X11BASE%%/bin/xinit %%MOZDIR%%/run-mozilla.sh ${FIREFOX} -install-global-extension -- %%X11BASE%%/bin/Xvfb :1001" > /dev/null 2>&1
-su - root -c "%%X11BASE%%/bin/xinit %%MOZDIR%%/run-mozilla.sh ${FIREFOX} -install-global-theme -- %%X11BASE%%/bin/Xvfb :1001" > /dev/null 2>&1
+su - root -c "env PATH=${PATH} %%X11BASE%%/bin/xinit %%MOZDIR%%/run-mozilla.sh ${FIREFOX} -install-global-extension -- %%X11BASE%%/bin/Xvfb :1001" > /dev/null 2>&1
+su - root -c "env PATH=${PATH} %%X11BASE%%/bin/xinit %%MOZDIR%%/run-mozilla.sh ${FIREFOX} -install-global-theme -- %%X11BASE%%/bin/Xvfb :1001" > /dev/null 2>&1
 
 exit 0
diff --git a/www/firefox/Makefile b/www/firefox/Makefile
index 3de712b3d316..1e9c0c738f32 100644
--- a/www/firefox/Makefile
+++ b/www/firefox/Makefile
@@ -6,13 +6,12 @@
 #
 
 PORTNAME=	firefox
-PORTVERSION=	1.0.r2
-PORTREVISION=	1
+PORTVERSION=	1.0
 PORTEPOCH=	1
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_MOZILLA}
-MASTER_SITE_SUBDIR=	${PORTNAME}/releases/1.0rc2/source
-DISTNAME=	${PORTNAME}-1.0rc2-source
+MASTER_SITE_SUBDIR=	${PORTNAME}/releases/1.0/source
+DISTNAME=	${PORTNAME}-1.0-source
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Web browser based on the browser portion of Mozilla
@@ -35,7 +34,7 @@ PLIST=		${WRKDIR}/plist
 PLUGINSDIR=	${PREFIX}/lib/browser_plugins
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_GNOME=	gtk20 libidl
+USE_GNOME=	gtk20 libidl gnomehier
 USE_ICONV=	yes
 USE_PERL5_BUILD=yes
 USE_X_PREFIX=	yes
@@ -43,6 +42,9 @@ WRKSRC=		${WRKDIR}/mozilla
 PKGINSTALL=	${WRKDIR}/pkg-install
 PKGDEINSTALL=	${WRKDIR}/pkg-deinstall
 
+FIREFOX_ICON=	firefox.png
+FIREFOX_ICON_SRC=${WRKSRC}/other-licenses/branding/firefox/content/alert-exclam.png
+
 PKGCONFIG_FILES=mozilla-gtkmozembed mozilla-js mozilla-xpcom \
 		mozilla-nspr mozilla-nss mozilla-plugin
 
@@ -121,6 +123,8 @@ post-extract::
 		-e 's|@PREFIX@|${FAKEDIR}/lib/firefox|'	\
 		-e 's|@PERL@|${PERL5}|'			\
 		<${FILESDIR}/mozconfig.in >${WRKSRC}/.mozconfig
+	@${SED} -e 's|@FIREFOX_ICON@|${FIREFOX_ICON}|' \
+		<${FILESDIR}/firefox.desktop.in >${WRKDIR}/firefox.desktop
 
 post-patch:
 	@${PERL} -pi -e 's|%%PREFIX%%|${PREFIX}|g' \
@@ -191,6 +195,8 @@ pre-install:
 		"s:^:@unexec ${RMDIR} %D/:" -e "s:$$: || true:" >> ${PLIST}; \
 	${FIND} * -type d ! -empty | ${SORT} -r | ${SED} -e "s:^:@dirrm :" | \
 		${GREP} / >> ${PLIST}
+	${ECHO_CMD} 'share/gnome/pixmaps/${FIREFOX_ICON}' >> ${PLIST}
+	${ECHO_CMD} 'share/gnome/applications/firefox.desktop' >> ${PLIST}
 
 do-install:
 # This is the actual installation.  First, the contents of FAKEDIR are
@@ -228,5 +234,7 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/other-licenses/branding/firefox/default.xpm \
 		${LOCAL_PREFIX}/lib/${PORTNAME}-${REALVERSION}/chrome/icons/default/default.xpm
 .endif # defined(WITH_NEW_ICON)
+	${INSTALL_DATA} ${FIREFOX_ICON_SRC} ${PREFIX}/share/gnome/pixmaps/${FIREFOX_ICON}
+	${INSTALL_DATA} ${WRKDIR}/firefox.desktop ${PREFIX}/share/gnome/applications
 
 .include <bsd.port.post.mk>
diff --git a/www/firefox/distinfo b/www/firefox/distinfo
index 5d99d1c044eb..15627b0a7580 100644
--- a/www/firefox/distinfo
+++ b/www/firefox/distinfo
@@ -1,2 +1,2 @@
-MD5 (firefox-1.0rc2-source.tar.bz2) = aab6ffe0e57de39b20d1c8ccef057171
-SIZE (firefox-1.0rc2-source.tar.bz2) = 32659115
+MD5 (firefox-1.0-source.tar.bz2) = 49c16a71f4de014ea471be81e46b1da8
+SIZE (firefox-1.0-source.tar.bz2) = 32686249
diff --git a/www/firefox/files/firefox.desktop.in b/www/firefox/files/firefox.desktop.in
new file mode 100644
index 000000000000..229000828162
--- /dev/null
+++ b/www/firefox/files/firefox.desktop.in
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Name=Firefox
+Comment=Firefox Web Browser
+Exec=firefox %U
+Icon=@FIREFOX_ICON@
+Terminal=false
+Type=Application
+Categories=Application;Network;
diff --git a/www/firefox/pkg-install.in b/www/firefox/pkg-install.in
index 8004a6516143..f548cac38445 100644
--- a/www/firefox/pkg-install.in
+++ b/www/firefox/pkg-install.in
@@ -7,7 +7,7 @@
 # Fix the chrome registry.
 
 umask 022
-PATH=/bin:/usr/bin
+PATH=/bin:/usr/bin:/usr/local/bin
 
 [ "x$1" = "x" ] && exit 1
 [ "x$2" != "xPOST-INSTALL" ] && exit 0
@@ -29,7 +29,7 @@ cd ${MOZDIR} || exit 1
 ./run-mozilla.sh ${REGCHROME} || true
 
 # Instantiate the extension space as root.
-su - root -c "%%X11BASE%%/bin/xinit %%MOZDIR%%/run-mozilla.sh ${FIREFOX} -install-global-extension -- %%X11BASE%%/bin/Xvfb :1001" > /dev/null 2>&1
-su - root -c "%%X11BASE%%/bin/xinit %%MOZDIR%%/run-mozilla.sh ${FIREFOX} -install-global-theme -- %%X11BASE%%/bin/Xvfb :1001" > /dev/null 2>&1
+su - root -c "env PATH=${PATH} %%X11BASE%%/bin/xinit %%MOZDIR%%/run-mozilla.sh ${FIREFOX} -install-global-extension -- %%X11BASE%%/bin/Xvfb :1001" > /dev/null 2>&1
+su - root -c "env PATH=${PATH} %%X11BASE%%/bin/xinit %%MOZDIR%%/run-mozilla.sh ${FIREFOX} -install-global-theme -- %%X11BASE%%/bin/Xvfb :1001" > /dev/null 2>&1
 
 exit 0
diff --git a/www/firefox10/Makefile b/www/firefox10/Makefile
index 3de712b3d316..1e9c0c738f32 100644
--- a/www/firefox10/Makefile
+++ b/www/firefox10/Makefile
@@ -6,13 +6,12 @@
 #
 
 PORTNAME=	firefox
-PORTVERSION=	1.0.r2
-PORTREVISION=	1
+PORTVERSION=	1.0
 PORTEPOCH=	1
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_MOZILLA}
-MASTER_SITE_SUBDIR=	${PORTNAME}/releases/1.0rc2/source
-DISTNAME=	${PORTNAME}-1.0rc2-source
+MASTER_SITE_SUBDIR=	${PORTNAME}/releases/1.0/source
+DISTNAME=	${PORTNAME}-1.0-source
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Web browser based on the browser portion of Mozilla
@@ -35,7 +34,7 @@ PLIST=		${WRKDIR}/plist
 PLUGINSDIR=	${PREFIX}/lib/browser_plugins
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_GNOME=	gtk20 libidl
+USE_GNOME=	gtk20 libidl gnomehier
 USE_ICONV=	yes
 USE_PERL5_BUILD=yes
 USE_X_PREFIX=	yes
@@ -43,6 +42,9 @@ WRKSRC=		${WRKDIR}/mozilla
 PKGINSTALL=	${WRKDIR}/pkg-install
 PKGDEINSTALL=	${WRKDIR}/pkg-deinstall
 
+FIREFOX_ICON=	firefox.png
+FIREFOX_ICON_SRC=${WRKSRC}/other-licenses/branding/firefox/content/alert-exclam.png
+
 PKGCONFIG_FILES=mozilla-gtkmozembed mozilla-js mozilla-xpcom \
 		mozilla-nspr mozilla-nss mozilla-plugin
 
@@ -121,6 +123,8 @@ post-extract::
 		-e 's|@PREFIX@|${FAKEDIR}/lib/firefox|'	\
 		-e 's|@PERL@|${PERL5}|'			\
 		<${FILESDIR}/mozconfig.in >${WRKSRC}/.mozconfig
+	@${SED} -e 's|@FIREFOX_ICON@|${FIREFOX_ICON}|' \
+		<${FILESDIR}/firefox.desktop.in >${WRKDIR}/firefox.desktop
 
 post-patch:
 	@${PERL} -pi -e 's|%%PREFIX%%|${PREFIX}|g' \
@@ -191,6 +195,8 @@ pre-install:
 		"s:^:@unexec ${RMDIR} %D/:" -e "s:$$: || true:" >> ${PLIST}; \
 	${FIND} * -type d ! -empty | ${SORT} -r | ${SED} -e "s:^:@dirrm :" | \
 		${GREP} / >> ${PLIST}
+	${ECHO_CMD} 'share/gnome/pixmaps/${FIREFOX_ICON}' >> ${PLIST}
+	${ECHO_CMD} 'share/gnome/applications/firefox.desktop' >> ${PLIST}
 
 do-install:
 # This is the actual installation.  First, the contents of FAKEDIR are
@@ -228,5 +234,7 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/other-licenses/branding/firefox/default.xpm \
 		${LOCAL_PREFIX}/lib/${PORTNAME}-${REALVERSION}/chrome/icons/default/default.xpm
 .endif # defined(WITH_NEW_ICON)
+	${INSTALL_DATA} ${FIREFOX_ICON_SRC} ${PREFIX}/share/gnome/pixmaps/${FIREFOX_ICON}
+	${INSTALL_DATA} ${WRKDIR}/firefox.desktop ${PREFIX}/share/gnome/applications
 
 .include <bsd.port.post.mk>
diff --git a/www/firefox10/distinfo b/www/firefox10/distinfo
index 5d99d1c044eb..15627b0a7580 100644
--- a/www/firefox10/distinfo
+++ b/www/firefox10/distinfo
@@ -1,2 +1,2 @@
-MD5 (firefox-1.0rc2-source.tar.bz2) = aab6ffe0e57de39b20d1c8ccef057171
-SIZE (firefox-1.0rc2-source.tar.bz2) = 32659115
+MD5 (firefox-1.0-source.tar.bz2) = 49c16a71f4de014ea471be81e46b1da8
+SIZE (firefox-1.0-source.tar.bz2) = 32686249
diff --git a/www/firefox10/files/firefox.desktop.in b/www/firefox10/files/firefox.desktop.in
new file mode 100644
index 000000000000..229000828162
--- /dev/null
+++ b/www/firefox10/files/firefox.desktop.in
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Name=Firefox
+Comment=Firefox Web Browser
+Exec=firefox %U
+Icon=@FIREFOX_ICON@
+Terminal=false
+Type=Application
+Categories=Application;Network;
diff --git a/www/firefox10/pkg-install.in b/www/firefox10/pkg-install.in
index 8004a6516143..f548cac38445 100644
--- a/www/firefox10/pkg-install.in
+++ b/www/firefox10/pkg-install.in
@@ -7,7 +7,7 @@
 # Fix the chrome registry.
 
 umask 022
-PATH=/bin:/usr/bin
+PATH=/bin:/usr/bin:/usr/local/bin
 
 [ "x$1" = "x" ] && exit 1
 [ "x$2" != "xPOST-INSTALL" ] && exit 0
@@ -29,7 +29,7 @@ cd ${MOZDIR} || exit 1
 ./run-mozilla.sh ${REGCHROME} || true
 
 # Instantiate the extension space as root.
-su - root -c "%%X11BASE%%/bin/xinit %%MOZDIR%%/run-mozilla.sh ${FIREFOX} -install-global-extension -- %%X11BASE%%/bin/Xvfb :1001" > /dev/null 2>&1
-su - root -c "%%X11BASE%%/bin/xinit %%MOZDIR%%/run-mozilla.sh ${FIREFOX} -install-global-theme -- %%X11BASE%%/bin/Xvfb :1001" > /dev/null 2>&1
+su - root -c "env PATH=${PATH} %%X11BASE%%/bin/xinit %%MOZDIR%%/run-mozilla.sh ${FIREFOX} -install-global-extension -- %%X11BASE%%/bin/Xvfb :1001" > /dev/null 2>&1
+su - root -c "env PATH=${PATH} %%X11BASE%%/bin/xinit %%MOZDIR%%/run-mozilla.sh ${FIREFOX} -install-global-theme -- %%X11BASE%%/bin/Xvfb :1001" > /dev/null 2>&1
 
 exit 0
diff --git a/www/firefox15/Makefile b/www/firefox15/Makefile
index 3de712b3d316..1e9c0c738f32 100644
--- a/www/firefox15/Makefile
+++ b/www/firefox15/Makefile
@@ -6,13 +6,12 @@
 #
 
 PORTNAME=	firefox
-PORTVERSION=	1.0.r2
-PORTREVISION=	1
+PORTVERSION=	1.0
 PORTEPOCH=	1
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_MOZILLA}
-MASTER_SITE_SUBDIR=	${PORTNAME}/releases/1.0rc2/source
-DISTNAME=	${PORTNAME}-1.0rc2-source
+MASTER_SITE_SUBDIR=	${PORTNAME}/releases/1.0/source
+DISTNAME=	${PORTNAME}-1.0-source
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Web browser based on the browser portion of Mozilla
@@ -35,7 +34,7 @@ PLIST=		${WRKDIR}/plist
 PLUGINSDIR=	${PREFIX}/lib/browser_plugins
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_GNOME=	gtk20 libidl
+USE_GNOME=	gtk20 libidl gnomehier
 USE_ICONV=	yes
 USE_PERL5_BUILD=yes
 USE_X_PREFIX=	yes
@@ -43,6 +42,9 @@ WRKSRC=		${WRKDIR}/mozilla
 PKGINSTALL=	${WRKDIR}/pkg-install
 PKGDEINSTALL=	${WRKDIR}/pkg-deinstall
 
+FIREFOX_ICON=	firefox.png
+FIREFOX_ICON_SRC=${WRKSRC}/other-licenses/branding/firefox/content/alert-exclam.png
+
 PKGCONFIG_FILES=mozilla-gtkmozembed mozilla-js mozilla-xpcom \
 		mozilla-nspr mozilla-nss mozilla-plugin
 
@@ -121,6 +123,8 @@ post-extract::
 		-e 's|@PREFIX@|${FAKEDIR}/lib/firefox|'	\
 		-e 's|@PERL@|${PERL5}|'			\
 		<${FILESDIR}/mozconfig.in >${WRKSRC}/.mozconfig
+	@${SED} -e 's|@FIREFOX_ICON@|${FIREFOX_ICON}|' \
+		<${FILESDIR}/firefox.desktop.in >${WRKDIR}/firefox.desktop
 
 post-patch:
 	@${PERL} -pi -e 's|%%PREFIX%%|${PREFIX}|g' \
@@ -191,6 +195,8 @@ pre-install:
 		"s:^:@unexec ${RMDIR} %D/:" -e "s:$$: || true:" >> ${PLIST}; \
 	${FIND} * -type d ! -empty | ${SORT} -r | ${SED} -e "s:^:@dirrm :" | \
 		${GREP} / >> ${PLIST}
+	${ECHO_CMD} 'share/gnome/pixmaps/${FIREFOX_ICON}' >> ${PLIST}
+	${ECHO_CMD} 'share/gnome/applications/firefox.desktop' >> ${PLIST}
 
 do-install:
 # This is the actual installation.  First, the contents of FAKEDIR are
@@ -228,5 +234,7 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/other-licenses/branding/firefox/default.xpm \
 		${LOCAL_PREFIX}/lib/${PORTNAME}-${REALVERSION}/chrome/icons/default/default.xpm
 .endif # defined(WITH_NEW_ICON)
+	${INSTALL_DATA} ${FIREFOX_ICON_SRC} ${PREFIX}/share/gnome/pixmaps/${FIREFOX_ICON}
+	${INSTALL_DATA} ${WRKDIR}/firefox.desktop ${PREFIX}/share/gnome/applications
 
 .include <bsd.port.post.mk>
diff --git a/www/firefox15/distinfo b/www/firefox15/distinfo
index 5d99d1c044eb..15627b0a7580 100644
--- a/www/firefox15/distinfo
+++ b/www/firefox15/distinfo
@@ -1,2 +1,2 @@
-MD5 (firefox-1.0rc2-source.tar.bz2) = aab6ffe0e57de39b20d1c8ccef057171
-SIZE (firefox-1.0rc2-source.tar.bz2) = 32659115
+MD5 (firefox-1.0-source.tar.bz2) = 49c16a71f4de014ea471be81e46b1da8
+SIZE (firefox-1.0-source.tar.bz2) = 32686249
diff --git a/www/firefox15/files/firefox.desktop.in b/www/firefox15/files/firefox.desktop.in
new file mode 100644
index 000000000000..229000828162
--- /dev/null
+++ b/www/firefox15/files/firefox.desktop.in
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Name=Firefox
+Comment=Firefox Web Browser
+Exec=firefox %U
+Icon=@FIREFOX_ICON@
+Terminal=false
+Type=Application
+Categories=Application;Network;
diff --git a/www/firefox15/pkg-install.in b/www/firefox15/pkg-install.in
index 8004a6516143..f548cac38445 100644
--- a/www/firefox15/pkg-install.in
+++ b/www/firefox15/pkg-install.in
@@ -7,7 +7,7 @@
 # Fix the chrome registry.
 
 umask 022
-PATH=/bin:/usr/bin
+PATH=/bin:/usr/bin:/usr/local/bin
 
 [ "x$1" = "x" ] && exit 1
 [ "x$2" != "xPOST-INSTALL" ] && exit 0
@@ -29,7 +29,7 @@ cd ${MOZDIR} || exit 1
 ./run-mozilla.sh ${REGCHROME} || true
 
 # Instantiate the extension space as root.
-su - root -c "%%X11BASE%%/bin/xinit %%MOZDIR%%/run-mozilla.sh ${FIREFOX} -install-global-extension -- %%X11BASE%%/bin/Xvfb :1001" > /dev/null 2>&1
-su - root -c "%%X11BASE%%/bin/xinit %%MOZDIR%%/run-mozilla.sh ${FIREFOX} -install-global-theme -- %%X11BASE%%/bin/Xvfb :1001" > /dev/null 2>&1
+su - root -c "env PATH=${PATH} %%X11BASE%%/bin/xinit %%MOZDIR%%/run-mozilla.sh ${FIREFOX} -install-global-extension -- %%X11BASE%%/bin/Xvfb :1001" > /dev/null 2>&1
+su - root -c "env PATH=${PATH} %%X11BASE%%/bin/xinit %%MOZDIR%%/run-mozilla.sh ${FIREFOX} -install-global-theme -- %%X11BASE%%/bin/Xvfb :1001" > /dev/null 2>&1
 
 exit 0
diff --git a/www/firefox3-devel/Makefile b/www/firefox3-devel/Makefile
index 3de712b3d316..1e9c0c738f32 100644
--- a/www/firefox3-devel/Makefile
+++ b/www/firefox3-devel/Makefile
@@ -6,13 +6,12 @@
 #
 
 PORTNAME=	firefox
-PORTVERSION=	1.0.r2
-PORTREVISION=	1
+PORTVERSION=	1.0
 PORTEPOCH=	1
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_MOZILLA}
-MASTER_SITE_SUBDIR=	${PORTNAME}/releases/1.0rc2/source
-DISTNAME=	${PORTNAME}-1.0rc2-source
+MASTER_SITE_SUBDIR=	${PORTNAME}/releases/1.0/source
+DISTNAME=	${PORTNAME}-1.0-source
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Web browser based on the browser portion of Mozilla
@@ -35,7 +34,7 @@ PLIST=		${WRKDIR}/plist
 PLUGINSDIR=	${PREFIX}/lib/browser_plugins
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_GNOME=	gtk20 libidl
+USE_GNOME=	gtk20 libidl gnomehier
 USE_ICONV=	yes
 USE_PERL5_BUILD=yes
 USE_X_PREFIX=	yes
@@ -43,6 +42,9 @@ WRKSRC=		${WRKDIR}/mozilla
 PKGINSTALL=	${WRKDIR}/pkg-install
 PKGDEINSTALL=	${WRKDIR}/pkg-deinstall
 
+FIREFOX_ICON=	firefox.png
+FIREFOX_ICON_SRC=${WRKSRC}/other-licenses/branding/firefox/content/alert-exclam.png
+
 PKGCONFIG_FILES=mozilla-gtkmozembed mozilla-js mozilla-xpcom \
 		mozilla-nspr mozilla-nss mozilla-plugin
 
@@ -121,6 +123,8 @@ post-extract::
 		-e 's|@PREFIX@|${FAKEDIR}/lib/firefox|'	\
 		-e 's|@PERL@|${PERL5}|'			\
 		<${FILESDIR}/mozconfig.in >${WRKSRC}/.mozconfig
+	@${SED} -e 's|@FIREFOX_ICON@|${FIREFOX_ICON}|' \
+		<${FILESDIR}/firefox.desktop.in >${WRKDIR}/firefox.desktop
 
 post-patch:
 	@${PERL} -pi -e 's|%%PREFIX%%|${PREFIX}|g' \
@@ -191,6 +195,8 @@ pre-install:
 		"s:^:@unexec ${RMDIR} %D/:" -e "s:$$: || true:" >> ${PLIST}; \
 	${FIND} * -type d ! -empty | ${SORT} -r | ${SED} -e "s:^:@dirrm :" | \
 		${GREP} / >> ${PLIST}
+	${ECHO_CMD} 'share/gnome/pixmaps/${FIREFOX_ICON}' >> ${PLIST}
+	${ECHO_CMD} 'share/gnome/applications/firefox.desktop' >> ${PLIST}
 
 do-install:
 # This is the actual installation.  First, the contents of FAKEDIR are
@@ -228,5 +234,7 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/other-licenses/branding/firefox/default.xpm \
 		${LOCAL_PREFIX}/lib/${PORTNAME}-${REALVERSION}/chrome/icons/default/default.xpm
 .endif # defined(WITH_NEW_ICON)
+	${INSTALL_DATA} ${FIREFOX_ICON_SRC} ${PREFIX}/share/gnome/pixmaps/${FIREFOX_ICON}
+	${INSTALL_DATA} ${WRKDIR}/firefox.desktop ${PREFIX}/share/gnome/applications
 
 .include <bsd.port.post.mk>
diff --git a/www/firefox3-devel/distinfo b/www/firefox3-devel/distinfo
index 5d99d1c044eb..15627b0a7580 100644
--- a/www/firefox3-devel/distinfo
+++ b/www/firefox3-devel/distinfo
@@ -1,2 +1,2 @@
-MD5 (firefox-1.0rc2-source.tar.bz2) = aab6ffe0e57de39b20d1c8ccef057171
-SIZE (firefox-1.0rc2-source.tar.bz2) = 32659115
+MD5 (firefox-1.0-source.tar.bz2) = 49c16a71f4de014ea471be81e46b1da8
+SIZE (firefox-1.0-source.tar.bz2) = 32686249
diff --git a/www/firefox3-devel/files/firefox.desktop.in b/www/firefox3-devel/files/firefox.desktop.in
new file mode 100644
index 000000000000..229000828162
--- /dev/null
+++ b/www/firefox3-devel/files/firefox.desktop.in
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Name=Firefox
+Comment=Firefox Web Browser
+Exec=firefox %U
+Icon=@FIREFOX_ICON@
+Terminal=false
+Type=Application
+Categories=Application;Network;
diff --git a/www/firefox3-devel/pkg-install.in b/www/firefox3-devel/pkg-install.in
index 8004a6516143..f548cac38445 100644
--- a/www/firefox3-devel/pkg-install.in
+++ b/www/firefox3-devel/pkg-install.in
@@ -7,7 +7,7 @@
 # Fix the chrome registry.
 
 umask 022
-PATH=/bin:/usr/bin
+PATH=/bin:/usr/bin:/usr/local/bin
 
 [ "x$1" = "x" ] && exit 1
 [ "x$2" != "xPOST-INSTALL" ] && exit 0
@@ -29,7 +29,7 @@ cd ${MOZDIR} || exit 1
 ./run-mozilla.sh ${REGCHROME} || true
 
 # Instantiate the extension space as root.
-su - root -c "%%X11BASE%%/bin/xinit %%MOZDIR%%/run-mozilla.sh ${FIREFOX} -install-global-extension -- %%X11BASE%%/bin/Xvfb :1001" > /dev/null 2>&1
-su - root -c "%%X11BASE%%/bin/xinit %%MOZDIR%%/run-mozilla.sh ${FIREFOX} -install-global-theme -- %%X11BASE%%/bin/Xvfb :1001" > /dev/null 2>&1
+su - root -c "env PATH=${PATH} %%X11BASE%%/bin/xinit %%MOZDIR%%/run-mozilla.sh ${FIREFOX} -install-global-extension -- %%X11BASE%%/bin/Xvfb :1001" > /dev/null 2>&1
+su - root -c "env PATH=${PATH} %%X11BASE%%/bin/xinit %%MOZDIR%%/run-mozilla.sh ${FIREFOX} -install-global-theme -- %%X11BASE%%/bin/Xvfb :1001" > /dev/null 2>&1
 
 exit 0
diff --git a/www/firefox35/Makefile b/www/firefox35/Makefile
index 3de712b3d316..1e9c0c738f32 100644
--- a/www/firefox35/Makefile
+++ b/www/firefox35/Makefile
@@ -6,13 +6,12 @@
 #
 
 PORTNAME=	firefox
-PORTVERSION=	1.0.r2
-PORTREVISION=	1
+PORTVERSION=	1.0
 PORTEPOCH=	1
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_MOZILLA}
-MASTER_SITE_SUBDIR=	${PORTNAME}/releases/1.0rc2/source
-DISTNAME=	${PORTNAME}-1.0rc2-source
+MASTER_SITE_SUBDIR=	${PORTNAME}/releases/1.0/source
+DISTNAME=	${PORTNAME}-1.0-source
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Web browser based on the browser portion of Mozilla
@@ -35,7 +34,7 @@ PLIST=		${WRKDIR}/plist
 PLUGINSDIR=	${PREFIX}/lib/browser_plugins
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_GNOME=	gtk20 libidl
+USE_GNOME=	gtk20 libidl gnomehier
 USE_ICONV=	yes
 USE_PERL5_BUILD=yes
 USE_X_PREFIX=	yes
@@ -43,6 +42,9 @@ WRKSRC=		${WRKDIR}/mozilla
 PKGINSTALL=	${WRKDIR}/pkg-install
 PKGDEINSTALL=	${WRKDIR}/pkg-deinstall
 
+FIREFOX_ICON=	firefox.png
+FIREFOX_ICON_SRC=${WRKSRC}/other-licenses/branding/firefox/content/alert-exclam.png
+
 PKGCONFIG_FILES=mozilla-gtkmozembed mozilla-js mozilla-xpcom \
 		mozilla-nspr mozilla-nss mozilla-plugin
 
@@ -121,6 +123,8 @@ post-extract::
 		-e 's|@PREFIX@|${FAKEDIR}/lib/firefox|'	\
 		-e 's|@PERL@|${PERL5}|'			\
 		<${FILESDIR}/mozconfig.in >${WRKSRC}/.mozconfig
+	@${SED} -e 's|@FIREFOX_ICON@|${FIREFOX_ICON}|' \
+		<${FILESDIR}/firefox.desktop.in >${WRKDIR}/firefox.desktop
 
 post-patch:
 	@${PERL} -pi -e 's|%%PREFIX%%|${PREFIX}|g' \
@@ -191,6 +195,8 @@ pre-install:
 		"s:^:@unexec ${RMDIR} %D/:" -e "s:$$: || true:" >> ${PLIST}; \
 	${FIND} * -type d ! -empty | ${SORT} -r | ${SED} -e "s:^:@dirrm :" | \
 		${GREP} / >> ${PLIST}
+	${ECHO_CMD} 'share/gnome/pixmaps/${FIREFOX_ICON}' >> ${PLIST}
+	${ECHO_CMD} 'share/gnome/applications/firefox.desktop' >> ${PLIST}
 
 do-install:
 # This is the actual installation.  First, the contents of FAKEDIR are
@@ -228,5 +234,7 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/other-licenses/branding/firefox/default.xpm \
 		${LOCAL_PREFIX}/lib/${PORTNAME}-${REALVERSION}/chrome/icons/default/default.xpm
 .endif # defined(WITH_NEW_ICON)
+	${INSTALL_DATA} ${FIREFOX_ICON_SRC} ${PREFIX}/share/gnome/pixmaps/${FIREFOX_ICON}
+	${INSTALL_DATA} ${WRKDIR}/firefox.desktop ${PREFIX}/share/gnome/applications
 
 .include <bsd.port.post.mk>
diff --git a/www/firefox35/distinfo b/www/firefox35/distinfo
index 5d99d1c044eb..15627b0a7580 100644
--- a/www/firefox35/distinfo
+++ b/www/firefox35/distinfo
@@ -1,2 +1,2 @@
-MD5 (firefox-1.0rc2-source.tar.bz2) = aab6ffe0e57de39b20d1c8ccef057171
-SIZE (firefox-1.0rc2-source.tar.bz2) = 32659115
+MD5 (firefox-1.0-source.tar.bz2) = 49c16a71f4de014ea471be81e46b1da8
+SIZE (firefox-1.0-source.tar.bz2) = 32686249
diff --git a/www/firefox35/files/firefox.desktop.in b/www/firefox35/files/firefox.desktop.in
new file mode 100644
index 000000000000..229000828162
--- /dev/null
+++ b/www/firefox35/files/firefox.desktop.in
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Name=Firefox
+Comment=Firefox Web Browser
+Exec=firefox %U
+Icon=@FIREFOX_ICON@
+Terminal=false
+Type=Application
+Categories=Application;Network;
diff --git a/www/firefox35/pkg-install.in b/www/firefox35/pkg-install.in
index 8004a6516143..f548cac38445 100644
--- a/www/firefox35/pkg-install.in
+++ b/www/firefox35/pkg-install.in
@@ -7,7 +7,7 @@
 # Fix the chrome registry.
 
 umask 022
-PATH=/bin:/usr/bin
+PATH=/bin:/usr/bin:/usr/local/bin
 
 [ "x$1" = "x" ] && exit 1
 [ "x$2" != "xPOST-INSTALL" ] && exit 0
@@ -29,7 +29,7 @@ cd ${MOZDIR} || exit 1
 ./run-mozilla.sh ${REGCHROME} || true
 
 # Instantiate the extension space as root.
-su - root -c "%%X11BASE%%/bin/xinit %%MOZDIR%%/run-mozilla.sh ${FIREFOX} -install-global-extension -- %%X11BASE%%/bin/Xvfb :1001" > /dev/null 2>&1
-su - root -c "%%X11BASE%%/bin/xinit %%MOZDIR%%/run-mozilla.sh ${FIREFOX} -install-global-theme -- %%X11BASE%%/bin/Xvfb :1001" > /dev/null 2>&1
+su - root -c "env PATH=${PATH} %%X11BASE%%/bin/xinit %%MOZDIR%%/run-mozilla.sh ${FIREFOX} -install-global-extension -- %%X11BASE%%/bin/Xvfb :1001" > /dev/null 2>&1
+su - root -c "env PATH=${PATH} %%X11BASE%%/bin/xinit %%MOZDIR%%/run-mozilla.sh ${FIREFOX} -install-global-theme -- %%X11BASE%%/bin/Xvfb :1001" > /dev/null 2>&1
 
 exit 0
diff --git a/www/firefox36/Makefile b/www/firefox36/Makefile
index 3de712b3d316..1e9c0c738f32 100644
--- a/www/firefox36/Makefile
+++ b/www/firefox36/Makefile
@@ -6,13 +6,12 @@
 #
 
 PORTNAME=	firefox
-PORTVERSION=	1.0.r2
-PORTREVISION=	1
+PORTVERSION=	1.0
 PORTEPOCH=	1
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_MOZILLA}
-MASTER_SITE_SUBDIR=	${PORTNAME}/releases/1.0rc2/source
-DISTNAME=	${PORTNAME}-1.0rc2-source
+MASTER_SITE_SUBDIR=	${PORTNAME}/releases/1.0/source
+DISTNAME=	${PORTNAME}-1.0-source
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Web browser based on the browser portion of Mozilla
@@ -35,7 +34,7 @@ PLIST=		${WRKDIR}/plist
 PLUGINSDIR=	${PREFIX}/lib/browser_plugins
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_GNOME=	gtk20 libidl
+USE_GNOME=	gtk20 libidl gnomehier
 USE_ICONV=	yes
 USE_PERL5_BUILD=yes
 USE_X_PREFIX=	yes
@@ -43,6 +42,9 @@ WRKSRC=		${WRKDIR}/mozilla
 PKGINSTALL=	${WRKDIR}/pkg-install
 PKGDEINSTALL=	${WRKDIR}/pkg-deinstall
 
+FIREFOX_ICON=	firefox.png
+FIREFOX_ICON_SRC=${WRKSRC}/other-licenses/branding/firefox/content/alert-exclam.png
+
 PKGCONFIG_FILES=mozilla-gtkmozembed mozilla-js mozilla-xpcom \
 		mozilla-nspr mozilla-nss mozilla-plugin
 
@@ -121,6 +123,8 @@ post-extract::
 		-e 's|@PREFIX@|${FAKEDIR}/lib/firefox|'	\
 		-e 's|@PERL@|${PERL5}|'			\
 		<${FILESDIR}/mozconfig.in >${WRKSRC}/.mozconfig
+	@${SED} -e 's|@FIREFOX_ICON@|${FIREFOX_ICON}|' \
+		<${FILESDIR}/firefox.desktop.in >${WRKDIR}/firefox.desktop
 
 post-patch:
 	@${PERL} -pi -e 's|%%PREFIX%%|${PREFIX}|g' \
@@ -191,6 +195,8 @@ pre-install:
 		"s:^:@unexec ${RMDIR} %D/:" -e "s:$$: || true:" >> ${PLIST}; \
 	${FIND} * -type d ! -empty | ${SORT} -r | ${SED} -e "s:^:@dirrm :" | \
 		${GREP} / >> ${PLIST}
+	${ECHO_CMD} 'share/gnome/pixmaps/${FIREFOX_ICON}' >> ${PLIST}
+	${ECHO_CMD} 'share/gnome/applications/firefox.desktop' >> ${PLIST}
 
 do-install:
 # This is the actual installation.  First, the contents of FAKEDIR are
@@ -228,5 +234,7 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/other-licenses/branding/firefox/default.xpm \
 		${LOCAL_PREFIX}/lib/${PORTNAME}-${REALVERSION}/chrome/icons/default/default.xpm
 .endif # defined(WITH_NEW_ICON)
+	${INSTALL_DATA} ${FIREFOX_ICON_SRC} ${PREFIX}/share/gnome/pixmaps/${FIREFOX_ICON}
+	${INSTALL_DATA} ${WRKDIR}/firefox.desktop ${PREFIX}/share/gnome/applications
 
 .include <bsd.port.post.mk>
diff --git a/www/firefox36/distinfo b/www/firefox36/distinfo
index 5d99d1c044eb..15627b0a7580 100644
--- a/www/firefox36/distinfo
+++ b/www/firefox36/distinfo
@@ -1,2 +1,2 @@
-MD5 (firefox-1.0rc2-source.tar.bz2) = aab6ffe0e57de39b20d1c8ccef057171
-SIZE (firefox-1.0rc2-source.tar.bz2) = 32659115
+MD5 (firefox-1.0-source.tar.bz2) = 49c16a71f4de014ea471be81e46b1da8
+SIZE (firefox-1.0-source.tar.bz2) = 32686249
diff --git a/www/firefox36/files/firefox.desktop.in b/www/firefox36/files/firefox.desktop.in
new file mode 100644
index 000000000000..229000828162
--- /dev/null
+++ b/www/firefox36/files/firefox.desktop.in
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Name=Firefox
+Comment=Firefox Web Browser
+Exec=firefox %U
+Icon=@FIREFOX_ICON@
+Terminal=false
+Type=Application
+Categories=Application;Network;
diff --git a/www/firefox36/pkg-install.in b/www/firefox36/pkg-install.in
index 8004a6516143..f548cac38445 100644
--- a/www/firefox36/pkg-install.in
+++ b/www/firefox36/pkg-install.in
@@ -7,7 +7,7 @@
 # Fix the chrome registry.
 
 umask 022
-PATH=/bin:/usr/bin
+PATH=/bin:/usr/bin:/usr/local/bin
 
 [ "x$1" = "x" ] && exit 1
 [ "x$2" != "xPOST-INSTALL" ] && exit 0
@@ -29,7 +29,7 @@ cd ${MOZDIR} || exit 1
 ./run-mozilla.sh ${REGCHROME} || true
 
 # Instantiate the extension space as root.
-su - root -c "%%X11BASE%%/bin/xinit %%MOZDIR%%/run-mozilla.sh ${FIREFOX} -install-global-extension -- %%X11BASE%%/bin/Xvfb :1001" > /dev/null 2>&1
-su - root -c "%%X11BASE%%/bin/xinit %%MOZDIR%%/run-mozilla.sh ${FIREFOX} -install-global-theme -- %%X11BASE%%/bin/Xvfb :1001" > /dev/null 2>&1
+su - root -c "env PATH=${PATH} %%X11BASE%%/bin/xinit %%MOZDIR%%/run-mozilla.sh ${FIREFOX} -install-global-extension -- %%X11BASE%%/bin/Xvfb :1001" > /dev/null 2>&1
+su - root -c "env PATH=${PATH} %%X11BASE%%/bin/xinit %%MOZDIR%%/run-mozilla.sh ${FIREFOX} -install-global-theme -- %%X11BASE%%/bin/Xvfb :1001" > /dev/null 2>&1
 
 exit 0
diff --git a/www/flock/Makefile b/www/flock/Makefile
index 3de712b3d316..1e9c0c738f32 100644
--- a/www/flock/Makefile
+++ b/www/flock/Makefile
@@ -6,13 +6,12 @@
 #
 
 PORTNAME=	firefox
-PORTVERSION=	1.0.r2
-PORTREVISION=	1
+PORTVERSION=	1.0
 PORTEPOCH=	1
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_MOZILLA}
-MASTER_SITE_SUBDIR=	${PORTNAME}/releases/1.0rc2/source
-DISTNAME=	${PORTNAME}-1.0rc2-source
+MASTER_SITE_SUBDIR=	${PORTNAME}/releases/1.0/source
+DISTNAME=	${PORTNAME}-1.0-source
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Web browser based on the browser portion of Mozilla
@@ -35,7 +34,7 @@ PLIST=		${WRKDIR}/plist
 PLUGINSDIR=	${PREFIX}/lib/browser_plugins
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_GNOME=	gtk20 libidl
+USE_GNOME=	gtk20 libidl gnomehier
 USE_ICONV=	yes
 USE_PERL5_BUILD=yes
 USE_X_PREFIX=	yes
@@ -43,6 +42,9 @@ WRKSRC=		${WRKDIR}/mozilla
 PKGINSTALL=	${WRKDIR}/pkg-install
 PKGDEINSTALL=	${WRKDIR}/pkg-deinstall
 
+FIREFOX_ICON=	firefox.png
+FIREFOX_ICON_SRC=${WRKSRC}/other-licenses/branding/firefox/content/alert-exclam.png
+
 PKGCONFIG_FILES=mozilla-gtkmozembed mozilla-js mozilla-xpcom \
 		mozilla-nspr mozilla-nss mozilla-plugin
 
@@ -121,6 +123,8 @@ post-extract::
 		-e 's|@PREFIX@|${FAKEDIR}/lib/firefox|'	\
 		-e 's|@PERL@|${PERL5}|'			\
 		<${FILESDIR}/mozconfig.in >${WRKSRC}/.mozconfig
+	@${SED} -e 's|@FIREFOX_ICON@|${FIREFOX_ICON}|' \
+		<${FILESDIR}/firefox.desktop.in >${WRKDIR}/firefox.desktop
 
 post-patch:
 	@${PERL} -pi -e 's|%%PREFIX%%|${PREFIX}|g' \
@@ -191,6 +195,8 @@ pre-install:
 		"s:^:@unexec ${RMDIR} %D/:" -e "s:$$: || true:" >> ${PLIST}; \
 	${FIND} * -type d ! -empty | ${SORT} -r | ${SED} -e "s:^:@dirrm :" | \
 		${GREP} / >> ${PLIST}
+	${ECHO_CMD} 'share/gnome/pixmaps/${FIREFOX_ICON}' >> ${PLIST}
+	${ECHO_CMD} 'share/gnome/applications/firefox.desktop' >> ${PLIST}
 
 do-install:
 # This is the actual installation.  First, the contents of FAKEDIR are
@@ -228,5 +234,7 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/other-licenses/branding/firefox/default.xpm \
 		${LOCAL_PREFIX}/lib/${PORTNAME}-${REALVERSION}/chrome/icons/default/default.xpm
 .endif # defined(WITH_NEW_ICON)
+	${INSTALL_DATA} ${FIREFOX_ICON_SRC} ${PREFIX}/share/gnome/pixmaps/${FIREFOX_ICON}
+	${INSTALL_DATA} ${WRKDIR}/firefox.desktop ${PREFIX}/share/gnome/applications
 
 .include <bsd.port.post.mk>
diff --git a/www/flock/distinfo b/www/flock/distinfo
index 5d99d1c044eb..15627b0a7580 100644
--- a/www/flock/distinfo
+++ b/www/flock/distinfo
@@ -1,2 +1,2 @@
-MD5 (firefox-1.0rc2-source.tar.bz2) = aab6ffe0e57de39b20d1c8ccef057171
-SIZE (firefox-1.0rc2-source.tar.bz2) = 32659115
+MD5 (firefox-1.0-source.tar.bz2) = 49c16a71f4de014ea471be81e46b1da8
+SIZE (firefox-1.0-source.tar.bz2) = 32686249
diff --git a/www/flock/files/firefox.desktop.in b/www/flock/files/firefox.desktop.in
new file mode 100644
index 000000000000..229000828162
--- /dev/null
+++ b/www/flock/files/firefox.desktop.in
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Name=Firefox
+Comment=Firefox Web Browser
+Exec=firefox %U
+Icon=@FIREFOX_ICON@
+Terminal=false
+Type=Application
+Categories=Application;Network;
diff --git a/www/flock/pkg-install.in b/www/flock/pkg-install.in
index 8004a6516143..f548cac38445 100644
--- a/www/flock/pkg-install.in
+++ b/www/flock/pkg-install.in
@@ -7,7 +7,7 @@
 # Fix the chrome registry.
 
 umask 022
-PATH=/bin:/usr/bin
+PATH=/bin:/usr/bin:/usr/local/bin
 
 [ "x$1" = "x" ] && exit 1
 [ "x$2" != "xPOST-INSTALL" ] && exit 0
@@ -29,7 +29,7 @@ cd ${MOZDIR} || exit 1
 ./run-mozilla.sh ${REGCHROME} || true
 
 # Instantiate the extension space as root.
-su - root -c "%%X11BASE%%/bin/xinit %%MOZDIR%%/run-mozilla.sh ${FIREFOX} -install-global-extension -- %%X11BASE%%/bin/Xvfb :1001" > /dev/null 2>&1
-su - root -c "%%X11BASE%%/bin/xinit %%MOZDIR%%/run-mozilla.sh ${FIREFOX} -install-global-theme -- %%X11BASE%%/bin/Xvfb :1001" > /dev/null 2>&1
+su - root -c "env PATH=${PATH} %%X11BASE%%/bin/xinit %%MOZDIR%%/run-mozilla.sh ${FIREFOX} -install-global-extension -- %%X11BASE%%/bin/Xvfb :1001" > /dev/null 2>&1
+su - root -c "env PATH=${PATH} %%X11BASE%%/bin/xinit %%MOZDIR%%/run-mozilla.sh ${FIREFOX} -install-global-theme -- %%X11BASE%%/bin/Xvfb :1001" > /dev/null 2>&1
 
 exit 0