Dynamically generate the part of the PLIST for libfreebl. This is because

the exact names of the freebl libraries depends on the platform and they
have a habit of changing even on minor releases.  This causes these mozilla
packages to be broken quite a lot on platforms other than NetBSD/i386.
Hopefully this fix will last longer than previous ones.  pkgrevision bumps
all around.

4 files changed, 10 insertions, 12 deletions

diff --git a/mail/thunderbird-gtk1/Makefile b/mail/thunderbird-gtk1/Makefile
index 510aab372c5..34e71aed7ed 100644
--- a/mail/thunderbird-gtk1/Makefile
+++ b/mail/thunderbird-gtk1/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.12 2006/11/08 13:15:40 ghen Exp $
+# $NetBSD: Makefile,v 1.13 2007/03/07 21:32:53 dmcmahill Exp $
 
 MOZILLA=	thunderbird-gtk1
+PKGREVISION=	1
 
 COMMENT=	Mozilla mail client using the older GTK1 toolkit
 
diff --git a/mail/thunderbird-gtk1/PLIST b/mail/thunderbird-gtk1/PLIST
index 1a6ef33a2dc..85008dbc8d2 100644
--- a/mail/thunderbird-gtk1/PLIST
+++ b/mail/thunderbird-gtk1/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.9 2007/03/02 14:12:25 ghen Exp $
+@comment $NetBSD: PLIST,v 1.10 2007/03/07 21:32:54 dmcmahill Exp $
 bin/${MOZILLA}
 @comment begin PROGRAMS
 lib/${MOZILLA}/${MOZILLA_BIN}
@@ -70,7 +70,7 @@ lib/${MOZILLA}/components/libxmlextras.${SO_SUFFIX}
 lib/${MOZILLA}/components/libxpcom_compat_c.${SO_SUFFIX}
 lib/${MOZILLA}/components/libxpconnect.${SO_SUFFIX}
 lib/${MOZILLA}/components/libxpinstall.${SO_SUFFIX}
-lib/${MOZILLA}/libfreebl3.${SO_SUFFIX}
+@comment libfreebl
 lib/${MOZILLA}/libgfxpsshar.${SO_SUFFIX}
 lib/${MOZILLA}/libgkgfx.${SO_SUFFIX}
 lib/${MOZILLA}/libgtkembedmoz.${SO_SUFFIX}
@@ -316,7 +316,7 @@ lib/${MOZILLA}/greprefs/xpinstall.js
 lib/${MOZILLA}/icons/mozicon16.xpm
 lib/${MOZILLA}/icons/mozicon50.xpm
 lib/${MOZILLA}/init.d/README
-lib/${MOZILLA}/libfreebl3.chk
+@comment libfreebl.chk
 lib/${MOZILLA}/libsoftokn3.chk
 lib/${MOZILLA}/res/EditorOverride.css
 lib/${MOZILLA}/res/arrow.gif
diff --git a/mail/thunderbird/Makefile b/mail/thunderbird/Makefile
index c000ab5dbfa..2cd2eb3ac5e 100644
--- a/mail/thunderbird/Makefile
+++ b/mail/thunderbird/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.24 2007/03/02 14:12:24 ghen Exp $
+# $NetBSD: Makefile,v 1.25 2007/03/07 21:32:53 dmcmahill Exp $
 
 MOZILLA=		thunderbird
 COMMENT=		Mozilla mail client
+PKGREVISION=		1
 
 MOZILLA_USE_GTK2=	# yes
 MOZILLA_USE_XFT=	YES
diff --git a/mail/thunderbird/PLIST b/mail/thunderbird/PLIST
index 059f8e20096..03a57ef58f1 100644
--- a/mail/thunderbird/PLIST
+++ b/mail/thunderbird/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.19 2007/03/02 14:12:24 ghen Exp $
+@comment $NetBSD: PLIST,v 1.20 2007/03/07 21:32:53 dmcmahill Exp $
 bin/${MOZILLA}
 @comment begin PROGRAMS
 lib/${MOZILLA}/${MOZILLA_BIN}
@@ -70,7 +70,7 @@ lib/${MOZILLA}/components/libxmlextras.${SO_SUFFIX}
 lib/${MOZILLA}/components/libxpcom_compat_c.${SO_SUFFIX}
 lib/${MOZILLA}/components/libxpconnect.${SO_SUFFIX}
 lib/${MOZILLA}/components/libxpinstall.${SO_SUFFIX}
-lib/${MOZILLA}/libfreebl3.${SO_SUFFIX}
+@comment libfreebl
 lib/${MOZILLA}/libgfxpsshar.${SO_SUFFIX}
 lib/${MOZILLA}/libgkgfx.${SO_SUFFIX}
 lib/${MOZILLA}/libgtkembedmoz.${SO_SUFFIX}
@@ -91,8 +91,6 @@ lib/${MOZILLA}/libxpcom.${SO_SUFFIX}
 lib/${MOZILLA}/libxpcom_compat.${SO_SUFFIX}
 lib/${MOZILLA}/libxpcom_core.${SO_SUFFIX}
 lib/${MOZILLA}/libxpistub.${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}/LICENSE.txt
@@ -319,9 +317,7 @@ lib/${MOZILLA}/greprefs/xpinstall.js
 lib/${MOZILLA}/icons/mozicon16.xpm
 lib/${MOZILLA}/icons/mozicon50.xpm
 lib/${MOZILLA}/init.d/README
-lib/${MOZILLA}/libfreebl3.chk
-${SUNOSLIB}lib/${MOZILLA}/libfreebl_hybrid_3.chk
-${SUNOSLIB}lib/${MOZILLA}/libfreebl_pure32_3.chk
+@comment libfreebl.chk
 lib/${MOZILLA}/libsoftokn3.chk
 lib/${MOZILLA}/res/EditorOverride.css
 lib/${MOZILLA}/res/arrow.gif