* Update to 1.5.b1 [1]

* Install as thunderbird-devel to allow for parallel installation with
  mail/thunderbird

Submitted by:	Marcus Alves Grando <marcus@corp.grupos.com.br> [1]


git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@4829 df743ca5-7f9a-e211-a948-0013205c9059

3 files changed, 20 insertions, 17 deletions

diff --git a/mail/thunderbird-devel/Makefile b/mail/thunderbird-devel/Makefile
index d7a200d99..d2554d2c1 100644
--- a/mail/thunderbird-devel/Makefile
+++ b/mail/thunderbird-devel/Makefile
@@ -3,15 +3,16 @@
 # Whom:				Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/mail/thunderbird-devel/Makefile,v 1.6 2005/06/28 05:40:07 adamw Exp $
+#   $MCom: ports/mail/thunderbird-devel/Makefile,v 1.7 2005/08/19 02:14:18 mezz Exp $
 #
 
 PORTNAME=	thunderbird
-PORTVERSION=	1.1.a1
+DISTVERSION=	1.5b1
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_MOZILLA}
-MASTER_SITE_SUBDIR=	thunderbird/releases/1.1a1/source
-DISTNAME=	${PORTNAME}-1.1a1-source
+MASTER_SITE_SUBDIR=	thunderbird/releases/${DISTVERSION}/source
+PKGNAMESUFFIX=	-devel
+DISTNAME=	${PORTNAME}-${DISTVERSION}-source
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Mozilla Thunderbird is standalone mail and news that stands above
@@ -45,11 +46,12 @@ LOCAL_SUBDIR=		lib/${PORTNAME}
 LOCAL_PREFIX=		${PREFIX}/${LOCAL_SUBDIR}
 ESD_LIB=		libesd.so.2
 
-THUNDERBIRD=		${PORTNAME}
-THUNDERBIRD_ICON_SRC=	${LOCAL_PREFIX}/lib/thunderbird-1.0+/icons/default.xpm
+THUNDERBIRD=		${PORTNAME}${PKGNAMESUFFIX}
+THUNDERBIRD_VER=	1.4
+THUNDERBIRD_ICON_SRC=	${LOCAL_PREFIX}/lib/${THUNDERBIRD}-${THUNDERBIRD_VER}/icons/default.xpm
 THUNDERBIRD_ICON=	${PORTNAME}.xpm
 MOZ_PIS_SCRIPTS=	S50cleanhome
-SCRIPTS_DIR=		${FAKEDIR}/${LOCAL_SUBDIR}/lib/${PORTNAME}-${PORTVERSION}
+SCRIPTS_DIR=		${FAKEDIR}/${LOCAL_SUBDIR}/lib/${PORTNAME}-${THUNDERBIRD_VER}
 MOZ_PIS_DIR=		${SCRIPTS_DIR}/init.d
 
 OPTIONS=	DEBUG "Build a debugging image" off \
@@ -130,11 +132,6 @@ post-patch:
 		${WRKSRC}/configure \
 		${WRKSRC}/intl/uconv/native/nsNativeUConvService.cpp \
 		${WRKSRC}/xpcom/io/nsNativeCharsetUtils.cpp
-	@${SED} -e 's|%%MOZDIR%%|${LOCAL_PREFIX}/lib/${PORTNAME}-1.0+|g ; \
-		s|%%X11BASE%%|${X11BASE}|g' \
-		< ${MASTERDIR}/pkg-install.in > ${PKGINSTALL}
-	@${SED} -e 's|%%MOZDIR%%|${LOCAL_PREFIX}/lib/${PORTNAME}-1.0+|g' \
-		< ${MASTERDIR}/pkg-deinstall.in > ${PKGDEINSTALL}
 	@${SED} -e 's|@THUNDERBIRD_ICON@|${THUNDERBIRD_ICON}|' \
 		< ${FILESDIR}/thunderbird.desktop.in > ${WRKDIR}/thunderbird.desktop
 .for ii in ${MOZ_PIS_SCRIPTS}
@@ -151,6 +148,11 @@ pre-configure:
 	fi
 
 pre-install:
