pkgsrc-bugs: pkg/25225: updated pkg thunderbird 0.5 (from pkgsrc-wip), patch included

Subject: pkg/25225: updated pkg thunderbird 0.5 (from pkgsrc-wip), patch included
To: None <gnats-bugs@gnats.NetBSD.org>
From: None <space7@meinberlikomm.de>
List: pkgsrc-bugs
Date: 04/18/2004 14:43:06
>Number:         25225
>Category:       pkg
>Synopsis:       updated pkg thunderbird 0.5
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pkg-manager
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Sun Apr 18 12:44:00 UTC 2004
>Closed-Date:
>Last-Modified:
>Originator:     Stefan Krüger
>Release:        NetBSD 2.0C
>Organization:
	
>Environment:
System: NetBSD dsl-62-220-19-57.berlikomm.net 2.0C NetBSD 2.0C (MONO) #1: Thu Apr 15 23:33:13 CEST 2004 space7@dsl-62-220-19-14.berlikomm.net:/usr/obj/sys/arch/i386/compile/MONO i386
Architecture: i386
Machine: i386
>Description:
	there's no native thunderbird pkg in pkgsrc, pkgsrc'-wip is outdated

	I wasn't able to handle thunderbirds original distfile, (source.tar.gz
	inside distfile.tar.bz2) so I looked around what other projects did
	and found out that the freebsd guys host the needed source.tar.gz,
	that's why you'll find lots of freebsd ftp mirrors in MASTER_SITES.

	I've sync'd all patches from www/mozilla/patches, updated the
	PLIST and well, it works now (though I've only build with
	gtk2 and xft)
>How-To-Repeat:
	cd /usr/pkgsrc/mail/thunderbird && make ;-)
>Fix:
diff -uNr --exclude CVS thunderbird.old/Makefile thunderbird/Makefile
--- thunderbird.old/Makefile	2004-04-18 14:00:22.000000000 +0200
+++ thunderbird/Makefile	2004-04-18 14:22:57.000000000 +0200
@@ -1,13 +1,19 @@
 # $NetBSD$
 #
 
-MOZILLA=	thunderbird
+MOZILLA=	thunderbird-gtk2
 MOZILLA_BIN=	thunderbird-bin
-MOZ_VER=	0.4
+MOZ_VER=	0.5
 EXTRACT_SUFX=	.tar.bz2
-DISTNAME=	thunderbird-source-${MOZ_VER}
-CATEGORIES=	mail
-MASTER_SITES=	http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/${MOZ_VER}/
+
+DISTNAME=	thunderbird-${MOZ_VER}-source
+MASTER_SITES=	ftp://ftp.de.FreeBSD.org/pub/FreeBSD/ports/distfiles/ \
+		ftp://ftp.ru.FreeBSD.org/pub/FreeBSD/ports/distfiles/ \
+		ftp://ftp.it.FreeBSD.org/pub/FreeBSD/ports/distfiles/ \
+		ftp://ftp.kr.FreeBSD.org/pub/FreeBSD/ports/distfiles/ \
+		ftp://ftp.jp.FreeBSD.org/pub/FreeBSD/ports/distfiles/ \
+		ftp://ftp.au.FreeBSD.org/pub/FreeBSD/ports/distfiles/ \
+		ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/distfiles/
 
 MAINTAINER=	hiramatu@boreas.dti.ne.jp
 HOMEPAGE=	http://www.mozilla.org/projects/thunderbird/
@@ -18,4 +24,7 @@
 
 CONFIGURE_ARGS+=        --enable-extensions=wallet,spellcheck,xmlextras
 
+MOZILLA_USE_GTK2=	# defined
+MOZILLA_USE_XFT=	YES
+
 .include "../../www/mozilla/Makefile.common"
diff -uNr --exclude CVS thunderbird.old/PLIST thunderbird/PLIST
--- thunderbird.old/PLIST	2004-04-18 14:00:22.000000000 +0200
+++ thunderbird/PLIST	2004-04-18 13:58:53.000000000 +0200
@@ -1,12 +1,10 @@
 @comment $NetBSD$
 bin/${MOZILLA}
 @comment begin PROGRAMS
