[SVN-Commit] r313 - in branches/experimental/www/seamonkey2-devel: . files

svn-freebsd-gecko at chruetertee.ch svn-freebsd-gecko at chruetertee.ch
Wed May 12 15:48:30 UTC 2010 

Author: beat
Date: Wed May 12 15:48:22 2010
New Revision: 313

Log:
- Add www/seamonkey2-devel with SeaMonkey 2.1 Alpha 1

Added:
   branches/experimental/www/seamonkey2-devel/
      - copied from r311, branches/experimental/www/seamonkey2/
   branches/experimental/www/seamonkey2-devel/files/patch-mozilla-config-Makefile.in
   branches/experimental/www/seamonkey2-devel/files/patch-mozilla-config-gcc-stl-wrapper.template.h
   branches/experimental/www/seamonkey2-devel/files/patch-mozilla-content-svg-content-src-nsSVGElement.cpp
Deleted:
   branches/experimental/www/seamonkey2-devel/files/patch-mozilla-media-liboggz-include-oggz-oggz_off_t_generated.h
Modified:
   branches/experimental/www/seamonkey2-devel/Makefile
   branches/experimental/www/seamonkey2-devel/distinfo
   branches/experimental/www/seamonkey2-devel/files/patch-configure
   branches/experimental/www/seamonkey2-devel/files/patch-mozilla-js-src-configure
   branches/experimental/www/seamonkey2-devel/files/patch-sysnss

Modified: branches/experimental/www/seamonkey2-devel/Makefile
==============================================================================
--- branches/experimental/www/seamonkey2/Makefile	Sat Apr 24 14:58:35 2010	(r311)
+++ branches/experimental/www/seamonkey2-devel/Makefile	Wed May 12 15:48:22 2010	(r313)
@@ -6,17 +6,17 @@
 #
 
 PORTNAME=	seamonkey
-DISTVERSION=	2.0.4
+DISTVERSION=	2.1a1
 CATEGORIES?=	www ipv6
 MASTER_SITES=	${MASTER_SITE_MOZILLA_EXTENDED}
-MASTER_SITE_SUBDIR=	seamonkey/releases/${DISTVERSION}/source
+MASTER_SITE_SUBDIR=	seamonkey/nightly/${DISTVERSION}-candidates/build1/source
 DISTNAME=	seamonkey-${DISTVERSION}.source
 
 MAINTAINER=	gecko at FreeBSD.org
 COMMENT=	The open source, standards compliant web browser
 
-CONFLICTS=	seamonkey-1* spidermonkey-1.[0-7]*
-LATEST_LINK=	seamonkey2
+CONFLICTS=	seamonkey-1* seamonkey-2.0* spidermonkey-1.[0-7]*
+LATEST_LINK=	seamonkey2-devel
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_GECKO=	gecko
@@ -24,6 +24,7 @@
 WANT_PERL=	yes
 HAS_CONFIGURE=	yes
 ALL_TARGET=	default
+USE_GL=		gl
 MAKE_JOBS_SAFE=	yes
 MOZ_PIS_SCRIPTS=	moz_pis_S50cleanhome
 MAKE_ENV=	LD_LIBRARY_PATH=${WRKSRC}/dist/bin
@@ -32,13 +33,17 @@
 
 CONFIGURE_ENV=	LOCALBASE=${LOCALBASE}
 
+MOZILLA=	${PORTNAME}-${PORTVERSION}
+MOZILLA_EXEC_NAME=	${PORTNAME}
 MOZ_EXTENSIONS=	default
 MOZ_OPTIONS+=	--with-default-mozilla-five-home=${PREFIX}/lib/${MOZILLA} \
 		--enable-svg \
 		--enable-application=suite	\
 		--enable-svg-renderer=cairo	\
 		--enable-system-cairo		\
-		--enable-canvas
+		--enable-canvas			\
+		--disable-necko-wifi		\
+		--disable-updater
 USE_MOZILLA=	-png -dbm -jpeg -xft
 MOZ_TOOLKIT=	cairo-gtk2
 MOZILLA_PLIST_DIRS=	bin lib
@@ -63,8 +68,8 @@
 EXTRA_PATCHES=	${FILESDIR}/libsydney_oss
 .endif
 
