[pkgsrc/pkgsrc-2008Q4]: pkgsrc/mail Pullup ticket #2624 - requested by ghen

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/a8f58d50a75a
branches:  pkgsrc-2008Q4
changeset: 552219:a8f58d50a75a
user:      tron <tron%pkgsrc.org@localhost>
date:      Wed Jan 07 16:50:30 2009 +0000

description:
Pullup ticket #2624 - requested by ghen
thunderbird: build fix
thunderbird-gtk1: build fix

Revisions pulled up:
- mail/thunderbird-gtk1/Makefile                1.20
- mail/thunderbird-gtk1/PLIST                   1.16
- mail/thunderbird/Makefile                     1.33
- mail/thunderbird/Makefile-thunderbird.common  1.42
- mail/thunderbird/PLIST                        1.26
---
Module Name:    pkgsrc
Committed By:   ghen
Date:           Wed Jan  7 14:23:03 UTC 2009

Modified Files:
        pkgsrc/mail/thunderbird: Makefile Makefile-thunderbird.common PLIST
        pkgsrc/mail/thunderbird-gtk1: Makefile PLIST

Log Message:
Include xdg-dirs for the share/applications and share/pixmaps directories,
otherwise thunderbird doesn't install properly if these directories don't
exist on the system, noted by tron.  Bump PKGREVISION, brick jmcneill. ;-)

diffstat:

 mail/thunderbird-gtk1/Makefile               |  3 ++-
 mail/thunderbird-gtk1/PLIST                  |  4 +++-
 mail/thunderbird/Makefile                    |  3 ++-
 mail/thunderbird/Makefile-thunderbird.common |  4 +++-
 mail/thunderbird/PLIST                       |  4 +++-
 5 files changed, 13 insertions(+), 5 deletions(-)

diffs (78 lines):

diff -r be71385534b6 -r a8f58d50a75a mail/thunderbird-gtk1/Makefile
--- a/mail/thunderbird-gtk1/Makefile    Wed Jan 07 14:09:08 2009 +0000
+++ b/mail/thunderbird-gtk1/Makefile    Wed Jan 07 16:50:30 2009 +0000
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.18.2.1 2009/01/07 13:40:51 tron Exp $
+# $NetBSD: Makefile,v 1.18.2.2 2009/01/07 16:50:30 tron Exp $
 
 MOZILLA=       thunderbird-gtk1
+PKGREVISION=   1
 
 COMMENT=       Mozilla mail client using the older GTK1 toolkit
 
diff -r be71385534b6 -r a8f58d50a75a mail/thunderbird-gtk1/PLIST
--- a/mail/thunderbird-gtk1/PLIST       Wed Jan 07 14:09:08 2009 +0000
+++ b/mail/thunderbird-gtk1/PLIST       Wed Jan 07 16:50:30 2009 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.15 2008/12/21 17:05:29 jmcneill Exp $
+@comment $NetBSD: PLIST,v 1.15.2.1 2009/01/07 16:50:30 tron Exp $
 bin/${MOZILLA}
 @comment begin PROGRAMS
 lib/${MOZILLA}/${MOZILLA_BIN}
@@ -2844,6 +2844,8 @@
 @unexec ${RM} %D/lib/${MOZILLA}/components/compreg.dat
 @unexec ${RM} %D/lib/${MOZILLA}/components/xpti.dat
 @comment begin DIRS
+@comment in xdg-dirs: @dirrm share/pixmaps
+@comment in xdg-dirs: @dirrm share/applications
 @dirrm lib/${MOZILLA}/res/throbber
 @dirrm lib/${MOZILLA}/res/samples/sampleimages
 @dirrm lib/${MOZILLA}/res/samples
diff -r be71385534b6 -r a8f58d50a75a mail/thunderbird/Makefile
--- a/mail/thunderbird/Makefile Wed Jan 07 14:09:08 2009 +0000
+++ b/mail/thunderbird/Makefile Wed Jan 07 16:50:30 2009 +0000
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.31.2.1 2009/01/07 13:40:51 tron Exp $
+# $NetBSD: Makefile,v 1.31.2.2 2009/01/07 16:50:30 tron Exp $
 
 MOZILLA=               thunderbird
+PKGREVISION=           1
 COMMENT=               Mozilla mail client
 
 MOZILLA_USE_GTK2=      # yes
diff -r be71385534b6 -r a8f58d50a75a mail/thunderbird/Makefile-thunderbird.common
--- a/mail/thunderbird/Makefile-thunderbird.common      Wed Jan 07 14:09:08 2009 +0000
+++ b/mail/thunderbird/Makefile-thunderbird.common      Wed Jan 07 16:50:30 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile-thunderbird.common,v 1.40.2.1 2009/01/07 13:40:51 tron Exp $
+# $NetBSD: Makefile-thunderbird.common,v 1.40.2.2 2009/01/07 16:50:30 tron Exp $
 # used by mail/thunderbird/Makefile
 # used by mail/thunderbird-gtk1/Makefile
 
@@ -27,6 +27,8 @@
 
 INSTALL_TEMPLATES+=    ${.CURDIR}/../../mail/thunderbird/INSTALL
 
+USE_DIRS+=             xdg-1.4
+
 post-install:
        ${FIND} ${DESTDIR:Q}${PREFIX:Q}/lib/${MOZILLA}/defaults -type f -exec ${CHMOD} u+w {} \;
        ${SED}          \
diff -r be71385534b6 -r a8f58d50a75a mail/thunderbird/PLIST
--- a/mail/thunderbird/PLIST    Wed Jan 07 14:09:08 2009 +0000
+++ b/mail/thunderbird/PLIST    Wed Jan 07 16:50:30 2009 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.25 2008/12/21 17:04:40 jmcneill Exp $
+@comment $NetBSD: PLIST,v 1.25.2.1 2009/01/07 16:50:30 tron Exp $
 bin/${MOZILLA}
 @comment begin PROGRAMS
 lib/${MOZILLA}/${MOZILLA_BIN}
@@ -2854,6 +2854,8 @@
 @unexec ${RM} %D/lib/${MOZILLA}/components/compreg.dat
 @unexec ${RM} %D/lib/${MOZILLA}/components/xpti.dat
 @comment begin DIRS
+@comment in xdg-dirs: @dirrm share/pixmaps
+@comment in xdg-dirs: @dirrm share/applications
 @dirrm lib/${MOZILLA}/res/throbber
 @dirrm lib/${MOZILLA}/res/samples/sampleimages
 @dirrm lib/${MOZILLA}/res/samples