+lib/${MOZILLA}/TestGtkEmbed
 lib/${MOZILLA}/${MOZILLA_BIN}
-lib/${MOZILLA}/dirver
-lib/${MOZILLA}/mangle
 lib/${MOZILLA}/mozilla-xremote-client
 lib/${MOZILLA}/mozipcd
-lib/${MOZILLA}/nsinstall
 lib/${MOZILLA}/regchrome
 lib/${MOZILLA}/regxpcom
 lib/${MOZILLA}/xpcshell
@@ -32,7 +30,6 @@
 lib/${MOZILLA}/components/libgfxps.${SO_SUFFIX}
 lib/${MOZILLA}/components/libgfxxprint.${SO_SUFFIX}
 lib/${MOZILLA}/components/libgklayout.${SO_SUFFIX}
-lib/${MOZILLA}/components/libgkplugin.${SO_SUFFIX}
 lib/${MOZILLA}/components/libhtmlpars.${SO_SUFFIX}
 lib/${MOZILLA}/components/libi18n.${SO_SUFFIX}
 lib/${MOZILLA}/components/libimglib2.${SO_SUFFIX}
@@ -65,7 +62,7 @@
 lib/${MOZILLA}/components/libwallet.${SO_SUFFIX}
 lib/${MOZILLA}/components/libwalletviewers.${SO_SUFFIX}
 lib/${MOZILLA}/components/libwebbrwsr.${SO_SUFFIX}
-lib/${MOZILLA}/components/libwidget_gtk.${SO_SUFFIX}
+lib/${MOZILLA}/components/libwidget_gtk2.${SO_SUFFIX}
 lib/${MOZILLA}/components/libxmlextras.${SO_SUFFIX}
 lib/${MOZILLA}/components/libxpcom_compat_c.${SO_SUFFIX}
 lib/${MOZILLA}/components/libxpconnect.${SO_SUFFIX}
@@ -76,7 +73,6 @@
 lib/${MOZILLA}/ipc/modules/libtransmgr.${SO_SUFFIX}
 lib/${MOZILLA}/libgkgfx.${SO_SUFFIX}
 lib/${MOZILLA}/libgtkembedmoz.${SO_SUFFIX}
-lib/${MOZILLA}/libgtksuperwin.${SO_SUFFIX}
 lib/${MOZILLA}/libgtkxtbin.${SO_SUFFIX}
 lib/${MOZILLA}/libjsj.${SO_SUFFIX}
 lib/${MOZILLA}/libldap50.${SO_SUFFIX}
@@ -95,12 +91,10 @@
 lib/${MOZILLA}/libxpcom.${SO_SUFFIX}
 lib/${MOZILLA}/libxpcom_compat.${SO_SUFFIX}
 lib/${MOZILLA}/libxpistub.${SO_SUFFIX}
-lib/${MOZILLA}/plugins/libnullplugin.${SO_SUFFIX}
 ${SUNOSLIB}lib/${MOZILLA}/libfreebl_hybrid_3.${SO_SUFFIX}
 ${SUNOSLIB}lib/${MOZILLA}/libfreebl_pure32_3.${SO_SUFFIX}
 @comment end DSO
 @comment begin DATA
-lib/${MOZILLA}/bloaturls.txt
 lib/${MOZILLA}/chrome/US.jar
 lib/${MOZILLA}/chrome/chromelist.txt
 lib/${MOZILLA}/chrome/classic.jar
@@ -114,6 +108,7 @@
 lib/${MOZILLA}/chrome/icons/default/abcardWindow16.xpm
 lib/${MOZILLA}/chrome/icons/default/addressbookWindow.xpm
 lib/${MOZILLA}/chrome/icons/default/addressbookWindow16.xpm
+lib/${MOZILLA}/chrome/icons/default/default.xpm
 lib/${MOZILLA}/chrome/icons/default/messengerWindow.xpm
 lib/${MOZILLA}/chrome/icons/default/messengerWindow16.xpm
 lib/${MOZILLA}/chrome/icons/default/msgcomposeWindow.xpm
@@ -124,6 +119,7 @@
 lib/${MOZILLA}/chrome/pippki.jar
 lib/${MOZILLA}/chrome/toolkit.jar
 lib/${MOZILLA}/components/accessibility.xpt
