Date: Mon, 17 Aug 2009 15:48:26 GMT From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org Subject: [SVN-Commit] r84 - in branches/experimental/www/libxul: . files Message-ID: <200908171548.n7HFmQhq061991@trillian.chruetertee.ch>
next in thread | raw e-mail | index | archive | help
Author: beat
Date: Mon Aug 17 15:48:25 2009
New Revision: 84
Log:
- Update to 1.9.1.2
Added:
branches/experimental/www/libxul/files/patch-js-src-config-mkdepend-Makefile.in
branches/experimental/www/libxul/files/patch-media-liboggplay-src-liboggplay-std_semaphore.h
branches/experimental/www/libxul/files/patch-media-liboggz-include-oggz-oggz_off_t_generated.h
branches/experimental/www/libxul/files/patch-media-libsydneyaudio-src-Makefile.in
Deleted:
branches/experimental/www/libxul/files/patch-layout-style-nsCSSValue.h
branches/experimental/www/libxul/files/patch-toolkit-components-history-src-nsGlobalHistory.cpp
branches/experimental/www/libxul/files/patch-toolkit-components-url-classifier-src-nsUrlClassifierDBService.cpp
branches/experimental/www/libxul/files/patch-xpfe-components-history-src-nsGlobalHistory.cpp
branches/experimental/www/libxul/files/patch-xulrunner_app_mozilla.in
Modified:
branches/experimental/www/libxul/Makefile
branches/experimental/www/libxul/distinfo
branches/experimental/www/libxul/files/patch-js_src_jsnum.c
Modified: branches/experimental/www/libxul/Makefile
==============================================================================
--- branches/experimental/www/libxul/Makefile Mon Aug 17 15:27:32 2009 (r83)
+++ branches/experimental/www/libxul/Makefile Mon Aug 17 15:48:25 2009 (r84)
@@ -7,11 +7,12 @@
#
PORTNAME= libxul
-PORTVERSION= 1.9.0.12
+PORTVERSION= 1.9.1.2
CATEGORIES?= www devel
MASTER_SITES= ${MASTER_SITE_MOZILLA}
MASTER_SITE_SUBDIR= xulrunner/releases/${PORTVERSION}/source/
DISTNAME= xulrunner-${PORTVERSION}-source
+WRKSRC= ${WRKDIR}/mozilla-1.9.1
MAINTAINER?= gecko@FreeBSD.org
COMMENT?= Mozilla runtime package that can be used to bootstrap XUL+XPCOM apps
@@ -57,6 +58,11 @@
${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%|${PTHREAD_LIBS:C/-pthread/${GECKO_PTHREAD_LIBS}/}|' \
${WRKSRC}/storage/build/Makefile.in \
${WRKSRC}/db/sqlite3/src/Makefile.in
+ @${REINPLACE_CMD} -e 's|-lc_r|${PTHREAD_LIBS}|g ; \
+ s|-lpthread|${PTHREAD_LIBS}|g ; \
+ s|echo aout|echo elf|g ; \
+ s|/usr/X11R6|${LOCALBASE}|g' \
+ ${WRKSRC}/js/src/configure
post-build:
@${REINPLACE_CMD} -e "s|\(Libs:.*\)\($$\)|\1 -Wl,-rpath,${PREFIX}/lib/${MOZ_RPATH}\2| ; \
Modified: branches/experimental/www/libxul/distinfo
==============================================================================
--- branches/experimental/www/libxul/distinfo Mon Aug 17 15:27:32 2009 (r83)
+++ branches/experimental/www/libxul/distinfo Mon Aug 17 15:48:25 2009 (r84)
@@ -1,3 +1,3 @@
-MD5 (xulrunner-1.9.0.12-source.tar.bz2) = 51ee3e72001b15b6af8c0a1bdf8256d2
-SHA256 (xulrunner-1.9.0.12-source.tar.bz2) = 3d46b1449e85e24827318ffebffdf27c9199c7161400666e9d4ef2bd3122db00
-SIZE (xulrunner-1.9.0.12-source.tar.bz2) = 37238703
+MD5 (xulrunner-1.9.1.2-source.tar.bz2) = 136867f95c86f3988b7f825e874b85de
+SHA256 (xulrunner-1.9.1.2-source.tar.bz2) = d68b5988907e06cc37793489589f5545487a9b1bbe6444b7e2e16450bd1cb9ae
+SIZE (xulrunner-1.9.1.2-source.tar.bz2) = 46787928
Added: branches/experimental/www/libxul/files/patch-js-src-config-mkdepend-Makefile.in
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/www/libxul/files/patch-js-src-config-mkdepend-Makefile.in Mon Aug 17 15:48:25 2009 (r84)
@@ -0,0 +1,11 @@
+--- js/src/config/mkdepend/Makefile.in.orig 2009-08-15 17:45:39.000000000 +0200
++++ js/src/config/mkdepend/Makefile.in 2009-08-15 17:46:08.000000000 +0200
+@@ -72,7 +72,7 @@
+
+ include $(topsrcdir)/config/rules.mk
+
+-HOST_CFLAGS += -DINCLUDEDIR=\"/usr/include\" -DOBJSUFFIX=\".$(OBJ_SUFFIX)\"
++HOST_CFLAGS += -DINCLUDEDIR=\"%%LOCALBASE%%/include\" -DOBJSUFFIX=\".$(OBJ_SUFFIX)\" -I/usr/local/include
+
+ ifdef GNU_CC
+ _GCCDIR = $(shell $(CC) -print-file-name=include)
Modified: branches/experimental/www/libxul/files/patch-js_src_jsnum.c
==============================================================================
--- branches/experimental/www/libxul/files/patch-js_src_jsnum.c Mon Aug 17 15:27:32 2009 (r83)
+++ branches/experimental/www/libxul/files/patch-js_src_jsnum.c Mon Aug 17 15:48:25 2009 (r84)
@@ -1,5 +1,5 @@
---- js/src/jsnum.c.orig Sun Nov 5 18:37:07 2006
-+++ js/src/jsnum.c Sun Nov 5 18:42:31 2006
+--- js/src/jsnum.cpp.orig 2009-08-14 19:00:22.000000000 +0200
++++ js/src/jsnum.cpp 2009-08-14 19:01:44.000000000 +0200
@@ -45,6 +45,9 @@
#if defined(XP_WIN) || defined(XP_OS2)
#include <float.h>
@@ -7,10 +7,10 @@
+#if defined(__FreeBSD__)
+#include <sys/param.h>
+#endif
- #include <locale.h>
- #include <limits.h>
- #include <math.h>
-@@ -532,7 +535,15 @@ static jsdouble NaN;
+ #ifdef XP_OS2
+ #define _PC_53 PC_53
+ #define _MCW_EM MCW_EM
+@@ -659,8 +662,16 @@
#else
@@ -21,8 +21,9 @@
+#else
+
#define FIX_FPU() ((void)0)
-+
-+#endif /* defined(__FreeBSD__) && __FreeBSD_version >= 503000 */
++#endif /* defined(__FreeBSD__) && __FreeBSD_version >= 503000 */
++
#endif
+ JSBool
Deleted: branches/experimental/www/libxul/files/patch-layout-style-nsCSSValue.h
==============================================================================
--- branches/experimental/www/libxul/files/patch-layout-style-nsCSSValue.h Mon Aug 17 15:48:25 2009 (r83)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,215 +0,0 @@
-# Ensure correct alignment for nsCSSValue objects inside nsCSSValue::Array.
-# (Bug 476345)
-
---- layout/style/nsCSSValue.h.orig 2008-07-02 00:51:43.000000000 +0200
-+++ layout/style/nsCSSValue.h 2009-02-01 21:43:29.000000000 +0100
-@@ -286,104 +286,7 @@
- // failure.
- static nsStringBuffer* BufferFromString(const nsString& aValue);
-
-- struct Array {
--
-- // return |Array| with reference count of zero
-- static Array* Create(PRUint16 aItemCount) {
-- return new (aItemCount) Array(aItemCount);
-- }
--
-- nsCSSValue& operator[](PRUint16 aIndex) {
-- NS_ASSERTION(aIndex < mCount, "out of range");
-- return *(First() + aIndex);
-- }
--
-- const nsCSSValue& operator[](PRUint16 aIndex) const {
-- NS_ASSERTION(aIndex < mCount, "out of range");
-- return *(First() + aIndex);
-- }
--
-- nsCSSValue& Item(PRUint16 aIndex) { return (*this)[aIndex]; }
-- const nsCSSValue& Item(PRUint16 aIndex) const { return (*this)[aIndex]; }
--
-- PRUint16 Count() const { return mCount; }
--
-- PRBool operator==(const Array& aOther) const
-- {
-- if (mCount != aOther.mCount)
-- return PR_FALSE;
-- for (PRUint16 i = 0; i < mCount; ++i)
-- if ((*this)[i] != aOther[i])
-- return PR_FALSE;
-- return PR_TRUE;
-- }
--
-- void AddRef() {
-- if (mRefCnt == PR_UINT16_MAX) {
-- NS_WARNING("refcount overflow, leaking nsCSSValue::Array");
-- return;
-- }
-- ++mRefCnt;
-- NS_LOG_ADDREF(this, mRefCnt, "nsCSSValue::Array", sizeof(*this));
-- }
-- void Release() {
-- if (mRefCnt == PR_UINT16_MAX) {
-- NS_WARNING("refcount overflow, leaking nsCSSValue::Array");
-- return;
-- }
-- --mRefCnt;
-- NS_LOG_RELEASE(this, mRefCnt, "nsCSSValue::Array");
-- if (mRefCnt == 0)
-- delete this;
-- }
--
-- private:
--
-- PRUint16 mRefCnt;
-- PRUint16 mCount;
--
-- void* operator new(size_t aSelfSize, PRUint16 aItemCount) CPP_THROW_NEW {
-- return ::operator new(aSelfSize + sizeof(nsCSSValue)*aItemCount);
-- }
--
-- void operator delete(void* aPtr) { ::operator delete(aPtr); }
--
-- nsCSSValue* First() {
-- return (nsCSSValue*) (((char*)this) + sizeof(*this));
-- }
--
-- const nsCSSValue* First() const {
-- return (const nsCSSValue*) (((const char*)this) + sizeof(*this));
-- }
--
--#define CSSVALUE_LIST_FOR_VALUES(var) \
-- for (nsCSSValue *var = First(), *var##_end = var + mCount; \
-- var != var##_end; ++var)
--
-- Array(PRUint16 aItemCount)
-- : mRefCnt(0)
-- , mCount(aItemCount)
-- {
-- MOZ_COUNT_CTOR(nsCSSValue::Array);
-- CSSVALUE_LIST_FOR_VALUES(val) {
-- new (val) nsCSSValue();
-- }
-- }
--
-- ~Array()
-- {
-- MOZ_COUNT_DTOR(nsCSSValue::Array);
-- CSSVALUE_LIST_FOR_VALUES(val) {
-- val->~nsCSSValue();
-- }
-- }
--
--#undef CSSVALUE_LIST_FOR_VALUES
--
-- private:
-- Array(const Array& aOther); // not to be implemented
-- };
--
-+ struct Array;
- struct URL {
- // Methods are not inline because using an nsIPrincipal means requiring
- // caps, which leads to REQUIRES hell, since this header is included all
-@@ -454,5 +357,102 @@
- } mValue;
- };
-
--#endif /* nsCSSValue_h___ */
-+struct nsCSSValue::Array {
-+
-+ // return |Array| with reference count of zero
-+ static Array* Create(PRUint16 aItemCount) {
-+ return new (aItemCount) Array(aItemCount);
-+ }
-+
-+ nsCSSValue& operator[](PRUint16 aIndex) {
-+ NS_ASSERTION(aIndex < mCount, "out of range");
-+ return mArray[aIndex];
-+ }
-+
-+ const nsCSSValue& operator[](PRUint16 aIndex) const {
-+ NS_ASSERTION(aIndex < mCount, "out of range");
-+ return mArray[aIndex];
-+ }
-+
-+ nsCSSValue& Item(PRUint16 aIndex) { return (*this)[aIndex]; }
-+ const nsCSSValue& Item(PRUint16 aIndex) const { return (*this)[aIndex]; }
-+
-+ PRUint16 Count() const { return mCount; }
-+
-+ PRBool operator==(const Array& aOther) const
-+ {
-+ if (mCount != aOther.mCount)
-+ return PR_FALSE;
-+ for (PRUint16 i = 0; i < mCount; ++i)
-+ if ((*this)[i] != aOther[i])
-+ return PR_FALSE;
-+ return PR_TRUE;
-+ }
-+
-+ void AddRef() {
-+ if (mRefCnt == PR_UINT16_MAX) {
-+ NS_WARNING("refcount overflow, leaking nsCSSValue::Array");
-+ return;
-+ }
-+ ++mRefCnt;
-+ NS_LOG_ADDREF(this, mRefCnt, "nsCSSValue::Array", sizeof(*this));
-+ }
-+ void Release() {
-+ if (mRefCnt == PR_UINT16_MAX) {
-+ NS_WARNING("refcount overflow, leaking nsCSSValue::Array");
-+ return;
-+ }
-+ --mRefCnt;
-+ NS_LOG_RELEASE(this, mRefCnt, "nsCSSValue::Array");
-+ if (mRefCnt == 0)
-+ delete this;
-+ }
-+
-+private:
-+
-+ PRUint16 mRefCnt;
-+ const PRUint16 mCount;
-+ // This must be the last sub-object, since we extend this array to
-+ // be of size mCount; it needs to be a sub-object so it gets proper
-+ // alignment.
-+ nsCSSValue mArray[1];
-
-+ void* operator new(size_t aSelfSize, PRUint16 aItemCount) CPP_THROW_NEW {
-+ return ::operator new(aSelfSize + sizeof(nsCSSValue) * (aItemCount - 1));
-+ }
-+
-+ void operator delete(void* aPtr) { ::operator delete(aPtr); }
-+
-+ nsCSSValue* First() { return mArray; }
-+
-+ const nsCSSValue* First() const { return mArray; }
-+
-+#define CSSVALUE_LIST_FOR_EXTRA_VALUES(var) \
-+for (nsCSSValue *var = First() + 1, *var##_end = First() + mCount; \
-+ var != var##_end; ++var)
-+
-+ Array(PRUint16 aItemCount)
-+ : mRefCnt(0)
-+ , mCount(aItemCount)
-+ {
-+ MOZ_COUNT_CTOR(nsCSSValue::Array);
-+ CSSVALUE_LIST_FOR_EXTRA_VALUES(val) {
-+ new (val) nsCSSValue();
-+ }
-+ }
-+
-+ ~Array()
-+ {
-+ MOZ_COUNT_DTOR(nsCSSValue::Array);
-+ CSSVALUE_LIST_FOR_EXTRA_VALUES(val) {
-+ val->~nsCSSValue();
-+ }
-+ }
-+
-+#undef CSSVALUE_LIST_FOR_VALUES
-+
-+private:
-+ Array(const Array& aOther); // not to be implemented
-+};
-+
-+#endif /* nsCSSValue_h___ */
Added: branches/experimental/www/libxul/files/patch-media-liboggplay-src-liboggplay-std_semaphore.h
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/www/libxul/files/patch-media-liboggplay-src-liboggplay-std_semaphore.h Mon Aug 17 15:48:25 2009 (r84)
@@ -0,0 +1,11 @@
+--- media/liboggplay/src/liboggplay/std_semaphore.h.orig 2009-08-15 21:22:20.000000000 +0200
++++ media/liboggplay/src/liboggplay/std_semaphore.h 2009-08-15 21:22:49.000000000 +0200
+@@ -74,7 +74,7 @@
+ * @retval non-zero on error
+ */
+
+-#if defined(linux) || defined(SOLARIS)
++#if defined(linux) || defined(SOLARIS) || defined(__FreeBSD__)
+ #include <semaphore.h>
+ #define SEM_CREATE(p,s) sem_init(&(p), 1, s)
+ #define SEM_SIGNAL(p) sem_post(&(p))
Added: branches/experimental/www/libxul/files/patch-media-liboggz-include-oggz-oggz_off_t_generated.h
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/www/libxul/files/patch-media-liboggz-include-oggz-oggz_off_t_generated.h Mon Aug 17 15:48:25 2009 (r84)
@@ -0,0 +1,11 @@
+--- media/liboggz/include/oggz/oggz_off_t_generated.h.orig 2009-08-15 21:52:14.000000000 +0200
++++ media/liboggz/include/oggz/oggz_off_t_generated.h 2009-08-15 21:52:44.000000000 +0200
+@@ -59,7 +59,7 @@
+
+ #include <sys/types.h>
+
+-#if defined(__APPLE__) || defined(SOLARIS)
++#if defined(__APPLE__) || defined(SOLARIS) || defined (__FreeBSD__)
+ typedef off_t oggz_off_t;
+ #else
+ typedef loff_t oggz_off_t;
Added: branches/experimental/www/libxul/files/patch-media-libsydneyaudio-src-Makefile.in
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/experimental/www/libxul/files/patch-media-libsydneyaudio-src-Makefile.in Mon Aug 17 15:48:25 2009 (r84)
@@ -0,0 +1,15 @@
+--- media/libsydneyaudio/src/Makefile.in.orig 2009-08-17 14:21:06.000000000 +0200
++++ media/libsydneyaudio/src/Makefile.in 2009-08-17 14:21:53.000000000 +0200
+@@ -45,6 +45,12 @@
+ LIBRARY_NAME = sydneyaudio
+ FORCE_STATIC_LIB= 1
+
++ifeq ($(OS_ARCH),FreeBSD)
++CSRCS = \
++ sydney_audio_oss.c \
++ $(NULL)
++endif
++
+ ifeq ($(OS_ARCH),Linux)
+ CSRCS = \
+ sydney_audio_alsa.c \
Deleted: branches/experimental/www/libxul/files/patch-toolkit-components-history-src-nsGlobalHistory.cpp
==============================================================================
--- branches/experimental/www/libxul/files/patch-toolkit-components-history-src-nsGlobalHistory.cpp Mon Aug 17 15:48:25 2009 (r83)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,24 +0,0 @@
---- toolkit/components/history/src/nsGlobalHistory.cpp.orig 2006-02-02 20:55:17.000000000 +0100
-+++ toolkit/components/history/src/nsGlobalHistory.cpp
-@@ -322,7 +322,9 @@ matchAgeInDaysCallback(nsIMdbRow *row, v
- if (err != 0) return PR_FALSE;
-
- PRTime rowDate;
-- PR_sscanf((const char*)yarn.mYarn_Buf, "%lld", &rowDate);
-+ long long ld;
-+ PR_sscanf((const char*)yarn.mYarn_Buf, "%lld", &ld);
-+ rowDate = ld;
-
- PRInt32 days = GetAgeInDays(matchSearchTerm->now, rowDate);
-
-@@ -1067,7 +1069,9 @@ nsGlobalHistory::GetRowValue(nsIMdbRow *
- if (!yarn.mYarn_Fill || !yarn.mYarn_Buf)
- return NS_OK;
-
-- PR_sscanf((const char*)yarn.mYarn_Buf, "%lld", aResult);
-+ long long ld;
-+ PR_sscanf((const char*)yarn.mYarn_Buf, "%lld", &ld);
-+ *aResult = ld;
-
- return NS_OK;
- }
Deleted: branches/experimental/www/libxul/files/patch-toolkit-components-url-classifier-src-nsUrlClassifierDBService.cpp
==============================================================================
--- branches/experimental/www/libxul/files/patch-toolkit-components-url-classifier-src-nsUrlClassifierDBService.cpp Mon Aug 17 15:48:25 2009 (r83)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,28 +0,0 @@
-# reported upstream as: https://bugzilla.mozilla.org/show_bug.cgi?id=469276
-
---- toolkit/components/url-classifier/src/nsUrlClassifierDBService.cpp.orig 2008-08-25 22:59:14.000000000 +0200
-+++ toolkit/components/url-classifier/src/nsUrlClassifierDBService.cpp 2008-12-12 16:31:11.000000000 +0100
-@@ -2023,8 +2023,9 @@
- return NS_ERROR_FAILURE;
- }
- const nsCSubstring& str = Substring(chunk, start, 4);
-- const PRUint32 *p = reinterpret_cast<const PRUint32*>(str.BeginReading());
-- entry->mAddChunkId = PR_ntohl(*p);
-+ PRUint32 p;
-+ memcpy(&p, str.BeginReading(), 4);
-+ entry->mAddChunkId = PR_ntohl(p);
- if (entry->mAddChunkId == 0) {
- NS_WARNING("Received invalid chunk number.");
- return NS_ERROR_FAILURE;
-@@ -2052,8 +2053,9 @@
-
- if (chunkType == CHUNK_SUB) {
- const nsCSubstring& str = Substring(chunk, start, 4);
-- const PRUint32 *p = reinterpret_cast<const PRUint32*>(str.BeginReading());
-- entry->mAddChunkId = PR_ntohl(*p);
-+ PRUint32 p;
-+ memcpy(&p, str.BeginReading(), 4);
-+ entry->mAddChunkId = PR_ntohl(p);
- if (entry->mAddChunkId == 0) {
- NS_WARNING("Received invalid chunk number.");
- return NS_ERROR_FAILURE;
Deleted: branches/experimental/www/libxul/files/patch-xpfe-components-history-src-nsGlobalHistory.cpp
==============================================================================
--- branches/experimental/www/libxul/files/patch-xpfe-components-history-src-nsGlobalHistory.cpp Mon Aug 17 15:48:25 2009 (r83)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,24 +0,0 @@
---- xpfe/components/history/src/nsGlobalHistory.cpp.orig 2007-12-03 05:25:14.000000000 +0100
-+++ xpfe/components/history/src/nsGlobalHistory.cpp
-@@ -304,7 +304,9 @@ matchAgeInDaysCallback(nsIMdbRow *row, v
- if (err != 0) return PR_FALSE;
-
- PRTime rowDate;
-- PR_sscanf((const char*)yarn.mYarn_Buf, "%lld", &rowDate);
-+ long long ld;
-+ PR_sscanf((const char*)yarn.mYarn_Buf, "%lld", &ld);
-+ rowDate = ld;
-
- PRInt32 days = matchSearchTerm->globalHist->GetAgeInDays(rowDate);
-
-@@ -1000,7 +1002,9 @@ nsGlobalHistory::GetRowValue(nsIMdbRow *
- if (!yarn.mYarn_Fill || !yarn.mYarn_Buf)
- return NS_OK;
-
-- PR_sscanf((const char*)yarn.mYarn_Buf, "%lld", aResult);
-+ long long ld;
-+ PR_sscanf((const char*)yarn.mYarn_Buf, "%lld", &ld);
-+ *aResult = ld;
-
- return NS_OK;
- }
Deleted: branches/experimental/www/libxul/files/patch-xulrunner_app_mozilla.in
==============================================================================
--- branches/experimental/www/libxul/files/patch-xulrunner_app_mozilla.in Mon Aug 17 15:48:25 2009 (r83)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,18 +0,0 @@
---- 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
-
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200908171548.n7HFmQhq061991>