27 files changed, 261 insertions, 36 deletions

diff --git a/www/firefox-devel/Makefile b/www/firefox-devel/Makefile
index 5eeeb7b36085..4cf8da901bc2 100644
--- a/www/firefox-devel/Makefile
+++ b/www/firefox-devel/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	firefox
-PORTVERSION=	0.9.1
-PORTREVISION=	1
+PORTVERSION=	0.9.3
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_MOZILLA}
 MASTER_SITE_SUBDIR=	${PORTNAME}/releases/${PORTVERSION}
@@ -42,6 +41,7 @@ USE_PERL5_BUILD=yes
 USE_X_PREFIX=	yes
 WRKSRC=		${WRKDIR}/mozilla
 PKGINSTALL=	${WRKDIR}/pkg-install
+PKGDEINSTALL=	${WRKDIR}/pkg-deinstall
 
 PKGCONFIG_FILES=mozilla-gtkmozembed mozilla-js mozilla-xpcom \
 		mozilla-nspr mozilla-nss mozilla-plugin
@@ -171,6 +171,8 @@ pre-install:
 		${FAKEDIR}/lib/${PORTNAME}/lib/${PORTNAME}-${PORTVERSION}/extensions.port
 	@${SED} -e 's|%%MOZDIR%%|${LOCAL_PREFIX}/lib/${PORTNAME}-${PORTVERSION}|g' \
 		< ${MASTERDIR}/pkg-install.in > ${PKGINSTALL}
+	@${SED} -e 's|%%MOZDIR%%|${LOCAL_PREFIX}/lib/${PORTNAME}-${PORTVERSION}|g' \
+		< ${MASTERDIR}/pkg-deinstall.in > ${PKGDEINSTALL}
 
 .if !defined (WITH_HEADERS)
 	@${RM} -fr ${FAKEDIR}/share/idl ${FAKEDIR}/include