-MOZSRC:=	${WRKDIR}/comm-1.9.1/mozilla
-WRKSRC=		${WRKDIR}/comm-1.9.1
+MOZSRC:=	${WRKDIR}/comm-central/mozilla
+WRKSRC=		${WRKDIR}/comm-central
 
 GECKO_PTHREAD_LIBS!=${CC} -dumpspecs | ${GREP} -m 1 '%{\!pg: %{pthread:' | ${SED
 } -e 's|^.*%{\!pg: %{pthread:|| ; s|}.*$$||' || ${TRUE}
@@ -108,9 +113,10 @@
 .endif
 
 .if defined(WITHOUT_DBUS)
-MOZ_OPTIONS+=	--disable-dbus
+MOZ_OPTIONS+=	--disable-dbus --disable-libnotify
 .else
-LIB_DEPENDS+=	dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib
+LIB_DEPENDS+=	dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \
+		notify.1:${PORTSDIR}/devel/libnotify
 .endif
 
 post-patch:
@@ -145,12 +151,6 @@
 		< ${FILESDIR}/seamonkey.desktop.in > \
 		${WRKDIR}/seamonkey.desktop
 
-port-pre-install:
-	@${REINPLACE_CMD} -e 's|seamonkey-${PORTVERSION}|seamonkey|' \
-		${FAKEDIR}/bin/seamonkey
-	@${RM} -f ${FAKEDIR}/bin/seamonkey.bak
-	${MV} ${FAKEDIR}/lib/seamonkey-${PORTVERSION} ${FAKEDIR}/lib/seamonkey
-
 pre-install:
 	${ECHO_CMD} share/applications/seamonkey.desktop >> ${PLIST}
 	${ECHO_CMD} "@unexec ${RMDIR} %D/share/applications 2>/dev/null || ${TRUE}" >> ${PLIST}

Modified: branches/experimental/www/seamonkey2-devel/distinfo
==============================================================================
--- branches/experimental/www/seamonkey2/distinfo	Sat Apr 24 14:58:35 2010	(r311)
+++ branches/experimental/www/seamonkey2-devel/distinfo	Wed May 12 15:48:22 2010	(r313)
@@ -1,3 +1,3 @@
-MD5 (seamonkey-2.0.4.source.tar.bz2) = 1a7f94a46890a60e0fb3340e567000c0
-SHA256 (seamonkey-2.0.4.source.tar.bz2) = b0b08e801878abdb0b114f86f8aca0ea7c00c45e50c509cbd421932dd1ff858b
-SIZE (seamonkey-2.0.4.source.tar.bz2) = 61574927
+MD5 (seamonkey-2.1a1.source.tar.bz2) = 16d87bc961e5c9153c8553fb1dc73320
+SHA256 (seamonkey-2.1a1.source.tar.bz2) = 2b702a535cf3c03345b032046fb48c191fbeade44d6f46797f43e7b52a5adaa2
+SIZE (seamonkey-2.1a1.source.tar.bz2) = 66738404

Modified: branches/experimental/www/seamonkey2-devel/files/patch-configure
==============================================================================
--- branches/experimental/www/seamonkey2/files/patch-configure	Sat Apr 24 14:58:35 2010	(r311)
+++ branches/experimental/www/seamonkey2-devel/files/patch-configure	Wed May 12 15:48:22 2010	(r313)
@@ -1,6 +1,6 @@
---- configure.orig	2009-10-08 04:03:59.000000000 +0200
-+++ configure	2009-10-10 19:56:41.000000000 +0200
-@@ -5794,7 +5794,7 @@
+--- configure.orig	2010-05-11 17:47:16.000000000 +0000
++++ configure	2010-05-11 17:51:00.000000000 +0000
+@@ -5956,7 +5956,7 @@
      CPU_ARCH=sparc
      ;;
  
@@ -8,17 +8,17 @@
 +amd64 | x86_64 | ia64)
      CPU_ARCH="$OS_TEST"
      ;;
- esac
-@@ -10890,7 +10890,7 @@
+ 
+@@ -10972,7 +10972,7 @@
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    ac_save_LIBS="$LIBS"
 -LIBS="-liconv  $LIBS"
 +LIBS="-L$LOCALBASE/lib -liconv  $LIBS"
  cat > conftest.$ac_ext <<EOF
