diff options
| author | ahze <ahze@FreeBSD.org> | 2006-11-19 08:58:54 +0800 |
|---|---|---|
| committer | ahze <ahze@FreeBSD.org> | 2006-11-19 08:58:54 +0800 |
| commit | c5a3d3601b88e60363223d8bcac911df1e090f66 (patch) | |
| tree | 603af4fd38cfc4f91655bb72c2b0c62a59c0f3ce | |
| parent | fecfc2005a3252bf285951dc3fe9d952c7d9afd8 (diff) | |
| download | freebsd-ports-gnome-c5a3d3601b88e60363223d8bcac911df1e090f66.tar.gz freebsd-ports-gnome-c5a3d3601b88e60363223d8bcac911df1e090f66.tar.zst freebsd-ports-gnome-c5a3d3601b88e60363223d8bcac911df1e090f66.zip | |
- Fix pthreads for sqlite3
- Merge some more patches from www/firefox
Submitted by: sajd via irc.freenode.org/#FreeBSD-GNOME
| -rw-r--r-- | mail/lightning/Makefile | 5 | ||||
| -rw-r--r-- | mail/lightning/files/patch-js_src_Makefile.in | 10 | ||||
| -rw-r--r-- | mail/lightning/files/patch-js_src_jsnum.c | 28 |
3 files changed, 43 insertions, 0 deletions
diff --git a/mail/lightning/Makefile b/mail/lightning/Makefile index 662ea72b8767..63340afbc398 100644 --- a/mail/lightning/Makefile +++ b/mail/lightning/Makefile @@ -7,6 +7,7 @@ PORTNAME= lightning PORTVERSION= 0.3 +PORTREVISION= 1 CATEGORIES= mail deskutils MASTER_SITES= ${MASTER_SITE_MOZILLA} MASTER_SITE_SUBDIR= calendar/${PORTNAME}/releases/${DISTVERSION}/source @@ -42,6 +43,8 @@ MOZ_MK_OPTIONS= MOZ_CO_PROJECT=mail,calendar .include <bsd.port.pre.mk> +GECKO_PTHREAD_LIBS!=${CC} -dumpspecs | ${GREP} pthread | ${SED} -e 's|^.*%{\!pg: %{pthread:|| ; s|}.*$$||' || ${TRUE} + .if ${OSVERSION} < 500000 BROKEN= does not build .endif @@ -60,6 +63,8 @@ pre-everything:: post-patch: @${SED} -e 's|@MOZILLA_ICON@|${MOZILLA_ICON}|' \ ${FILESDIR}/${MOZILLA}.desktop.in >${WRKDIR}/${MOZILLA}.desktop + ${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%|${GECKO_PTHREAD_LIBS}|' \ + ${WRKSRC}/storage/build/Makefile.in @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \ ${WRKSRC}/security/manager/ssl/src/Makefile.in diff --git a/mail/lightning/files/patch-js_src_Makefile.in b/mail/lightning/files/patch-js_src_Makefile.in new file mode 100644 index 000000000000..fb0bd7f1986b --- /dev/null +++ b/mail/lightning/files/patch-js_src_Makefile.in @@ -0,0 +1,10 @@ +--- js/src/Makefile.in.orig Wed Oct 18 09:23:09 2006 ++++ js/src/Makefile.in Wed Oct 18 09:27:27 2006 +@@ -244,6 +244,7 @@ + endif + + LDFLAGS += $(pathsubst -l%,$(NSPR_STATIC_PATH)/%.a,$(NSPR_LIBS)) ++LDFLAGS += -lc + + # BeOS and HP-UX do not require the extra linking of "-lm" + ifeq (,$(filter BeOS HP-UX WINNT WINCE OpenVMS,$(OS_ARCH))) diff --git a/mail/lightning/files/patch-js_src_jsnum.c b/mail/lightning/files/patch-js_src_jsnum.c new file mode 100644 index 000000000000..a3ef2769ab9c --- /dev/null +++ b/mail/lightning/files/patch-js_src_jsnum.c @@ -0,0 +1,28 @@ +--- js/src/jsnum.c.orig Sun Nov 5 18:37:07 2006 ++++ js/src/jsnum.c Sun Nov 5 18:42:31 2006 +@@ -45,6 +45,9 @@ + #if defined(XP_WIN) || defined(XP_OS2) + #include <float.h> + #endif ++#if defined(__FreeBSD__) ++#include <sys/param.h> ++#endif + #include <locale.h> + #include <limits.h> + #include <math.h> +@@ -532,7 +535,15 @@ static jsdouble NaN; + + #else + ++#if defined(__FreeBSD__) && __FreeBSD_version >= 601000 ++#include <fenv.h> ++#define FIX_FPU() (fedisableexcept(FE_ALL_EXCEPT)) ++ ++#else ++ + #define FIX_FPU() ((void)0) ++ ++#endif /* defined(__FreeBSD__) && __FreeBSD_version >= 503000 */ + + #endif + |