+lib/${MOZILLA}/components/accessibility-atk.xpt
 lib/${MOZILLA}/components/addrbook.xpt
 lib/${MOZILLA}/components/appshell.xpt
 lib/${MOZILLA}/components/autocomplete.xpt
@@ -264,8 +260,6 @@
 lib/${MOZILLA}/components/xremoteservice.xpt
 lib/${MOZILLA}/components/xuldoc.xpt
 lib/${MOZILLA}/components/xultmpl.xpt
-lib/${MOZILLA}/defaults/isp/US/movemail.rdf
-lib/${MOZILLA}/defaults/isp/movemail.rdf
 lib/${MOZILLA}/defaults/messenger/US/mailViews.dat
 lib/${MOZILLA}/defaults/messenger/mailViews.dat
 lib/${MOZILLA}/defaults/pref/all.js
@@ -304,7 +298,6 @@
 lib/${MOZILLA}/res/EditorOverride.css
 lib/${MOZILLA}/res/arrow.gif
 lib/${MOZILLA}/res/arrowd.gif
-lib/${MOZILLA}/res/bloatcycle.html
 lib/${MOZILLA}/res/broken-image.gif
 lib/${MOZILLA}/res/builtin/htmlBindings.xml
 lib/${MOZILLA}/res/builtin/platformHTMLBindings.xml
@@ -319,6 +312,7 @@
 lib/${MOZILLA}/res/entityTables/htmlEntityVersions.properties
 lib/${MOZILLA}/res/entityTables/mathml20.properties
 lib/${MOZILLA}/res/entityTables/transliterate.properties
+lib/${MOZILLA}/res/fonts/fontEncoding.properties
 lib/${MOZILLA}/res/fonts/mathfont.properties
 lib/${MOZILLA}/res/fonts/mathfontCMEX10.properties
 lib/${MOZILLA}/res/fonts/mathfontCMSY10.properties
@@ -474,23 +468,30 @@
 lib/${MOZILLA}/res/unixcharset.properties
 lib/${MOZILLA}/res/viewer.properties
 lib/${MOZILLA}/res/viewsource.css
-lib/${MOZILLA}/shlibsign
 @comment end DATA
 @comment begin INCLUDE
 include/${MOZILLA}/accessibility/nsAccessNode.h
 include/${MOZILLA}/accessibility/nsAccessNodeWrap.h
 include/${MOZILLA}/accessibility/nsAccessibleEventData.h
+include/${MOZILLA}/accessibility/nsAccessibleText.h
 include/${MOZILLA}/accessibility/nsAccessibleWrap.h
 include/${MOZILLA}/accessibility/nsDocAccessibleWrap.h
 include/${MOZILLA}/accessibility/nsIAccessNode.h
 include/${MOZILLA}/accessibility/nsIAccessibilityService.h
 include/${MOZILLA}/accessibility/nsIAccessible.h
+include/${MOZILLA}/accessibility/nsIAccessibleAction.h
 include/${MOZILLA}/accessibility/nsIAccessibleCaret.h
 include/${MOZILLA}/accessibility/nsIAccessibleDocument.h
+include/${MOZILLA}/accessibility/nsIAccessibleEditableText.h
 include/${MOZILLA}/accessibility/nsIAccessibleEvent.h
+include/${MOZILLA}/accessibility/nsIAccessibleHyperLink.h
+include/${MOZILLA}/accessibility/nsIAccessibleHyperText.h
 include/${MOZILLA}/accessibility/nsIAccessibleProvider.h
 include/${MOZILLA}/accessibility/nsIAccessibleRetrieval.h
 include/${MOZILLA}/accessibility/nsIAccessibleSelectable.h
+include/${MOZILLA}/accessibility/nsIAccessibleTable.h
+include/${MOZILLA}/accessibility/nsIAccessibleText.h
+include/${MOZILLA}/accessibility/nsIAccessibleValue.h
 include/${MOZILLA}/accessibility/nsPIAccessNode.h
 include/${MOZILLA}/accessibility/nsPIAccessible.h
 include/${MOZILLA}/accessibility/nsPIAccessibleDocument.h
