[SVN-Commit] r217 - branches/experimental/mail/thunderbird3 trunk/mail/thunderbird3

[svn-freebsd-gecko at chruetertee.ch]

Author: beat
Date: Fri Dec 18 21:16:04 2009
New Revision: 217

Log:
- Fix installation of desktop icon
- Bump PORTREVISION

Reported by:	Guoqin Ren on forums.freebsd.org
Submitted by:	Yuri Pankov via forums.freebsd.org / IRC

Modified:
   branches/experimental/mail/thunderbird3/Makefile
   trunk/mail/thunderbird3/Makefile

Modified: branches/experimental/mail/thunderbird3/Makefile
==============================================================================
--- branches/experimental/mail/thunderbird3/Makefile	Fri Dec 18 18:52:33 2009	(r216)
+++ branches/experimental/mail/thunderbird3/Makefile	Fri Dec 18 21:16:04 2009	(r217)
@@ -2,11 +2,12 @@
 # Date created:         4 September 2003
 # Whom:             Joe Marcus Clarke <marcus at FreeBSD.org>
 #
-# $FreeBSD$
+# $FreeBSD: ports/mail/thunderbird3/Makefile,v 1.110 2009/12/14 15:35:17 beat Exp $
 #
 
 PORTNAME=	thunderbird
 DISTVERSION=	3.0
+PORTREVISION=	1
 CATEGORIES=	mail ipv6
 MASTER_SITES=	${MASTER_SITE_MOZILLA}
 MASTER_SITE_SUBDIR=	${PORTNAME}/releases/${DISTVERSION}/source/
@@ -45,7 +46,8 @@
 MOZILLA_PLIST_DIRS=	bin lib
 MOZ_PKGCONFIG_FILES=
 
-PORTNAME_ICON=	${PREFIX}/lib/${PORTNAME}/icons/default.xpm
+PORTNAME_ICON=	${PORTNAME}.png
+PORTNAME_ICON_SRC=	${PREFIX}/lib/${MOZILLA}/chrome/icons/default/default48.png
 
 SYSTEM_PREFS=	${FAKEDIR}/lib/${PORTNAME}-${PORTVERSION}/defaults/pref/${PORTNAME}.js
 MOZ_PIS_SCRIPTS=moz_pis_S50cleanhome
@@ -80,8 +82,7 @@
 .endif
 
 post-extract::
-	${SED} -e 's|@MOZILLA_ICON@|${MOZILLA_ICON}|' -e 's|@MOZILLA@|${MOZILLA}|' \
-		-e 's|@MOZILLA_NAME@|${MOZILLA_NAME}|' \
+	${SED} -e 's|@PORTNAME_ICON@|${PORTNAME_ICON}|' \
 		<${FILESDIR}/thunderbird.desktop.in >${WRKDIR}/${MOZILLA_EXEC_NAME}.desktop
 	${LN} -s  ${WRKSRC}/mail ${WRKSRC}/mozilla/mail
 
@@ -113,9 +114,11 @@
 pre-install:
 	@${ECHO_CMD} 'share/applications/${PORTNAME}.desktop' >> ${PLIST}
 	@${ECHO_CMD} '@dirrmtry share/applications' >> ${PLIST}
+	@${ECHO_CMD} 'share/pixmaps/${PORTNAME_ICON}' >> ${PLIST}
 
 post-install:
 	${MKDIR} ${PREFIX}/share/applications
 	${INSTALL_DATA} ${WRKDIR}/${MOZILLA_EXEC_NAME}.desktop ${PREFIX}/share/applications
+	${LN} -sf ${PORTNAME_ICON_SRC} ${PREFIX}/share/pixmaps/${PORTNAME_ICON}
 
 .include <bsd.port.post.mk>

Modified: trunk/mail/thunderbird3/Makefile
==============================================================================
--- trunk/mail/thunderbird3/Makefile	Fri Dec 18 18:52:33 2009	(r216)
+++ trunk/mail/thunderbird3/Makefile	Fri Dec 18 21:16:04 2009	(r217)
@@ -7,6 +7,7 @@
 
 PORTNAME=	thunderbird
 DISTVERSION=	3.0
+PORTREVISION=	1
 CATEGORIES=	mail ipv6
 MASTER_SITES=	${MASTER_SITE_MOZILLA}
 MASTER_SITE_SUBDIR=	${PORTNAME}/releases/${DISTVERSION}/source/
@@ -45,7 +46,8 @@
 MOZILLA_PLIST_DIRS=	bin lib
 MOZ_PKGCONFIG_FILES=
 
-PORTNAME_ICON=	${PREFIX}/lib/${PORTNAME}/icons/default.xpm
+PORTNAME_ICON=	${PORTNAME}.png
+PORTNAME_ICON_SRC=	${PREFIX}/lib/${MOZILLA}/chrome/icons/default/default48.png
 
 SYSTEM_PREFS=	${FAKEDIR}/lib/${PORTNAME}-${PORTVERSION}/defaults/pref/${PORTNAME}.js
 MOZ_PIS_SCRIPTS=moz_pis_S50cleanhome
@@ -80,8 +82,7 @@
 .endif
 
 post-extract::
-	${SED} -e 's|@MOZILLA_ICON@|${MOZILLA_ICON}|' -e 's|@MOZILLA@|${MOZILLA}|' \
-		-e 's|@MOZILLA_NAME@|${MOZILLA_NAME}|' \
+	${SED} -e 's|@PORTNAME_ICON@|${PORTNAME_ICON}|' \
 		<${FILESDIR}/thunderbird.desktop.in >${WRKDIR}/${MOZILLA_EXEC_NAME}.desktop
 	${LN} -s  ${WRKSRC}/mail ${WRKSRC}/mozilla/mail
 
@@ -113,9 +114,11 @@
 pre-install:
 	@${ECHO_CMD} 'share/applications/${PORTNAME}.desktop' >> ${PLIST}
 	@${ECHO_CMD} '@dirrmtry share/applications' >> ${PLIST}
+	@${ECHO_CMD} 'share/pixmaps/${PORTNAME_ICON}' >> ${PLIST}
 
 post-install:
 	${MKDIR} ${PREFIX}/share/applications
 	${INSTALL_DATA} ${WRKDIR}/${MOZILLA_EXEC_NAME}.desktop ${PREFIX}/share/applications
+	${LN} -sf ${PORTNAME_ICON_SRC} ${PREFIX}/share/pixmaps/${PORTNAME_ICON}
 
 .include <bsd.port.post.mk>