[SVN-Commit] r70 - in trunk/www/firefox3-devel: . files

svn-freebsd-gecko at chruetertee.ch svn-freebsd-gecko at chruetertee.ch
Tue Aug 11 09:38:05 UTC 2009 

Author: beat
Date: Tue Aug 11 09:37:57 2009
New Revision: 70

Log:
- Update to 3.6 Alpha 1

Added:
   trunk/www/firefox3-devel/files/patch-configure
   trunk/www/firefox3-devel/files/patch-toolkit_mozapps_update_src_updater_updater.cpp
Deleted:
   trunk/www/firefox3-devel/files/patch-toolkit_mozapps_installer_packager.mk
Modified:
   trunk/www/firefox3-devel/Makefile
   trunk/www/firefox3-devel/distinfo
   trunk/www/firefox3-devel/files/patch-js-src-config_config.mk
   trunk/www/firefox3-devel/files/patch-layout_generic_Makefile.in
   trunk/www/firefox3-devel/files/patch-media_liboggz_include_oggz_oggz_off_t_generated.h
   trunk/www/firefox3-devel/pkg-message

Modified: trunk/www/firefox3-devel/Makefile
==============================================================================
--- trunk/www/firefox3-devel/Makefile	Sun Aug  9 19:12:53 2009	(r69)
+++ trunk/www/firefox3-devel/Makefile	Tue Aug 11 09:37:57 2009	(r70)
@@ -2,21 +2,22 @@
 # Date created:			2002/10/21
 # Whom:				Alan Eldridge <alane at FreeBSD.org>
 #
-# $FreeBSD: ports/www/firefox3-devel/Makefile,v 1.168 2009/04/25 22:45:27 miwi Exp $
+# $FreeBSD: ports/www/firefox3-devel/Makefile,v 1.174 2009/06/30 20:19:48 miwi Exp $
 #
 
 PORTNAME=	firefox
-DISTVERSION=	3.5
+DISTVERSION=	3.6a1
 PORTEPOCH=	1
 CATEGORIES=	www ipv6
 MASTER_SITES=	${MASTER_SITE_MOZILLA}
-MASTER_SITE_SUBDIR=	${PORTNAME}/releases/${DISTVERSION}/source
-DISTNAME=	${PORTNAME}-${DISTVERSION}-source
+MASTER_SITE_SUBDIR=	${PORTNAME}/nightly/${DISTVERSION}-candidates/build1/source
+DISTNAME=	${PORTNAME}-${DISTVERSION}.source
 
 MAINTAINER=	gecko at FreeBSD.org
 COMMENT=	Web browser based on the browser portion of Mozilla
 
-BUILD_DEPENDS=	nspr>=4.7:${PORTSDIR}/devel/nspr
+BUILD_DEPENDS=	nspr>=4.8:${PORTSDIR}/devel/nspr
+LIB_DEPENDS=	notify.1:${PORTSDIR}/devel/libnotify
 
 USE_AUTOTOOLS=	autoconf:213:run
 LATEST_LINK=	firefox3-devel
@@ -40,7 +41,7 @@
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 NO_MOZPKGINSTALL=yes
-CONFLICTS=      firefox-3.0.*
+CONFLICTS=	firefox-3.[0,5].*
 
 FIREFOX_ICON=		${MOZILLA}.png
 FIREFOX_ICON_SRC=	${PREFIX}/lib/${MOZILLA}/chrome/icons/default/default48.png
@@ -49,7 +50,7 @@
 		--enable-svg --enable-svg-renderer=cairo \
 		--enable-application=browser \
 		--enable-official-branding \
-		--enable-canvas --enable-libxul
+		--enable-canvas --enable-libxul --disable-necko-wifi
 
 SYSTEM_PREFS=		${FAKEDIR}/lib/${MOZILLA}/defaults/pref/firefox.js
 
@@ -59,6 +60,10 @@
 
 .include <bsd.port.pre.mk>
 
+.if ${ARCH} == "sparc64"
+BROKEN=		Does not compile on sparc64
+.endif
+
 .if ${OSVERSION} < 700000
 LIB_DEPENDS+=	pulse.0:${PORTSDIR}/audio/pulseaudio
 EXTRA_PATCHES=	${FILESDIR}/releng6_pulseaudio
@@ -66,11 +71,7 @@
 EXTRA_PATCHES=	${FILESDIR}/libsydney_oss
 .endif
 
-.if ${ARCH} == "sparc64"
-BROKEN=		does not compile
-.endif
-
-WRKSRC:=	${WRKSRC}-1.9.1
+WRKSRC:=	${WRKSRC}-central
 
 GECKO_PTHREAD_LIBS!=${CC} -dumpspecs | ${GREP} -m 1 '%{\!pg: %{pthread:' | ${SED} -e 's|^.*%{\!pg: %{pthread:|| ; s|}.*$$||' || ${TRUE}
 