@@ -560,6 +561,10 @@
 include/${MOZILLA}/addrbook/nsIAddrDatabase.h
 include/${MOZILLA}/addrbook/nsIAddressBook.h
 include/${MOZILLA}/addrbook/nsILDAPPrefsService.h
+include/${MOZILLA}/addrbook/nsIMsgVCardService.h
+include/${MOZILLA}/addrbook/nsMsgVCardService.h
+include/${MOZILLA}/addrbook/nsVCard.h
+include/${MOZILLA}/addrbook/nsVCardObj.h
 include/${MOZILLA}/appcomps/nsCharsetMenu.h
 include/${MOZILLA}/appcomps/nsFontPackageHandler.h
 include/${MOZILLA}/appcomps/nsIAutoCompleteListener.h
@@ -1125,6 +1130,7 @@
 include/${MOZILLA}/imglib2/imgIContainerObserver.h
 include/${MOZILLA}/imglib2/imgIDecoder.h
 include/${MOZILLA}/imglib2/imgIDecoderObserver.h
+include/${MOZILLA}/imglib2/imgIEncoder.h
 include/${MOZILLA}/imglib2/imgILoad.h
 include/${MOZILLA}/imglib2/imgILoader.h
 include/${MOZILLA}/imglib2/imgIRequest.h
@@ -2096,6 +2102,7 @@
 include/${MOZILLA}/shistory/nsISHistoryInternal.h
 include/${MOZILLA}/shistory/nsISHistoryListener.h
 include/${MOZILLA}/sidebar/nsISidebar.h
+include/${MOZILLA}/spellchecker/mozIPersonalDictionary.h
 include/${MOZILLA}/spellchecker/mozISpellCheckingEngine.h
 include/${MOZILLA}/spellchecker/mozISpellI18NManager.h
 include/${MOZILLA}/spellchecker/mozISpellI18NUtil.h
@@ -2233,9 +2240,8 @@
 include/${MOZILLA}/webshell/nsIRefreshURI.h
 include/${MOZILLA}/webshell/nsIWebShell.h
 include/${MOZILLA}/webshell/nsIWebShellServices.h
-include/${MOZILLA}/widget/gdksuperwin.h
-include/${MOZILLA}/widget/gtkmozarea.h
-include/${MOZILLA}/widget/gtkmozbox.h
+include/${MOZILLA}/widget/mozcontainer.h
+include/${MOZILLA}/widget/mozdrawingarea.h
 include/${MOZILLA}/widget/nsEvent.h
 include/${MOZILLA}/widget/nsGUIEvent.h
 include/${MOZILLA}/widget/nsIAppShell.h
@@ -2552,7 +2558,6 @@
 @dirrm lib/${MOZILLA}/chrome/overlayinfo/communicator
 @dirrm lib/${MOZILLA}/chrome/overlayinfo
 @comment begin DIRS
-@dirrm lib/${MOZILLA}/searchplugins
 @dirrm lib/${MOZILLA}/res/throbber
 @dirrm lib/${MOZILLA}/res/samples/sampleimages
 @dirrm lib/${MOZILLA}/res/samples
@@ -2564,7 +2569,6 @@
 @dirrm lib/${MOZILLA}/res/dtd
 @dirrm lib/${MOZILLA}/res/builtin
 @dirrm lib/${MOZILLA}/res
-@dirrm lib/${MOZILLA}/plugins
 @dirrm lib/${MOZILLA}/ipc/modules
 @dirrm lib/${MOZILLA}/ipc
 @dirrm lib/${MOZILLA}/icons
@@ -2578,7 +2582,6 @@
 @dirrm lib/${MOZILLA}/defaults/isp
 @dirrm lib/${MOZILLA}/defaults/messenger/US
 @dirrm lib/${MOZILLA}/defaults/messenger
-@dirrm lib/${MOZILLA}/defaults/autoconfig
 @dirrm lib/${MOZILLA}/defaults
 @dirrm lib/${MOZILLA}/components/myspell
 @dirrm lib/${MOZILLA}/components
