9 files changed, 48 insertions, 177 deletions

diff --git a/www/mozilla-devel/Makefile b/www/mozilla-devel/Makefile
index df87ad21a4a7..a7e5360936ee 100644
--- a/www/mozilla-devel/Makefile
+++ b/www/mozilla-devel/Makefile
@@ -6,16 +6,15 @@
 #
 
 PORTNAME?=	mozilla
-PORTVERSION=	1.7.b
-PORTREVISION?=	1
+PORTVERSION=	1.7.r1
+PORTREVISION?=	0
 PORTEPOCH?=	2
 CATEGORIES?=	www
 MASTER_SITES=	${MASTER_SITE_MOZILLA} \
 		${MASTER_SITE_LOCAL:S/$/:local/}
-MASTER_SITE_SUBDIR=	mozilla/releases/${PORTNAME}${PORTVERSION:S/.b/b/}/src \
+MASTER_SITE_SUBDIR=	mozilla/releases/${PORTNAME}${PORTVERSION:S/.r1/rc1/}/src \
 			marcus/:local
-DISTFILES=	${PORTNAME}-source-${PORTVERSION:S/.b/b/}-source${EXTRACT_SUFX} \
-		 libart_lgpl-moz-2.3.10${EXTRACT_SUFX}:local
+DISTFILES=	${PORTNAME}-source-${PORTVERSION:S/.r1/rc1/}${EXTRACT_SUFX}
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	The open source, standards compliant web browser
@@ -241,8 +240,7 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|libesd\.so\.0|${ESD_LIB}|g' \
 		${WRKSRC}/widget/src/gtk2/nsSound.cpp
 	@${REINPLACE_CMD} -e '/accessibility.typeaheadfind.enablesound/s/true/false/' \
-		${WRKSRC}/modules/libpref/src/init/all.js \
-		${WRKSRC}/calendar/sunbird/app/profile/all.js
+		${WRKSRC}/modules/libpref/src/init/all.js
 	@${REINPLACE_CMD} -e 's|<iconv.h>|\"${LOCALBASE}/include/iconv.h\"|g' \
 		${WRKSRC}/configure \
 		${WRKSRC}/intl/uconv/native/nsNativeUConvService.cpp \
diff --git a/www/mozilla-devel/distinfo b/www/mozilla-devel/distinfo
index 95c21a25824f..453037db5d25 100644
--- a/www/mozilla-devel/distinfo
+++ b/www/mozilla-devel/distinfo
@@ -1,4 +1,2 @@
-MD5 (mozilla-source-1.7b-source.tar.bz2) = ee564ecbc7f443f9e49eca1d9ff57296
-SIZE (mozilla-source-1.7b-source.tar.bz2) = 32081692
-MD5 (libart_lgpl-moz-2.3.10.tar.bz2) = a3747d70ba1fff09285d1b23679d0903
-SIZE (libart_lgpl-moz-2.3.10.tar.bz2) = 102847
+MD5 (mozilla-source-1.7rc1.tar.bz2) = a78b2e2dc2c8fa9b22c9e406e3cde808
+SIZE (mozilla-source-1.7rc1.tar.bz2) = 34162006
diff --git a/www/mozilla-devel/files/patch-qt b/www/mozilla-devel/files/patch-qt
index 80213cec7548..6b72f3f007ae 100644
--- a/www/mozilla-devel/files/patch-qt
+++ b/www/mozilla-devel/files/patch-qt
@@ -1,15 +1,15 @@
---- configure.orig	Mon Mar 15 23:00:47 2004
-+++ configure	Fri Mar 19 18:09:53 2004
-@@ -9370,7 +9370,7 @@
+--- configure.orig	Tue Apr 20 21:39:17 2004
++++ configure	Thu Apr 29 14:01:52 2004
+@@ -9362,7 +9362,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 9376 "configure"
+ #line 9368 "configure"
  #include "confdefs.h"
