Fix the GNOME desktop file handling.

This is a (little bit) modified version of the submitted patch.

Submitted by: 	Piotr Smyrak <piotr.smyrak@heron.pl>

6 files changed, 54 insertions, 4 deletions

diff --git a/mail/claws-mail/Makefile b/mail/claws-mail/Makefile
index 3032e5502670..1370c4e301eb 100644
--- a/mail/claws-mail/Makefile
+++ b/mail/claws-mail/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	sylpheed-claws
 PORTVERSION=	0.9.13
+PORTREVISION=	1
 CATEGORIES=	mail news ipv6
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	sylpheed-claws
@@ -198,6 +199,11 @@ post-install:
 		maildir2sylpheed.pl multiwebsearch.conf multiwebsearch.pl \
 		nautilus2sylpheed.sh outlook2sylpheed.pl tb2sylpheed\
 		textviewer.sh update-po uudec vcard2xml.py ${DATADIR}
+
+.if ${HAVE_GNOME:Mgnomehier} != ""
+	@${INSTALL_DATA} ${WRKSRC}/sylpheed.desktop ${PREFIX}/share/gnome/apps/Internet/sylpheed-claws.desktop
+.endif
+
 .if !defined(WITHOUT_THEMES)
 	@${MKDIR} ${DATADIR}/themes
 	@cd ${WRKDIR}/${THEMEFILE:C/.tar.gz//} && ${FIND} . -print | \
diff --git a/mail/claws-mail/files/patch-sylpheed.desktop b/mail/claws-mail/files/patch-sylpheed.desktop
new file mode 100644
index 000000000000..163b639afe9d
--- /dev/null
+++ b/mail/claws-mail/files/patch-sylpheed.desktop
@@ -0,0 +1,20 @@
+--- sylpheed.desktop.orig	Mon Dec 13 13:41:28 2004
++++ sylpheed.desktop	Mon Dec 13 13:44:45 2004
+@@ -1,10 +1,13 @@
+ [Desktop Entry]
+-Name=Sylpheed
+-Name[ja]=Sylpheed
++Version=1.0
++Encoding=UTF-8
++Name=Sylpheed Claws
++Name[ja]=Sylpheed Claws
+ Comment=E-Mail client
+ Comment[ja]=電子メールクライアント
+-Exec=sylpheed
+-Icon=sylpheed.png
++Comment[pl]=Klient poczty elektronicznej
++Exec=sylpheed-claws
++Icon=sylpheed-claws.png
+ Terminal=0
+ Type=Application
+ Categories=Application;Network;
diff --git a/mail/claws-mail/pkg-plist b/mail/claws-mail/pkg-plist
index 286e829946fa..9b01212c5f1d 100644
--- a/mail/claws-mail/pkg-plist
+++ b/mail/claws-mail/pkg-plist
@@ -354,8 +354,7 @@ share/locale/sv/LC_MESSAGES/sylpheed-claws.mo
 share/locale/zh_CN/LC_MESSAGES/sylpheed-claws.mo
 share/locale/zh_TW.Big5/LC_MESSAGES/sylpheed-claws.mo
 share/pixmaps/sylpheed-claws.png
-%%GNOME%%share/gnome/pixmaps/sylpheed.png
-%%GNOME%%share/gnome/apps/Internet/sylpheed.desktop
+%%GNOME%%share/gnome/apps/Internet/sylpheed-claws.desktop
 %%DATADIR%%/OOo2sylpheed.pl
 %%DATADIR%%/calypso_convert.pl
 %%DATADIR%%/convert_mbox.pl
diff --git a/mail/sylpheed-claws/Makefile b/mail/sylpheed-claws/Makefile
index 3032e5502670..1370c4e301eb 100644
--- a/mail/sylpheed-claws/Makefile
+++ b/mail/sylpheed-claws/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	sylpheed-claws
 PORTVERSION=	0.9.13
+PORTREVISION=	1
 CATEGORIES=	mail news ipv6
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	sylpheed-claws
@@ -198,6 +199,11 @@ post-install:
 		maildir2sylpheed.pl multiwebsearch.conf multiwebsearch.pl \
 		nautilus2sylpheed.sh outlook2sylpheed.pl tb2sylpheed\
 		textviewer.sh update-po uudec vcard2xml.py ${DATADIR}
+
+.if ${HAVE_GNOME:Mgnomehier} != ""
+	@${INSTALL_DATA} ${WRKSRC}/sylpheed.desktop ${PREFIX}/share/gnome/apps/Internet/sylpheed-claws.desktop
+.endif
+
 .if !defined(WITHOUT_THEMES)
 	@${MKDIR} ${DATADIR}/themes
 	@cd ${WRKDIR}/${THEMEFILE:C/.tar.gz//} && ${FIND} . -print | \
diff --git a/mail/sylpheed-claws/files/patch-sylpheed.desktop b/mail/sylpheed-claws/files/patch-sylpheed.desktop
new file mode 100644
index 000000000000..163b639afe9d
--- /dev/null
+++ b/mail/sylpheed-claws/files/patch-sylpheed.desktop
@@ -0,0 +1,20 @@
+--- sylpheed.desktop.orig	Mon Dec 13 13:41:28 2004
++++ sylpheed.desktop	Mon Dec 13 13:44:45 2004
+@@ -1,10 +1,13 @@
+ [Desktop Entry]
+-Name=Sylpheed
+-Name[ja]=Sylpheed
++Version=1.0
++Encoding=UTF-8
++Name=Sylpheed Claws
++Name[ja]=Sylpheed Claws
+ Comment=E-Mail client
+ Comment[ja]=電子メールクライアント
+-Exec=sylpheed
+-Icon=sylpheed.png
++Comment[pl]=Klient poczty elektronicznej
++Exec=sylpheed-claws
++Icon=sylpheed-claws.png
+ Terminal=0
+ Type=Application
+ Categories=Application;Network;
diff --git a/mail/sylpheed-claws/pkg-plist b/mail/sylpheed-claws/pkg-plist
index 286e829946fa..9b01212c5f1d 100644
--- a/mail/sylpheed-claws/pkg-plist
+++ b/mail/sylpheed-claws/pkg-plist
@@ -354,8 +354,7 @@ share/locale/sv/LC_MESSAGES/sylpheed-claws.mo
 share/locale/zh_CN/LC_MESSAGES/sylpheed-claws.mo
 share/locale/zh_TW.Big5/LC_MESSAGES/sylpheed-claws.mo
 share/pixmaps/sylpheed-claws.png
-%%GNOME%%share/gnome/pixmaps/sylpheed.png
-%%GNOME%%share/gnome/apps/Internet/sylpheed.desktop
+%%GNOME%%share/gnome/apps/Internet/sylpheed-claws.desktop
 %%DATADIR%%/OOo2sylpheed.pl
 %%DATADIR%%/calypso_convert.pl
 %%DATADIR%%/convert_mbox.pl