@@ -2712,7 +2715,6 @@
 @dirrm include/${MOZILLA}/browsercomps
 @dirrm include/${MOZILLA}/browser
 @dirrm include/${MOZILLA}/bayesflt
-@dirrm include/${MOZILLA}/autoconfig
 @dirrm include/${MOZILLA}/appshell
 @dirrm include/${MOZILLA}/appcomps
 @dirrm include/${MOZILLA}/addrbook
diff -uNr --exclude CVS thunderbird.old/TODO thunderbird/TODO
--- thunderbird.old/TODO	2004-04-18 14:00:22.000000000 +0200
+++ thunderbird/TODO	1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-0.5 out.
diff -uNr --exclude CVS thunderbird.old/distinfo thunderbird/distinfo
--- thunderbird.old/distinfo	2004-04-18 14:00:22.000000000 +0200
+++ thunderbird/distinfo	2004-04-16 00:01:48.000000000 +0200
@@ -1,8 +1,8 @@
 $NetBSD$
 
-SHA1 (thunderbird-source-0.4.tar.bz2) = e84fab22248c8052e110272204214ff3a3ad0690
-Size (thunderbird-source-0.4.tar.bz2) = 30968925 bytes
-SHA1 (patch-ab) = 36fa52e9d31e596fac3ff797a6299c5a71c34550
+SHA1 (thunderbird-0.5-source.tar.bz2) = 7ff5e9b8402ceada9b152fc68bca199a6cf75e9e
+Size (thunderbird-0.5-source.tar.bz2) = 31426444 bytes
+SHA1 (patch-ab) = ddb1ba102585037100f7dd0c0c04e45caf32732d
 SHA1 (patch-ac) = ec539828930a98d813f783458bb8b7fabfaa24b3
 SHA1 (patch-ad) = 80e873748f5fcb9fbf1f179d1f68c4e9568aece9
 SHA1 (patch-ae) = 26da0a58f19e8e7fa7bed6a093f15e727bce98e9
@@ -10,11 +10,15 @@
 SHA1 (patch-ag) = 1efb1d526df39fc46223e2805d364f0639d0fc7c
 SHA1 (patch-am) = 596ac06abb1de21a197a9db93fde0eaec19f36d8
 SHA1 (patch-aw) = 48a240bd793729a534467d9feb23d96a65cdcc64
+SHA1 (patch-ax) = 070c88dee0446b093ab1c2a9120dc1747642d46f
+SHA1 (patch-ay) = b9bc5ce449c6851781b12cd1e7bc43186b3654fd
 SHA1 (patch-ba) = 539b6c690dea4f9c8f7ad67de2f0357b1cdee769
-SHA1 (patch-bb) = 38e4378fcc7b180845ed1e42af828bcce9119aa8
+SHA1 (patch-bb) = 11929b787fcc04306612711bc15b6c53d73afd63
 SHA1 (patch-be) = 20050e778410393b2ac6343b9f8ba2c0affc432b
 SHA1 (patch-bm) = d67723f17ca2ceaab0488798f55a4c621926a029
 SHA1 (patch-bn) = b5a5effc0b427ede79171f167a4110959ed8b064
-SHA1 (patch-bo) = b4c52c0b798e4a3004fe1eee0630eba173204943
-SHA1 (patch-bp) = 016262f79861111dd124627874b1c642d1d1d64e
+SHA1 (patch-bo) = a4fd1fc935e671aa12f30ccb24fa83787cc8f14f
+SHA1 (patch-bp) = b542833425591539a6b859be4eea55c88b7d69e8
 SHA1 (patch-bq) = f81601c6bf7aa3a47d93bd9a24b5d22fd7133e1c
+SHA1 (patch-br) = 4fd94d2748a39a21791aaef27c9c8a8d2a1eadd8
+SHA1 (patch-bs) = 24d5689c7d58d74d8d936b5b373491aa9127d358
diff -uNr --exclude CVS thunderbird.old/patches/patch-ab thunderbird/patches/patch-ab
--- thunderbird.old/patches/patch-ab	2004-04-18 14:00:22.000000000 +0200
+++ thunderbird/patches/patch-ab	2004-04-15 18:48:25.000000000 +0200
@@ -1,9 +1,8 @@
 $NetBSD$
 
