[pkgsrc/trunk]: pkgsrc/mail Add .desktop file for GNOME/KDE/Xfce integration,...

[jmcneill <jmcneill%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/f1ca8549cbb9
branches:  trunk
changeset: 551976:f1ca8549cbb9
user:      jmcneill <jmcneill%pkgsrc.org@localhost>
date:      Sun Dec 21 17:04:40 2008 +0000

description:
Add .desktop file for GNOME/KDE/Xfce integration, bump PKGREVISION.
ok wiz@

diffstat:

 mail/thunderbird-gtk1/Makefile                |   3 ++-
 mail/thunderbird-gtk1/PLIST                   |   4 +++-
 mail/thunderbird/Makefile                     |   3 ++-
 mail/thunderbird/Makefile-thunderbird.common  |  12 +++++++++++-
 mail/thunderbird/PLIST                        |   4 +++-
 mail/thunderbird/files/thunderbird.desktop.in |  11 +++++++++++
 6 files changed, 32 insertions(+), 5 deletions(-)

diffs (101 lines):

diff -r 2db351e7f737 -r f1ca8549cbb9 mail/thunderbird-gtk1/Makefile
--- a/mail/thunderbird-gtk1/Makefile    Sun Dec 21 16:57:32 2008 +0000
+++ b/mail/thunderbird-gtk1/Makefile    Sun Dec 21 17:04:40 2008 +0000
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.17 2008/05/20 11:52:50 ghen Exp $
+# $NetBSD: Makefile,v 1.18 2008/12/21 17:05:29 jmcneill Exp $
 
 MOZILLA=       thunderbird-gtk1
+PKGREVISION=   1
 
 COMMENT=       Mozilla mail client using the older GTK1 toolkit
 
diff -r 2db351e7f737 -r f1ca8549cbb9 mail/thunderbird-gtk1/PLIST
--- a/mail/thunderbird-gtk1/PLIST       Sun Dec 21 16:57:32 2008 +0000
+++ b/mail/thunderbird-gtk1/PLIST       Sun Dec 21 17:04:40 2008 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.14 2008/08/22 09:42:15 ghen Exp $
+@comment $NetBSD: PLIST,v 1.15 2008/12/21 17:05:29 jmcneill Exp $
 bin/${MOZILLA}
 @comment begin PROGRAMS
 lib/${MOZILLA}/${MOZILLA_BIN}
@@ -2837,6 +2837,8 @@
 include/${MOZILLA}/nss/sslt.h
 include/${MOZILLA}/nss/watcomfx.h
 @comment end INCLUDE-PUBLIC
+share/applications/${MOZILLA}.desktop
+share/pixmaps/${MOZILLA}.xpm
 @exec env LD_LIBRARY_PATH=%D/lib/${MOZILLA} MOZILLA_FIVE_HOME=%D/lib/${MOZILLA} %D/lib/${MOZILLA}/regxpcom
 @unexec ${RM} -f %D/lib/${MOZILLA}/chrome/app-chrome.manifest
 @unexec ${RM} %D/lib/${MOZILLA}/components/compreg.dat
diff -r 2db351e7f737 -r f1ca8549cbb9 mail/thunderbird/Makefile
--- a/mail/thunderbird/Makefile Sun Dec 21 16:57:32 2008 +0000
+++ b/mail/thunderbird/Makefile Sun Dec 21 17:04:40 2008 +0000
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.30 2007/11/15 15:05:22 tron Exp $
+# $NetBSD: Makefile,v 1.31 2008/12/21 17:04:40 jmcneill Exp $
 
 MOZILLA=               thunderbird
+PKGREVISION=           1
 COMMENT=               Mozilla mail client
 
 MOZILLA_USE_GTK2=      # yes
diff -r 2db351e7f737 -r f1ca8549cbb9 mail/thunderbird/Makefile-thunderbird.common
--- a/mail/thunderbird/Makefile-thunderbird.common      Sun Dec 21 16:57:32 2008 +0000
+++ b/mail/thunderbird/Makefile-thunderbird.common      Sun Dec 21 17:04:40 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile-thunderbird.common,v 1.39 2008/12/19 07:59:26 roy Exp $
+# $NetBSD: Makefile-thunderbird.common,v 1.40 2008/12/21 17:04:40 jmcneill Exp $
 # used by mail/thunderbird/Makefile
 # used by mail/thunderbird-gtk1/Makefile
 
@@ -29,6 +29,16 @@
 
 post-install:
        ${FIND} ${DESTDIR:Q}${PREFIX:Q}/lib/${MOZILLA}/defaults -type f -exec ${CHMOD} u+w {} \;
+       ${SED}          \
+               -e 's|@MOZILLA@|${MOZILLA}|g' \
+               -e 's|@MOZILLA_NAME@|Thunderbird|g' \
+               -e 's|@MOZILLA_ICON@|${MOZILLA}.xpm|g' \
+               < ${.CURDIR}/../../mail/thunderbird/files/thunderbird.desktop.in \
+               > ${WRKDIR}/${MOZILLA}.desktop
+       ${INSTALL_DATA} ${WRKDIR}/${MOZILLA}.desktop \
+           ${DESTDIR:Q}${PREFIX:Q}/share/applications/${MOZILLA}.desktop
+       ${LN} -sf ${DESTDIR:Q}${PREFIX:Q}/lib/${MOZILLA}/chrome/icons/default/default.xpm \
+           ${DESTDIR:Q}${PREFIX:Q}/share/pixmaps/${MOZILLA}.xpm
 
 .include "../../mk/bsd.fast.prefs.mk"
 
diff -r 2db351e7f737 -r f1ca8549cbb9 mail/thunderbird/PLIST
--- a/mail/thunderbird/PLIST    Sun Dec 21 16:57:32 2008 +0000
+++ b/mail/thunderbird/PLIST    Sun Dec 21 17:04:40 2008 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.24 2008/08/22 09:42:15 ghen Exp $
+@comment $NetBSD: PLIST,v 1.25 2008/12/21 17:04:40 jmcneill Exp $
 bin/${MOZILLA}
 @comment begin PROGRAMS
 lib/${MOZILLA}/${MOZILLA_BIN}
@@ -2847,6 +2847,8 @@
 include/${MOZILLA}/nss/sslt.h
 include/${MOZILLA}/nss/watcomfx.h
 @comment end INCLUDE-PUBLIC
+share/applications/${MOZILLA}.desktop
+share/pixmaps/${MOZILLA}.xpm
 @exec env LD_LIBRARY_PATH=%D/lib/${MOZILLA}:%D/lib MOZILLA_FIVE_HOME=%D/lib/${MOZILLA} %D/lib/${MOZILLA}/regxpcom
 @unexec ${RM} -f %D/lib/${MOZILLA}/chrome/app-chrome.manifest
 @unexec ${RM} %D/lib/${MOZILLA}/components/compreg.dat
diff -r 2db351e7f737 -r f1ca8549cbb9 mail/thunderbird/files/thunderbird.desktop.in
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/mail/thunderbird/files/thunderbird.desktop.in     Sun Dec 21 17:04:40 2008 +0000
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=@MOZILLA_NAME@
+GenericName=Mail Client
+Comment=Mail client and News Reader
+Exec=@MOZILLA@ %U
+Icon=@MOZILLA_ICON@
+StartupNotify=false
+Terminal=false
+Type=Application
+Categories=Application;Network;