- Update to 1.0b

- Enable <canvas> support

Release notes:	http://www.mozilla.org/projects/seamonkey/releases/seamonkey1.0b

8 files changed, 60 insertions, 72 deletions

diff --git a/www/seamonkey/Makefile b/www/seamonkey/Makefile
index 52a209de4c23..38d22f8a2d10 100644
--- a/www/seamonkey/Makefile
+++ b/www/seamonkey/Makefile
@@ -7,13 +7,10 @@
 #
 
 PORTNAME=	seamonkey
-DISTVERSION=	1.0a1
-PORTREVISION=	1
+DISTVERSION=	1.0b
 CATEGORIES?=	www
-MASTER_SITES=	${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	ahze
-#MASTER_SITES=	${MASTER_SITE_MOZILLA}
-#MASTER_SITE_SUBDIR=	seamonkey/releases/${DISTVERSION}
+MASTER_SITES=	${MASTER_SITE_MOZILLA}
+MASTER_SITE_SUBDIR=	seamonkey/releases/${DISTVERSION}
 DISTNAME=	${PORTNAME}-${DISTVERSION}.source
 
 MAINTAINER=	gnome@FreeBSD.org
@@ -34,7 +31,8 @@ CONFIGURE_ENV=	LOCALBASE=${LOCALBASE}
 MOZ_EXTENSIONS=	default
 MOZ_OPTIONS+=	--enable-application=suite	\
 		--enable-svg-renderer=cairo	\
-		--enable-system-cairo
+		--enable-system-cairo		\
+		--enable-canvas
 MOZ_MK_OPTIONS+=	MOZ_CO_PROJECT=suite
 
 OPTIONS=MAILNEWS "Enable Mail and News modules" on \
@@ -89,10 +87,6 @@ MOZ_OPTIONS+=	--enable-calendar
 MOZ_OPTIONS+=	--disable-composer
 .endif
 
-#.if ${ARCH} == "i386"
-#CONFIGURE_ARGS+=	--enable-reorder
-#.endif
-
 post-patch:
 	@${REINPLACE_CMD} -e '/accessibility.typeaheadfind.enablesound/s/true/false/' \
 		${WRKSRC}/modules/libpref/src/init/all.js
diff --git a/www/seamonkey/distinfo b/www/seamonkey/distinfo
index e11b29a82f6a..bd45cec89290 100644
--- a/www/seamonkey/distinfo
+++ b/www/seamonkey/distinfo
@@ -1,3 +1,3 @@
-MD5 (seamonkey-1.0a1.source.tar.bz2) = a67d506a12d865491f24753eb19d8c24
-SHA256 (seamonkey-1.0a1.source.tar.bz2) = 55d42c3c2a3ead4f5a76b47db00bd0bbee185c0a92d955b401eed9cf6e9f88bf
-SIZE (seamonkey-1.0a1.source.tar.bz2) = 32442355
+MD5 (seamonkey-1.0b.source.tar.bz2) = 169496f3a71209110c32558cd4204742
+SHA256 (seamonkey-1.0b.source.tar.bz2) = 2943d4216262f8cfaa49c1c49d1bd79b51860046bbd71a61277ec0c82d5ce0df
+SIZE (seamonkey-1.0b.source.tar.bz2) = 33065289
diff --git a/www/seamonkey/files/patch-build_unix_run-mozilla.sh b/www/seamonkey/files/patch-build_unix_run-mozilla.sh
index 3d392ba01521..6d8cb15859a2 100644
--- a/www/seamonkey/files/patch-build_unix_run-mozilla.sh
+++ b/www/seamonkey/files/patch-build_unix_run-mozilla.sh
@@ -1,15 +1,15 @@
---- build/unix/run-mozilla.sh.orig	Mon Oct 17 13:21:17 2005
-+++ build/unix/run-mozilla.sh	Thu Nov 10 22:01:41 2005
-@@ -333,7 +333,7 @@
- ## LD_LIBRARY_PATH because $ORIGIN doesn't work on a symbolic link.
- if [ `uname -s` != "SunOS" -o -h "$MOZ_PROGRAM" ]
- then
--	LD_LIBRARY_PATH=${MOZ_DIST_BIN}:${MOZ_DIST_BIN}/plugins:${MRE_HOME}${LD_LIBRARY_PATH+":$LD_LIBRARY_PATH"}
-+	LD_LIBRARY_PATH=${MOZ_DIST_BIN}:${MOZ_DIST_BIN}/plugins:%%PREFIX%%/lib/browser_plugins:%%PREFIX%%/lib/browser_linux_plugins:${MRE_HOME}${LD_LIBRARY_PATH+":$LD_LIBRARY_PATH"}
- fi 
- 
+--- build/unix/run-mozilla.sh.orig	Sat Oct  1 01:36:47 2005
++++ build/unix/run-mozilla.sh	Thu Dec 22 17:51:10 2005
+@@ -328,7 +328,7 @@
+ fi
+ ##
+ ## Set LD_LIBRARY_PATH
+-LD_LIBRARY_PATH=${MOZ_DIST_BIN}:${MOZ_DIST_BIN}/plugins:${MRE_HOME}${LD_LIBRARY_PATH+":$LD_LIBRARY_PATH"}
++LD_LIBRARY_PATH=${MOZ_DIST_BIN}:%%PREFIX%%/lib/browser_plugins:%%PREFIX%%/lib/browser_linux_plugins:${MOZ_DIST_BIN}/plugins:${MRE_HOME}${LD_LIBRARY_PATH+":$LD_LIBRARY_PATH"}
  if [ -n "$LD_LIBRARYN32_PATH" ]
-@@ -422,6 +422,9 @@
+ then
+ 	LD_LIBRARYN32_PATH=${MOZ_DIST_BIN}:${MOZ_DIST_BIN}/plugins:${MRE_HOME}${LD_LIBRARYN32_PATH+":$LD_LIBRARYN32_PATH"}
+@@ -415,6 +415,9 @@
  #
  export MOZILLA_FIVE_HOME LD_LIBRARY_PATH
  export SHLIB_PATH LIBPATH LIBRARY_PATH ADDON_PATH DYLD_LIBRARY_PATH
diff --git a/www/seamonkey/files/patch-configure b/www/seamonkey/files/patch-configure
index 220e73132694..a973ee0586b7 100644
--- a/www/seamonkey/files/patch-configure
+++ b/www/seamonkey/files/patch-configure
@@ -1,15 +1,15 @@
---- configure.orig	Thu Nov 10 15:33:30 2005
-+++ configure	Thu Nov 10 22:04:56 2005
-@@ -10203,7 +10203,7 @@
+--- configure.orig	Tue Oct  4 02:01:48 2005
++++ configure	Thu Dec 22 17:54:43 2005
+@@ -10016,7 +10016,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 10209 "configure"
+ #line 10022 "configure"
  #include "confdefs.h"
-@@ -10234,7 +10234,7 @@
+@@ -10047,7 +10047,7 @@
  fi
  if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
    echo "$ac_t""yes" 1>&6
@@ -18,16 +18,16 @@
  else
    echo "$ac_t""no" 1>&6
  echo $ac_n "checking for libiconv in -liconv""... $ac_c" 1>&6
-@@ -10244,7 +10244,7 @@
+@@ -10057,7 +10057,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 10250 "configure"
+ #line 10063 "configure"
  #include "confdefs.h"
-@@ -10275,7 +10275,7 @@
+@@ -10088,7 +10088,7 @@
  fi
  if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
    echo "$ac_t""yes" 1>&6
@@ -36,12 +36,12 @@
  else
    echo "$ac_t""no" 1>&6
  fi
-@@ -12745,7 +12745,7 @@
+@@ -12518,7 +12518,7 @@
    MOZ_SUITE=1
    MOZ_PROFILESHARING=
    MOZ_APP_VERSION=$SEAMONKEY_VERSION
--  MOZ_EXTENSIONS_DEFAULT=" cookie wallet content-packs xml-rpc xmlextras help p3p pref venkman inspector irc universalchardet typeaheadfind webservices spellcheck gnomevfs auth sroaming permissions reporter"
-+  MOZ_EXTENSIONS_DEFAULT=" cookie wallet content-packs xml-rpc xmlextras help p3p pref venkman inspector  universalchardet typeaheadfind webservices spellcheck gnomevfs auth sroaming permissions reporter"
+-  MOZ_EXTENSIONS_DEFAULT=" cookie wallet content-packs xml-rpc xmlextras help p3p pref transformiix venkman inspector irc universalchardet typeaheadfind webservices spellcheck gnomevfs auth sroaming permissions reporter"
++  MOZ_EXTENSIONS_DEFAULT=" cookie wallet content-packs xml-rpc xmlextras help p3p pref transformiix venkman inspector universalchardet typeaheadfind webservices spellcheck gnomevfs auth sroaming permissions reporter"
    cat >> confdefs.h <<\EOF
  #define MOZ_SUITE 1
  EOF
diff --git a/www/seamonkey2/Makefile b/www/seamonkey2/Makefile
index 52a209de4c23..38d22f8a2d10 100644
--- a/www/seamonkey2/Makefile
+++ b/www/seamonkey2/Makefile
@@ -7,13 +7,10 @@
 #
 
 PORTNAME=	seamonkey
-DISTVERSION=	1.0a1
-PORTREVISION=	1
+DISTVERSION=	1.0b
 CATEGORIES?=	www
-MASTER_SITES=	${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	ahze
-#MASTER_SITES=	${MASTER_SITE_MOZILLA}
-#MASTER_SITE_SUBDIR=	seamonkey/releases/${DISTVERSION}
+MASTER_SITES=	${MASTER_SITE_MOZILLA}
+MASTER_SITE_SUBDIR=	seamonkey/releases/${DISTVERSION}
 DISTNAME=	${PORTNAME}-${DISTVERSION}.source
 
 MAINTAINER=	gnome@FreeBSD.org
@@ -34,7 +31,8 @@ CONFIGURE_ENV=	LOCALBASE=${LOCALBASE}
 MOZ_EXTENSIONS=	default
 MOZ_OPTIONS+=	--enable-application=suite	\
 		--enable-svg-renderer=cairo	\
-		--enable-system-cairo
+		--enable-system-cairo		\
+		--enable-canvas
 MOZ_MK_OPTIONS+=	MOZ_CO_PROJECT=suite
 
 OPTIONS=MAILNEWS "Enable Mail and News modules" on \
@@ -89,10 +87,6 @@ MOZ_OPTIONS+=	--enable-calendar
 MOZ_OPTIONS+=	--disable-composer
 .endif
 
-#.if ${ARCH} == "i386"
-#CONFIGURE_ARGS+=	--enable-reorder
-#.endif
-
 post-patch:
 	@${REINPLACE_CMD} -e '/accessibility.typeaheadfind.enablesound/s/true/false/' \
 		${WRKSRC}/modules/libpref/src/init/all.js
diff --git a/www/seamonkey2/distinfo b/www/seamonkey2/distinfo
index e11b29a82f6a..bd45cec89290 100644
--- a/www/seamonkey2/distinfo
+++ b/www/seamonkey2/distinfo
@@ -1,3 +1,3 @@
-MD5 (seamonkey-1.0a1.source.tar.bz2) = a67d506a12d865491f24753eb19d8c24
-SHA256 (seamonkey-1.0a1.source.tar.bz2) = 55d42c3c2a3ead4f5a76b47db00bd0bbee185c0a92d955b401eed9cf6e9f88bf
-SIZE (seamonkey-1.0a1.source.tar.bz2) = 32442355
+MD5 (seamonkey-1.0b.source.tar.bz2) = 169496f3a71209110c32558cd4204742
+SHA256 (seamonkey-1.0b.source.tar.bz2) = 2943d4216262f8cfaa49c1c49d1bd79b51860046bbd71a61277ec0c82d5ce0df
+SIZE (seamonkey-1.0b.source.tar.bz2) = 33065289
diff --git a/www/seamonkey2/files/patch-build_unix_run-mozilla.sh b/www/seamonkey2/files/patch-build_unix_run-mozilla.sh
index 3d392ba01521..6d8cb15859a2 100644
--- a/www/seamonkey2/files/patch-build_unix_run-mozilla.sh
+++ b/www/seamonkey2/files/patch-build_unix_run-mozilla.sh
@@ -1,15 +1,15 @@
---- build/unix/run-mozilla.sh.orig	Mon Oct 17 13:21:17 2005
-+++ build/unix/run-mozilla.sh	Thu Nov 10 22:01:41 2005
-@@ -333,7 +333,7 @@
- ## LD_LIBRARY_PATH because $ORIGIN doesn't work on a symbolic link.
- if [ `uname -s` != "SunOS" -o -h "$MOZ_PROGRAM" ]
- then
--	LD_LIBRARY_PATH=${MOZ_DIST_BIN}:${MOZ_DIST_BIN}/plugins:${MRE_HOME}${LD_LIBRARY_PATH+":$LD_LIBRARY_PATH"}
-+	LD_LIBRARY_PATH=${MOZ_DIST_BIN}:${MOZ_DIST_BIN}/plugins:%%PREFIX%%/lib/browser_plugins:%%PREFIX%%/lib/browser_linux_plugins:${MRE_HOME}${LD_LIBRARY_PATH+":$LD_LIBRARY_PATH"}
- fi 
- 
+--- build/unix/run-mozilla.sh.orig	Sat Oct  1 01:36:47 2005
++++ build/unix/run-mozilla.sh	Thu Dec 22 17:51:10 2005
+@@ -328,7 +328,7 @@
+ fi
+ ##
+ ## Set LD_LIBRARY_PATH
+-LD_LIBRARY_PATH=${MOZ_DIST_BIN}:${MOZ_DIST_BIN}/plugins:${MRE_HOME}${LD_LIBRARY_PATH+":$LD_LIBRARY_PATH"}
++LD_LIBRARY_PATH=${MOZ_DIST_BIN}:%%PREFIX%%/lib/browser_plugins:%%PREFIX%%/lib/browser_linux_plugins:${MOZ_DIST_BIN}/plugins:${MRE_HOME}${LD_LIBRARY_PATH+":$LD_LIBRARY_PATH"}
  if [ -n "$LD_LIBRARYN32_PATH" ]
-@@ -422,6 +422,9 @@
+ then
+ 	LD_LIBRARYN32_PATH=${MOZ_DIST_BIN}:${MOZ_DIST_BIN}/plugins:${MRE_HOME}${LD_LIBRARYN32_PATH+":$LD_LIBRARYN32_PATH"}
+@@ -415,6 +415,9 @@
  #
  export MOZILLA_FIVE_HOME LD_LIBRARY_PATH
  export SHLIB_PATH LIBPATH LIBRARY_PATH ADDON_PATH DYLD_LIBRARY_PATH
diff --git a/www/seamonkey2/files/patch-configure b/www/seamonkey2/files/patch-configure
index 220e73132694..a973ee0586b7 100644
--- a/www/seamonkey2/files/patch-configure
+++ b/www/seamonkey2/files/patch-configure
@@ -1,15 +1,15 @@
---- configure.orig	Thu Nov 10 15:33:30 2005
-+++ configure	Thu Nov 10 22:04:56 2005
-@@ -10203,7 +10203,7 @@
+--- configure.orig	Tue Oct  4 02:01:48 2005
++++ configure	Thu Dec 22 17:54:43 2005
+@@ -10016,7 +10016,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 10209 "configure"
+ #line 10022 "configure"
  #include "confdefs.h"
-@@ -10234,7 +10234,7 @@
+@@ -10047,7 +10047,7 @@
  fi
  if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
    echo "$ac_t""yes" 1>&6
@@ -18,16 +18,16 @@
  else
    echo "$ac_t""no" 1>&6
  echo $ac_n "checking for libiconv in -liconv""... $ac_c" 1>&6
-@@ -10244,7 +10244,7 @@
+@@ -10057,7 +10057,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 10250 "configure"
+ #line 10063 "configure"
  #include "confdefs.h"
-@@ -10275,7 +10275,7 @@
+@@ -10088,7 +10088,7 @@
  fi
  if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
    echo "$ac_t""yes" 1>&6
@@ -36,12 +36,12 @@
  else
    echo "$ac_t""no" 1>&6
  fi
-@@ -12745,7 +12745,7 @@
+@@ -12518,7 +12518,7 @@
    MOZ_SUITE=1
    MOZ_PROFILESHARING=
    MOZ_APP_VERSION=$SEAMONKEY_VERSION
--  MOZ_EXTENSIONS_DEFAULT=" cookie wallet content-packs xml-rpc xmlextras help p3p pref venkman inspector irc universalchardet typeaheadfind webservices spellcheck gnomevfs auth sroaming permissions reporter"
-+  MOZ_EXTENSIONS_DEFAULT=" cookie wallet content-packs xml-rpc xmlextras help p3p pref venkman inspector  universalchardet typeaheadfind webservices spellcheck gnomevfs auth sroaming permissions reporter"
+-  MOZ_EXTENSIONS_DEFAULT=" cookie wallet content-packs xml-rpc xmlextras help p3p pref transformiix venkman inspector irc universalchardet typeaheadfind webservices spellcheck gnomevfs auth sroaming permissions reporter"
++  MOZ_EXTENSIONS_DEFAULT=" cookie wallet content-packs xml-rpc xmlextras help p3p pref transformiix venkman inspector universalchardet typeaheadfind webservices spellcheck gnomevfs auth sroaming permissions reporter"
    cat >> confdefs.h <<\EOF
  #define MOZ_SUITE 1
  EOF