+	@${SED} -e 's|%%MOZDIR%%|${LOCAL_PREFIX}/lib/${PORTNAME}-${THUNDERBIRD_VER}|g ; \
+		s|%%X11BASE%%|${X11BASE}|g' \
+		< ${MASTERDIR}/pkg-install.in > ${PKGINSTALL}
+	@${SED} -e 's|%%MOZDIR%%|${LOCAL_PREFIX}/lib/${PORTNAME}-${THUNDERBIRD_VER}|g' \
+		< ${MASTERDIR}/pkg-deinstall.in > ${PKGDEINSTALL}
 # Overview:  the program installs itself in FAKEDIR, then a list is made of the
 # files and directories in there.  This is the PLIST (packing list) for the
 # package, replacing the traditional pkg-plist file.
@@ -159,6 +161,7 @@ pre-install:
 		Makefile ${MAKE_ARGS} ${INSTALL_TARGET}
 	@${MKDIR} ${SCRIPTS_DIR}
 	@${MKDIR} ${MOZ_PIS_DIR}
+	${RM} -rf ${FAKEDIR}/lib/${THUNDERBIRD}/lib/${THUNDERBIRD}-${THUNDERBIRD_VER}/extensions
 .for ii in mac win
 .for jj in / .jar
 	@${RM} -rf ${FAKEDIR}/lib/${PORTNAME}/lib/${PORTNAME}-${PORTVERSION}/chrome/en-${ii}${jj}
@@ -204,9 +207,8 @@ post-install:
 		${LOCAL_PREFIX}/bin/thunderbird-config
 	${FIND} ${LOCAL_PREFIX}/lib/pkgconfig -type f | ${XARGS} \
 		${PERL} -pi -e 's|${FAKEDIR}|${PREFIX}|g'
-	${MKDIR} ${PREFIX}/share/applications
+	${MKDIR} ${PREFIX}/share/applications ${PREFIX}/share/pixmaps
 	${INSTALL_DATA} ${WRKDIR}/thunderbird.desktop ${PREFIX}/share/applications
-	${INSTALL_DATA} ${WRKSRC}/other-licenses/branding/thunderbird/default.xpm ${THUNDERBIRD_ICON_SRC}
 	${LN} -sf ${THUNDERBIRD_ICON_SRC} ${PREFIX}/share/pixmaps/${THUNDERBIRD_ICON}
 
 .include <bsd.port.post.mk>
diff --git a/mail/thunderbird-devel/distinfo b/mail/thunderbird-devel/distinfo
index 5f1803a3a..53acbf755 100644
--- a/mail/thunderbird-devel/distinfo
+++ b/mail/thunderbird-devel/distinfo
@@ -1,2 +1,2 @@
-MD5 (thunderbird-1.1a1-source.tar.bz2) = 3497e03dbaf4ea996980f1e28dd6c81d
-SIZE (thunderbird-1.1a1-source.tar.bz2) = 34116075
+MD5 (thunderbird-1.5b1-source.tar.bz2) = 5fffd977cc4c873731bc15b13c5503b0
+SIZE (thunderbird-1.5b1-source.tar.bz2) = 34733709
diff --git a/mail/thunderbird-devel/pkg-deinstall.in b/mail/thunderbird-devel/pkg-deinstall.in
index d8d555153..882205445 100644
--- a/mail/thunderbird-devel/pkg-deinstall.in
+++ b/mail/thunderbird-devel/pkg-deinstall.in
@@ -1,7 +1,7 @@
 #!/bin/sh
 #
 # $FreeBSD$
-#   $MCom$
+#   $MCom: ports/mail/thunderbird-devel/pkg-deinstall.in,v 1.5 2005/06/28 05:40:07 adamw Exp $
 #
 # Date created:			Mon Nov 29, 2003
 # Whom:				Thierry Thomas (<thierry@pompo.net>)
@@ -22,5 +22,6 @@ rm -f ${MOZDIR}/components.ini
 rm -f ${MOZDIR}/defaults.ini
 rm -f ${MOZDIR}/components/*.dat
 rm -rf ${MOZDIR}/extensions
+rm -rf ${MOZDIR}/updates
 
 exit 0