Update to 1.5b1. Unfortunately, chrome registration is still broken, so

you will have to run as root for the first time.

Submitted by:	Marcus Alves Grando <marcus@corp.grupos.com.br>


git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@4812 df743ca5-7f9a-e211-a948-0013205c9059

8 files changed, 26 insertions, 46 deletions

diff --git a/www/firefox-devel/Makefile b/www/firefox-devel/Makefile
index 68bfdb3ad..62af80275 100644
--- a/www/firefox-devel/Makefile
+++ b/www/firefox-devel/Makefile
@@ -3,16 +3,16 @@
 # Whom:				Alan Eldridge <alane@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/www/firefox-devel/Makefile,v 1.13 2005/08/19 02:23:56 mezz Exp $
+#   $MCom: ports/www/firefox-devel/Makefile,v 1.14 2005/08/20 00:06:18 marcus Exp $
 #
 
 PORTNAME=	firefox
-DISTVERSION=	1.1a2
-PORTREVISION=	2
+DISTVERSION=	1.5b1
+PORTREVISION=	0
 PORTEPOCH=	1
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_MOZILLA}
-MASTER_SITE_SUBDIR=	${PORTNAME}/releases/deerpark/alpha2/source/
+MASTER_SITE_SUBDIR=	${PORTNAME}/releases/${DISTVERSION}/source/
 DISTNAME=	${PORTNAME}-${DISTVERSION}-source
 
 MAINTAINER=	gnome@FreeBSD.org
