12 files changed, 44 insertions, 40 deletions

diff --git a/mail/thunderbird-devel/Makefile b/mail/thunderbird-devel/Makefile
index 82f9a3e9998a..4d310e993c79 100644
--- a/mail/thunderbird-devel/Makefile
+++ b/mail/thunderbird-devel/Makefile
@@ -7,8 +7,7 @@
 #
 
 PORTNAME=	thunderbird
-PORTVERSION=	1.0.6
-PORTREVISION=	3
+PORTVERSION=	1.0.7
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_MOZILLA}
 MASTER_SITE_SUBDIR=	${PORTNAME}/releases/${PORTVERSION}/source
diff --git a/mail/thunderbird-devel/distinfo b/mail/thunderbird-devel/distinfo
index bac899b6bf63..2530ca2574a4 100644
--- a/mail/thunderbird-devel/distinfo
+++ b/mail/thunderbird-devel/distinfo
@@ -1,2 +1,2 @@
-MD5 (thunderbird-1.0.6-source.tar.bz2) = a0ddcc8bd5ee2c9be724b6963ad27111
-SIZE (thunderbird-1.0.6-source.tar.bz2) = 33366077
+MD5 (thunderbird-1.0.7-source.tar.bz2) = e6388feb0ffcd189af779f165c124b4d
+SIZE (thunderbird-1.0.7-source.tar.bz2) = 33385665
diff --git a/mail/thunderbird-devel/files/patch-mail_app_mozilla.in b/mail/thunderbird-devel/files/patch-mail_app_mozilla.in
index 01091fb2ce3b..24eeb12c3ab9 100644
--- a/mail/thunderbird-devel/files/patch-mail_app_mozilla.in
+++ b/mail/thunderbird-devel/files/patch-mail_app_mozilla.in
@@ -122,7 +122,7 @@
  
  # Use run-mozilla.sh in the current dir if it exists
  # If not, then start resolving symlinks until we find run-mozilla.sh
-@@ -82,160 +113,214 @@
+@@ -82,162 +113,214 @@
  curdir=`dirname "$progname"`
  progbase=`basename "$progname"`
  run_moz="$curdir/run-mozilla.sh"
@@ -181,7 +181,6 @@
 -fi
 -
 -script_args=""
--moreargs=""
 -debugging=0
 -MOZILLA_BIN="${progbase}-bin"
 -
@@ -410,7 +409,8 @@
 -# Default action - no running instance or _USE_EXIST (${_USE_EXIST}) ! -eq 1
 -########################################################################### Main
  
--while [ $# -gt 0 ]
+-pass_arg_count=0
+-while [ $# -gt $pass_arg_count ]
 -do
 -  case "$1" in
 -    -p | --pure | -pure)
@@ -427,8 +427,11 @@
 -      shift 2
 -      ;;
 -    *)
--      moreargs="$moreargs \"$1\""
--      shift 1
+-      # Move the unrecognized argument to the end of the list.
+-      arg="$1"
+-      shift
+-      set -- "$@" "$arg"
+-      pass_arg_count=`expr $pass_arg_count + 1`
 -      ;;
 -  esac
 -done
@@ -452,7 +455,6 @@
 +fi
  
 -export MRE_HOME
--eval "set -- $moreargs"
 +# real invocation
 +eval "set -- ${moreargs}"
  
diff --git a/mail/thunderbird-esr/Makefile b/mail/thunderbird-esr/Makefile
index 82f9a3e9998a..4d310e993c79 100644
--- a/mail/thunderbird-esr/Makefile
+++ b/mail/thunderbird-esr/Makefile
@@ -7,8 +7,7 @@
 #
 
 PORTNAME=	thunderbird
-PORTVERSION=	1.0.6
-PORTREVISION=	3
+PORTVERSION=	1.0.7
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_MOZILLA}
 MASTER_SITE_SUBDIR=	${PORTNAME}/releases/${PORTVERSION}/source
