diff options
| author | beat <beat@FreeBSD.org> | 2011-09-29 00:19:49 +0800 |
|---|---|---|
| committer | beat <beat@FreeBSD.org> | 2011-09-29 00:19:49 +0800 |
| commit | 1508f35e5e6bddfac640a02689957f9a07c7398c (patch) | |
| tree | fc5ecc5f012bc231b3a3b2f24148663a3a134995 /www/firefox | |
| parent | 4278fe43642718ee763efebeb6614fb498d9eeb7 (diff) | |
| download | freebsd-ports-gnome-1508f35e5e6bddfac640a02689957f9a07c7398c.tar.gz freebsd-ports-gnome-1508f35e5e6bddfac640a02689957f9a07c7398c.tar.zst freebsd-ports-gnome-1508f35e5e6bddfac640a02689957f9a07c7398c.zip | |
- Check for affected FreeBSD versions in
patch-xpcom__threads__nsThreadManager.cpp.
- Restore r1.4 of patch-js-src-Makefile.in which was accidentally reverted
with the last update.
- Bump PORTREVISION.
Submitted by: h h <aakuusta AT gmail.com>
Diffstat (limited to 'www/firefox')
| -rw-r--r-- | www/firefox/Makefile | 1 | ||||
| -rw-r--r-- | www/firefox/files/patch-js-src-Makefile.in | 20 | ||||
| -rw-r--r-- | www/firefox/files/patch-xpcom__threads__nsThreadManager.cpp | 5 |
3 files changed, 13 insertions, 13 deletions
diff --git a/www/firefox/Makefile b/www/firefox/Makefile index 2a7d531d50ac..0c88f8687ab6 100644 --- a/www/firefox/Makefile +++ b/www/firefox/Makefile @@ -7,6 +7,7 @@ PORTNAME= firefox DISTVERSION= 7.0 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= www ipv6 MASTER_SITES= ${MASTER_SITE_MOZILLA} diff --git a/www/firefox/files/patch-js-src-Makefile.in b/www/firefox/files/patch-js-src-Makefile.in index 2aa090fc3b57..75b37bf70bfe 100644 --- a/www/firefox/files/patch-js-src-Makefile.in +++ b/www/firefox/files/patch-js-src-Makefile.in @@ -28,14 +28,12 @@ INCLUDES += -I$(srcdir) - --@@ -793,7 +796,8 @@ -+@@ -793,7 +796,7 @@ - endif # WINNT - - ifeq ($(OS_ARCH),FreeBSD) - -EXTRA_LIBS += -pthread --+DEFINES += -DFREEBSD - +EXTRA_LIBS += -pthread -lc - endif - ifeq ($(OS_ARCH),IRIX) +@@ -793,7 +796,7 @@ + endif # WINNT + + ifeq ($(OS_ARCH),FreeBSD) +-EXTRA_LIBS += -pthread ++EXTRA_LIBS += -pthread -lc + endif + ifeq ($(OS_ARCH),IRIX) + ifdef USE_N32 diff --git a/www/firefox/files/patch-xpcom__threads__nsThreadManager.cpp b/www/firefox/files/patch-xpcom__threads__nsThreadManager.cpp index 085800f9d08a..80e832263a77 100644 --- a/www/firefox/files/patch-xpcom__threads__nsThreadManager.cpp +++ b/www/firefox/files/patch-xpcom__threads__nsThreadManager.cpp @@ -1,10 +1,11 @@ --- ./xpcom/threads/nsThreadManager.cpp.orig 2011-08-25 02:37:45.000000000 +0200 +++ ./xpcom/threads/nsThreadManager.cpp 2011-08-28 17:14:14.000000000 +0200 -@@ -89,6 +89,10 @@ +@@ -89,6 +89,11 @@ nsresult nsThreadManager::Init() { -+#ifdef NS_TLS ++#ifdef NS_TLS && (__FreeBSD_version < 802513 \ ++ || (__FreeBSD_version >= 900000 && __FreeBSD_version < 900045)) + if (!gTLSThreadID) + gTLSThreadID = mozilla::threads::Generic; +#endif |