diff options
Diffstat (limited to 'www/firefox')
| -rw-r--r-- | www/firefox/Makefile-firefox.common | 3 | ||||
| -rw-r--r-- | www/firefox/Makefile.common | 9 | ||||
| -rw-r--r-- | www/firefox/buildlink3.mk | 14 | ||||
| -rw-r--r-- | www/firefox/distinfo | 4 | ||||
| -rw-r--r-- | www/firefox/patches/patch-ba | 6 |
5 files changed, 19 insertions, 17 deletions
diff --git a/www/firefox/Makefile-firefox.common b/www/firefox/Makefile-firefox.common index d5a91b51404..def7ab7b24c 100644 --- a/www/firefox/Makefile-firefox.common +++ b/www/firefox/Makefile-firefox.common @@ -1,4 +1,5 @@ -# $NetBSD: Makefile-firefox.common,v 1.56 2008/04/17 07:39:20 ghen Exp $ +# $NetBSD: Makefile-firefox.common,v 1.57 2008/05/19 10:43:02 tnn Exp $ +# used by www/firefox/Makefile MOZILLA_BIN= firefox-bin MOZ_VER= 2.0.0.14 diff --git a/www/firefox/Makefile.common b/www/firefox/Makefile.common index 7af105e9bcf..a70be25c163 100644 --- a/www/firefox/Makefile.common +++ b/www/firefox/Makefile.common @@ -1,4 +1,5 @@ -# $NetBSD: Makefile.common,v 1.24 2008/02/08 10:34:19 tnn Exp $ +# $NetBSD: Makefile.common,v 1.25 2008/05/19 10:43:02 tnn Exp $ +# used by www/firefox/Makefile-firefox.common MOZ_DIST_VER?= ${MOZ_VER} DISTNAME?= mozilla-${MOZ_DIST_VER}-source @@ -183,7 +184,7 @@ post-build: # do that part dynamically rather than trying to always keep our conditionals # up to date. Note that the exact set of libfreebl libs has had a history # of changing even on minor releases. -PLIST_SRC= ${WRKDIR}/PLIST +PLIST_SRC= ${WRKDIR}/PLIST pre-install: cd ${WRKSRC:Q}/dist/bin && ls libfreebl*.${SO_SUFFIX} | ${SORT} | \ ${AWK} '{print "lib/$${MOZILLA}/" $$0}' > ${WRKSRC}/PLIST.libfreebl @@ -206,9 +207,9 @@ post-install: .include "../../mk/pthread.buildlink3.mk" .if defined(PTHREAD_TYPE) && (${PTHREAD_TYPE} == "none") -CONFIGURE_ARGS+= --without-pthreads +CONFIGURE_ARGS+= --without-pthreads .else -CONFIGURE_ARGS+= --with-pthreads +CONFIGURE_ARGS+= --with-pthreads .endif .if ${MOZILLA_USE_XFT} == "YES" diff --git a/www/firefox/buildlink3.mk b/www/firefox/buildlink3.mk index c3a61c1e3a4..206ccfcf117 100644 --- a/www/firefox/buildlink3.mk +++ b/www/firefox/buildlink3.mk @@ -1,15 +1,15 @@ -# $NetBSD: buildlink3.mk,v 1.15 2007/05/12 13:53:07 ghen Exp $ +# $NetBSD: buildlink3.mk,v 1.16 2008/05/19 10:43:02 tnn Exp $ -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -FIREFOX_BUILDLINK3_MK:= ${FIREFOX_BUILDLINK3_MK}+ +BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ +FIREFOX_BUILDLINK3_MK:= ${FIREFOX_BUILDLINK3_MK}+ .if !empty(BUILDLINK_DEPTH:M+) BUILDLINK_DEPENDS+= firefox .endif -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nfirefox} -BUILDLINK_PACKAGES+= firefox -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}firefox +BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nfirefox} +BUILDLINK_PACKAGES+= firefox +BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}firefox .if !empty(FIREFOX_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.firefox+= firefox>=2.0 @@ -17,4 +17,4 @@ BUILDLINK_ABI_DEPENDS.firefox+= firefox>=2.0.0.3nb1 BUILDLINK_PKGSRCDIR.firefox?= ../../www/firefox .endif # FIREFOX_BUILDLINK3_MK -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} +BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/www/firefox/distinfo b/www/firefox/distinfo index 6c610518821..293a6308d3a 100644 --- a/www/firefox/distinfo +++ b/www/firefox/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.76 2008/04/17 07:39:20 ghen Exp $ +$NetBSD: distinfo,v 1.77 2008/05/19 10:43:02 tnn Exp $ SHA1 (firefox-2.0.0.14-source.tar.bz2) = de263675a137a8e2b25757c4d292e7a3e2434f74 RMD160 (firefox-2.0.0.14-source.tar.bz2) = 31eec3454946cfb1c57bd71f32c2a41982276006 @@ -21,7 +21,7 @@ SHA1 (patch-ap) = 58b4867336c73c3908e508501025bdbd8e2e8b30 SHA1 (patch-aq) = 59c1c9922413fd50e1b0573158ad56439a79debf SHA1 (patch-aw) = 9d4388a7bd89b7ca884b9e7eb4855e3afb8e8c3a SHA1 (patch-ax) = 1518e5bb0ee162d7c4135a6cfb8112da83a38855 -SHA1 (patch-ba) = 5e64f23ec426f9baef29f397084dba7158279071 +SHA1 (patch-ba) = f0f3e17b4e2d383d5c45462fa2e3e69b22495932 SHA1 (patch-bb) = 4ade97ffe2c8b16262dfa992e47ad7c9a666d037 SHA1 (patch-bm) = a0a69ca516e8a569d5e61293d5610b236192bf85 SHA1 (patch-bo) = 6e06648e1ea9320349f3b2a524055b513ca74358 diff --git a/www/firefox/patches/patch-ba b/www/firefox/patches/patch-ba index 8f4eed6a8e5..516a4956042 100644 --- a/www/firefox/patches/patch-ba +++ b/www/firefox/patches/patch-ba @@ -1,4 +1,4 @@ -$NetBSD: patch-ba,v 1.6 2007/05/12 13:53:08 ghen Exp $ +$NetBSD: patch-ba,v 1.7 2008/05/19 10:43:02 tnn Exp $ diff -ruN ../Orig/mozilla/nsprpub/pr/include/md/_netbsd.cfg ./nsprpub/pr/include/md/_netbsd.cfg --- ../Orig/mozilla/nsprpub/pr/include/md/_netbsd.cfg 2004-04-28 09:33:44.000000000 +0900 @@ -18,7 +18,7 @@ diff -ruN ../Orig/mozilla/nsprpub/pr/include/md/_netbsd.cfg ./nsprpub/pr/include #define PR_ALIGN_OF_POINTER 4 -#elif defined(__sparc__) || defined(__MIPSEB__) -+#elif defined(__sparc_v9__) ++#elif defined(__sparcv9) + +#undef IS_LITTLE_ENDIAN +#define IS_BIG_ENDIAN 1 @@ -64,7 +64,7 @@ diff -ruN ../Orig/mozilla/nsprpub/pr/include/md/_netbsd.cfg ./nsprpub/pr/include +#define PR_ALIGN_OF_DOUBLE 8 +#define PR_ALIGN_OF_POINTER 8 + -+#elif defined(__sparc__) || defined(__MIPSEB__) || defined(__ARMEB__) ++#elif defined(__sparc) || defined(__MIPSEB__) || defined(__ARMEB__) #undef IS_LITTLE_ENDIAN #define IS_BIG_ENDIAN 1 |