-diff -ru ../Orig/mozilla/configure.in ./configure.in
---- ../Orig/mozilla/configure.in	2003-08-30 02:14:58.000000000 +0900
-+++ ./configure.in	2003-10-16 15:38:38.000000000 +0900
-@@ -902,6 +902,9 @@
+--- configure.in.orig	2004-02-27 14:24:52.000000000 +0900
++++ configure.in	2004-02-27 14:33:42.000000000 +0900
+@@ -959,6 +959,9 @@
  #	MKSHLIB_FORCE_ALL='-Wl,-Bforcearchive'
  #	MKSHLIB_UNFORCE_ALL=''
  #    fi
@@ -13,21 +12,30 @@
      ;; 
  
  *-hpux*)
-@@ -1190,6 +1193,13 @@
+@@ -1248,6 +1251,13 @@
      if test "$LIBRUNPATH"; then
  	DSO_LDOPTS="-Wl,-R$LIBRUNPATH $DSO_LDOPTS"
      fi
 +
 +    case "${target_cpu}" in
 +    alpha*)
-+    	CFLAGS="$CFLAGS -mieee"
-+    	CXXFLAGS="$CXXFLAGS -mieee"
++	CFLAGS="$CFLAGS -mieee"
++	CXXFLAGS="$CXXFLAGS -mieee"
 +    ;;
 +    esac
      ;;
  
  *-nto*) 
-@@ -1596,7 +1606,7 @@
+@@ -1478,7 +1488,7 @@
+        MKCSHLIB='$(CC) $(CFLAGS) $(DSO_PIC_FLAGS) $(DSO_LDOPTS) -o $@'
+        MKSHLIB_FORCE_ALL='-Qoption ld -z,allextract'
+        MKSHLIB_UNFORCE_ALL=''
+-       DSO_LDOPTS='-G -Qoption ld -z,muldefs -h $@'
++       DSO_LDOPTS='-G -z muldefs -h $@'
+        AR_LIST="$AR t"
+        AR_EXTRACT="$AR x"
+        AR_DELETE="$AR d"
+@@ -1649,7 +1659,7 @@
                   [siginfo_t* info;],
                   [ac_cv_siginfo_t=true],
                   [ac_cv_siginfo_t=false])])
@@ -36,7 +44,7 @@
    AC_DEFINE(HAVE_SIGINFO_T)
    AC_MSG_RESULT(yes)
  else
-@@ -2143,9 +2153,6 @@
+@@ -2192,9 +2202,6 @@
  				CXXFLAGS="$CXXFLAGS -mt" 
  			fi
  			;;
diff -uNr --exclude CVS thunderbird.old/patches/patch-ax thunderbird/patches/patch-ax
--- thunderbird.old/patches/patch-ax	1970-01-01 01:00:00.000000000 +0100
+++ thunderbird/patches/patch-ax	2004-04-15 18:48:51.000000000 +0200
@@ -0,0 +1,15 @@
+$NetBSD$
+
+--- security/coreconf/SunOS5.mk.orig	2003-03-21 15:45:37.000000000 +1100
++++ security/coreconf/SunOS5.mk
+@@ -165,6 +165,10 @@ endif
+ 	DSO_LDOPTS += -G -h $(notdir $@)
+ endif
+ 
++ifdef LIBRUNPATH
++DSO_LDOPTS += -R$(LIBRUNPATH)
++endif
++
+ # -KPIC generates position independent code for use in shared libraries.
+ # (Similarly for -fPIC in case of gcc.)
+ ifdef NS_USE_GCC
diff -uNr --exclude CVS thunderbird.old/patches/patch-ay thunderbird/patches/patch-ay
--- thunderbird.old/patches/patch-ay	1970-01-01 01:00:00.000000000 +0100
+++ thunderbird/patches/patch-ay	2004-04-15 18:48:56.000000000 +0200
@@ -0,0 +1,14 @@
+$NetBSD$
+
+--- nsprpub/config/rules.mk.orig	2003-09-16 11:00:28.000000000 +0900
++++ nsprpub/config/rules.mk	2004-02-27 14:50:13.000000000 +0900
+@@ -371,6 +371,9 @@
+ ifeq ($(OS_ARCH),SunOS)
+ 	grep -v ';-' $< | \
+ 	sed -e 's,;+,,' -e 's; DATA ;;' -e 's,;;,,' -e 's,;.*,;,' > $@
++ifdef LIBRUNPATH
++DSO_LDOPTS		+=-R$(LIBRUNPATH)
++endif
+ endif
+ ifeq ($(OS_ARCH),OS2)
+ 	echo LIBRARY $(LIBRARY_NAME)$(LIBRARY_VERSION) INITINSTANCE TERMINSTANCE > $@
diff -uNr --exclude CVS thunderbird.old/patches/patch-bb thunderbird/patches/patch-bb
--- thunderbird.old/patches/patch-bb	2004-04-18 14:00:22.000000000 +0200
+++ thunderbird/patches/patch-bb	2004-04-15 18:49:09.000000000 +0200
@@ -1,8 +1,7 @@
 $NetBSD$
 