@@ -124,5 +125,6 @@
 	${INSTALL_DATA} ${WRKDIR}/${MOZILLA}.desktop ${PREFIX}/share/applications/
 	${MKDIR} ${PREFIX}/lib/${MOZILLA}/chrome/icons/default
 	${LN} -sf ${FIREFOX_ICON_SRC} ${PREFIX}/share/pixmaps/${FIREFOX_ICON}
+	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.post.mk>

Modified: trunk/www/firefox3-devel/distinfo
==============================================================================
--- trunk/www/firefox3-devel/distinfo	Sun Aug  9 19:12:53 2009	(r69)
+++ trunk/www/firefox3-devel/distinfo	Tue Aug 11 09:37:57 2009	(r70)
@@ -1,3 +1,3 @@
-MD5 (firefox-3.5-source.tar.bz2) = 6dd59399db08963ef022a1d0e5010053
-SHA256 (firefox-3.5-source.tar.bz2) = 15f80f5cc83ebcd559975019837d12f8cda0b7130337d352410195689915b23a
-SIZE (firefox-3.5-source.tar.bz2) = 46444013
+MD5 (firefox-3.6a1.source.tar.bz2) = 15c4223c101c62d03a469f76593a343f
+SHA256 (firefox-3.6a1.source.tar.bz2) = 3e51fe3594bcf6f425740e9dcde930cff0f1e95f7ce2b60207fa6abc74cf29cc
+SIZE (firefox-3.6a1.source.tar.bz2) = 44933567

Added: trunk/www/firefox3-devel/files/patch-configure
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ trunk/www/firefox3-devel/files/patch-configure	Tue Aug 11 09:37:57 2009	(r70)
@@ -0,0 +1,11 @@
+--- configure.orig	2009-07-24 11:36:04.000000000 +0200
++++ configure	2009-07-24 11:36:16.000000000 +0200
+@@ -5502,7 +5502,7 @@
+     CPU_ARCH=sparc
+     ;;
+ 
+-x86_64 | ia64)
++amd64 | x86_64 | ia64)
+     CPU_ARCH="$OS_TEST"
+     ;;
+ esac

Modified: trunk/www/firefox3-devel/files/patch-js-src-config_config.mk
==============================================================================
--- trunk/www/firefox3-devel/files/patch-js-src-config_config.mk	Sun Aug  9 19:12:53 2009	(r69)
+++ trunk/www/firefox3-devel/files/patch-js-src-config_config.mk	Tue Aug 11 09:37:57 2009	(r70)
@@ -1,11 +1,10 @@
---- js/src/config/config.mk.orig	2009-04-28 11:14:01.760089946 +0000
-+++ js/src/config/config.mk	2009-04-28 11:14:30.311093216 +0000
-@@ -490,7 +490,7 @@
- INCLUDES	= $(LOCAL_INCLUDES) $(REQ_INCLUDES) $(REQ_INCLUDES_SDK) -I$(PUBLIC) $(OS_INCLUDES)
- 
- ifndef MOZILLA_INTERNAL_API
--INCLUDES	+= -I$(LIBXUL_DIST)/sdk/include
-+INCLUDES	+= -I$(LIBXUL_DIST)/sdk/include -I%%LOCALBASE%%/include
- endif
- 
- include $(topsrcdir)/config/static-checking-config.mk
+--- js/src/config/config.mk.orig	2009-08-07 00:49:23.000000000 +0200
++++ js/src/config/config.mk	2009-08-09 20:50:05.000000000 +0200
+@@ -506,6 +506,7 @@
+   -I$(srcdir) \
+   -I. \
+   -I$(DIST)/include -I$(DIST)/include/nsprpub \
++  -I%%LOCALBASE%%/include \
+   $(if $(LIBXUL_SDK),-I$(LIBXUL_SDK)/include -I$(LIBXUL_SDK)/include/nsprpub) \
+   $(OS_INCLUDES) \
+   $(NULL) 

Modified: trunk/www/firefox3-devel/files/patch-layout_generic_Makefile.in
==============================================================================
--- trunk/www/firefox3-devel/files/patch-layout_generic_Makefile.in	Sun Aug  9 19:12:53 2009	(r69)
+++ trunk/www/firefox3-devel/files/patch-layout_generic_Makefile.in	Tue Aug 11 09:37:57 2009	(r70)
@@ -1,9 +1,9 @@
---- layout/generic/Makefile.in.orig	2009-04-28 11:16:16.059107000 +0000
-+++ layout/generic/Makefile.in	2009-04-28 11:16:41.171110062 +0000
-@@ -188,9 +188,10 @@
+--- layout/generic/Makefile.in.orig	2009-08-07 00:49:41.000000000 +0200
++++ layout/generic/Makefile.in	2009-08-09 20:54:53.000000000 +0200
+@@ -187,9 +187,10 @@
  		-I$(srcdir)/../../content/base/src \
  		-I$(srcdir)/../../content/html/content/src \
- 		-I$(srcdir)/../../dom/src/base \
+ 		-I$(srcdir)/../../dom/base \
 -		$(MOZ_CAIRO_CFLAGS) \
  		$(NULL)
  

