diff options
| author | ahze <ahze@df743ca5-7f9a-e211-a948-0013205c9059> | 2006-10-12 06:27:13 +0800 |
|---|---|---|
| committer | ahze <ahze@df743ca5-7f9a-e211-a948-0013205c9059> | 2006-10-12 06:27:13 +0800 |
| commit | 7984f05bd0c538fa3cbb82e59294e93198d25f6d (patch) | |
| tree | d4e87aecd03836cc37211c190582b1aab023bba9 /www | |
| parent | e8c761c5b104d63d78b653a2b0099d951d0a9a8e (diff) | |
| download | marcuscom-ports-7984f05bd0c538fa3cbb82e59294e93198d25f6d.tar marcuscom-ports-7984f05bd0c538fa3cbb82e59294e93198d25f6d.tar.gz marcuscom-ports-7984f05bd0c538fa3cbb82e59294e93198d25f6d.tar.bz2 marcuscom-ports-7984f05bd0c538fa3cbb82e59294e93198d25f6d.tar.lz marcuscom-ports-7984f05bd0c538fa3cbb82e59294e93198d25f6d.tar.xz marcuscom-ports-7984f05bd0c538fa3cbb82e59294e93198d25f6d.tar.zst marcuscom-ports-7984f05bd0c538fa3cbb82e59294e93198d25f6d.zip | |
- Fix expr usage
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@7716 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'www')
| -rw-r--r-- | www/libxul/Makefile | 4 | ||||
| -rw-r--r-- | www/libxul/files/patch-xulrunner_app_mozilla.in | 18 | ||||
| -rw-r--r-- | www/xulrunner/Makefile | 4 | ||||
| -rw-r--r-- | www/xulrunner/files/patch-xulrunner_app_mozilla.in | 18 |
4 files changed, 40 insertions, 4 deletions
diff --git a/www/libxul/Makefile b/www/libxul/Makefile index 93e77a44f..f26e49209 100644 --- a/www/libxul/Makefile +++ b/www/libxul/Makefile @@ -3,11 +3,11 @@ # Whom: Michael Johnson <ahze@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/www/xulrunner/Makefile,v 1.9 2006/10/09 18:00:44 ahze Exp $ +# $MCom: ports/www/xulrunner/Makefile,v 1.10 2006/10/11 22:09:25 ahze Exp $ PORTNAME= xulrunner PORTVERSION= 1.8.0.4 -PORTREVISION?= 2 +PORTREVISION?= 3 CATEGORIES?= www devel MASTER_SITES= ${MASTER_SITE_MOZILLA} MASTER_SITE_SUBDIR= xulrunner/releases/${PORTVERSION}/source/ diff --git a/www/libxul/files/patch-xulrunner_app_mozilla.in b/www/libxul/files/patch-xulrunner_app_mozilla.in new file mode 100644 index 000000000..1839a79d7 --- /dev/null +++ b/www/libxul/files/patch-xulrunner_app_mozilla.in @@ -0,0 +1,18 @@ +--- xulrunner/app/mozilla.in.orig Wed Oct 11 18:25:16 2006 ++++ xulrunner/app/mozilla.in Wed Oct 11 18:25:48 2006 +@@ -193,12 +193,12 @@ + done #others arg + + #???: needs check if othersopt begin with -* ? +-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 -e X"${_optLast}" : '/.*'` -eq 0 ] && _optLast="file://`pwd`/${_optLast}" ++elif [ `expr -e X"${_optLast}" : '.*:/.*'` -gt 0 -o -n X"${_optOthers}" ]; then #???? like before... + _NEW_WINDOW=1 + fi + diff --git a/www/xulrunner/Makefile b/www/xulrunner/Makefile index 93e77a44f..f26e49209 100644 --- a/www/xulrunner/Makefile +++ b/www/xulrunner/Makefile @@ -3,11 +3,11 @@ # Whom: Michael Johnson <ahze@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/www/xulrunner/Makefile,v 1.9 2006/10/09 18:00:44 ahze Exp $ +# $MCom: ports/www/xulrunner/Makefile,v 1.10 2006/10/11 22:09:25 ahze Exp $ PORTNAME= xulrunner PORTVERSION= 1.8.0.4 -PORTREVISION?= 2 +PORTREVISION?= 3 CATEGORIES?= www devel MASTER_SITES= ${MASTER_SITE_MOZILLA} MASTER_SITE_SUBDIR= xulrunner/releases/${PORTVERSION}/source/ diff --git a/www/xulrunner/files/patch-xulrunner_app_mozilla.in b/www/xulrunner/files/patch-xulrunner_app_mozilla.in new file mode 100644 index 000000000..1839a79d7 --- /dev/null +++ b/www/xulrunner/files/patch-xulrunner_app_mozilla.in @@ -0,0 +1,18 @@ +--- xulrunner/app/mozilla.in.orig Wed Oct 11 18:25:16 2006 ++++ xulrunner/app/mozilla.in Wed Oct 11 18:25:48 2006 +@@ -193,12 +193,12 @@ + done #others arg + + #???: needs check if othersopt begin with -* ? +-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 -e X"${_optLast}" : '/.*'` -eq 0 ] && _optLast="file://`pwd`/${_optLast}" ++elif [ `expr -e X"${_optLast}" : '.*:/.*'` -gt 0 -o -n X"${_optOthers}" ]; then #???? like before... + _NEW_WINDOW=1 + fi + |