diff --git a/mail/thunderbird-esr/distinfo b/mail/thunderbird-esr/distinfo
index bac899b6bf63..2530ca2574a4 100644
--- a/mail/thunderbird-esr/distinfo
+++ b/mail/thunderbird-esr/distinfo
@@ -1,2 +1,2 @@
-MD5 (thunderbird-1.0.6-source.tar.bz2) = a0ddcc8bd5ee2c9be724b6963ad27111
-SIZE (thunderbird-1.0.6-source.tar.bz2) = 33366077
+MD5 (thunderbird-1.0.7-source.tar.bz2) = e6388feb0ffcd189af779f165c124b4d
+SIZE (thunderbird-1.0.7-source.tar.bz2) = 33385665
diff --git a/mail/thunderbird-esr/files/patch-mail_app_mozilla.in b/mail/thunderbird-esr/files/patch-mail_app_mozilla.in
index 01091fb2ce3b..24eeb12c3ab9 100644
--- a/mail/thunderbird-esr/files/patch-mail_app_mozilla.in
+++ b/mail/thunderbird-esr/files/patch-mail_app_mozilla.in
@@ -122,7 +122,7 @@
  
  # Use run-mozilla.sh in the current dir if it exists
  # If not, then start resolving symlinks until we find run-mozilla.sh
-@@ -82,160 +113,214 @@
+@@ -82,162 +113,214 @@
  curdir=`dirname "$progname"`
  progbase=`basename "$progname"`
  run_moz="$curdir/run-mozilla.sh"
@@ -181,7 +181,6 @@
 -fi
 -
 -script_args=""
--moreargs=""
 -debugging=0
 -MOZILLA_BIN="${progbase}-bin"
 -
@@ -410,7 +409,8 @@
 -# Default action - no running instance or _USE_EXIST (${_USE_EXIST}) ! -eq 1
 -########################################################################### Main
  
--while [ $# -gt 0 ]
+-pass_arg_count=0
+-while [ $# -gt $pass_arg_count ]
 -do
 -  case "$1" in
 -    -p | --pure | -pure)
@@ -427,8 +427,11 @@
 -      shift 2
 -      ;;
 -    *)
--      moreargs="$moreargs \"$1\""
--      shift 1
+-      # Move the unrecognized argument to the end of the list.
+-      arg="$1"
+-      shift
+-      set -- "$@" "$arg"
+-      pass_arg_count=`expr $pass_arg_count + 1`
 -      ;;
 -  esac
 -done
@@ -452,7 +455,6 @@
 +fi
  
 -export MRE_HOME
--eval "set -- $moreargs"
 +# real invocation
 +eval "set -- ${moreargs}"
  
diff --git a/mail/thunderbird/Makefile b/mail/thunderbird/Makefile
index 82f9a3e9998a..4d310e993c79 100644
--- a/mail/thunderbird/Makefile
+++ b/mail/thunderbird/Makefile
@@ -7,8 +7,7 @@
 #
 
 PORTNAME=	thunderbird
-PORTVERSION=	1.0.6
-PORTREVISION=	3
+PORTVERSION=	1.0.7
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_MOZILLA}
 MASTER_SITE_SUBDIR=	${PORTNAME}/releases/${PORTVERSION}/source
diff --git a/mail/thunderbird/distinfo b/mail/thunderbird/distinfo
index bac899b6bf63..2530ca2574a4 100644
--- a/mail/thunderbird/distinfo
+++ b/mail/thunderbird/distinfo
@@ -1,2 +1,2 @@
-MD5 (thunderbird-1.0.6-source.tar.bz2) = a0ddcc8bd5ee2c9be724b6963ad27111
-SIZE (thunderbird-1.0.6-source.tar.bz2) = 33366077
+MD5 (thunderbird-1.0.7-source.tar.bz2) = e6388feb0ffcd189af779f165c124b4d
+SIZE (thunderbird-1.0.7-source.tar.bz2) = 33385665
diff --git a/mail/thunderbird/files/patch-mail_app_mozilla.in b/mail/thunderbird/files/patch-mail_app_mozilla.in
index 01091fb2ce3b..24eeb12c3ab9 100644
--- a/mail/thunderbird/files/patch-mail_app_mozilla.in
+++ b/mail/thunderbird/files/patch-mail_app_mozilla.in
@@ -122,7 +122,7 @@
  
  # Use run-mozilla.sh in the current dir if it exists
  # If not, then start resolving symlinks until we find run-mozilla.sh
-@@ -82,160 +113,214 @@
+@@ -82,162 +113,214 @@
  curdir=`dirname "$progname"`
  progbase=`basename "$progname"`
  run_moz="$curdir/run-mozilla.sh"