- #line 10896 "configure"
+ #line 10978 "configure"
  #include "confdefs.h"
-@@ -10921,7 +10921,7 @@
+@@ -11003,7 +11003,7 @@
  fi
  if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
    echo "$ac_t""yes" 1>&6
@@ -27,16 +27,16 @@
  else
    echo "$ac_t""no" 1>&6
  echo $ac_n "checking for libiconv in -liconv""... $ac_c" 1>&6
-@@ -10931,7 +10931,7 @@
+@@ -11013,7 +11013,7 @@
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    ac_save_LIBS="$LIBS"
 -LIBS="-liconv  $LIBS"
 +LIBS="-L$LOCALBASE/lib -liconv  $LIBS"
  cat > conftest.$ac_ext <<EOF
- #line 10937 "configure"
+ #line 11019 "configure"
  #include "confdefs.h"
-@@ -10962,7 +10962,7 @@
+@@ -11044,7 +11044,7 @@
  fi
  if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
    echo "$ac_t""yes" 1>&6

Added: branches/experimental/www/seamonkey2-devel/files/patch-mozilla-config-Makefile.in
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/experimental/www/seamonkey2-devel/files/patch-mozilla-config-Makefile.in	Wed May 12 15:48:22 2010	(r313)
@@ -0,0 +1,16 @@
+--- mozilla/config/Makefile.in
++++ mozilla/config/Makefile.in
+@@ -139,10 +139,10 @@ GARBAGE_DIRS += system_wrappers
+ endif
+ 
+ ifdef WRAP_STL_INCLUDES
+-ifdef GCC_VERSION
+-stl_compiler = gcc
+-else
++ifdef _MSC_VER
+ stl_compiler = msvc
++else
++stl_compiler = gcc
+ endif
+ endif
+ 

Added: branches/experimental/www/seamonkey2-devel/files/patch-mozilla-config-gcc-stl-wrapper.template.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/experimental/www/seamonkey2-devel/files/patch-mozilla-config-gcc-stl-wrapper.template.h	Wed May 12 15:48:22 2010	(r313)
@@ -0,0 +1,11 @@
+--- mozilla/config/gcc-stl-wrapper.template.h.orig	2010-05-12 13:56:18.000000000 +0000
++++ mozilla/config/gcc-stl-wrapper.template.h	2010-05-12 13:56:52.000000000 +0000
+@@ -89,7 +89,7 @@
+ // -fshort-wchar).  We don't want that and so define our own inlined
+ // __throw_*().
+ #ifndef mozilla_throw_gcc_h
+-#  include "mozilla/throw_gcc.h"
++#  include "../../memory/mozalloc/throw_gcc.h"
+ #endif
+ 
+ #endif  // if mozilla_${HEADER}_h

Added: branches/experimental/www/seamonkey2-devel/files/patch-mozilla-content-svg-content-src-nsSVGElement.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/experimental/www/seamonkey2-devel/files/patch-mozilla-content-svg-content-src-nsSVGElement.cpp	Wed May 12 15:48:22 2010	(r313)
@@ -0,0 +1,15 @@
+--- mozilla/content/svg/content/src/nsSVGElement.cpp.orig	2010-05-12 16:46:09.000000000 +0200
++++ mozilla/content/svg/content/src/nsSVGElement.cpp	2010-05-12 16:49:33.000000000 +0200
+@@ -102,7 +102,11 @@
+ // vararg-list methods in this file:
+ //   nsSVGElement::GetAnimated{Length,Number,Integer}Values
+ // See bug 547964 for details:
+-PR_STATIC_ASSERT(sizeof(void*) == sizeof(nsnull));
++// I really try to get the details but I'm not allowed to
++// access this bug in bugzilla:
++// You are not authorized to access bug #547964.
++// So disable this ASSERT as it breaks build.
++//PR_STATIC_ASSERT(sizeof(void*) == sizeof(nsnull));
+ 
+ 
+ nsSVGEnumMapping nsSVGElement::sSVGUnitTypesMap[] = {

Modified: branches/experimental/www/seamonkey2-devel/files/patch-mozilla-js-src-configure
==============================================================================
--- branches/experimental/www/seamonkey2/files/patch-mozilla-js-src-configure	Sat Apr 24 14:58:35 2010	(r311)
+++ branches/experimental/www/seamonkey2-devel/files/patch-mozilla-js-src-configure	Wed May 12 15:48:22 2010	(r313)
@@ -1,13 +1,22 @@
---- mozilla/js/src/configure.orig	2009-09-17 16:34:18.000000000 +0200
-+++ mozilla/js/src/configure	2009-09-17 16:34:46.000000000 +0200
-@@ -6916,10 +6916,6 @@
-     ENABLE_JIT=1
+--- mozilla/js/src/configure.orig	2010-05-11 17:52:14.000000000 +0000
++++ mozilla/js/src/configure	2010-05-11 17:52:48.000000000 +0000
+@@ -5370,7 +5370,7 @@
+     CPU_ARCH=sparc
+     ;;
+ 
+-x86_64 | ia64)
++amd64 | x86_64 | ia64)
+     CPU_ARCH="$OS_TEST"
+     ;;
+ 
+@@ -7300,10 +7300,6 @@
+     ENABLE_TRACEJIT=1
      NANOJIT_ARCH=ARM
      ;;
 -sparc*-*)
