[SVN-Commit] r689 - in branches/experimental/www/seamonkey-beta: . files

[svn-freebsd-gecko at chruetertee.ch]

Author: beat
Date: Sun Jan 22 21:46:18 2012
New Revision: 689

Log:
- Update to 2.7 Beta 4

Added:
   branches/experimental/www/seamonkey-beta/files/patch-mozilla-ipc-chromium-src-base-dir_reader_linux.h
   branches/experimental/www/seamonkey-beta/files/patch-mozilla-js-src-jscpucfg.h
Modified:
   branches/experimental/www/seamonkey-beta/Makefile
   branches/experimental/www/seamonkey-beta/distinfo

Modified: branches/experimental/www/seamonkey-beta/Makefile
==============================================================================
--- branches/experimental/www/seamonkey-beta/Makefile	Sun Jan 22 21:39:09 2012	(r688)
+++ branches/experimental/www/seamonkey-beta/Makefile	Sun Jan 22 21:46:18 2012	(r689)
@@ -2,11 +2,11 @@
 # Date created:		31 Mar 1998
 # Whom:			eivind/dima/jseger
 #
-# $FreeBSD: ports/www/seamonkey/Makefile,v 1.317 2011/11/29 21:27:59 beat Exp $
+# $FreeBSD: ports/www/seamonkey/Makefile,v 1.319 2011/12/23 16:58:05 beat Exp $
 #
 
 PORTNAME=	seamonkey
-DISTVERSION=	2.6
+DISTVERSION=	2.7b4
 CATEGORIES?=	www ipv6
 MASTER_SITES=	${MASTER_SITE_MOZILLA_EXTENDED}
 MASTER_SITE_SUBDIR=	seamonkey/releases/${DISTVERSION}/source
@@ -67,8 +67,8 @@
 
 .include <bsd.port.pre.mk>
 
-MOZSRC:=	${WRKDIR}/comm-release/mozilla
-WRKSRC=		${WRKDIR}/comm-release
+MOZSRC:=	${WRKDIR}/comm-beta/mozilla
+WRKSRC=		${WRKDIR}/comm-beta
 
 .if ${HAVE_GNOME:Mlibgnomeui}!=""
 USE_GNOME+=	libgnomeui
@@ -142,12 +142,12 @@
 		${WRKSRC}/mozilla/xpcom/io/nsNativeCharsetUtils.cpp
 	@${REINPLACE_CMD} -e 's|libgnome-2.so.0|libgnome-2.so|' \
 		${WRKSRC}/mozilla/toolkit/xre/nsNativeAppSupportUnix.cpp \
-		${WRKSRC}/mozilla/modules/libpr0n/decoders/icon/gtk/nsIconChannel.cpp
+		${WRKSRC}/mozilla/image/decoders/icon/gtk/nsIconChannel.cpp
 	@${REINPLACE_CMD} -e 's|libgnomeui-2.so.0|libgnomeui-2.so|' \
 		${WRKSRC}/mozilla/toolkit/xre/nsNativeAppSupportUnix.cpp \
-		${WRKSRC}/mozilla/modules/libpr0n/decoders/icon/gtk/nsIconChannel.cpp
+		${WRKSRC}/mozilla/image/decoders/icon/gtk/nsIconChannel.cpp
 	@${REINPLACE_CMD} -e 's|libgnomevfs-2.so.0|libgnomevfs-2.so|' \
-		${WRKSRC}/mozilla/modules/libpr0n/decoders/icon/gtk/nsIconChannel.cpp
+		${WRKSRC}/mozilla/image/decoders/icon/gtk/nsIconChannel.cpp
 	@${REINPLACE_CMD} -e 's|-lc_r|${PTHREAD_LIBS}|g ; \
 		s|-lpthread|${PTHREAD_LIBS}|g ; \
 		s|echo aout|echo elf|g ; \