@@ -181,7 +181,6 @@
 -fi
 -
 -script_args=""
--moreargs=""
 -debugging=0
 -MOZILLA_BIN="${progbase}-bin"
 -
@@ -410,7 +409,8 @@
 -# Default action - no running instance or _USE_EXIST (${_USE_EXIST}) ! -eq 1
 -########################################################################### Main
  
--while [ $# -gt 0 ]
+-pass_arg_count=0
+-while [ $# -gt $pass_arg_count ]
 -do
 -  case "$1" in
 -    -p | --pure | -pure)
@@ -427,8 +427,11 @@
 -      shift 2
 -      ;;
 -    *)
--      moreargs="$moreargs \"$1\""
--      shift 1
+-      # Move the unrecognized argument to the end of the list.
+-      arg="$1"
+-      shift
+-      set -- "$@" "$arg"
+-      pass_arg_count=`expr $pass_arg_count + 1`
 -      ;;
 -  esac
 -done
@@ -452,7 +455,6 @@
 +fi
  
 -export MRE_HOME
--eval "set -- $moreargs"
 +# real invocation
 +eval "set -- ${moreargs}"
  
diff --git a/mail/thunderbird3/Makefile b/mail/thunderbird3/Makefile
index 82f9a3e9998a..4d310e993c79 100644
--- a/mail/thunderbird3/Makefile
+++ b/mail/thunderbird3/Makefile
@@ -7,8 +7,7 @@
 #
 
 PORTNAME=	thunderbird
-PORTVERSION=	1.0.6
-PORTREVISION=	3
+PORTVERSION=	1.0.7
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_MOZILLA}
 MASTER_SITE_SUBDIR=	${PORTNAME}/releases/${PORTVERSION}/source
diff --git a/mail/thunderbird3/distinfo b/mail/thunderbird3/distinfo
index bac899b6bf63..2530ca2574a4 100644
--- a/mail/thunderbird3/distinfo
+++ b/mail/thunderbird3/distinfo
@@ -1,2 +1,2 @@
-MD5 (thunderbird-1.0.6-source.tar.bz2) = a0ddcc8bd5ee2c9be724b6963ad27111
-SIZE (thunderbird-1.0.6-source.tar.bz2) = 33366077
+MD5 (thunderbird-1.0.7-source.tar.bz2) = e6388feb0ffcd189af779f165c124b4d
+SIZE (thunderbird-1.0.7-source.tar.bz2) = 33385665
diff --git a/mail/thunderbird3/files/patch-mail_app_mozilla.in b/mail/thunderbird3/files/patch-mail_app_mozilla.in
index 01091fb2ce3b..24eeb12c3ab9 100644
--- a/mail/thunderbird3/files/patch-mail_app_mozilla.in
+++ b/mail/thunderbird3/files/patch-mail_app_mozilla.in
@@ -122,7 +122,7 @@
  
  # Use run-mozilla.sh in the current dir if it exists
  # If not, then start resolving symlinks until we find run-mozilla.sh
-@@ -82,160 +113,214 @@
+@@ -82,162 +113,214 @@
  curdir=`dirname "$progname"`
  progbase=`basename "$progname"`
  run_moz="$curdir/run-mozilla.sh"
@@ -181,7 +181,6 @@
 -fi
 -
 -script_args=""
--moreargs=""
 -debugging=0
 -MOZILLA_BIN="${progbase}-bin"
 -
@@ -410,7 +409,8 @@
 -# Default action - no running instance or _USE_EXIST (${_USE_EXIST}) ! -eq 1
 -########################################################################### Main
  
--while [ $# -gt 0 ]
+-pass_arg_count=0
+-while [ $# -gt $pass_arg_count ]
 -do
 -  case "$1" in
 -    -p | --pure | -pure)
@@ -427,8 +427,11 @@
 -      shift 2
 -      ;;
 -    *)
--      moreargs="$moreargs \"$1\""
--      shift 1
+-      # Move the unrecognized argument to the end of the list.
+-      arg="$1"
+-      shift
+-      set -- "$@" "$arg"
+-      pass_arg_count=`expr $pass_arg_count + 1`
 -      ;;
 -  esac
 -done
@@ -452,7 +455,6 @@
 +fi
  
 -export MRE_HOME
--eval "set -- $moreargs"
 +# real invocation
 +eval "set -- ${moreargs}"