-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-01-17 08:09:14.000000000 +0900
-+++ ./nsprpub/pr/include/md/_netbsd.h	2003-10-16 15:37:32.000000000 +0900
+--- nsprpub/pr/include/md/_netbsd.h.orig	2004-02-27 14:55:33.000000000 +0900
++++ nsprpub/pr/include/md/_netbsd.h	2004-02-27 15:29:42.000000000 +0900
 @@ -48,12 +48,20 @@
  #define _PR_SI_ARCHITECTURE "m68k"
  #elif defined(__powerpc__)
@@ -24,7 +23,20 @@
  #endif
  
  #if defined(__ELF__)
-@@ -107,7 +115,17 @@
+@@ -86,6 +94,12 @@
+ #define _PR_INET6_PROBE
+ #endif
+ 
++#if __NetBSD_Version__ >= 106370000
++/* NetBSD 1.6ZK */
++#define _PR_HAVE_GETPROTO_R
++#define _PR_HAVE_GETPROTO_R_INT
++#endif
++
+ #define USE_SETJMP
+ 
+ #ifndef _PR_PTHREADS
+@@ -108,7 +122,17 @@
  }
  #define	_MD_GET_SP(_thread)	CONTEXT(_thread)[2]
  #endif
@@ -43,7 +55,7 @@
  #define _MD_INIT_CONTEXT(_thread, _sp, _main, status)			\
  {									\
      sigsetjmp(CONTEXT(_thread), 1);					\
-@@ -149,7 +167,7 @@
+@@ -150,7 +174,7 @@
  }
  #define	_MD_GET_SP(_thread)	CONTEXT(_thread)[32]
  #endif
diff -uNr --exclude CVS thunderbird.old/patches/patch-bo thunderbird/patches/patch-bo
--- thunderbird.old/patches/patch-bo	2004-04-18 14:00:22.000000000 +0200
+++ thunderbird/patches/patch-bo	2004-04-15 18:49:16.000000000 +0200
@@ -1,9 +1,8 @@
 $NetBSD$
 
-diff -ru ../Orig/mozilla/nsprpub/configure.in ./nsprpub/configure.in
---- ../Orig/mozilla/nsprpub/configure.in	2003-08-30 09:18:18.000000000 +0900
-+++ ./nsprpub/configure.in	2003-10-16 15:37:46.000000000 +0900
-@@ -932,6 +932,9 @@
+--- nsprpub/configure.in.orig	2004-02-27 15:03:10.000000000 +0900
++++ nsprpub/configure.in	2004-02-27 15:05:21.000000000 +0900
+@@ -930,6 +930,9 @@
      DSO_LDOPTS='-shared -Wl,-soname -Wl,$(notdir $@)'
      MDCPUCFG_H=_freebsd.cfg
      PR_MD_CSRCS=freebsd.c
@@ -13,7 +12,7 @@
      ;;
  
  *-hpux*)
-@@ -2175,7 +2178,14 @@
+@@ -2182,7 +2185,14 @@
  	        _PTHREAD_LDFLAGS="-lc_r"
  	    fi
  	    ;;