-@@ -9401,7 +9401,7 @@
+@@ -9393,7 +9393,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
-@@ -9411,7 +9411,7 @@
+@@ -9403,7 +9403,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 9417 "configure"
+ #line 9409 "configure"
  #include "confdefs.h"
-@@ -9442,7 +9442,7 @@
+@@ -9434,7 +9434,7 @@
  fi
  if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
    echo "$ac_t""yes" 1>&6
@@ -36,7 +36,7 @@
  else
    echo "$ac_t""no" 1>&6
  fi
-@@ -12299,9 +12299,9 @@
+@@ -12298,9 +12298,9 @@
  
  
  
@@ -48,42 +48,3 @@
  
  # Check whether --enable-extensions or --disable-extensions was given.
  if test "${enable_extensions+set}" = set; then
-@@ -12507,15 +12507,15 @@
- 
- 
-                     if test -z "$GSSAPI_LIBS" ; then
--        LIBS="$LIBS -lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err"
--        echo $ac_n "checking for gss_init_sec_context in -lgssapi_krb5""... $ac_c" 1>&6
--echo "configure:12513: checking for gss_init_sec_context in -lgssapi_krb5" >&5
--ac_lib_var=`echo gssapi_krb5'_'gss_init_sec_context | sed 'y%./+-%__p_%'`
-+        LIBS="$LIBS -lkrb5 -lcrypto -lasn1 -lcom_err -lroken -lgssapi -lcrypt"
-+        echo $ac_n "checking for gss_init_sec_context in -lgssapi""... $ac_c" 1>&6
-+echo "configure:12513: checking for gss_init_sec_context in -lgssapi" >&5
-+ac_lib_var=`echo gssapi'_'gss_init_sec_context | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   ac_save_LIBS="$LIBS"
--LIBS="-lgssapi_krb5  $LIBS"
-+LIBS="-lgssapi  $LIBS"
- cat > conftest.$ac_ext <<EOF
- #line 12521 "configure"
- #include "confdefs.h"
-@@ -12543,7 +12543,7 @@
- fi
- if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-   echo "$ac_t""yes" 1>&6
--  GSSAPI_LIBS="-L$GSSAPI_DIR/lib -lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err"
-+  GSSAPI_LIBS="-L$GSSAPI_DIR/lib -lgssapi -lkrb5 -lasn1 -lroken -lcrypto -lcom_err -lcrypt"
- else
-   echo "$ac_t""no" 1>&6
- fi
-@@ -12653,7 +12653,7 @@
-         cat > conftest.$ac_ext <<EOF
- #line 12655 "configure"
- #include "confdefs.h"
-- #include <gssapi/gssapi.h> 
-+ #include <gssapi.h> 
- int main() {
-  gss_OID oid = GSS_C_NT_HOSTBASED_SERVICE; 
- ; return 0; }
diff --git a/www/seamonkey/Makefile b/www/seamonkey/Makefile
index df87ad21a4a7..a7e5360936ee 100644
--- a/www/seamonkey/Makefile
+++ b/www/seamonkey/Makefile
@@ -6,16 +6,15 @@
 #
 
 PORTNAME?=	mozilla
-PORTVERSION=	1.7.b
-PORTREVISION?=	1
+PORTVERSION=	1.7.r1
+PORTREVISION?=	0
 PORTEPOCH?=	2
 CATEGORIES?=	www
 MASTER_SITES=	${MASTER_SITE_MOZILLA} \
 		${MASTER_SITE_LOCAL:S/$/:local/}
-MASTER_SITE_SUBDIR=	mozilla/releases/${PORTNAME}${PORTVERSION:S/.b/b/}/src \
+MASTER_SITE_SUBDIR=	mozilla/releases/${PORTNAME}${PORTVERSION:S/.r1/rc1/}/src \
 			marcus/:local
-DISTFILES=	${PORTNAME}-source-${PORTVERSION:S/.b/b/}-source${EXTRACT_SUFX} \
-		 libart_lgpl-moz-2.3.10${EXTRACT_SUFX}:local
+DISTFILES=	${PORTNAME}-source-${PORTVERSION:S/.r1/rc1/}${EXTRACT_SUFX}
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	The open source, standards compliant web browser
@@ -241,8 +240,7 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|libesd\.so\.0|${ESD_LIB}|g' \
 		${WRKSRC}/widget/src/gtk2/nsSound.cpp
 	@${REINPLACE_CMD} -e '/accessibility.typeaheadfind.enablesound/s/true/false/' \
-		${WRKSRC}/modules/libpref/src/init/all.js \
-		${WRKSRC}/calendar/sunbird/app/profile/all.js
+		${WRKSRC}/modules/libpref/src/init/all.js
 	@${REINPLACE_CMD} -e 's|<iconv.h>|\"${LOCALBASE}/include/iconv.h\"|g' \
 		${WRKSRC}/configure \
 		${WRKSRC}/intl/uconv/native/nsNativeUConvService.cpp \
diff --git a/www/seamonkey/distinfo b/www/seamonkey/distinfo
index 95c21a25824f..453037db5d25 100644
--- a/www/seamonkey/distinfo
+++ b/www/seamonkey/distinfo
@@ -1,4 +1,2 @@
-MD5 (mozilla-source-1.7b-source.tar.bz2) = ee564ecbc7f443f9e49eca1d9ff57296
-SIZE (mozilla-source-1.7b-source.tar.bz2) = 32081692
-MD5 (libart_lgpl-moz-2.3.10.tar.bz2) = a3747d70ba1fff09285d1b23679d0903
-SIZE (libart_lgpl-moz-2.3.10.tar.bz2) = 102847
+MD5 (mozilla-source-1.7rc1.tar.bz2) = a78b2e2dc2c8fa9b22c9e406e3cde808
+SIZE (mozilla-source-1.7rc1.tar.bz2) = 34162006
diff --git a/www/seamonkey/files/patch-qt b/www/seamonkey/files/patch-qt
index 80213cec7548..6b72f3f007ae 100644
--- a/www/seamonkey/files/patch-qt
+++ b/www/seamonkey/files/patch-qt
@@ -1,15 +1,15 @@
---- configure.orig	Mon Mar 15 23:00:47 2004
-+++ configure	Fri Mar 19 18:09:53 2004
-@@ -9370,7 +9370,7 @@
+--- configure.orig	Tue Apr 20 21:39:17 2004
++++ configure	Thu Apr 29 14:01:52 2004
+@@ -9362,7 +9362,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 9376 "configure"
+ #line 9368 "configure"
  #include "confdefs.h"
-@@ -9401,7 +9401,7 @@
+@@ -9393,7 +9393,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
-@@ -9411,7 +9411,7 @@
+@@ -9403,7 +9403,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 9417 "configure"
+ #line 9409 "configure"
  #include "confdefs.h"
-@@ -9442,7 +9442,7 @@
+@@ -9434,7 +9434,7 @@
  fi
  if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
    echo "$ac_t""yes" 1>&6
@@ -36,7 +36,7 @@
  else
    echo "$ac_t""no" 1>&6
  fi
-@@ -12299,9 +12299,9 @@
+@@ -12298,9 +12298,9 @@
  
  
  
@@ -48,42 +48,3 @@
  
  # Check whether --enable-extensions or --disable-extensions was given.
  if test "${enable_extensions+set}" = set; then
-@@ -12507,15 +12507,15 @@
- 
- 
-                     if test -z "$GSSAPI_LIBS" ; then
--        LIBS="$LIBS -lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err"
--        echo $ac_n "checking for gss_init_sec_context in -lgssapi_krb5""... $ac_c" 1>&6
--echo "configure:12513: checking for gss_init_sec_context in -lgssapi_krb5" >&5
--ac_lib_var=`echo gssapi_krb5'_'gss_init_sec_context | sed 'y%./+-%__p_%'`
-+        LIBS="$LIBS -lkrb5 -lcrypto -lasn1 -lcom_err -lroken -lgssapi -lcrypt"
-+        echo $ac_n "checking for gss_init_sec_context in -lgssapi""... $ac_c" 1>&6
-+echo "configure:12513: checking for gss_init_sec_context in -lgssapi" >&5
-+ac_lib_var=`echo gssapi'_'gss_init_sec_context | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   ac_save_LIBS="$LIBS"
--LIBS="-lgssapi_krb5  $LIBS"
-+LIBS="-lgssapi  $LIBS"
- cat > conftest.$ac_ext <<EOF
- #line 12521 "configure"
- #include "confdefs.h"
-@@ -12543,7 +12543,7 @@
- fi
- if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-   echo "$ac_t""yes" 1>&6
--  GSSAPI_LIBS="-L$GSSAPI_DIR/lib -lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err"
-+  GSSAPI_LIBS="-L$GSSAPI_DIR/lib -lgssapi -lkrb5 -lasn1 -lroken -lcrypto -lcom_err -lcrypt"
- else
-   echo "$ac_t""no" 1>&6
- fi
-@@ -12653,7 +12653,7 @@
-         cat > conftest.$ac_ext <<EOF
- #line 12655 "configure"
- #include "confdefs.h"
-- #include <gssapi/gssapi.h> 
-+ #include <gssapi.h> 
- int main() {
-  gss_OID oid = GSS_C_NT_HOSTBASED_SERVICE; 
- ; return 0; }
diff --git a/www/seamonkey2/Makefile b/www/seamonkey2/Makefile
index df87ad21a4a7..a7e5360936ee 100644
--- a/www/seamonkey2/Makefile
+++ b/www/seamonkey2/Makefile
@@ -6,16 +6,15 @@
 #
 
 PORTNAME?=	mozilla