--    ENABLE_JIT=1
+-    ENABLE_TRACEJIT=1
 -    NANOJIT_ARCH=Sparc
 -    ;;
  esac
  
- # Check whether --enable-jit or --disable-jit was given.
+ # Check whether --enable-tracejit or --disable-tracejit was given.

Deleted: branches/experimental/www/seamonkey2/files/patch-mozilla-media-liboggz-include-oggz-oggz_off_t_generated.h
==============================================================================
--- branches/experimental/www/seamonkey2/files/patch-mozilla-media-liboggz-include-oggz-oggz_off_t_generated.h	Wed May 12 15:48:22 2010	(r311)
+++ /dev/null	00:00:00 1970	(deleted)
@@ -1,11 +0,0 @@
---- mozilla/media/liboggz/include/oggz/oggz_off_t_generated.h.orig	2009-09-03 19:49:16.000000000 +0200
-+++ mozilla/media/liboggz/include/oggz/oggz_off_t_generated.h	2009-09-14 19:59:18.000000000 +0200
-@@ -59,7 +59,7 @@
- 
- #include <sys/types.h>
- 
--#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;

Modified: branches/experimental/www/seamonkey2-devel/files/patch-sysnss
==============================================================================
--- branches/experimental/www/seamonkey2/files/patch-sysnss	Sat Apr 24 14:58:35 2010	(r311)
+++ branches/experimental/www/seamonkey2-devel/files/patch-sysnss	Wed May 12 15:48:22 2010	(r313)
@@ -1,6 +1,6 @@
---- mozilla/security/manager/Makefile.in.orig	2009-10-08 04:03:28.000000000 +0200
-+++ mozilla/security/manager/Makefile.in	2009-10-11 00:38:00.000000000 +0200
-@@ -46,16 +46,8 @@
+--- mozilla/security/manager/Makefile.in.orig	2010-05-11 01:56:21.000000000 +0000
++++ mozilla/security/manager/Makefile.in	2010-05-11 18:03:40.000000000 +0000
+@@ -47,16 +47,8 @@
  MODULE = psm
  
  ifndef MOZ_NATIVE_NSS
@@ -17,38 +17,25 @@
  ifndef NSS_DISABLE_DBM
  NSSDBM3_LIB = $(DLL_PREFIX)nssdbm3$(DLL_SUFFIX)
  NSSDBM3_CHK = $(DLL_PREFIX)nssdbm3.chk
-@@ -249,11 +241,6 @@
- .nss.cleaned: .nss.checkout
- ifndef MOZ_NATIVE_NSS
- 	$(MAKE) -C $(topsrcdir)/security/coreconf $(DEFAULT_GMAKE_FLAGS) clean
--	$(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS) clean
--ifndef SKIP_CHK
--	$(MAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS) clean
--	$(MAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS) clean
--endif
- 	touch $@
- endif
- 
-@@ -274,76 +261,8 @@
+@@ -322,73 +314,8 @@
  
  libs::
  ifndef MOZ_NATIVE_NSS
--	$(MAKE) -C $(topsrcdir)/security/coreconf $(DEFAULT_GMAKE_FLAGS)
 -ifndef NSS_DISABLE_DBM
