- switch to gtk1

- catch up to current statvfs support

4 files changed, 13 insertions, 24 deletions

diff --git a/mail/thunderbird/Makefile b/mail/thunderbird/Makefile
index f039a125880..6b8e55bf7e9 100644
--- a/mail/thunderbird/Makefile
+++ b/mail/thunderbird/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/04/19 23:25:27 taya Exp $
+# $NetBSD: Makefile,v 1.2 2004/04/26 13:56:09 taya Exp $
 
 MOZILLA=	thunderbird
 MOZILLA_BIN=	thunderbird-bin
 MOZ_VER=	0.5
+PKGREVISION=	1
 EXTRACT_SUFX=	.tar.gz
 DISTNAME=	thunderbird-${MOZ_VER}-source
 MASTER_SITES=	http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/${MOZ_VER}/ \
@@ -15,8 +16,6 @@ CONFIGURE_ENV+=	MOZ_THUNDERBIRD=1
 MAKE_ENV+=	MOZ_THUNDERBIRD=1
 
 CONFIGURE_ARGS+=	--enable-extensions=wallet,spellcheck,xmlextras
-MOZILLA_USE_GTK2=	# defined
-MOZILLA_USE_XFT=	YES
 
 #
 # XXX
diff --git a/mail/thunderbird/PLIST b/mail/thunderbird/PLIST
index bef6954395f..43f19e077cf 100644
--- a/mail/thunderbird/PLIST
+++ b/mail/thunderbird/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2004/04/19 23:25:29 taya Exp $
+@comment $NetBSD: PLIST,v 1.2 2004/04/26 13:56:09 taya Exp $
 bin/${MOZILLA}
 @comment begin PROGRAMS
 lib/${MOZILLA}/${MOZILLA_BIN}
@@ -65,7 +65,7 @@ lib/${MOZILLA}/components/libucvmath.${SO_SUFFIX}
 lib/${MOZILLA}/components/libwallet.${SO_SUFFIX}
 lib/${MOZILLA}/components/libwalletviewers.${SO_SUFFIX}
 lib/${MOZILLA}/components/libwebbrwsr.${SO_SUFFIX}
-lib/${MOZILLA}/components/libwidget_gtk2.${SO_SUFFIX}
+lib/${MOZILLA}/components/libwidget_gtk.${SO_SUFFIX}
 lib/${MOZILLA}/components/libxmlextras.${SO_SUFFIX}
 lib/${MOZILLA}/components/libxpcom_compat_c.${SO_SUFFIX}
 lib/${MOZILLA}/components/libxpconnect.${SO_SUFFIX}
@@ -76,6 +76,7 @@ lib/${MOZILLA}/ipc/modules/liblockmodule.${SO_SUFFIX}
 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}
@@ -106,12 +107,10 @@ lib/${MOZILLA}/chrome/en-US.jar
 lib/${MOZILLA}/chrome/en-mac.jar
 lib/${MOZILLA}/chrome/en-unix.jar
 lib/${MOZILLA}/chrome/en-win.jar
-lib/${MOZILLA}/chrome/icons/default.xpm
 lib/${MOZILLA}/chrome/icons/default/abcardWindow.xpm
 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
@@ -121,7 +120,6 @@ lib/${MOZILLA}/chrome/messenger.jar
 lib/${MOZILLA}/chrome/pipnss.jar
 lib/${MOZILLA}/chrome/pippki.jar
 lib/${MOZILLA}/chrome/toolkit.jar
-lib/${MOZILLA}/components/accessibility-atk.xpt
 lib/${MOZILLA}/components/accessibility.xpt
 lib/${MOZILLA}/components/addrbook.xpt
 lib/${MOZILLA}/components/appshell.xpt
@@ -318,7 +316,6 @@ lib/${MOZILLA}/res/entityTables/html40Symbols.properties
 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
@@ -479,25 +476,17 @@ lib/${MOZILLA}/res/viewsource.css
 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
@@ -2252,8 +2241,9 @@ include/${MOZILLA}/webshell/nsILinkHandler.h
 include/${MOZILLA}/webshell/nsIRefreshURI.h
 include/${MOZILLA}/webshell/nsIWebShell.h
 include/${MOZILLA}/webshell/nsIWebShellServices.h
-include/${MOZILLA}/widget/mozcontainer.h
-include/${MOZILLA}/widget/mozdrawingarea.h
+include/${MOZILLA}/widget/gdksuperwin.h
+include/${MOZILLA}/widget/gtkmozarea.h
+include/${MOZILLA}/widget/gtkmozbox.h
 include/${MOZILLA}/widget/nsEvent.h
 include/${MOZILLA}/widget/nsGUIEvent.h
 include/${MOZILLA}/widget/nsIAppShell.h
diff --git a/mail/thunderbird/distinfo b/mail/thunderbird/distinfo
index e5c17f81dad..fdeaf8ab6b1 100644
--- a/mail/thunderbird/distinfo
+++ b/mail/thunderbird/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.1.1.1 2004/04/19 23:25:27 taya Exp $
+$NetBSD: distinfo,v 1.2 2004/04/26 13:56:09 taya Exp $
 
 SHA1 (thunderbird-0.5-source.tar.gz) = eb47a2e56f6f50bdf6586d1eeee80e01493579ce
 Size (thunderbird-0.5-source.tar.gz) = 31783591 bytes
@@ -17,6 +17,6 @@ SHA1 (patch-bm) = f557aa3ce9a25c91884cfd42bb505422e52ac958
 SHA1 (patch-bn) = 07573c79b22821873954d7c70821a382ea42fe4e
 SHA1 (patch-bo) = a6bba31568b60818455911279e7db01c49c94498
 SHA1 (patch-bp) = 5f5eed098d2763ca6a4987d012c9377b81300aa3
-SHA1 (patch-bq) = 50965a09de76d1bba3e202746cbb5b197b036cdc
+SHA1 (patch-bq) = 0c520287d97027da06a5aa65cbd038bf19a49dde
 SHA1 (patch-br) = 560d738c648b864711d663323bdd1478b7d28103
 SHA1 (patch-bs) = 212db65f7eb1f71898468004c1e735609377baec
diff --git a/mail/thunderbird/patches/patch-bq b/mail/thunderbird/patches/patch-bq
index 7e5b6c700de..2764d16688d 100644
--- a/mail/thunderbird/patches/patch-bq
+++ b/mail/thunderbird/patches/patch-bq
@@ -1,14 +1,14 @@
-$NetBSD: patch-bq,v 1.1.1.1 2004/04/19 23:25:29 taya Exp $
+$NetBSD: patch-bq,v 1.2 2004/04/26 13:56:09 taya Exp $
 
 diff -ru ../Orig/mozilla/xpcom/io/nsLocalFileUnix.h ./xpcom/io/nsLocalFileUnix.h
 --- ../Orig/mozilla/xpcom/io/nsLocalFileUnix.h	2003-07-19 07:14:16.000000000 +0900
-+++ ./xpcom/io/nsLocalFileUnix.h	2004-01-16 23:18:06.000000000 +0900
++++ ./xpcom/io/nsLocalFileUnix.h	2004-04-23 15:01:23.000000000 +0900
 @@ -57,7 +57,7 @@
  #endif
  
  // so we can statfs on freebsd
 -#if defined(__FreeBSD__)
-+#if defined(__FreeBSD__) || defined(__NetBSD__)
++#if defined(__FreeBSD__) || (defined(__NetBSD__) && !defined(HAVE_STATVFS))
      #define HAVE_SYS_STATFS_H
      #define STATFS statfs
      #include <sys/param.h>