@@ -51,11 +51,11 @@ EXTRACT_AFTER_ARGS=	| ${TAR} -xf - --exclude */CVS/* \
 FIREFOX=	${PORTNAME}
 FF_SUFX=	-devel
 FF=		${FIREFOX}${FF_SUFX}
-FF_VER=		1.0+
+FF_VER=		1.4
 #FF_VER=	${PORTVERSION}
 
-FIREFOX_ICON=	${FF}.xpm
-FIREFOX_ICON_SRC=	${PREFIX}/lib/${FF}/chrome/icons/default/default.xpm
+FIREFOX_ICON=		${FF}.xpm
+FIREFOX_ICON_SRC=	${PREFIX}/lib/${FF}/icons/default.xpm
 
 PKGCONFIG_FILES=firefox-gtkmozembed firefox-js firefox-xpcom \
 		firefox-nspr firefox-nss firefox-plugin
@@ -269,7 +269,8 @@ post-install:
 .endif
 	${MKDIR} ${PREFIX}/share/applications ${PREFIX}/share/pixmaps
 	${INSTALL_DATA} ${WRKDIR}/${FF}.desktop ${PREFIX}/share/applications/
-	${INSTALL_DATA} ${WRKSRC}/other-licenses/branding/firefox/default.xpm ${FIREFOX_ICON_SRC}
+	${MKDIR} ${PREFIX}/lib/${FF}/chrome/icons/default
+	${LN} -sf ${FIREFOX_ICON_SRC} ${PREFIX}/lib/${FF}/chrome/icons/default/default.xpm
 	${LN} -sf ${FIREFOX_ICON_SRC} ${PREFIX}/share/pixmaps/${FIREFOX_ICON}
 	@-update-desktop-database
 
diff --git a/www/firefox-devel/distinfo b/www/firefox-devel/distinfo
index 26e37e16b..d2ee0e01a 100644
--- a/www/firefox-devel/distinfo
+++ b/www/firefox-devel/distinfo
@@ -1,2 +1,2 @@
-MD5 (firefox-1.1a2-source.tar.bz2) = 109b48c9be1f7b80bf45c7ad40601ac5
-SIZE (firefox-1.1a2-source.tar.bz2) = 33352181
+MD5 (firefox-1.5b1-source.tar.bz2) = a1b2549a31c74e7366213bb2ba76876f
+SIZE (firefox-1.5b1-source.tar.bz2) = 34203376
diff --git a/www/firefox-devel/files/patch-mozilla_widget_src_gtk2_mozdrawingarea.c b/www/firefox-devel/files/patch-mozilla_widget_src_gtk2_mozdrawingarea.c
deleted file mode 100644
index 9e58b5186..000000000
--- a/www/firefox-devel/files/patch-mozilla_widget_src_gtk2_mozdrawingarea.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- widget/src/gtk2/mozdrawingarea.c.orig	Tue Apr 30 12:29:00 2002
-+++ widget/src/gtk2/mozdrawingarea.c	Thu Aug 18 22:27:27 2005
-@@ -168,7 +168,9 @@
- 
-     drawingarea = MOZ_DRAWINGAREA(object);
- 
-+    gdk_window_set_user_data(drawingarea->inner_window, NULL);
-     gdk_window_destroy(drawingarea->inner_window);
-+    gdk_window_set_user_data(drawingarea->clip_window, NULL);
-     gdk_window_destroy(drawingarea->clip_window);
- 
-     (* parent_class->finalize) (object);
diff --git a/www/firefox-devel/pkg-deinstall.in b/www/firefox-devel/pkg-deinstall.in
index b0866686a..207825923 100644
--- a/www/firefox-devel/pkg-deinstall.in
+++ b/www/firefox-devel/pkg-deinstall.in
@@ -1,7 +1,7 @@
 #!/bin/sh
 #
 # $FreeBSD$
-#   $MCom: ports/www/firefox-devel/pkg-deinstall.in,v 1.6 2005/07/14 05:25:43 ahze Exp $
+#   $MCom: ports/www/firefox-devel/pkg-deinstall.in,v 1.7 2005/08/09 00:32:57 marcus Exp $
 #
 # Date created:			Mon Nov 29, 2003
 # Whom:				Thierry Thomas (<thierry@pompo.net>)
@@ -16,6 +16,7 @@ PATH=/bin:/usr/bin
 MOZDIR=%%MOZDIR%%
 
 rm -rf ${MOZDIR}/chrome/overlayinfo
+rm -rf ${MOZDIR}/chrome/icons
 rm -f ${MOZDIR}/chrome/app-chrome.manifest
 rm -f ${MOZDIR}/chrome/*.rdf
 rm -f ${MOZDIR}/component.reg
diff --git a/www/firefox3-devel/Makefile b/www/firefox3-devel/Makefile
index 68bfdb3ad..62af80275 100644
--- a/www/firefox3-devel/Makefile
+++ b/www/firefox3-devel/Makefile
@@ -3,16 +3,16 @@
 # Whom:				Alan Eldridge <alane@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/www/firefox-devel/Makefile,v 1.13 2005/08/19 02:23:56 mezz Exp $
+#   $MCom: ports/www/firefox-devel/Makefile,v 1.14 2005/08/20 00:06:18 marcus Exp $
 #
 
 PORTNAME=	firefox
-DISTVERSION=	1.1a2
-PORTREVISION=	2
+DISTVERSION=	1.5b1
+PORTREVISION=	0
 PORTEPOCH=	1
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_MOZILLA}
-MASTER_SITE_SUBDIR=	${PORTNAME}/releases/deerpark/alpha2/source/
+MASTER_SITE_SUBDIR=	${PORTNAME}/releases/${DISTVERSION}/source/
 DISTNAME=	${PORTNAME}-${DISTVERSION}-source
 
 MAINTAINER=	gnome@FreeBSD.org
@@ -51,11 +51,11 @@ EXTRACT_AFTER_ARGS=	| ${TAR} -xf - --exclude */CVS/* \
 FIREFOX=	${PORTNAME}
 FF_SUFX=	-devel
 FF=		${FIREFOX}${FF_SUFX}
-FF_VER=		1.0+
+FF_VER=		1.4
 #FF_VER=	${PORTVERSION}
 
-FIREFOX_ICON=	${FF}.xpm
-FIREFOX_ICON_SRC=	${PREFIX}/lib/${FF}/chrome/icons/default/default.xpm
+FIREFOX_ICON=		${FF}.xpm
+FIREFOX_ICON_SRC=	${PREFIX}/lib/${FF}/icons/default.xpm
 
 PKGCONFIG_FILES=firefox-gtkmozembed firefox-js firefox-xpcom \
 		firefox-nspr firefox-nss firefox-plugin
@@ -269,7 +269,8 @@ post-install:
 .endif
 	${MKDIR} ${PREFIX}/share/applications ${PREFIX}/share/pixmaps
 	${INSTALL_DATA} ${WRKDIR}/${FF}.desktop ${PREFIX}/share/applications/
-	${INSTALL_DATA} ${WRKSRC}/other-licenses/branding/firefox/default.xpm ${FIREFOX_ICON_SRC}
+	${MKDIR} ${PREFIX}/lib/${FF}/chrome/icons/default
+	${LN} -sf ${FIREFOX_ICON_SRC} ${PREFIX}/lib/${FF}/chrome/icons/default/default.xpm
 	${LN} -sf ${FIREFOX_ICON_SRC} ${PREFIX}/share/pixmaps/${FIREFOX_ICON}
 	@-update-desktop-database
 
diff --git a/www/firefox3-devel/distinfo b/www/firefox3-devel/distinfo
index 26e37e16b..d2ee0e01a 100644
--- a/www/firefox3-devel/distinfo
+++ b/www/firefox3-devel/distinfo
@@ -1,2 +1,2 @@
-MD5 (firefox-1.1a2-source.tar.bz2) = 109b48c9be1f7b80bf45c7ad40601ac5
-SIZE (firefox-1.1a2-source.tar.bz2) = 33352181
+MD5 (firefox-1.5b1-source.tar.bz2) = a1b2549a31c74e7366213bb2ba76876f
+SIZE (firefox-1.5b1-source.tar.bz2) = 34203376
diff --git a/www/firefox3-devel/files/patch-mozilla_widget_src_gtk2_mozdrawingarea.c b/www/firefox3-devel/files/patch-mozilla_widget_src_gtk2_mozdrawingarea.c
deleted file mode 100644
index 9e58b5186..000000000
--- a/www/firefox3-devel/files/patch-mozilla_widget_src_gtk2_mozdrawingarea.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- widget/src/gtk2/mozdrawingarea.c.orig	Tue Apr 30 12:29:00 2002
-+++ widget/src/gtk2/mozdrawingarea.c	Thu Aug 18 22:27:27 2005
-@@ -168,7 +168,9 @@
- 
-     drawingarea = MOZ_DRAWINGAREA(object);
- 
-+    gdk_window_set_user_data(drawingarea->inner_window, NULL);
-     gdk_window_destroy(drawingarea->inner_window);
-+    gdk_window_set_user_data(drawingarea->clip_window, NULL);
-     gdk_window_destroy(drawingarea->clip_window);
- 
-     (* parent_class->finalize) (object);
diff --git a/www/firefox3-devel/pkg-deinstall.in b/www/firefox3-devel/pkg-deinstall.in
index b0866686a..207825923 100644
--- a/www/firefox3-devel/pkg-deinstall.in
+++ b/www/firefox3-devel/pkg-deinstall.in
@@ -1,7 +1,7 @@
 #!/bin/sh
 #
 # $FreeBSD$
-#   $MCom: ports/www/firefox-devel/pkg-deinstall.in,v 1.6 2005/07/14 05:25:43 ahze Exp $
+#   $MCom: ports/www/firefox-devel/pkg-deinstall.in,v 1.7 2005/08/09 00:32:57 marcus Exp $
 #
 # Date created:			Mon Nov 29, 2003
 # Whom:				Thierry Thomas (<thierry@pompo.net>)
@@ -16,6 +16,7 @@ PATH=/bin:/usr/bin
 MOZDIR=%%MOZDIR%%
 
 rm -rf ${MOZDIR}/chrome/overlayinfo
+rm -rf ${MOZDIR}/chrome/icons
 rm -f ${MOZDIR}/chrome/app-chrome.manifest
 rm -f ${MOZDIR}/chrome/*.rdf
 rm -f ${MOZDIR}/component.reg