--	$(MAKE) -C $(topsrcdir)/security/dbm $(DEFAULT_GMAKE_FLAGS) 
+-	$(NSSMAKE) -C $(NSS_SRCDIR)/security/dbm $(DEFAULT_GMAKE_FLAGS) 
 -endif
--	$(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS)
+-	$(NSSMAKE) -C $(NSS_SRCDIR)/security/nss/lib $(DEFAULT_GMAKE_FLAGS)
 -ifdef ENABLE_TESTS
--	# Need certutil binary for mochitest certificates generation
--	$(MAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS)
--	$(MAKE) -C $(topsrcdir)/security/nss/cmd/certutil $(DEFAULT_GMAKE_FLAGS)
--	$(MAKE) -C $(topsrcdir)/security/nss/cmd/pk12util $(DEFAULT_GMAKE_FLAGS)
+-# Need certutil binary for mochitest certificates generation
+-	$(NSSMAKE) -C $(NSS_SRCDIR)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS)
+-	$(NSSMAKE) -C $(NSS_SRCDIR)/security/nss/cmd/certutil $(DEFAULT_GMAKE_FLAGS)
+-	$(NSSMAKE) -C $(NSS_SRCDIR)/security/nss/cmd/pk12util $(DEFAULT_GMAKE_FLAGS)
 -endif
 -ifndef SKIP_CHK
 -ifndef ENABLE_TESTS # Just avoid secondary compile
--	$(MAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS)
+-	$(NSSMAKE) -C $(NSS_SRCDIR)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS)
 -endif
--	$(MAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS)
+-	$(NSSMAKE) -C $(NSS_SRCDIR)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS)
 -endif
 -	$(INSTALL) -m 755 $(DIST)/lib/$(LOADABLE_ROOT_MODULE) $(DIST)/bin
 -ifndef SKIP_CHK
@@ -99,15 +86,13 @@
 -# NSS installs headers to dist/public and we want them in dist/include
 -	$(NSINSTALL) -D $(DIST)/include/nss
 -	(cd $(DIST)/public/nss && tar $(TAR_CREATE_FLAGS) - .) | \
--	  (cd $(DIST)/include/nss && tar -xf -)
--	(cd $(DIST)/public/nss && tar $(TAR_CREATE_FLAGS) - .) | \
--	  (cd $(DIST)/sdk/include && tar -xf -)
+-	  (cd $(DIST)/include && tar -xf -)
  endif
 +	$(MAKE) -C $(topsrcdir)/security/coreconf $(DEFAULT_GMAKE_FLAGS)
  	$(MAKE) -C boot $@
  	$(MAKE) -C ssl $@
  	$(MAKE) -C locales $@
-@@ -356,47 +275,6 @@
+@@ -401,47 +328,6 @@
  
  install::
  ifndef MOZ_NATIVE_NSS
@@ -155,19 +140,17 @@
  endif
  	$(MAKE) -C boot $@
  	$(MAKE) -C ssl $@
-@@ -413,12 +291,6 @@
+@@ -458,10 +344,4 @@
  	$(MAKE) -C pki $@
  endif
  ifndef MOZ_NATIVE_NSS
--	$(MAKE) -C $(topsrcdir)/security/coreconf $(DEFAULT_GMAKE_FLAGS) clean
--	$(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS) clean
+-	$(NSSMAKE) -C $(NSS_SRCDIR)/security/coreconf $(DEFAULT_GMAKE_FLAGS) clean
+-	$(NSSMAKE) -C $(NSS_SRCDIR)/security/nss/lib $(DEFAULT_GMAKE_FLAGS) clean
 -ifndef SKIP_CHK
--	$(MAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS) clean
--	$(MAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS) clean
+-	$(NSSMAKE) -C $(NSS_SRCDIR)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS) clean
+-	$(NSSMAKE) -C $(NSS_SRCDIR)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS) clean
 -endif
  endif
- 
- echo-requires-recursive::
 --- mozilla/security/manager/ssl/src/Makefile.in.orig	2009-08-26 19:05:39.000000000 +0200
 +++ mozilla/security/manager/ssl/src/Makefile.in	2009-08-26 19:06:17.000000000 +0200
 @@ -138,13 +138,14 @@

More information about the freebsd-gecko mailing list