pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/mail 1)Generate extension directory at installation time.
details: https://anonhg.NetBSD.org/pkgsrc/rev/47b3853de49a
branches: trunk
changeset: 485101:47b3853de49a
user: taya <taya%pkgsrc.org@localhost>
date: Sat Dec 04 02:16:03 2004 +0000
description:
1)Generate extension directory at installation time.
2)sync patches from www/mozilla.
- update patch-ab
from commit log
>> date: 2004/08/31 02:37:57; author: danw; state: Exp; lines: +13 -6
>> darwin fixes (tested against firefox-gtk2)
- update patch-ac
- update patch-bx
- add patch-bz
- add patch-ca
- add patch-cb
from commit log
>> date: 2004/07/07 09:08:31; author: aymeric; state: Exp; lines: +14 -7
>> . on PowerPC, update files so that Mozilla works properly when compiled with
>> gcc version 3+.
>> . generally reduce diffs to Linux version
>> . retain compatibility with older ABI (AIX-like) thanks to useful comments
>> from Charles Hannum
>>
>> Thanks to Matthew Green for the fruitful discussion. This should address
>> PR#23240 as far as mozilla is concerned.
- remove patch-bn
enable HAVE_SOCKLEN_T
- update patch-br
from commit log
>> date: 2004/10/04 11:52:45; author: grant; state: Exp; lines: +10 -6
>> bring across a patch in Firefox for using thread-safe resolver library
>> functions on NetBSD >=2.0F.
- update patch-cc
make mozilla work on NetBSD-current/alpha
3)bump PKGREVISION
diffstat:
mail/thunderbird-gtk2/PLIST | 4 +-
mail/thunderbird/Makefile-thunderbird.common | 8 +-
mail/thunderbird/PLIST | 4 +-
mail/thunderbird/distinfo | 15 +-
mail/thunderbird/patches/patch-ab | 21 ++-
mail/thunderbird/patches/patch-ac | 23 ++-
mail/thunderbird/patches/patch-bn | 18 --
mail/thunderbird/patches/patch-br | 18 +-
mail/thunderbird/patches/patch-bx | 53 ++++++--
mail/thunderbird/patches/patch-bz | 122 +++++++++++++++++++
mail/thunderbird/patches/patch-ca | 166 +++++++++++++++++++++++++++
mail/thunderbird/patches/patch-cb | 26 ++++
mail/thunderbird/patches/patch-cc | 16 ++
13 files changed, 428 insertions(+), 66 deletions(-)
diffs (truncated from 684 to 300 lines):
diff -r f184742e75d8 -r 47b3853de49a mail/thunderbird-gtk2/PLIST
--- a/mail/thunderbird-gtk2/PLIST Sat Dec 04 01:49:17 2004 +0000
+++ b/mail/thunderbird-gtk2/PLIST Sat Dec 04 02:16:03 2004 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2004/11/14 23:38:20 taya Exp $
+@comment $NetBSD: PLIST,v 1.6 2004/12/04 02:16:03 taya Exp $
bin/${MOZILLA}
@comment begin PROGRAMS
lib/${MOZILLA}/${MOZILLA_BIN}
@@ -2587,6 +2587,7 @@
@comment end INCLUDE
@exec env LD_LIBRARY_PATH=%D/lib/${MOZILLA} MOZILLA_FIVE_HOME=%D/lib/${MOZILLA} %D/lib/${MOZILLA}/regxpcom
@exec env LD_LIBRARY_PATH=%D/lib/${MOZILLA} MOZILLA_FIVE_HOME=%D/lib/${MOZILLA} %D/lib/${MOZILLA}/regchrome
+@exec env LD_LIBRARY_PATH=%D/lib/${MOZILLA} MOZILLA_FIVE_HOME=%D/lib/${MOZILLA} %D/lib/${MOZILLA}/${MOZILLA_BIN} -register
@unexec ${RM} %D/lib/${MOZILLA}/chrome/chrome.rdf
@unexec ${RM} %D/lib/${MOZILLA}/chrome/overlayinfo/browser/content/overlays.rdf
@unexec ${RM} %D/lib/${MOZILLA}/chrome/overlayinfo/communicator/content/overlays.rdf
@@ -2636,7 +2637,6 @@
@dirrm lib/${MOZILLA}/chrome/icons/default
@dirrm lib/${MOZILLA}/chrome/icons
@dirrm lib/${MOZILLA}/chrome
-@dirrm lib/${MOZILLA}
@dirrm include/${MOZILLA}/zlib
@dirrm include/${MOZILLA}/xultmpl
@dirrm include/${MOZILLA}/xuldoc
diff -r f184742e75d8 -r 47b3853de49a mail/thunderbird/Makefile-thunderbird.common
--- a/mail/thunderbird/Makefile-thunderbird.common Sat Dec 04 01:49:17 2004 +0000
+++ b/mail/thunderbird/Makefile-thunderbird.common Sat Dec 04 02:16:03 2004 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile-thunderbird.common,v 1.3 2004/11/14 23:38:20 taya Exp $
+# $NetBSD: Makefile-thunderbird.common,v 1.4 2004/12/04 02:16:03 taya Exp $
MOZILLA_BIN= thunderbird-bin
MOZ_VER= 0.9
+PKGREVISION= 1
EXTRACT_SUFX= .tar.bz2
DISTNAME= thunderbird-${MOZ_VER}-source
MASTER_SITES= http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/${MOZ_VER}/ \
@@ -24,4 +25,9 @@
${MV} ${WRKSRC}/dist/bin/extensions/installed-extensions.txt \
${WRKSRC}/dist/bin/extensions/installed-extensions-processed.txt
+post-install:
+ cd ${PREFIX}/lib/${MOZILLA} && \
+ ${SETENV} LD_LIBRARY_PATH=. MOZILLA_FIVE_HOME=. HOME=${WRKSRC} \
+ ./${MOZILLA_BIN} -register
+
.include "../../www/mozilla/Makefile.common"
diff -r f184742e75d8 -r 47b3853de49a mail/thunderbird/PLIST
--- a/mail/thunderbird/PLIST Sat Dec 04 01:49:17 2004 +0000
+++ b/mail/thunderbird/PLIST Sat Dec 04 02:16:03 2004 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2004/11/14 23:38:20 taya Exp $
+@comment $NetBSD: PLIST,v 1.7 2004/12/04 02:16:03 taya Exp $
bin/${MOZILLA}
@comment begin PROGRAMS
lib/${MOZILLA}/${MOZILLA_BIN}
@@ -2575,6 +2575,7 @@
@comment end INCLUDE
@exec env LD_LIBRARY_PATH=%D/lib/${MOZILLA} MOZILLA_FIVE_HOME=%D/lib/${MOZILLA} %D/lib/${MOZILLA}/regxpcom
@exec env LD_LIBRARY_PATH=%D/lib/${MOZILLA} MOZILLA_FIVE_HOME=%D/lib/${MOZILLA} %D/lib/${MOZILLA}/regchrome
+@exec env LD_LIBRARY_PATH=%D/lib/${MOZILLA} MOZILLA_FIVE_HOME=%D/lib/${MOZILLA} %D/lib/${MOZILLA}/${MOZILLA_BIN} -register
@unexec ${RM} %D/lib/${MOZILLA}/chrome/chrome.rdf
@unexec ${RM} %D/lib/${MOZILLA}/chrome/overlayinfo/browser/content/overlays.rdf
@unexec ${RM} %D/lib/${MOZILLA}/chrome/overlayinfo/communicator/content/overlays.rdf
@@ -2624,7 +2625,6 @@
@dirrm lib/${MOZILLA}/chrome/icons/default
@dirrm lib/${MOZILLA}/chrome/icons
@dirrm lib/${MOZILLA}/chrome
-@dirrm lib/${MOZILLA}
@dirrm include/${MOZILLA}/zlib
@dirrm include/${MOZILLA}/xultmpl
@dirrm include/${MOZILLA}/xuldoc
diff -r f184742e75d8 -r 47b3853de49a mail/thunderbird/distinfo
--- a/mail/thunderbird/distinfo Sat Dec 04 01:49:17 2004 +0000
+++ b/mail/thunderbird/distinfo Sat Dec 04 02:16:03 2004 +0000
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.9 2004/11/14 23:38:20 taya Exp $
+$NetBSD: distinfo,v 1.10 2004/12/04 02:16:03 taya Exp $
SHA1 (thunderbird-0.9-source.tar.bz2) = a818a1f471935379da1e364c5da3457446c1d53a
Size (thunderbird-0.9-source.tar.bz2) = 33197138 bytes
SHA1 (patch-aa) = 9225a7a2c9b4545e800008169d4d88452c85d1a9
-SHA1 (patch-ab) = 0c1f2d6cca09b4dd6b168ed29d84d245967a3369
-SHA1 (patch-ac) = e9bc27529cf595ab6f120d9021dd7d6c49112084
+SHA1 (patch-ab) = 77038a3dee47573782d912a928327d046c6d3c7f
+SHA1 (patch-ac) = 32aa4b92eea19aca07077a292cb759d074026642
SHA1 (patch-ad) = 19afc8dfaf9f14439d747e42ee2f64a9c1a9dc3d
SHA1 (patch-ae) = 364b91f0bf51e49bb140e13dfb775a89ea38bb28
SHA1 (patch-af) = 6addfc2bd0b3e3aaefff6cce6836384ca44baf30
@@ -21,14 +21,17 @@
SHA1 (patch-ba) = a0d70d713d2d4746d9128724c382b019f353f5af
SHA1 (patch-bb) = 9ba4bcd86e581496bbc6b40b3a3f062dfd5e416f
SHA1 (patch-bm) = 6bd7bf1262cec43b0324693d43929497c3fb3991
-SHA1 (patch-bn) = d31d2b2c3712abdd766e9fa0cee147d7c8936cd4
SHA1 (patch-bo) = 357c4cacdc179191d6fe263b4eb62cc56b7ec25f
SHA1 (patch-bq) = 3b8a951828b0e6906e4352027b4d36c9b1f8aaae
-SHA1 (patch-br) = aa48e974306fdbfc1e71b5fd9c1f5d18771143f5
+SHA1 (patch-br) = 52d5b595f1e25ac5d6664864ab0cbe5e14012168
SHA1 (patch-bs) = 81065130c96bf966b22e6abb767a5b674dcb52cb
SHA1 (patch-bt) = 6e3ceb31866dfb0dba81c93446db2b21e1df9baa
SHA1 (patch-bu) = db33b8651e3cb1fbf9a18dbe78e1e8288cfda0ee
SHA1 (patch-bv) = 4f23dfd885131ea866f31370f1421e7c19706860
SHA1 (patch-bw) = fc3a518d3762be6e85104a6dc7fffd5ae1a463c8
-SHA1 (patch-bx) = 721c58f89c829ec3dfd72a311d49c211833b107c
+SHA1 (patch-bx) = 046e19c9c4b431369411658373b14c1822841d85
SHA1 (patch-by) = 643185af7a0df7030b2b96447ee4031dc9c82f88
+SHA1 (patch-bz) = 6f854d74a9d1d1174ce8eff7d65f8024a7da4711
+SHA1 (patch-ca) = 479ef14631ae019ae5ca1c08a2f786294f3e972b
+SHA1 (patch-cb) = fd0f033d63be066ce5c47057d72c48a085718908
+SHA1 (patch-cc) = cb08d4b7330c9e471d172c11772c840e613ceb76
diff -r f184742e75d8 -r 47b3853de49a mail/thunderbird/patches/patch-ab
--- a/mail/thunderbird/patches/patch-ab Sat Dec 04 01:49:17 2004 +0000
+++ b/mail/thunderbird/patches/patch-ab Sat Dec 04 02:16:03 2004 +0000
@@ -1,9 +1,16 @@
-$NetBSD: patch-ab,v 1.3 2004/06/24 23:09:55 taya Exp $
+$NetBSD: patch-ab,v 1.4 2004/12/04 02:16:03 taya Exp $
-diff -ru ../Orig/mozilla/configure.in ./configure.in
---- ../Orig/mozilla/configure.in 2004-05-14 06:57:46.000000000 +0900
-+++ ./configure.in 2004-06-15 23:55:39.000000000 +0900
-@@ -1017,6 +1017,9 @@
+--- configure.in.orig Thu May 13 17:57:46 2004
++++ configure.in
+@@ -996,7 +996,6 @@ case "$target" in
+ powerpc*)
+ _PLATFORM_DEFAULT_TOOLKIT='mac'
+ DSO_LDOPTS="$DSO_LDOPTS -arch ppc"
+- MOZ_ENABLE_POSTSCRIPT=
+ # set MACOSX to generate lib/mac/MoreFiles/Makefile
+ MACOSX=1
+ ;;
+@@ -1017,6 +1016,9 @@ case "$target" in
# MKSHLIB_FORCE_ALL='-Wl,-Bforcearchive'
# MKSHLIB_UNFORCE_ALL=''
# fi
@@ -13,7 +20,7 @@
;;
*-hpux*)
-@@ -1308,6 +1311,13 @@
+@@ -1308,6 +1310,13 @@ case "$target" in
if test "$LIBRUNPATH"; then
DSO_LDOPTS="-Wl,-R$LIBRUNPATH $DSO_LDOPTS"
fi
@@ -27,7 +34,7 @@
;;
*-nto*)
-@@ -1531,7 +1541,7 @@
+@@ -1531,7 +1540,7 @@ dnl the qsort routine under solaris is f
MKCSHLIB='$(CC) $(CFLAGS) $(DSO_PIC_FLAGS) -G -Wl,-z -Wl,muldefs -o $@'
MKSHLIB_FORCE_ALL='-Qoption ld -z,allextract'
MKSHLIB_UNFORCE_ALL=''
diff -r f184742e75d8 -r 47b3853de49a mail/thunderbird/patches/patch-ac
--- a/mail/thunderbird/patches/patch-ac Sat Dec 04 01:49:17 2004 +0000
+++ b/mail/thunderbird/patches/patch-ac Sat Dec 04 02:16:03 2004 +0000
@@ -1,9 +1,8 @@
-$NetBSD: patch-ac,v 1.3 2004/06/24 23:09:55 taya Exp $
+$NetBSD: patch-ac,v 1.4 2004/12/04 02:16:03 taya Exp $
-diff -ru ../Orig/mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in ./xpcom/reflect/xptcall/src/md/unix/Makefile.in
---- ../Orig/mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in 2004-04-23 05:50:05.000000000 +0900
-+++ ./xpcom/reflect/xptcall/src/md/unix/Makefile.in 2004-06-15 23:55:43.000000000 +0900
-@@ -49,6 +49,9 @@
+--- xpcom/reflect/xptcall/src/md/unix/Makefile.in.orig 2004-04-22 22:50:05.000000000 +0200
++++ xpcom/reflect/xptcall/src/md/unix/Makefile.in
+@@ -49,6 +49,9 @@ ifneq (,$(filter FreeBSD NetBSD OpenBSD
ifeq (86,$(findstring 86,$(OS_TEST)))
CPPSRCS := xptcinvoke_unixish_x86.cpp xptcstubs_unixish_x86.cpp
endif
@@ -13,7 +12,7 @@
endif
#
# New code for Linux, et. al., with gcc
-@@ -140,7 +143,7 @@
+@@ -140,7 +143,7 @@ endif
# NetBSD/ARM
#
ifeq ($(OS_ARCH),NetBSD)
@@ -22,7 +21,7 @@
CPPSRCS := xptcinvoke_arm_netbsd.cpp xptcstubs_arm_netbsd.cpp
endif
endif
-@@ -174,7 +177,7 @@
+@@ -174,7 +177,7 @@ endif
# NetBSD/m68k
#
ifeq ($(OS_ARCH),NetBSD)
@@ -31,7 +30,15 @@
CPPSRCS := xptcinvoke_netbsd_m68k.cpp xptcstubs_netbsd_m68k.cpp
endif
endif
-@@ -305,6 +308,13 @@
+@@ -257,6 +260,7 @@ endif
+ ifneq (,$(filter NetBSDmacppc NetBSDbebox NetBSDofppc NetBSDprep NetBSDamigappc,$(OS_ARCH)$(OS_TEST)))
+ CPPSRCS := xptcinvoke_ppc_netbsd.cpp xptcstubs_ppc_netbsd.cpp
+ ASFILES := xptcinvoke_asm_ppc_netbsd.s xptcstubs_asm_ppc_netbsd.s
++AS := $(CC) -c -x assembler-with-cpp
+ endif
+
+ #
+@@ -305,6 +309,13 @@ ifeq ($(OS_ARCH)$(OS_TEST),NetBSDsparc)
CPPSRCS := xptcinvoke_sparc_netbsd.cpp xptcstubs_sparc_netbsd.cpp
ASFILES := xptcinvoke_asm_sparc_netbsd.s xptcstubs_asm_sparc_netbsd.s
endif
diff -r f184742e75d8 -r 47b3853de49a mail/thunderbird/patches/patch-bn
--- a/mail/thunderbird/patches/patch-bn Sat Dec 04 01:49:17 2004 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,18 +0,0 @@
-$NetBSD: patch-bn,v 1.3 2004/06/24 23:09:56 taya Exp $
-
-diff -ru ../Orig/mozilla/xpcom/io/nsNativeCharsetUtils.cpp ./xpcom/io/nsNativeCharsetUtils.cpp
---- ../Orig/mozilla/xpcom/io/nsNativeCharsetUtils.cpp 2004-05-28 03:55:10.000000000 +0900
-+++ ./xpcom/io/nsNativeCharsetUtils.cpp 2004-06-15 23:56:38.000000000 +0900
-@@ -295,7 +295,12 @@
- {
- const char *blank_list[] = { "", NULL };
- const char **native_charset_list = blank_list;
-+#ifdef CODESET
- const char *native_charset = nl_langinfo(CODESET);
-+#else
-+ const char *native_charset = nsnull;
-+#endif
-+
- if (native_charset == nsnull) {
- NS_ERROR("native charset is unknown");
- // fallback to ISO-8859-1
diff -r f184742e75d8 -r 47b3853de49a mail/thunderbird/patches/patch-br
--- a/mail/thunderbird/patches/patch-br Sat Dec 04 01:49:17 2004 +0000
+++ b/mail/thunderbird/patches/patch-br Sat Dec 04 02:16:03 2004 +0000
@@ -1,17 +1,21 @@
-$NetBSD: patch-br,v 1.3 2004/06/24 23:09:56 taya Exp $
+$NetBSD: patch-br,v 1.4 2004/12/04 02:16:03 taya Exp $
-diff -ru ../Orig/mozilla/nsprpub/pr/src/misc/prnetdb.c ./nsprpub/pr/src/misc/prnetdb.c
---- ../Orig/mozilla/nsprpub/pr/src/misc/prnetdb.c 2004-01-23 07:22:37.000000000 +0900
-+++ ./nsprpub/pr/src/misc/prnetdb.c 2004-06-15 23:56:46.000000000 +0900
-@@ -2094,7 +2094,12 @@
+--- nsprpub/pr/src/misc/prnetdb.c.orig 2004-04-28 22:00:17.000000000 +1000
++++ nsprpub/pr/src/misc/prnetdb.c
+@@ -2097,7 +2097,17 @@ PR_IMPLEMENT(PRAddrInfo *) PR_GetAddrInf
*/
hints.ai_socktype = SOCK_STREAM;
-+ LOCK_DNS();
++/* NetBSD 2.0F */
++#if defined(__NetBSD_Version__) && __NetBSD_Version__ < 200060000
++ LOCK_DNS();
++#endif
+
rv = GETADDRINFO(hostname, NULL, &hints, &res);
+
-+ UNLOCK_DNS();
++#if defined(__NetBSD_Version__) && __NetBSD_Version__ < 200060000
++ UNLOCK_DNS();
++#endif
+
if (rv == 0)
return (PRAddrInfo *) res;
diff -r f184742e75d8 -r 47b3853de49a mail/thunderbird/patches/patch-bx
--- a/mail/thunderbird/patches/patch-bx Sat Dec 04 01:49:17 2004 +0000
+++ b/mail/thunderbird/patches/patch-bx Sat Dec 04 02:16:03 2004 +0000
@@ -1,13 +1,45 @@
-$NetBSD: patch-bx,v 1.1 2004/06/24 23:09:56 taya Exp $
+$NetBSD: patch-bx,v 1.2 2004/12/04 02:16:03 taya Exp $
-diff -ru ../Orig/mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_ppc_netbsd.cpp ./xpcom/reflect/xptcall/src/md/unix/xptcstubs_ppc_netbsd.cpp
---- ../Orig/mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_ppc_netbsd.cpp 2001-09-29 05:12:53.000000000 +0900
-+++ ./xpcom/reflect/xptcall/src/md/unix/xptcstubs_ppc_netbsd.cpp 2004-06-15 23:56:59.000000000 +0900
-@@ -195,6 +195,47 @@
+--- xpcom/reflect/xptcall/src/md/unix/xptcstubs_ppc_netbsd.cpp.orig 2001-09-28 22:12:53.000000000 +0200
++++ xpcom/reflect/xptcall/src/md/unix/xptcstubs_ppc_netbsd.cpp
+@@ -119,8 +119,10 @@ PrepareAndDispatch(nsXPTCStubBase* self,
+ if ((PRUint32) ap & 4) ap++; // doubles are 8-byte aligned on stack
+ dp->val.d = *(double*) ap;
+ ap += 2;
++#if __GXX_ABI_VERSION < 100
+ if (gpr < GPR_COUNT)
+ gpr += 2;
++#endif
+ }
+ continue;
+ }
+@@ -130,8 +132,10 @@ PrepareAndDispatch(nsXPTCStubBase* self,
+ else {
+ dp->val.f = *(float*) ap;
+ ap += 1;
++#if __GXX_ABI_VERSION < 100
+ if (gpr < GPR_COUNT)
+ gpr += 1;
++#endif
+ }
+ continue;
+ }
+@@ -195,7 +199,9 @@ PrepareAndDispatch(nsXPTCStubBase* self,
// however, it's quick, dirty, and'll break when the ABI changes on
// us, which is what we want ;-).
-+#if defined(__GXX_ABI_VERSION) && __GXX_ABI_VERSION >= 100 /* G++ V3 ABI */
Home |
Main Index |
Thread Index |
Old Index