diff options
| -rw-r--r-- | www/mozilla-gtk2/Makefile | 5 | ||||
| -rw-r--r-- | www/mozilla/Makefile | 3 | ||||
| -rw-r--r-- | www/mozilla/Makefile.common | 6 | ||||
| -rw-r--r-- | www/mozilla/distinfo | 7 | ||||
| -rwxr-xr-x | www/mozilla/files/moz-install | 9 | ||||
| -rw-r--r-- | www/mozilla/patches/patch-ba | 13 | ||||
| -rw-r--r-- | www/mozilla/patches/patch-bb | 17 | ||||
| -rw-r--r-- | www/mozilla/patches/patch-bw | 64 |
8 files changed, 102 insertions, 22 deletions
diff --git a/www/mozilla-gtk2/Makefile b/www/mozilla-gtk2/Makefile index 39a5e49dbf5..c697247c676 100644 --- a/www/mozilla-gtk2/Makefile +++ b/www/mozilla-gtk2/Makefile @@ -1,9 +1,10 @@ -# $NetBSD: Makefile,v 1.6 2004/04/27 12:10:55 grant Exp $ +# $NetBSD: Makefile,v 1.7 2004/06/01 15:02:55 taya Exp $ MOZILLA= mozilla-gtk2 MOZILLA_BIN= mozilla-bin +MOZCONFDIR= .mozilla MOZ_VER= 1.6 -PKGREVISION= 3 +PKGREVISION= 4 EXTRACT_SUFX= .tar.bz2 DISTFILES= ${DISTNAME}${EXTRACT_SUFX} diff --git a/www/mozilla/Makefile b/www/mozilla/Makefile index 2b81047d77d..691224fde36 100644 --- a/www/mozilla/Makefile +++ b/www/mozilla/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.129 2004/04/25 13:19:56 tron Exp $ +# $NetBSD: Makefile,v 1.130 2004/06/01 15:01:17 taya Exp $ MOZILLA= mozilla MOZILLA_BIN= mozilla-bin +MOZCONFDIR= .mozilla MOZ_VER= 1.6 PKGREVISION= 2 EXTRACT_SUFX= .tar.bz2 diff --git a/www/mozilla/Makefile.common b/www/mozilla/Makefile.common index 52428abc77f..3051c7003e1 100644 --- a/www/mozilla/Makefile.common +++ b/www/mozilla/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.38 2004/04/25 13:07:19 tron Exp $ +# $NetBSD: Makefile.common,v 1.39 2004/06/01 15:01:17 taya Exp $ MOZ_DIST_VER?= ${MOZ_VER} DISTNAME?= mozilla-source-${MOZ_DIST_VER} @@ -70,6 +70,7 @@ LDFLAGS+= -Wl,${RPATH_FLAG}${MOZ_LIBDIR} MAKE_ENV+= MOZ_INTERNAL_LIBART_LGPL=1 CONFIGURE_ENV+= MOZ_INTERNAL_LIBART_LGPL=1 CONFIGURE_ARGS+= --enable-svg +CONFIGURE_ARGS+= --enable-svg-renderer-libart .endif .ifdef BUILD_CALENDAR @@ -87,6 +88,9 @@ CONFIGURE_ARGS+= --enable-xinerama # avoid creating a .mozilla directory in the users home # directory SCRIPTS_ENV+= HOME="${WRKDIR}" +.if (${MOZCONFDIR} != "") +SCRIPTS_ENV+= TMPMOZCONFDIR="${WRKDIR}/${MOZCONFDIR}" +.endif PLIST_SUBST+= MOZILLA=${MOZILLA} PLIST_SUBST+= MOZILLA_BIN=${MOZILLA_BIN} diff --git a/www/mozilla/distinfo b/www/mozilla/distinfo index 3c8e85fe05f..736b1684f97 100644 --- a/www/mozilla/distinfo +++ b/www/mozilla/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.55 2004/05/30 14:02:01 sekiya Exp $ +$NetBSD: distinfo,v 1.56 2004/06/01 15:01:17 taya Exp $ SHA1 (mozilla-source-1.6.tar.bz2) = baecca0ecec35704049ab6debaec6c96adbade35 Size (mozilla-source-1.6.tar.bz2) = 31037452 bytes @@ -19,8 +19,8 @@ SHA1 (patch-an) = 78b448a64c2a46bc3a1d458bdbcb5d64be1ed9f4 SHA1 (patch-ao) = 7048e3a06d1569e31d2350c2473887a50aa81498 SHA1 (patch-aw) = 5beeefa214a3003a74ccc68776a97a414c6acff1 SHA1 (patch-ax) = 070c88dee0446b093ab1c2a9120dc1747642d46f -SHA1 (patch-ba) = cff5e12280379546688ca556259e2265a1542ab8 -SHA1 (patch-bb) = 8fc197bc5b0b53e8ed7c3e8295bf459b42c2c384 +SHA1 (patch-ba) = d2e195900ed806aaf18e8a56efcf26c0bd4941ce +SHA1 (patch-bb) = b3cedb7b6ae46749d5222ab9fd6bc087c781d459 SHA1 (patch-bm) = f557aa3ce9a25c91884cfd42bb505422e52ac958 SHA1 (patch-bn) = 07573c79b22821873954d7c70821a382ea42fe4e SHA1 (patch-bo) = a6bba31568b60818455911279e7db01c49c94498 @@ -31,3 +31,4 @@ SHA1 (patch-bs) = e9434aadc52b0120dcfc80e57002152d2bd47605 SHA1 (patch-bt) = a033b83ee633391ffc138442697fbe754ec92902 SHA1 (patch-bu) = db33b8651e3cb1fbf9a18dbe78e1e8288cfda0ee SHA1 (patch-bv) = 4f23dfd885131ea866f31370f1421e7c19706860 +SHA1 (patch-bw) = 63f66b8e001b8352e73935a1f629de4bb1e70075 diff --git a/www/mozilla/files/moz-install b/www/mozilla/files/moz-install index 84ff864a69d..7c57c33694e 100755 --- a/www/mozilla/files/moz-install +++ b/www/mozilla/files/moz-install @@ -1,6 +1,6 @@ #!/bin/sh # -# $NetBSD: moz-install,v 1.8 2004/01/17 00:04:49 taya Exp $ +# $NetBSD: moz-install,v 1.9 2004/06/01 15:01:17 taya Exp $ ${SED} -e "s,@PREFIX@,${PREFIX},g" -e "s,@MOZILLA@,${MOZILLA}," -e "s,@MOZILLA_BIN@,${MOZILLA_BIN}," ${FILESDIR}/mozilla-${OBJECT_FMT}.in > ${PREFIX}/bin/${MOZILLA} ${CHOWN} ${BINOWN} ${PREFIX}/bin/${MOZILLA} @@ -63,3 +63,10 @@ ${RM} -f ${TMP_PLIST} cd ${PREFIX}/lib/${MOZILLA} ${SETENV} LD_LIBRARY_PATH=. MOZILLA_FIVE_HOME=. ./regxpcom ${SETENV} LD_LIBRARY_PATH=. MOZILLA_FIVE_HOME=. ./regchrome + +# +# remove generated user conf directory (e.g. ${WRKSRC}/.mozilla) +# +if [ x"${TMPMOZCONFDIR}" != x ] ; then + ${RM} -rf ${TMPMOZCONFDIR} +fi diff --git a/www/mozilla/patches/patch-ba b/www/mozilla/patches/patch-ba index 355dd8382a4..28de33eab6e 100644 --- a/www/mozilla/patches/patch-ba +++ b/www/mozilla/patches/patch-ba @@ -1,14 +1,15 @@ -$NetBSD: patch-ba,v 1.16 2004/05/30 14:02:01 sekiya Exp $ +$NetBSD: patch-ba,v 1.17 2004/06/01 15:01:18 taya Exp $ ---- nsprpub/pr/include/md/_netbsd.cfg.orig 2000-12-02 06:29:17.000000000 +0900 -+++ nsprpub/pr/include/md/_netbsd.cfg 2004-05-30 11:20:29.000000000 +0900 +diff -ru ../Orig/mozilla/nsprpub/pr/include/md/_netbsd.cfg ./nsprpub/pr/include/md/_netbsd.cfg +--- ../Orig/mozilla/nsprpub/pr/include/md/_netbsd.cfg 2000-12-02 06:29:17.000000000 +0900 ++++ ./nsprpub/pr/include/md/_netbsd.cfg 2004-05-30 23:39:50.000000000 +0900 @@ -45,7 +45,8 @@ #define PR_AF_INET6 24 /* same as AF_INET6 */ -#if defined(__i386__) || defined(__arm32__) || defined(__MIPSEL__) -+#if defined(__i386__) || defined(__arm32__) || defined(__arm__) || \ -+ defined(__armel__) || defined(__MIPSEL__) ++#if defined(__i386__) || defined(__arm32__) || defined(__ARMEL__) || \ ++ defined(__MIPSEL__) #define IS_LITTLE_ENDIAN 1 #undef IS_BIG_ENDIAN @@ -63,7 +64,7 @@ $NetBSD: patch-ba,v 1.16 2004/05/30 14:02:01 sekiya Exp $ +#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 diff --git a/www/mozilla/patches/patch-bb b/www/mozilla/patches/patch-bb index abcf7f98170..370ae836e4d 100644 --- a/www/mozilla/patches/patch-bb +++ b/www/mozilla/patches/patch-bb @@ -1,7 +1,8 @@ -$NetBSD: patch-bb,v 1.17 2004/05/30 14:02:01 sekiya Exp $ +$NetBSD: patch-bb,v 1.18 2004/06/01 15:01:18 taya Exp $ ---- nsprpub/pr/include/md/_netbsd.h.orig 2003-09-12 02:24:53.000000000 +0900 -+++ nsprpub/pr/include/md/_netbsd.h 2004-05-30 14:36:16.000000000 +0900 +diff -ru ../Orig/mozilla/nsprpub/pr/include/md/_netbsd.h ./nsprpub/pr/include/md/_netbsd.h +--- ../Orig/mozilla/nsprpub/pr/include/md/_netbsd.h 2003-09-12 02:24:53.000000000 +0900 ++++ ./nsprpub/pr/include/md/_netbsd.h 2004-05-30 23:41:41.000000000 +0900 @@ -44,16 +44,26 @@ #define _PR_SI_ARCHITECTURE "x86" #elif defined(__alpha__) @@ -20,12 +21,12 @@ $NetBSD: patch-bb,v 1.17 2004/05/30 14:02:01 sekiya Exp $ #define _PR_SI_ARCHITECTURE "mips" #elif defined(__arm32__) #define _PR_SI_ARCHITECTURE "arm32" -+#elif defined(__arm__) -+#define _PR_SI_ARCHITECTURE "arm" -+#elif defined(__armel__) ++#elif defined(__ARMEL__) +#define _PR_SI_ARCHITECTURE "armel" -+#elif defined(__armeb__) ++#elif defined(__ARMEL__) +#define _PR_SI_ARCHITECTURE "armeb" ++#elif defined(__arm__) ++#define _PR_SI_ARCHITECTURE "arm" #endif #if defined(__ELF__) @@ -66,7 +67,7 @@ $NetBSD: patch-bb,v 1.17 2004/05/30 14:02:01 sekiya Exp $ #define _MD_GET_SP(_thread) CONTEXT(_thread)[32] #endif -#ifdef __arm32__ -+#if defined(__arm32__) || defined(__arm__) || defined(__armel__) || defined(__armeb__) ++#ifdef __arm__ #define _MD_INIT_CONTEXT(_thread, _sp, _main, status) \ { \ sigsetjmp(CONTEXT(_thread), 1); \ diff --git a/www/mozilla/patches/patch-bw b/www/mozilla/patches/patch-bw new file mode 100644 index 00000000000..80a8fa44a9b --- /dev/null +++ b/www/mozilla/patches/patch-bw @@ -0,0 +1,64 @@ +$NetBSD: patch-bw,v 1.1 2004/06/01 15:01:18 taya Exp $ + +diff -ru ../Orig/mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_linux_alpha.cpp ./xpcom/reflect/xptcall/src/md/unix/xptcstubs_linux_alpha.cpp +--- ../Orig/mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_linux_alpha.cpp 2001-09-29 05:12:52.000000000 +0900 ++++ ./xpcom/reflect/xptcall/src/md/unix/xptcstubs_linux_alpha.cpp 2004-05-11 16:29:31.000000000 +0900 +@@ -188,6 +188,50 @@ + * nsresult nsXPTCStubBase::Stub##n() + * Sets register $1 to "methodIndex" and jumps to SharedStub. + */ ++#if defined(__GXX_ABI_VERSION) && __GXX_ABI_VERSION >= 100 /* G++ V3 ABI */ ++#define STUB_ENTRY(n) \ ++__asm__( \ ++"#### Stub"#n" ####\n" \ ++".text\n" \ ++" .align 5\n" \ ++" .if "#n" < 10 \n" \ ++" .globl _ZN14nsXPTCStubBase5Stub"#n"Ev\n" \ ++" .ent _ZN14nsXPTCStubBase5Stub"#n"Ev\n" \ ++"_ZN14nsXPTCStubBase5Stub"#n"Ev:\n" \ ++" .frame $30,0,$26,0\n" \ ++" ldgp $29,0($27)\n" \ ++"$_ZN14nsXPTCStubBase5Stub"#n"Ev..ng:\n" \ ++" .prologue 1\n" \ ++" lda $1,"#n"\n" \ ++" br $31,$SharedStub..ng\n" \ ++" .end _ZN14nsXPTCStubBase5Stub"#n"Ev" \ ++" .elseif "#n" < 100 \n" \ ++" .globl _ZN14nsXPTCStubBase6Stub"#n"Ev\n" \ ++" .ent _ZN14nsXPTCStubBase6Stub"#n"Ev\n" \ ++"_ZN14nsXPTCStubBase6Stub"#n"Ev:\n" \ ++" .frame $30,0,$26,0\n" \ ++" ldgp $29,0($27)\n" \ ++"$_ZN14nsXPTCStubBase6Stub"#n"Ev..ng:\n" \ ++" .prologue 1\n" \ ++" lda $1,"#n"\n" \ ++" br $31,$SharedStub..ng\n" \ ++" .end _ZN14nsXPTCStubBase6Stub"#n"Ev" \ ++" .elseif "#n" < 1000 \n" \ ++" .globl _ZN14nsXPTCStubBase7Stub"#n"Ev\n" \ ++" .ent _ZN14nsXPTCStubBase7Stub"#n"Ev\n" \ ++"_ZN14nsXPTCStubBase7Stub"#n"Ev:\n" \ ++" .frame $30,0,$26,0\n" \ ++" ldgp $29,0($27)\n" \ ++"$_ZN14nsXPTCStubBase7Stub"#n"Ev..ng:\n" \ ++" .prologue 1\n" \ ++" lda $1,"#n"\n" \ ++" br $31,$SharedStub..ng\n" \ ++" .end _ZN14nsXPTCStubBase7Stub"#n"Ev" \ ++" .else\n" \ ++" .err \"stub number "#n"> 1000 not yet supported\"\n" \ ++" .endif\n" \ ++ ); ++#else /* G++2.95 ABI */ + #define STUB_ENTRY(n) \ + __asm__( \ + "#### Stub"#n" ####\n" \ +@@ -204,6 +248,7 @@ + "br $31,$SharedStub..ng\n\t" \ + ".end Stub"#n"__14nsXPTCStubBase" \ + ); ++#endif + + #define SENTINEL_ENTRY(n) \ + nsresult nsXPTCStubBase::Sentinel##n() \ |