Modified: trunk/www/firefox3-devel/files/patch-media_liboggz_include_oggz_oggz_off_t_generated.h
==============================================================================
--- trunk/www/firefox3-devel/files/patch-media_liboggz_include_oggz_oggz_off_t_generated.h	Sun Aug  9 19:12:53 2009	(r69)
+++ trunk/www/firefox3-devel/files/patch-media_liboggz_include_oggz_oggz_off_t_generated.h	Tue Aug 11 09:37:57 2009	(r70)
@@ -1,11 +1,11 @@
---- media/liboggz/include/oggz/oggz_off_t_generated.h.orig	2009-04-24 01:46:48.000000000 +0000
-+++ media/liboggz/include/oggz/oggz_off_t_generated.h	2009-04-28 08:44:02.369576627 +0000
+--- media/liboggz/include/oggz/oggz_off_t_generated.h.orig	2009-08-07 00:49:53.000000000 +0200
++++ media/liboggz/include/oggz/oggz_off_t_generated.h	2009-08-09 20:57:55.000000000 +0200
 @@ -59,7 +59,7 @@
  
  #include <sys/types.h>
  
--#if defined(__APPLE__) || defined(SOLARIS)
-+#if defined(__APPLE__) || defined(SOLARIS) || defined (__FreeBSD__)
+-#if defined(__APPLE__) || defined(SOLARIS) || defined(OS2)
++#if defined(__APPLE__) || defined(SOLARIS) || defined(OS2) || defined (__FreeBSD__)
  typedef off_t oggz_off_t;
  #else
  typedef loff_t oggz_off_t;

Deleted: trunk/www/firefox3-devel/files/patch-toolkit_mozapps_installer_packager.mk
==============================================================================
--- trunk/www/firefox3-devel/files/patch-toolkit_mozapps_installer_packager.mk	Tue Aug 11 09:37:57 2009	(r69)
+++ /dev/null	00:00:00 1970	(deleted)
@@ -1,11 +0,0 @@
---- toolkit/mozapps/installer/packager.mk.orig	2007-09-26 13:45:01.000000000 -0400
-+++ toolkit/mozapps/installer/packager.mk	2007-09-26 13:47:29.000000000 -0400
-@@ -409,7 +409,7 @@
- 	(cd $(DIST)/sdk/include && tar $(TAR_CREATE_FLAGS) - .) | \
- 	  (cd $(DESTDIR)$(includedir)/stable && tar -xf -)
- # The dist/include has module subdirectories that we need to flatten
--	find $(DIST)/include -xtype f -exec $(SYSINSTALL) $(IFLAGS1) {} $(DESTDIR)$(includedir)/unstable \;
-+	find $(DIST)/include -type f -o -type l -exec $(SYSINSTALL) $(IFLAGS1) {} $(DESTDIR)$(includedir)/unstable \;
- # IDL directory is stable (dist/sdk/idl) and unstable (dist/idl)
- 	$(NSINSTALL) -D $(DESTDIR)$(idldir)/stable 
- 	$(NSINSTALL) -D $(DESTDIR)$(idldir)/unstable

Added: trunk/www/firefox3-devel/files/patch-toolkit_mozapps_update_src_updater_updater.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ trunk/www/firefox3-devel/files/patch-toolkit_mozapps_update_src_updater_updater.cpp	Tue Aug 11 09:37:57 2009	(r70)
@@ -0,0 +1,20 @@
+--- toolkit/mozapps/update/src/updater/updater.cpp.orig	2009-08-10 15:02:48.000000000 +0200
++++ toolkit/mozapps/update/src/updater/updater.cpp	2009-08-11 11:02:01.000000000 +0200
+@@ -509,7 +509,7 @@
+   struct stat ss;
+ 
+   AutoFile sfile = NS_tfopen(spath, NS_T("rb"));
+-  if (sfile == NULL || fstat(fileno(sfile), &ss)) {
++  if (sfile == NULL || fstat(fileno((FILE*)sfile), &ss)) {
+     LOG(("copy_file: failed to open or stat: %p," LOG_S ",%d\n", sfile, spath, errno));
+     return READ_ERROR;
+   }
+@@ -1607,7 +1607,7 @@
+     return READ_ERROR;
+ 
+   struct stat ms;
+-  rv = fstat(fileno(mfile), &ms);
++  rv = fstat(fileno((FILE*)mfile), &ms);
+   if (rv)
+     return READ_ERROR;
+ 

Modified: trunk/www/firefox3-devel/pkg-message
==============================================================================
--- trunk/www/firefox3-devel/pkg-message	Sun Aug  9 19:12:53 2009	(r69)
+++ trunk/www/firefox3-devel/pkg-message	Tue Aug 11 09:37:57 2009	(r70)
@@ -37,7 +37,7 @@
 
 Please include the following information with any bug report:
 * Output from 'uname -a'.
-* Date/time stamp from www/firefox-devel/Makefile.
+* Date/time stamp from www/firefox3-devel/Makefile.
 * Where/when did the problem occur: configuring, building, or
 	running firefox
 * How can you reproduce the problem?

More information about the freebsd-gecko mailing list