Modified: branches/experimental/www/seamonkey-beta/distinfo
==============================================================================
--- branches/experimental/www/seamonkey-beta/distinfo	Sun Jan 22 21:39:09 2012	(r688)
+++ branches/experimental/www/seamonkey-beta/distinfo	Sun Jan 22 21:46:18 2012	(r689)
@@ -1,2 +1,2 @@
-SHA256 (seamonkey-2.6.source.tar.bz2) = ebac80074583bb8a79e58aa59595b57266de092c846d51c005222decba5d9cb2
-SIZE (seamonkey-2.6.source.tar.bz2) = 96733312
+SHA256 (seamonkey-2.7b4.source.tar.bz2) = 3005eb8560b79db40074f4f2e01fb98d437648f67646c33cbf7f41a090ae943b
+SIZE (seamonkey-2.7b4.source.tar.bz2) = 98498350

Added: branches/experimental/www/seamonkey-beta/files/patch-mozilla-ipc-chromium-src-base-dir_reader_linux.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/experimental/www/seamonkey-beta/files/patch-mozilla-ipc-chromium-src-base-dir_reader_linux.h	Sun Jan 22 21:46:18 2012	(r689)
@@ -0,0 +1,45 @@
+--- mozilla/ipc/chromium/src/base/dir_reader_linux.h.orig	2011-12-16 21:29:22.000000000 +0100
++++ mozilla/ipc/chromium/src/base/dir_reader_linux.h	2011-12-19 21:00:27.000000000 +0100
+@@ -9,6 +9,7 @@
+ #include <errno.h>
+ #include <fcntl.h>
+ #include <stdint.h>
++#include <sys/dirent.h>
+ #include <sys/syscall.h>
+ #include <unistd.h>
+ 
+@@ -19,6 +20,8 @@
+ 
+ namespace base {
+ 
++#define linux_dirent struct dirent
++#if 0
+ struct linux_dirent {
+   uint64_t        d_ino;
+   int64_t         d_off;
+@@ -26,11 +29,16 @@
+   unsigned char   d_type;
+   char            d_name[0];
+ };
++#endif
+ 
+ class DirReaderLinux {
+  public:
+   explicit DirReaderLinux(const char* directory_path)
++#ifdef O_DIRECTORY
+       : fd_(open(directory_path, O_RDONLY | O_DIRECTORY)),
++#else
++      : fd_(open(directory_path, O_RDONLY)),
++#endif
+         offset_(0),
+         size_(0) {
+     memset(buf_, 0, sizeof(buf_));
+@@ -57,7 +65,7 @@
+     if (offset_ != size_)
+       return true;
+ 
+-    const int r = syscall(__NR_getdents64, fd_, buf_, sizeof(buf_));
++    const int r = syscall(SYS_getdents, fd_, buf_, sizeof(buf_));
+     if (r == 0)
+       return false;
+     if (r == -1) {

Added: branches/experimental/www/seamonkey-beta/files/patch-mozilla-js-src-jscpucfg.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/experimental/www/seamonkey-beta/files/patch-mozilla-js-src-jscpucfg.h	Sun Jan 22 21:46:18 2012	(r689)
@@ -0,0 +1,22 @@
+--- mozilla/js/src/jscpucfg.h.orig	2012-01-18 17:38:54.409461514 +0100
++++ mozilla/js/src/jscpucfg.h	2012-01-18 17:38:59.522462164 +0100
+@@ -77,6 +77,19 @@
+ #define IS_BIG_ENDIAN 1
+ #endif
+ 
++#elif defined(__FreeBSD__)
++#include <sys/endian.h>
++
++#if defined(BYTE_ORDER)
++#if BYTE_ORDER == LITTLE_ENDIAN
++#define IS_LITTLE_ENDIAN 1
++#undef  IS_BIG_ENDIAN
++#elif BYTE_ORDER == BIG_ENDIAN
++#undef  IS_LITTLE_ENDIAN
++#define IS_BIG_ENDIAN 1
++#endif
++#endif
++
+ #elif defined(JS_HAVE_ENDIAN_H)
+ #include <endian.h>
+