Try to install share/applications/sylpheed.desktop instead of

share/gnome/applications/sylpheed.desktop.

Suggested by:	marcus, mezz

2 files changed, 7 insertions, 10 deletions

diff --git a/mail/sylpheed2-devel/Makefile b/mail/sylpheed2-devel/Makefile
index 17e55e9d1ebf..a1ec3c89c13d 100644
--- a/mail/sylpheed2-devel/Makefile
+++ b/mail/sylpheed2-devel/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	sylpheed
 PORTVERSION=	2.2.0
+PORTREVISION=	1
 CATEGORIES=	mail ipv6
 MASTER_SITES=	http://sylpheed.good-day.net/sylpheed/v2.2/ \
 		${MASTER_SITE_SOURCEFORGE}
@@ -28,7 +29,6 @@ USE_ICONV=	yes
 USE_X_PREFIX=	yes
 USE_GNOME=	gtk20
 GNU_CONFIGURE=	yes
-USE_REINPLACE=	yes
 
 CONFIGURE_ENV=	CPPFLAGS="-I${PREFIX}/include -I${LOCALBASE}/include -I${X11BASE}/include" \
 		LIBS="-L${PREFIX}/lib -L${LOCALBASE}/lib -L${X11BASE}/lib"
@@ -93,11 +93,6 @@ CONFIGURE_ARGS+=--enable-gtkspell
 CONFIGURE_ARGS+=--disable-gtkspell
 .endif
 
-.if defined(WITH_GNOME)
-PLIST_FILES=	share/gnome/applications/sylpheed.desktop \
-		share/gnome/pixmaps/sylpheed.png
-.endif
-
 MAKEFILES=	Makefile.in ac/Makefile.in faq/Makefile.in faq/de/Makefile.in \
 		faq/en/Makefile.in faq/es/Makefile.in faq/fr/Makefile.in \
 		faq/it/Makefile.in manual/Makefile.in manual/en/Makefile.in \
@@ -122,6 +117,8 @@ post-patch:
 .endif
 
 post-install:
+	@${INSTALL_DATA} ${WRKSRC}/sylpheed.png ${PREFIX}/share/pixmaps/
+	@${INSTALL_DATA} ${WRKSRC}/sylpheed.desktop ${PREFIX}/share/applications/
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 .for i in ChangeLog INSTALL README TODO
@@ -129,9 +126,5 @@ post-install:
 	@${INSTALL_DATA} ${WRKSRC}/${i}.ja ${DOCSDIR}
 .endfor
 .endif
-.if defined(WITH_GNOME)
-	@${INSTALL_DATA} ${WRKSRC}/sylpheed.png ${PREFIX}/share/gnome/pixmaps/
-	@${INSTALL_DATA} ${WRKSRC}/sylpheed.desktop ${PREFIX}/share/gnome/applications/
-.endif
 
 .include <bsd.port.post.mk>
diff --git a/mail/sylpheed2-devel/pkg-plist b/mail/sylpheed2-devel/pkg-plist
index 5cefe13806ce..c1220e31e336 100644
--- a/mail/sylpheed2-devel/pkg-plist
+++ b/mail/sylpheed2-devel/pkg-plist
@@ -1,4 +1,6 @@
 bin/sylpheed
+share/applications/sylpheed.desktop
+share/pixmaps/sylpheed.png
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog.ja
 %%PORTDOCS%%%%DOCSDIR%%/INSTALL
@@ -111,5 +113,7 @@ share/locale/zh_TW/LC_MESSAGES/sylpheed.mo
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/faq/de
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/faq
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
+@dirrmtry share/pixmaps
 @dirrmtry share/locale/lt/LC_MESSAGES
 @dirrmtry share/locale/lt
+@dirrmtry share/applications