@@ -22,7 +21,7 @@
 +	    AC_DEFINE(_REENTRANT)
 +	    AC_DEFINE(_THREAD_SAFE)
 +	    if test "$ac_cv_have_dash_pthread" = "yes"; then
-+	        _PTHREAD_LDFLAGS="-pthread"
++	         _PTHREAD_LDFLAGS="-pthread"
 +	    fi
 +	    ;;
 +    *-openbsd*|*-bsdi*)
diff -uNr --exclude CVS thunderbird.old/patches/patch-bp thunderbird/patches/patch-bp
--- thunderbird.old/patches/patch-bp	2004-04-18 14:00:22.000000000 +0200
+++ thunderbird/patches/patch-bp	2004-04-15 18:49:20.000000000 +0200
@@ -2,13 +2,13 @@
 
 diff -ru ../Orig/mozilla/other-licenses/libical/src/libical/Makefile.in ./other-licenses/libical/src/libical/Makefile.in
 --- ../Orig/mozilla/other-licenses/libical/src/libical/Makefile.in	2003-01-08 13:59:28.000000000 +0900
-+++ ./other-licenses/libical/src/libical/Makefile.in	2003-10-16 15:37:49.000000000 +0900
++++ ./other-licenses/libical/src/libical/Makefile.in	2003-10-20 10:19:54.000000000 +0900
 @@ -179,7 +179,7 @@
  	$(PERL) $(ICALSCRIPTS)/mkrestrictiontable.pl  -i $(srcdir)/icalrestriction.c.in \
                  $(DESIGNDATA)/restrictions.csv > icalrestriction.c
  
 -ifneq (,$(filter BeOS Darwin OpenVMS,$(OS_ARCH)))
-+ifneq (,$(filter BeOS Darwin OpenVMS NetBSD,FreeBSD,$(OS_ARCH)))
++ifneq (,$(filter BeOS Darwin OpenVMS NetBSD FreeBSD,$(OS_ARCH)))
  DEFINES	+= -D__USE_BSD=1
  endif
  
diff -uNr --exclude CVS thunderbird.old/patches/patch-br thunderbird/patches/patch-br
--- thunderbird.old/patches/patch-br	1970-01-01 01:00:00.000000000 +0100
+++ thunderbird/patches/patch-br	2004-04-15 18:49:24.000000000 +0200
@@ -0,0 +1,17 @@
+$NetBSD$
+
+--- nsprpub/pr/src/misc/prnetdb.c.orig	2003-10-31 14:09:29.000000000 +0900
++++ nsprpub/pr/src/misc/prnetdb.c	2004-02-27 15:09:13.000000000 +0900
+@@ -2094,7 +2094,12 @@
+          */
+         hints.ai_socktype = SOCK_STREAM;
+ 
++        LOCK_DNS();
++
+         rv = GETADDRINFO(hostname, NULL, &hints, &res);
++
++        UNLOCK_DNS();
++
+         if (rv == 0)
+             return (PRAddrInfo *) res;
+ 
diff -uNr --exclude CVS thunderbird.old/patches/patch-bs thunderbird/patches/patch-bs
--- thunderbird.old/patches/patch-bs	1970-01-01 01:00:00.000000000 +0100
+++ thunderbird/patches/patch-bs	2004-04-15 22:20:52.000000000 +0200
@@ -0,0 +1,11 @@
+--- toolkit/mozapps/downloads/src/Makefile.in.orig	2004-04-15 22:18:39.000000000 +0200
++++ toolkit/mozapps/downloads/src/Makefile.in	2004-04-15 22:18:42.000000000 +0200
+@@ -31,7 +31,7 @@
+ libs:: nsHelperAppDlg.js
+ 
+ nsHelperAppDlg.js: nsHelperAppDlg.js.in
+-	$(MOZILLA_DIR)/config/preprocessor.pl $(DEFINES) $(ACDEFINES) $^ > $@ 
++	$(PERL) $(MOZILLA_DIR)/config/preprocessor.pl $(DEFINES) $(ACDEFINES) $^ > $@ 
+ 	$(NSINSTALL) $@ $(DIST)/bin/components/
+ 
+ include $(topsrcdir)/config/rules.mk
>Release-Note:
>Audit-Trail:
>Unformatted: