- dont unload dependent libs (avoid dlclose bug)

- fix lp64 bug
- fix alpha wantlib
- adjust depends for esound & ORBit
- use MODULE devel/gettext

okay wilfried@ and reviewed by alek@

mail/mozilla-thunderbird/Makefile

@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.19 2005/03/26 19:04:59 wilfried Exp $
+# $OpenBSD: Makefile,v 1.20 2005/04/01 19:24:07 kurt Exp $
 
 ONLY_FOR_ARCHS=	alpha i386 sparc sparc64 amd64 powerpc
 
@@ -6,7 +6,7 @@ COMMENT=	"redesign of the integrated Mozilla App-Suite mail component"
 
 VER=		1.0.2
 DISTNAME=	mozilla
-PKGNAME=	mozilla-thunderbird-${VER}
+PKGNAME=	mozilla-thunderbird-${VER}p0
 
 CATEGORIES=	mail news
 
@@ -18,23 +18,26 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 WANTLIB=		X11 Xext Xft Xi Xp Xrender Xt c fontconfig freetype \
-			iconv intl m pthread stdc++ z
+			m pthread z
+.  if empty(MACHINE_ARCH:Malpha)
+WANTLIB+=		stdc++
+.  endif
 
 MASTER_SITES=	http://ftp.eu.mozilla.org/pub/mozilla.org/thunderbird/releases/${VER}/source/ \
 		http://ftp.mozilla.org/pub/thunderbird/releases/${VER}/source/
 DISTFILES=	thunderbird-${VER}-source.tar.bz2
 
-MODULES=	gcc3
+MODULES=	gcc3 devel/gettext
 MODGCC3_ARCHES=	alpha
 MODGCC3_LANGS=	C++
-BUILD_DEPENDS=	:zip->=2.3:archivers/zip \
+RUN_DEPENDS=	:esound-*:audio/esound
+BUILD_DEPENDS=	:ORBit-*:devel/ORBit \
+		:zip->=2.3:archivers/zip \
 		:pkgconfig-*:devel/pkgconfig
 LIB_DEPENDS=	gtk.1,gdk.1::x11/gtk+ \
 		glib.1,gmodule.1::devel/glib \
-		IDL.4::devel/ORBit \
 		jpeg.62::graphics/jpeg \
-		png.3::graphics/png \
-		esd.2::audio/esound
+		png.3::graphics/png
 
 VMEM_WARNING=	Yes
 

mail/mozilla-thunderbird/patches/patch-mailnews_mime_src_mimemsg_cpp

@@ -0,0 +1,12 @@
+$OpenBSD: patch-mailnews_mime_src_mimemsg_cpp,v 1.1 2005/04/01 19:24:07 kurt Exp $
+--- mailnews/mime/src/mimemsg.cpp.orig	Thu Mar 31 15:06:05 2005
++++ mailnews/mime/src/mimemsg.cpp	Thu Mar 31 15:06:20 2005
+@@ -522,7 +522,7 @@ MimeMessage_close_headers (MimeObject *o
+ 	{
+ 		PRUint32 flags = 0;
+ 		char dummy = 0;
+-		if (sscanf(xmoz, " %lx %c", &flags, &dummy) == 1 &&
++		if (sscanf(xmoz, " %x %c", &flags, &dummy) == 1 &&
+ 			flags & MSG_FLAG_PARTIAL)
+ 		{
+ 			obj->options->html_closure = obj;

mail/mozilla-thunderbird/patches/patch-xpcom_components_xcDll_cpp

@@ -0,0 +1,11 @@
+$OpenBSD: patch-xpcom_components_xcDll_cpp,v 1.1 2005/04/01 19:24:07 kurt Exp $
+--- xpcom/components/xcDll.cpp.orig	Thu Mar 31 15:01:22 2005
++++ xpcom/components/xcDll.cpp	Thu Mar 31 15:03:30 2005
+@@ -66,7 +66,6 @@
+ 
+ #include "nsTraceRefcntImpl.h"
+ 
+-#define UNLOAD_DEPENDENT_LIBS
+ #ifdef HPUX
+ #undef UNLOAD_DEPENDENT_LIBS
+ #endif