-PORTVERSION=	1.7.b
-PORTREVISION?=	1
+PORTVERSION=	1.7.r1
+PORTREVISION?=	0
 PORTEPOCH?=	2
 CATEGORIES?=	www
 MASTER_SITES=	${MASTER_SITE_MOZILLA} \
 		${MASTER_SITE_LOCAL:S/$/:local/}
-MASTER_SITE_SUBDIR=	mozilla/releases/${PORTNAME}${PORTVERSION:S/.b/b/}/src \
+MASTER_SITE_SUBDIR=	mozilla/releases/${PORTNAME}${PORTVERSION:S/.r1/rc1/}/src \
 			marcus/:local
-DISTFILES=	${PORTNAME}-source-${PORTVERSION:S/.b/b/}-source${EXTRACT_SUFX} \
-		 libart_lgpl-moz-2.3.10${EXTRACT_SUFX}:local
+DISTFILES=	${PORTNAME}-source-${PORTVERSION:S/.r1/rc1/}${EXTRACT_SUFX}
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	The open source, standards compliant web browser
@@ -241,8 +240,7 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|libesd\.so\.0|${ESD_LIB}|g' \
 		${WRKSRC}/widget/src/gtk2/nsSound.cpp
 	@${REINPLACE_CMD} -e '/accessibility.typeaheadfind.enablesound/s/true/false/' \