diff --git a/www/firefox-devel/distinfo b/www/firefox-devel/distinfo
index dd967eb6a528..53764c79efd8 100644
--- a/www/firefox-devel/distinfo
+++ b/www/firefox-devel/distinfo
@@ -1,2 +1,2 @@
-MD5 (firefox-0.9.1-source.tar.bz2) = 3df6fe17a5d400c1fc154df3c7a8dbb4
-SIZE (firefox-0.9.1-source.tar.bz2) = 33960883
+MD5 (firefox-0.9.3-source.tar.bz2) = 641ebf96d2211b3c5527e88389b9687e
+SIZE (firefox-0.9.3-source.tar.bz2) = 33945173
diff --git a/www/firefox-devel/pkg-deinstall.in b/www/firefox-devel/pkg-deinstall.in
new file mode 100644
index 000000000000..3fe1644fc054
--- /dev/null
+++ b/www/firefox-devel/pkg-deinstall.in
@@ -0,0 +1,23 @@
+#!/bin/sh
+#
+# $FreeBSD$
+#
+# Date created:			Mon Nov 29, 2003
+# Whom:				Thierry Thomas (<thierry@pompo.net>)
+# Fix the chrome registry.
+
+umask 022
+PATH=/bin:/usr/bin
+
+[ "x$1" = "x" ] && exit 1
+[ "x$2" != "xDEINSTALL" ] && exit 0
+
+MOZDIR=%%MOZDIR%%
+
+rm -rf ${MOZDIR}/chrome/overlayinfo
+rm -f ${MOZDIR}/chrome/*.rdf
+rm -f ${MOZDIR}/component.reg
+rm -f ${MOZDIR}/components/*.dat
+rm -rf ${MOZDIR}/extensions
+
+exit 0
diff --git a/www/firefox-esr/Makefile b/www/firefox-esr/Makefile
index 5eeeb7b36085..4cf8da901bc2 100644
--- a/www/firefox-esr/Makefile
+++ b/www/firefox-esr/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	firefox
-PORTVERSION=	0.9.1
-PORTREVISION=	1
+PORTVERSION=	0.9.3
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_MOZILLA}
 MASTER_SITE_SUBDIR=	${PORTNAME}/releases/${PORTVERSION}
@@ -42,6 +41,7 @@ USE_PERL5_BUILD=yes
 USE_X_PREFIX=	yes
 WRKSRC=		${WRKDIR}/mozilla
 PKGINSTALL=	${WRKDIR}/pkg-install
+PKGDEINSTALL=	${WRKDIR}/pkg-deinstall
 
 PKGCONFIG_FILES=mozilla-gtkmozembed mozilla-js mozilla-xpcom \
 		mozilla-nspr mozilla-nss mozilla-plugin
@@ -171,6 +171,8 @@ pre-install:
 		${FAKEDIR}/lib/${PORTNAME}/lib/${PORTNAME}-${PORTVERSION}/extensions.port
 	@${SED} -e 's|%%MOZDIR%%|${LOCAL_PREFIX}/lib/${PORTNAME}-${PORTVERSION}|g' \
 		< ${MASTERDIR}/pkg-install.in > ${PKGINSTALL}
+	@${SED} -e 's|%%MOZDIR%%|${LOCAL_PREFIX}/lib/${PORTNAME}-${PORTVERSION}|g' \
+		< ${MASTERDIR}/pkg-deinstall.in > ${PKGDEINSTALL}
 
 .if !defined (WITH_HEADERS)
 	@${RM} -fr ${FAKEDIR}/share/idl ${FAKEDIR}/include
diff --git a/www/firefox-esr/distinfo b/www/firefox-esr/distinfo
index dd967eb6a528..53764c79efd8 100644
--- a/www/firefox-esr/distinfo
+++ b/www/firefox-esr/distinfo
@@ -1,2 +1,2 @@
-MD5 (firefox-0.9.1-source.tar.bz2) = 3df6fe17a5d400c1fc154df3c7a8dbb4
-SIZE (firefox-0.9.1-source.tar.bz2) = 33960883
+MD5 (firefox-0.9.3-source.tar.bz2) = 641ebf96d2211b3c5527e88389b9687e
+SIZE (firefox-0.9.3-source.tar.bz2) = 33945173
diff --git a/www/firefox-esr/pkg-deinstall.in b/www/firefox-esr/pkg-deinstall.in
new file mode 100644
index 000000000000..3fe1644fc054
--- /dev/null
+++ b/www/firefox-esr/pkg-deinstall.in
@@ -0,0 +1,23 @@
+#!/bin/sh
+#
+# $FreeBSD$
+#
+# Date created:			Mon Nov 29, 2003
+# Whom:				Thierry Thomas (<thierry@pompo.net>)
+# Fix the chrome registry.
+
+umask 022
+PATH=/bin:/usr/bin
+
+[ "x$1" = "x" ] && exit 1
+[ "x$2" != "xDEINSTALL" ] && exit 0
+
+MOZDIR=%%MOZDIR%%
+
+rm -rf ${MOZDIR}/chrome/overlayinfo
+rm -f ${MOZDIR}/chrome/*.rdf
+rm -f ${MOZDIR}/component.reg
+rm -f ${MOZDIR}/components/*.dat
+rm -rf ${MOZDIR}/extensions
+
+exit 0
diff --git a/www/firefox/Makefile b/www/firefox/Makefile
index 5eeeb7b36085..4cf8da901bc2 100644
--- a/www/firefox/Makefile
+++ b/www/firefox/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	firefox
-PORTVERSION=	0.9.1
-PORTREVISION=	1
+PORTVERSION=	0.9.3
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_MOZILLA}
 MASTER_SITE_SUBDIR=	${PORTNAME}/releases/${PORTVERSION}
@@ -42,6 +41,7 @@ USE_PERL5_BUILD=yes
 USE_X_PREFIX=	yes
 WRKSRC=		${WRKDIR}/mozilla
 PKGINSTALL=	${WRKDIR}/pkg-install
+PKGDEINSTALL=	${WRKDIR}/pkg-deinstall
 
 PKGCONFIG_FILES=mozilla-gtkmozembed mozilla-js mozilla-xpcom \
 		mozilla-nspr mozilla-nss mozilla-plugin
@@ -171,6 +171,8 @@ pre-install:
 		${FAKEDIR}/lib/${PORTNAME}/lib/${PORTNAME}-${PORTVERSION}/extensions.port
 	@${SED} -e 's|%%MOZDIR%%|${LOCAL_PREFIX}/lib/${PORTNAME}-${PORTVERSION}|g' \
 		< ${MASTERDIR}/pkg-install.in > ${PKGINSTALL}
+	@${SED} -e 's|%%MOZDIR%%|${LOCAL_PREFIX}/lib/${PORTNAME}-${PORTVERSION}|g' \
+		< ${MASTERDIR}/pkg-deinstall.in > ${PKGDEINSTALL}
 
 .if !defined (WITH_HEADERS)
 	@${RM} -fr ${FAKEDIR}/share/idl ${FAKEDIR}/include
diff --git a/www/firefox/distinfo b/www/firefox/distinfo
index dd967eb6a528..53764c79efd8 100644
--- a/www/firefox/distinfo
+++ b/www/firefox/distinfo
@@ -1,2 +1,2 @@
-MD5 (firefox-0.9.1-source.tar.bz2) = 3df6fe17a5d400c1fc154df3c7a8dbb4
-SIZE (firefox-0.9.1-source.tar.bz2) = 33960883
+MD5 (firefox-0.9.3-source.tar.bz2) = 641ebf96d2211b3c5527e88389b9687e
+SIZE (firefox-0.9.3-source.tar.bz2) = 33945173
diff --git a/www/firefox/pkg-deinstall.in b/www/firefox/pkg-deinstall.in
new file mode 100644
index 000000000000..3fe1644fc054
--- /dev/null
+++ b/www/firefox/pkg-deinstall.in
@@ -0,0 +1,23 @@
+#!/bin/sh
+#
+# $FreeBSD$
+#
+# Date created:			Mon Nov 29, 2003
+# Whom:				Thierry Thomas (<thierry@pompo.net>)
+# Fix the chrome registry.
+
+umask 022
+PATH=/bin:/usr/bin
+
+[ "x$1" = "x" ] && exit 1
+[ "x$2" != "xDEINSTALL" ] && exit 0
+
+MOZDIR=%%MOZDIR%%
+
+rm -rf ${MOZDIR}/chrome/overlayinfo
+rm -f ${MOZDIR}/chrome/*.rdf
+rm -f ${MOZDIR}/component.reg
+rm -f ${MOZDIR}/components/*.dat
+rm -rf ${MOZDIR}/extensions
+
+exit 0
diff --git a/www/firefox10/Makefile b/www/firefox10/Makefile
index 5eeeb7b36085..4cf8da901bc2 100644
--- a/www/firefox10/Makefile
+++ b/www/firefox10/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	firefox
-PORTVERSION=	0.9.1
-PORTREVISION=	1
+PORTVERSION=	0.9.3
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_MOZILLA}
 MASTER_SITE_SUBDIR=	${PORTNAME}/releases/${PORTVERSION}
@@ -42,6 +41,7 @@ USE_PERL5_BUILD=yes
 USE_X_PREFIX=	yes
 WRKSRC=		${WRKDIR}/mozilla
 PKGINSTALL=	${WRKDIR}/pkg-install
+PKGDEINSTALL=	${WRKDIR}/pkg-deinstall
 
 PKGCONFIG_FILES=mozilla-gtkmozembed mozilla-js mozilla-xpcom \
 		mozilla-nspr mozilla-nss mozilla-plugin
@@ -171,6 +171,8 @@ pre-install:
 		${FAKEDIR}/lib/${PORTNAME}/lib/${PORTNAME}-${PORTVERSION}/extensions.port
 	@${SED} -e 's|%%MOZDIR%%|${LOCAL_PREFIX}/lib/${PORTNAME}-${PORTVERSION}|g' \
 		< ${MASTERDIR}/pkg-install.in > ${PKGINSTALL}
+	@${SED} -e 's|%%MOZDIR%%|${LOCAL_PREFIX}/lib/${PORTNAME}-${PORTVERSION}|g' \
+		< ${MASTERDIR}/pkg-deinstall.in > ${PKGDEINSTALL}
 
 .if !defined (WITH_HEADERS)
 	@${RM} -fr ${FAKEDIR}/share/idl ${FAKEDIR}/include
diff --git a/www/firefox10/distinfo b/www/firefox10/distinfo
index dd967eb6a528..53764c79efd8 100644
--- a/www/firefox10/distinfo
+++ b/www/firefox10/distinfo
@@ -1,2 +1,2 @@
-MD5 (firefox-0.9.1-source.tar.bz2) = 3df6fe17a5d400c1fc154df3c7a8dbb4
-SIZE (firefox-0.9.1-source.tar.bz2) = 33960883
+MD5 (firefox-0.9.3-source.tar.bz2) = 641ebf96d2211b3c5527e88389b9687e
+SIZE (firefox-0.9.3-source.tar.bz2) = 33945173
diff --git a/www/firefox10/pkg-deinstall.in b/www/firefox10/pkg-deinstall.in
new file mode 100644
index 000000000000..3fe1644fc054
--- /dev/null
+++ b/www/firefox10/pkg-deinstall.in
@@ -0,0 +1,23 @@
+#!/bin/sh
+#
+# $FreeBSD$
+#
+# Date created:			Mon Nov 29, 2003
+# Whom:				Thierry Thomas (<thierry@pompo.net>)
+# Fix the chrome registry.
+
+umask 022
+PATH=/bin:/usr/bin
+
+[ "x$1" = "x" ] && exit 1
+[ "x$2" != "xDEINSTALL" ] && exit 0
+
+MOZDIR=%%MOZDIR%%
+
+rm -rf ${MOZDIR}/chrome/overlayinfo
+rm -f ${MOZDIR}/chrome/*.rdf
+rm -f ${MOZDIR}/component.reg
+rm -f ${MOZDIR}/components/*.dat
+rm -rf ${MOZDIR}/extensions
+
+exit 0
diff --git a/www/firefox15/Makefile b/www/firefox15/Makefile
index 5eeeb7b36085..4cf8da901bc2 100644
--- a/www/firefox15/Makefile
+++ b/www/firefox15/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	firefox
-PORTVERSION=	0.9.1
-PORTREVISION=	1
+PORTVERSION=	0.9.3
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_MOZILLA}
 MASTER_SITE_SUBDIR=	${PORTNAME}/releases/${PORTVERSION}
@@ -42,6 +41,7 @@ USE_PERL5_BUILD=yes
 USE_X_PREFIX=	yes
 WRKSRC=		${WRKDIR}/mozilla
 PKGINSTALL=	${WRKDIR}/pkg-install
+PKGDEINSTALL=	${WRKDIR}/pkg-deinstall
 
 PKGCONFIG_FILES=mozilla-gtkmozembed mozilla-js mozilla-xpcom \
 		mozilla-nspr mozilla-nss mozilla-plugin
@@ -171,6 +171,8 @@ pre-install:
 		${FAKEDIR}/lib/${PORTNAME}/lib/${PORTNAME}-${PORTVERSION}/extensions.port
 	@${SED} -e 's|%%MOZDIR%%|${LOCAL_PREFIX}/lib/${PORTNAME}-${PORTVERSION}|g' \
 		< ${MASTERDIR}/pkg-install.in > ${PKGINSTALL}
+	@${SED} -e 's|%%MOZDIR%%|${LOCAL_PREFIX}/lib/${PORTNAME}-${PORTVERSION}|g' \
+		< ${MASTERDIR}/pkg-deinstall.in > ${PKGDEINSTALL}
 
 .if !defined (WITH_HEADERS)
 	@${RM} -fr ${FAKEDIR}/share/idl ${FAKEDIR}/include
diff --git a/www/firefox15/distinfo b/www/firefox15/distinfo
index dd967eb6a528..53764c79efd8 100644
--- a/www/firefox15/distinfo
+++ b/www/firefox15/distinfo
@@ -1,2 +1,2 @@
-MD5 (firefox-0.9.1-source.tar.bz2) = 3df6fe17a5d400c1fc154df3c7a8dbb4
-SIZE (firefox-0.9.1-source.tar.bz2) = 33960883
+MD5 (firefox-0.9.3-source.tar.bz2) = 641ebf96d2211b3c5527e88389b9687e
+SIZE (firefox-0.9.3-source.tar.bz2) = 33945173
diff --git a/www/firefox15/pkg-deinstall.in b/www/firefox15/pkg-deinstall.in
new file mode 100644
index 000000000000..3fe1644fc054
--- /dev/null
+++ b/www/firefox15/pkg-deinstall.in
@@ -0,0 +1,23 @@
+#!/bin/sh
+#
+# $FreeBSD$
+#
+# Date created:			Mon Nov 29, 2003
+# Whom:				Thierry Thomas (<thierry@pompo.net>)
+# Fix the chrome registry.
+
+umask 022
+PATH=/bin:/usr/bin
+
+[ "x$1" = "x" ] && exit 1
+[ "x$2" != "xDEINSTALL" ] && exit 0
+
+MOZDIR=%%MOZDIR%%
+
+rm -rf ${MOZDIR}/chrome/overlayinfo
+rm -f ${MOZDIR}/chrome/*.rdf
+rm -f ${MOZDIR}/component.reg
+rm -f ${MOZDIR}/components/*.dat
+rm -rf ${MOZDIR}/extensions
+
+exit 0
diff --git a/www/firefox3-devel/Makefile b/www/firefox3-devel/Makefile
index 5eeeb7b36085..4cf8da901bc2 100644
--- a/www/firefox3-devel/Makefile
+++ b/www/firefox3-devel/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	firefox
-PORTVERSION=	0.9.1
-PORTREVISION=	1
+PORTVERSION=	0.9.3
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_MOZILLA}
 MASTER_SITE_SUBDIR=	${PORTNAME}/releases/${PORTVERSION}
@@ -42,6 +41,7 @@ USE_PERL5_BUILD=yes
 USE_X_PREFIX=	yes
 WRKSRC=		${WRKDIR}/mozilla
 PKGINSTALL=	${WRKDIR}/pkg-install
+PKGDEINSTALL=	${WRKDIR}/pkg-deinstall
 
 PKGCONFIG_FILES=mozilla-gtkmozembed mozilla-js mozilla-xpcom \
 		mozilla-nspr mozilla-nss mozilla-plugin
@@ -171,6 +171,8 @@ pre-install:
 		${FAKEDIR}/lib/${PORTNAME}/lib/${PORTNAME}-${PORTVERSION}/extensions.port
 	@${SED} -e 's|%%MOZDIR%%|${LOCAL_PREFIX}/lib/${PORTNAME}-${PORTVERSION}|g' \
 		< ${MASTERDIR}/pkg-install.in > ${PKGINSTALL}
+	@${SED} -e 's|%%MOZDIR%%|${LOCAL_PREFIX}/lib/${PORTNAME}-${PORTVERSION}|g' \
+		< ${MASTERDIR}/pkg-deinstall.in > ${PKGDEINSTALL}
 
 .if !defined (WITH_HEADERS)
 	@${RM} -fr ${FAKEDIR}/share/idl ${FAKEDIR}/include
diff --git a/www/firefox3-devel/distinfo b/www/firefox3-devel/distinfo
index dd967eb6a528..53764c79efd8 100644
--- a/www/firefox3-devel/distinfo
+++ b/www/firefox3-devel/distinfo
@@ -1,2 +1,2 @@
-MD5 (firefox-0.9.1-source.tar.bz2) = 3df6fe17a5d400c1fc154df3c7a8dbb4
-SIZE (firefox-0.9.1-source.tar.bz2) = 33960883
+MD5 (firefox-0.9.3-source.tar.bz2) = 641ebf96d2211b3c5527e88389b9687e
+SIZE (firefox-0.9.3-source.tar.bz2) = 33945173
diff --git a/www/firefox3-devel/pkg-deinstall.in b/www/firefox3-devel/pkg-deinstall.in
new file mode 100644
index 000000000000..3fe1644fc054
--- /dev/null
+++ b/www/firefox3-devel/pkg-deinstall.in
@@ -0,0 +1,23 @@
+#!/bin/sh
+#
+# $FreeBSD$
+#
+# Date created:			Mon Nov 29, 2003
+# Whom:				Thierry Thomas (<thierry@pompo.net>)
+# Fix the chrome registry.
+
+umask 022
+PATH=/bin:/usr/bin
+
+[ "x$1" = "x" ] && exit 1
+[ "x$2" != "xDEINSTALL" ] && exit 0
+
+MOZDIR=%%MOZDIR%%
+
+rm -rf ${MOZDIR}/chrome/overlayinfo
+rm -f ${MOZDIR}/chrome/*.rdf
+rm -f ${MOZDIR}/component.reg
+rm -f ${MOZDIR}/components/*.dat
+rm -rf ${MOZDIR}/extensions
+
+exit 0
diff --git a/www/firefox35/Makefile b/www/firefox35/Makefile
index 5eeeb7b36085..4cf8da901bc2 100644
--- a/www/firefox35/Makefile
+++ b/www/firefox35/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	firefox
-PORTVERSION=	0.9.1
-PORTREVISION=	1
+PORTVERSION=	0.9.3
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_MOZILLA}
 MASTER_SITE_SUBDIR=	${PORTNAME}/releases/${PORTVERSION}
@@ -42,6 +41,7 @@ USE_PERL5_BUILD=yes
 USE_X_PREFIX=	yes
 WRKSRC=		${WRKDIR}/mozilla
 PKGINSTALL=	${WRKDIR}/pkg-install
+PKGDEINSTALL=	${WRKDIR}/pkg-deinstall
 
 PKGCONFIG_FILES=mozilla-gtkmozembed mozilla-js mozilla-xpcom \
 		mozilla-nspr mozilla-nss mozilla-plugin
@@ -171,6 +171,8 @@ pre-install:
 		${FAKEDIR}/lib/${PORTNAME}/lib/${PORTNAME}-${PORTVERSION}/extensions.port
 	@${SED} -e 's|%%MOZDIR%%|${LOCAL_PREFIX}/lib/${PORTNAME}-${PORTVERSION}|g' \
 		< ${MASTERDIR}/pkg-install.in > ${PKGINSTALL}
+	@${SED} -e 's|%%MOZDIR%%|${LOCAL_PREFIX}/lib/${PORTNAME}-${PORTVERSION}|g' \
+		< ${MASTERDIR}/pkg-deinstall.in > ${PKGDEINSTALL}
 
 .if !defined (WITH_HEADERS)
 	@${RM} -fr ${FAKEDIR}/share/idl ${FAKEDIR}/include
diff --git a/www/firefox35/distinfo b/www/firefox35/distinfo
index dd967eb6a528..53764c79efd8 100644
--- a/www/firefox35/distinfo
+++ b/www/firefox35/distinfo
@@ -1,2 +1,2 @@
-MD5 (firefox-0.9.1-source.tar.bz2) = 3df6fe17a5d400c1fc154df3c7a8dbb4
-SIZE (firefox-0.9.1-source.tar.bz2) = 33960883
+MD5 (firefox-0.9.3-source.tar.bz2) = 641ebf96d2211b3c5527e88389b9687e
+SIZE (firefox-0.9.3-source.tar.bz2) = 33945173
diff --git a/www/firefox35/pkg-deinstall.in b/www/firefox35/pkg-deinstall.in
new file mode 100644
index 000000000000..3fe1644fc054
--- /dev/null
+++ b/www/firefox35/pkg-deinstall.in
@@ -0,0 +1,23 @@
+#!/bin/sh
+#
+# $FreeBSD$
+#
+# Date created:			Mon Nov 29, 2003
+# Whom:				Thierry Thomas (<thierry@pompo.net>)
+# Fix the chrome registry.
+
+umask 022
+PATH=/bin:/usr/bin
+
+[ "x$1" = "x" ] && exit 1
+[ "x$2" != "xDEINSTALL" ] && exit 0
+
+MOZDIR=%%MOZDIR%%
+
+rm -rf ${MOZDIR}/chrome/overlayinfo
+rm -f ${MOZDIR}/chrome/*.rdf
+rm -f ${MOZDIR}/component.reg
+rm -f ${MOZDIR}/components/*.dat
+rm -rf ${MOZDIR}/extensions
+
+exit 0
diff --git a/www/firefox36/Makefile b/www/firefox36/Makefile
index 5eeeb7b36085..4cf8da901bc2 100644
--- a/www/firefox36/Makefile
+++ b/www/firefox36/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	firefox
-PORTVERSION=	0.9.1
-PORTREVISION=	1
+PORTVERSION=	0.9.3
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_MOZILLA}
 MASTER_SITE_SUBDIR=	${PORTNAME}/releases/${PORTVERSION}
@@ -42,6 +41,7 @@ USE_PERL5_BUILD=yes
 USE_X_PREFIX=	yes
 WRKSRC=		${WRKDIR}/mozilla
 PKGINSTALL=	${WRKDIR}/pkg-install
+PKGDEINSTALL=	${WRKDIR}/pkg-deinstall
 
 PKGCONFIG_FILES=mozilla-gtkmozembed mozilla-js mozilla-xpcom \
 		mozilla-nspr mozilla-nss mozilla-plugin
@@ -171,6 +171,8 @@ pre-install:
 		${FAKEDIR}/lib/${PORTNAME}/lib/${PORTNAME}-${PORTVERSION}/extensions.port
 	@${SED} -e 's|%%MOZDIR%%|${LOCAL_PREFIX}/lib/${PORTNAME}-${PORTVERSION}|g' \
 		< ${MASTERDIR}/pkg-install.in > ${PKGINSTALL}
+	@${SED} -e 's|%%MOZDIR%%|${LOCAL_PREFIX}/lib/${PORTNAME}-${PORTVERSION}|g' \
+		< ${MASTERDIR}/pkg-deinstall.in > ${PKGDEINSTALL}
 
 .if !defined (WITH_HEADERS)
 	@${RM} -fr ${FAKEDIR}/share/idl ${FAKEDIR}/include
diff --git a/www/firefox36/distinfo b/www/firefox36/distinfo
index dd967eb6a528..53764c79efd8 100644
--- a/www/firefox36/distinfo
+++ b/www/firefox36/distinfo
@@ -1,2 +1,2 @@
-MD5 (firefox-0.9.1-source.tar.bz2) = 3df6fe17a5d400c1fc154df3c7a8dbb4
-SIZE (firefox-0.9.1-source.tar.bz2) = 33960883
+MD5 (firefox-0.9.3-source.tar.bz2) = 641ebf96d2211b3c5527e88389b9687e
+SIZE (firefox-0.9.3-source.tar.bz2) = 33945173
diff --git a/www/firefox36/pkg-deinstall.in b/www/firefox36/pkg-deinstall.in
new file mode 100644
index 000000000000..3fe1644fc054
--- /dev/null
+++ b/www/firefox36/pkg-deinstall.in
@@ -0,0 +1,23 @@
+#!/bin/sh
+#
+# $FreeBSD$
+#
+# Date created:			Mon Nov 29, 2003
+# Whom:				Thierry Thomas (<thierry@pompo.net>)
+# Fix the chrome registry.
+
+umask 022
+PATH=/bin:/usr/bin
+
+[ "x$1" = "x" ] && exit 1
+[ "x$2" != "xDEINSTALL" ] && exit 0
+
+MOZDIR=%%MOZDIR%%
+
+rm -rf ${MOZDIR}/chrome/overlayinfo
+rm -f ${MOZDIR}/chrome/*.rdf
+rm -f ${MOZDIR}/component.reg
+rm -f ${MOZDIR}/components/*.dat
+rm -rf ${MOZDIR}/extensions
+
+exit 0
diff --git a/www/flock/Makefile b/www/flock/Makefile
index 5eeeb7b36085..4cf8da901bc2 100644
--- a/www/flock/Makefile
+++ b/www/flock/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	firefox
-PORTVERSION=	0.9.1
-PORTREVISION=	1
+PORTVERSION=	0.9.3
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_MOZILLA}
 MASTER_SITE_SUBDIR=	${PORTNAME}/releases/${PORTVERSION}
@@ -42,6 +41,7 @@ USE_PERL5_BUILD=yes
 USE_X_PREFIX=	yes
 WRKSRC=		${WRKDIR}/mozilla
 PKGINSTALL=	${WRKDIR}/pkg-install
+PKGDEINSTALL=	${WRKDIR}/pkg-deinstall
 
 PKGCONFIG_FILES=mozilla-gtkmozembed mozilla-js mozilla-xpcom \
 		mozilla-nspr mozilla-nss mozilla-plugin
@@ -171,6 +171,8 @@ pre-install:
 		${FAKEDIR}/lib/${PORTNAME}/lib/${PORTNAME}-${PORTVERSION}/extensions.port
 	@${SED} -e 's|%%MOZDIR%%|${LOCAL_PREFIX}/lib/${PORTNAME}-${PORTVERSION}|g' \
 		< ${MASTERDIR}/pkg-install.in > ${PKGINSTALL}
+	@${SED} -e 's|%%MOZDIR%%|${LOCAL_PREFIX}/lib/${PORTNAME}-${PORTVERSION}|g' \
+		< ${MASTERDIR}/pkg-deinstall.in > ${PKGDEINSTALL}
 
 .if !defined (WITH_HEADERS)
 	@${RM} -fr ${FAKEDIR}/share/idl ${FAKEDIR}/include
diff --git a/www/flock/distinfo b/www/flock/distinfo
index dd967eb6a528..53764c79efd8 100644
--- a/www/flock/distinfo
+++ b/www/flock/distinfo
@@ -1,2 +1,2 @@
-MD5 (firefox-0.9.1-source.tar.bz2) = 3df6fe17a5d400c1fc154df3c7a8dbb4
-SIZE (firefox-0.9.1-source.tar.bz2) = 33960883
+MD5 (firefox-0.9.3-source.tar.bz2) = 641ebf96d2211b3c5527e88389b9687e
+SIZE (firefox-0.9.3-source.tar.bz2) = 33945173
diff --git a/www/flock/pkg-deinstall.in b/www/flock/pkg-deinstall.in
new file mode 100644
index 000000000000..3fe1644fc054
--- /dev/null
+++ b/www/flock/pkg-deinstall.in
@@ -0,0 +1,23 @@
+#!/bin/sh
+#
+# $FreeBSD$
+#
+# Date created:			Mon Nov 29, 2003
+# Whom:				Thierry Thomas (<thierry@pompo.net>)
+# Fix the chrome registry.
+
+umask 022
+PATH=/bin:/usr/bin
+
+[ "x$1" = "x" ] && exit 1
+[ "x$2" != "xDEINSTALL" ] && exit 0
+
+MOZDIR=%%MOZDIR%%
+
+rm -rf ${MOZDIR}/chrome/overlayinfo
+rm -f ${MOZDIR}/chrome/*.rdf
+rm -f ${MOZDIR}/component.reg
+rm -f ${MOZDIR}/components/*.dat
+rm -rf ${MOZDIR}/extensions
+
+exit 0