aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorahze <ahze@FreeBSD.org>2004-12-29 11:28:51 +0800
committerahze <ahze@FreeBSD.org>2004-12-29 11:28:51 +0800
commitd2724a3306f616275d235c9d35e4d59887bee0d5 (patch)
tree972e3f88815ae82352cdcdda8d6236e9e24f3065
parent4fd3d8a856e66820e235117edc6868bd05623ed7 (diff)
downloadfreebsd-ports-gnome-d2724a3306f616275d235c9d35e4d59887bee0d5.tar.gz
freebsd-ports-gnome-d2724a3306f616275d235c9d35e4d59887bee0d5.tar.zst
freebsd-ports-gnome-d2724a3306f616275d235c9d35e4d59887bee0d5.zip
- Fix expr usage for 4.x since expr on 4.x
is not POSIX compliant. [1] Submitted by: girgen [1]
-rw-r--r--mail/thunderbird-devel/files/patch-mail_app_mozilla.in6
-rw-r--r--mail/thunderbird-esr/files/patch-mail_app_mozilla.in6
-rw-r--r--mail/thunderbird/files/patch-mail_app_mozilla.in6
-rw-r--r--mail/thunderbird3/files/patch-mail_app_mozilla.in6
4 files changed, 12 insertions, 12 deletions
diff --git a/mail/thunderbird-devel/files/patch-mail_app_mozilla.in b/mail/thunderbird-devel/files/patch-mail_app_mozilla.in
index aec8e60c4bcb..a296ae83e7ae 100644
--- a/mail/thunderbird-devel/files/patch-mail_app_mozilla.in
+++ b/mail/thunderbird-devel/files/patch-mail_app_mozilla.in
@@ -5,14 +5,14 @@
#???: needs check if othersopt begin with -* ?
-if [ `expr "${_optLast}" : '.*:/.*'` -eq 0 -a \( -f "${_optLast}" -o -d "${_optLast}" \) ]; then
-+if [ `expr -- "${_optLast}" : '.*:/.*'` -eq 0 -a \( -f "${_optLast}" -o -d "${_optLast}" \) ]; then
++if [ `expr X"${_optLast}" : 'X.*:/.*'` -eq 0 -a \( -f "${_optLast}" -o -d "${_optLast}" \) ]; then
# Last argument seems to be a local file/directory
# Check, if it is absolutely specified (ie. /home/foo/file vs. ./file)
# If it is just "relatively" (./file) specified, make it absolutely
- [ `expr "${_optLast}" : '/.*'` -eq 0 ] && _optLast="file://`pwd`/${_optLast}"
-elif [ `expr "${_optLast}" : '.*:/.*'` -gt 0 -o -n "${_optOthers}" ]; then #???? like before...
-+ [ `expr -- "${_optLast}" : '/.*'` -eq 0 ] && _optLast="file://`pwd`/${_optLast}"
-+elif [ `expr -- "${_optLast}" : '.*:/.*'` -gt 0 -o -n "${_optOthers}" ]; then #???? like before...
++ [ `expr X"${_optLast}" : 'X/.*'` -eq 0 ] && _optLast="file://`pwd`/${_optLast}"
++elif [ `expr X"${_optLast}" : 'X.*:/.*'` -gt 0 -o -n "${_optOthers}" ]; then #???? like before...
_NEW_WINDOW=1
fi
################################################################ Parse Arguments
diff --git a/mail/thunderbird-esr/files/patch-mail_app_mozilla.in b/mail/thunderbird-esr/files/patch-mail_app_mozilla.in
index aec8e60c4bcb..a296ae83e7ae 100644
--- a/mail/thunderbird-esr/files/patch-mail_app_mozilla.in
+++ b/mail/thunderbird-esr/files/patch-mail_app_mozilla.in
@@ -5,14 +5,14 @@
#???: needs check if othersopt begin with -* ?
-if [ `expr "${_optLast}" : '.*:/.*'` -eq 0 -a \( -f "${_optLast}" -o -d "${_optLast}" \) ]; then
-+if [ `expr -- "${_optLast}" : '.*:/.*'` -eq 0 -a \( -f "${_optLast}" -o -d "${_optLast}" \) ]; then
++if [ `expr X"${_optLast}" : 'X.*:/.*'` -eq 0 -a \( -f "${_optLast}" -o -d "${_optLast}" \) ]; then
# Last argument seems to be a local file/directory
# Check, if it is absolutely specified (ie. /home/foo/file vs. ./file)
# If it is just "relatively" (./file) specified, make it absolutely
- [ `expr "${_optLast}" : '/.*'` -eq 0 ] && _optLast="file://`pwd`/${_optLast}"
-elif [ `expr "${_optLast}" : '.*:/.*'` -gt 0 -o -n "${_optOthers}" ]; then #???? like before...
-+ [ `expr -- "${_optLast}" : '/.*'` -eq 0 ] && _optLast="file://`pwd`/${_optLast}"
-+elif [ `expr -- "${_optLast}" : '.*:/.*'` -gt 0 -o -n "${_optOthers}" ]; then #???? like before...
++ [ `expr X"${_optLast}" : 'X/.*'` -eq 0 ] && _optLast="file://`pwd`/${_optLast}"
++elif [ `expr X"${_optLast}" : 'X.*:/.*'` -gt 0 -o -n "${_optOthers}" ]; then #???? like before...
_NEW_WINDOW=1
fi
################################################################ Parse Arguments
diff --git a/mail/thunderbird/files/patch-mail_app_mozilla.in b/mail/thunderbird/files/patch-mail_app_mozilla.in
index aec8e60c4bcb..a296ae83e7ae 100644
--- a/mail/thunderbird/files/patch-mail_app_mozilla.in
+++ b/mail/thunderbird/files/patch-mail_app_mozilla.in
@@ -5,14 +5,14 @@
#???: needs check if othersopt begin with -* ?
-if [ `expr "${_optLast}" : '.*:/.*'` -eq 0 -a \( -f "${_optLast}" -o -d "${_optLast}" \) ]; then
-+if [ `expr -- "${_optLast}" : '.*:/.*'` -eq 0 -a \( -f "${_optLast}" -o -d "${_optLast}" \) ]; then
++if [ `expr X"${_optLast}" : 'X.*:/.*'` -eq 0 -a \( -f "${_optLast}" -o -d "${_optLast}" \) ]; then
# Last argument seems to be a local file/directory
# Check, if it is absolutely specified (ie. /home/foo/file vs. ./file)
# If it is just "relatively" (./file) specified, make it absolutely
- [ `expr "${_optLast}" : '/.*'` -eq 0 ] && _optLast="file://`pwd`/${_optLast}"
-elif [ `expr "${_optLast}" : '.*:/.*'` -gt 0 -o -n "${_optOthers}" ]; then #???? like before...
-+ [ `expr -- "${_optLast}" : '/.*'` -eq 0 ] && _optLast="file://`pwd`/${_optLast}"
-+elif [ `expr -- "${_optLast}" : '.*:/.*'` -gt 0 -o -n "${_optOthers}" ]; then #???? like before...
++ [ `expr X"${_optLast}" : 'X/.*'` -eq 0 ] && _optLast="file://`pwd`/${_optLast}"
++elif [ `expr X"${_optLast}" : 'X.*:/.*'` -gt 0 -o -n "${_optOthers}" ]; then #???? like before...
_NEW_WINDOW=1
fi
################################################################ Parse Arguments
diff --git a/mail/thunderbird3/files/patch-mail_app_mozilla.in b/mail/thunderbird3/files/patch-mail_app_mozilla.in
index aec8e60c4bcb..a296ae83e7ae 100644
--- a/mail/thunderbird3/files/patch-mail_app_mozilla.in
+++ b/mail/thunderbird3/files/patch-mail_app_mozilla.in
@@ -5,14 +5,14 @@
#???: needs check if othersopt begin with -* ?
-if [ `expr "${_optLast}" : '.*:/.*'` -eq 0 -a \( -f "${_optLast}" -o -d "${_optLast}" \) ]; then
-+if [ `expr -- "${_optLast}" : '.*:/.*'` -eq 0 -a \( -f "${_optLast}" -o -d "${_optLast}" \) ]; then
++if [ `expr X"${_optLast}" : 'X.*:/.*'` -eq 0 -a \( -f "${_optLast}" -o -d "${_optLast}" \) ]; then
# Last argument seems to be a local file/directory
# Check, if it is absolutely specified (ie. /home/foo/file vs. ./file)
# If it is just "relatively" (./file) specified, make it absolutely
- [ `expr "${_optLast}" : '/.*'` -eq 0 ] && _optLast="file://`pwd`/${_optLast}"
-elif [ `expr "${_optLast}" : '.*:/.*'` -gt 0 -o -n "${_optOthers}" ]; then #???? like before...
-+ [ `expr -- "${_optLast}" : '/.*'` -eq 0 ] && _optLast="file://`pwd`/${_optLast}"
-+elif [ `expr -- "${_optLast}" : '.*:/.*'` -gt 0 -o -n "${_optOthers}" ]; then #???? like before...
++ [ `expr X"${_optLast}" : 'X/.*'` -eq 0 ] && _optLast="file://`pwd`/${_optLast}"
++elif [ `expr X"${_optLast}" : 'X.*:/.*'` -gt 0 -o -n "${_optOthers}" ]; then #???? like before...
_NEW_WINDOW=1
fi
################################################################ Parse Arguments