-		${WRKSRC}/modules/libpref/src/init/all.js \
-		${WRKSRC}/calendar/sunbird/app/profile/all.js
+		${WRKSRC}/modules/libpref/src/init/all.js
 	@${REINPLACE_CMD} -e 's|<iconv.h>|\"${LOCALBASE}/include/iconv.h\"|g' \
 		${WRKSRC}/configure \
 		${WRKSRC}/intl/uconv/native/nsNativeUConvService.cpp \
diff --git a/www/seamonkey2/distinfo b/www/seamonkey2/distinfo
index 95c21a25824f..453037db5d25 100644
--- a/www/seamonkey2/distinfo
+++ b/www/seamonkey2/distinfo
@@ -1,4 +1,2 @@
-MD5 (mozilla-source-1.7b-source.tar.bz2) = ee564ecbc7f443f9e49eca1d9ff57296
-SIZE (mozilla-source-1.7b-source.tar.bz2) = 32081692
-MD5 (libart_lgpl-moz-2.3.10.tar.bz2) = a3747d70ba1fff09285d1b23679d0903
-SIZE (libart_lgpl-moz-2.3.10.tar.bz2) = 102847
+MD5 (mozilla-source-1.7rc1.tar.bz2) = a78b2e2dc2c8fa9b22c9e406e3cde808
+SIZE (mozilla-source-1.7rc1.tar.bz2) = 34162006
diff --git a/www/seamonkey2/files/patch-qt b/www/seamonkey2/files/patch-qt
index 80213cec7548..6b72f3f007ae 100644
--- a/www/seamonkey2/files/patch-qt
+++ b/www/seamonkey2/files/patch-qt
@@ -1,15 +1,15 @@
---- configure.orig	Mon Mar 15 23:00:47 2004
-+++ configure	Fri Mar 19 18:09:53 2004
-@@ -9370,7 +9370,7 @@
+--- configure.orig	Tue Apr 20 21:39:17 2004
++++ configure	Thu Apr 29 14:01:52 2004
+@@ -9362,7 +9362,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 9376 "configure"
+ #line 9368 "configure"
  #include "confdefs.h"
-@@ -9401,7 +9401,7 @@
+@@ -9393,7 +9393,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
-@@ -9411,7 +9411,7 @@
+@@ -9403,7 +9403,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 9417 "configure"
+ #line 9409 "configure"
  #include "confdefs.h"
-@@ -9442,7 +9442,7 @@
+@@ -9434,7 +9434,7 @@
  fi
  if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
    echo "$ac_t""yes" 1>&6
@@ -36,7 +36,7 @@
  else
    echo "$ac_t""no" 1>&6
  fi
-@@ -12299,9 +12299,9 @@
+@@ -12298,9 +12298,9 @@
  
  
  
@@ -48,42 +48,3 @@
  
  # Check whether --enable-extensions or --disable-extensions was given.
  if test "${enable_extensions+set}" = set; then
-@@ -12507,15 +12507,15 @@
- 
- 
-                     if test -z "$GSSAPI_LIBS" ; then
--        LIBS="$LIBS -lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err"
--        echo $ac_n "checking for gss_init_sec_context in -lgssapi_krb5""... $ac_c" 1>&6
--echo "configure:12513: checking for gss_init_sec_context in -lgssapi_krb5" >&5
--ac_lib_var=`echo gssapi_krb5'_'gss_init_sec_context | sed 'y%./+-%__p_%'`
-+        LIBS="$LIBS -lkrb5 -lcrypto -lasn1 -lcom_err -lroken -lgssapi -lcrypt"
-+        echo $ac_n "checking for gss_init_sec_context in -lgssapi""... $ac_c" 1>&6
-+echo "configure:12513: checking for gss_init_sec_context in -lgssapi" >&5
-+ac_lib_var=`echo gssapi'_'gss_init_sec_context | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   ac_save_LIBS="$LIBS"
--LIBS="-lgssapi_krb5  $LIBS"
-+LIBS="-lgssapi  $LIBS"
- cat > conftest.$ac_ext <<EOF
- #line 12521 "configure"
- #include "confdefs.h"
-@@ -12543,7 +12543,7 @@
- fi
- if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-   echo "$ac_t""yes" 1>&6
--  GSSAPI_LIBS="-L$GSSAPI_DIR/lib -lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err"
-+  GSSAPI_LIBS="-L$GSSAPI_DIR/lib -lgssapi -lkrb5 -lasn1 -lroken -lcrypto -lcom_err -lcrypt"
- else
-   echo "$ac_t""no" 1>&6
- fi
-@@ -12653,7 +12653,7 @@
-         cat > conftest.$ac_ext <<EOF
- #line 12655 "configure"
- #include "confdefs.h"
-- #include <gssapi/gssapi.h> 
-+ #include <gssapi.h> 
- int main() {
-  gss_OID oid = GSS_C_NT_HOSTBASED_SERVICE; 
- ; return 0; }