6 files changed, 50 insertions, 56 deletions

diff --git a/mail/claws-mail/Makefile b/mail/claws-mail/Makefile
index ecbb50ff6bbb..13cab1d7efca 100644
--- a/mail/claws-mail/Makefile
+++ b/mail/claws-mail/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	sylpheed-claws
-PORTVERSION=	2.0.0
-PORTREVISION=	3
+PORTVERSION=	2.1.0
 CATEGORIES=	mail news ipv6
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	sylpheed-claws
@@ -31,7 +30,6 @@ USE_GMAKE=	yes
 USE_ICONV=	yes
 USE_X_PREFIX=	yes
 USE_GNOME=	gnomehack pkgconfig gtk20
-USE_REINPLACE=	yes
 USE_AUTOTOOLS=	autoconf:259 libtool:15
 USE_GCC=	3.3+
 WANT_GNOME=	yes
@@ -75,14 +73,6 @@ CONFIGURE_ENV+=	OPENSSL_CFLAGS="-I${OPENSSLINC}" \
 CONFIGURE_ARGS+=	--disable-openssl
 .endif
 
-.if ${HAVE_GNOME:Mgnomehier} != "" || defined(WITH_GNOMEPRINT)
-USE_GNOME+=	gnomehier
-PLIST_SUB+=	GNOME=""
-USE_GNOME+=	gnomehier
-.else
-PLIST_SUB+=	GNOME="@comment "
-.endif
-
 .if ${HAVE_GNOME:Mgnomeprint} != "" || defined(WITH_GNOMEPRINT)
 PLIST_SUB+=     	GNOMEPRINT=""
 USE_GNOME+=		libgnomeprint libgnomeprintui
@@ -198,12 +188,8 @@ post-install:
 		multiwebsearch.pl nautilus2sylpheed.sh outlook2sylpheed.pl \
 		tb2sylpheed textviewer.sh update-po uudec vcard2xml.py \
 		${DATADIR}
-
-.if ${HAVE_GNOME:Mgnomehier} != ""
-	@${MKDIR} ${PREFIX}/share/gnome/applications
-	@${INSTALL_DATA} ${WRKSRC}/sylpheed-claws.desktop ${PREFIX}/share/gnome/applications/
-.endif
-
+	@${MKDIR} ${PREFIX}/share/applications
+	@${INSTALL_DATA} ${WRKSRC}/sylpheed-claws.desktop ${PREFIX}/share/applications/
 .if !defined(WITHOUT_THEMES)
 	@${MKDIR} ${DATADIR}/themes
 	@cd ${WRKDIR}/${THEMEFILE:C/.tar.gz//} && ${FIND} . -print | \
diff --git a/mail/claws-mail/distinfo b/mail/claws-mail/distinfo
index d8b4db3ca766..14e93aa55259 100644
--- a/mail/claws-mail/distinfo
+++ b/mail/claws-mail/distinfo
@@ -1,6 +1,6 @@
-MD5 (sylpheed-claws-2.0.0.tar.bz2) = 6e26f8e36772b71361d0c463b9a6c7a1
-SHA256 (sylpheed-claws-2.0.0.tar.bz2) = 6f7e7c2ec81d6fa608f0efc785a81928dbafad3eae8b3ac3c58d3b3413eb344d
-SIZE (sylpheed-claws-2.0.0.tar.bz2) = 3764105
+MD5 (sylpheed-claws-2.1.0.tar.bz2) = 03988307d87ed9d10253d35b323e5e51
+SHA256 (sylpheed-claws-2.1.0.tar.bz2) = 67ea6b04fb4ef3a4af4004e64d1084df2e1694939c884904488d94adbac92b8b
+SIZE (sylpheed-claws-2.1.0.tar.bz2) = 3832528
 MD5 (sylpheed-iconset-20040929.tar.gz) = d72cf03bf3d13cf9e2785eaca3807707
 SHA256 (sylpheed-iconset-20040929.tar.gz) = 11e791cf7187b5f3ac5a5ab5f0144d9ea8701bbc6182b30b35c30c2cc50e5210
 SIZE (sylpheed-iconset-20040929.tar.gz) = 1298891
diff --git a/mail/claws-mail/pkg-plist b/mail/claws-mail/pkg-plist
index cc0b2002fcaf..002f939a1a7f 100644
--- a/mail/claws-mail/pkg-plist
+++ b/mail/claws-mail/pkg-plist
@@ -198,9 +198,26 @@ include/sylpheed-claws/undo.h
 include/sylpheed-claws/unmime.h
 include/sylpheed-claws/vcard.h
 include/sylpheed-claws/wizard.h
+%%CLAM_PLUG%%lib/sylpheed-claws/plugins/clamav_plugin.a
+%%CLAM_PLUG%%lib/sylpheed-claws/plugins/clamav_plugin.la
+%%CLAM_PLUG%%lib/sylpheed-claws/plugins/clamav_plugin.so
 lib/sylpheed-claws/plugins/dillo_viewer.a
 lib/sylpheed-claws/plugins/dillo_viewer.la
 lib/sylpheed-claws/plugins/dillo_viewer.so
+%%GPGME%%lib/sylpheed-claws/plugins/pgpcore.la
+%%GPGME%%lib/sylpheed-claws/plugins/pgpcore.so
+%%GPGME%%lib/sylpheed-claws/plugins/pgpcore.a
+%%GPGME%%lib/sylpheed-claws/plugins/pgpmime.deps
+%%GPGME%%lib/sylpheed-claws/plugins/pgpmime.a
+%%GPGME%%lib/sylpheed-claws/plugins/pgpmime.la
+%%GPGME%%lib/sylpheed-claws/plugins/pgpmime.so
+%%GPGME%%lib/sylpheed-claws/plugins/pgpinline.a
+%%GPGME%%lib/sylpheed-claws/plugins/pgpinline.deps
+%%GPGME%%lib/sylpheed-claws/plugins/pgpinline.la
+%%GPGME%%lib/sylpheed-claws/plugins/pgpinline.so
+%%SA_PLUG%%lib/sylpheed-claws/plugins/spamassassin.a
+%%SA_PLUG%%lib/sylpheed-claws/plugins/spamassassin.la
+%%SA_PLUG%%lib/sylpheed-claws/plugins/spamassassin.so
 lib/sylpheed-claws/plugins/trayicon.a
 lib/sylpheed-claws/plugins/trayicon.la
 lib/sylpheed-claws/plugins/trayicon.so
@@ -213,13 +230,6 @@ libdata/pkgconfig/sylpheed-claws.pc
 %%GPGME%%@dirrm include/sylpheed-claws/plugins/pgpmime
 @dirrmtry include/sylpheed-claws/plugins
 @dirrmtry include/sylpheed-claws
-%%CLAM_PLUG%%lib/sylpheed-claws/plugins/clamav_plugin.so
-%%GPGME%%lib/sylpheed-claws/plugins/pgpcore.so
-%%GPGME%%lib/sylpheed-claws/plugins/pgpmime.deps
-%%GPGME%%lib/sylpheed-claws/plugins/pgpmime.so
-%%GPGME%%lib/sylpheed-claws/plugins/pgpinline.deps
-%%GPGME%%lib/sylpheed-claws/plugins/pgpinline.so
-%%SA_PLUG%%lib/sylpheed-claws/plugins/spamassassin.so
 %%PORTDOCS%%%%DOCSDIR%%/NEWS
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/README.sylprint
@@ -253,7 +263,7 @@ share/locale/zh_TW/LC_MESSAGES/sylpheed-claws.mo
 share/pixmaps/sylpheed-claws-128x128.png
 share/pixmaps/sylpheed-claws-64x64.png
 share/pixmaps/sylpheed-claws.png
-%%GNOME%%share/gnome/applications/sylpheed-claws.desktop
+share/applications/sylpheed-claws.desktop
 %%DATADIR%%/OOo2sylpheed.pl
 %%DATADIR%%/acroread2sylpheed.pl
 %%DATADIR%%/calypso_convert.pl
@@ -2042,6 +2052,7 @@ share/pixmaps/sylpheed-claws.png
 %%THEMES%%@dirrm %%DATADIR%%/themes/tom_2.1.1
 %%THEMES%%@dirrm %%DATADIR%%/themes
 @dirrm %%DATADIR%%
+@dirrmtry share/applications
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/manual/en
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/manual
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/mail/sylpheed-claws/Makefile b/mail/sylpheed-claws/Makefile
index ecbb50ff6bbb..13cab1d7efca 100644
--- a/mail/sylpheed-claws/Makefile
+++ b/mail/sylpheed-claws/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	sylpheed-claws
-PORTVERSION=	2.0.0
-PORTREVISION=	3
+PORTVERSION=	2.1.0
 CATEGORIES=	mail news ipv6
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	sylpheed-claws
@@ -31,7 +30,6 @@ USE_GMAKE=	yes
 USE_ICONV=	yes
 USE_X_PREFIX=	yes
 USE_GNOME=	gnomehack pkgconfig gtk20
-USE_REINPLACE=	yes
 USE_AUTOTOOLS=	autoconf:259 libtool:15
 USE_GCC=	3.3+
 WANT_GNOME=	yes
@@ -75,14 +73,6 @@ CONFIGURE_ENV+=	OPENSSL_CFLAGS="-I${OPENSSLINC}" \
 CONFIGURE_ARGS+=	--disable-openssl
 .endif
 
-.if ${HAVE_GNOME:Mgnomehier} != "" || defined(WITH_GNOMEPRINT)
-USE_GNOME+=	gnomehier
-PLIST_SUB+=	GNOME=""
-USE_GNOME+=	gnomehier
-.else
-PLIST_SUB+=	GNOME="@comment "
-.endif
-
 .if ${HAVE_GNOME:Mgnomeprint} != "" || defined(WITH_GNOMEPRINT)
 PLIST_SUB+=     	GNOMEPRINT=""
 USE_GNOME+=		libgnomeprint libgnomeprintui
@@ -198,12 +188,8 @@ post-install:
 		multiwebsearch.pl nautilus2sylpheed.sh outlook2sylpheed.pl \
 		tb2sylpheed textviewer.sh update-po uudec vcard2xml.py \
 		${DATADIR}
-
-.if ${HAVE_GNOME:Mgnomehier} != ""
-	@${MKDIR} ${PREFIX}/share/gnome/applications
-	@${INSTALL_DATA} ${WRKSRC}/sylpheed-claws.desktop ${PREFIX}/share/gnome/applications/
-.endif
-
+	@${MKDIR} ${PREFIX}/share/applications
+	@${INSTALL_DATA} ${WRKSRC}/sylpheed-claws.desktop ${PREFIX}/share/applications/
 .if !defined(WITHOUT_THEMES)
 	@${MKDIR} ${DATADIR}/themes
 	@cd ${WRKDIR}/${THEMEFILE:C/.tar.gz//} && ${FIND} . -print | \
diff --git a/mail/sylpheed-claws/distinfo b/mail/sylpheed-claws/distinfo
index d8b4db3ca766..14e93aa55259 100644
--- a/mail/sylpheed-claws/distinfo
+++ b/mail/sylpheed-claws/distinfo
@@ -1,6 +1,6 @@
-MD5 (sylpheed-claws-2.0.0.tar.bz2) = 6e26f8e36772b71361d0c463b9a6c7a1
-SHA256 (sylpheed-claws-2.0.0.tar.bz2) = 6f7e7c2ec81d6fa608f0efc785a81928dbafad3eae8b3ac3c58d3b3413eb344d
-SIZE (sylpheed-claws-2.0.0.tar.bz2) = 3764105
+MD5 (sylpheed-claws-2.1.0.tar.bz2) = 03988307d87ed9d10253d35b323e5e51
+SHA256 (sylpheed-claws-2.1.0.tar.bz2) = 67ea6b04fb4ef3a4af4004e64d1084df2e1694939c884904488d94adbac92b8b
+SIZE (sylpheed-claws-2.1.0.tar.bz2) = 3832528
 MD5 (sylpheed-iconset-20040929.tar.gz) = d72cf03bf3d13cf9e2785eaca3807707
 SHA256 (sylpheed-iconset-20040929.tar.gz) = 11e791cf7187b5f3ac5a5ab5f0144d9ea8701bbc6182b30b35c30c2cc50e5210
 SIZE (sylpheed-iconset-20040929.tar.gz) = 1298891
diff --git a/mail/sylpheed-claws/pkg-plist b/mail/sylpheed-claws/pkg-plist
index cc0b2002fcaf..002f939a1a7f 100644
--- a/mail/sylpheed-claws/pkg-plist
+++ b/mail/sylpheed-claws/pkg-plist
@@ -198,9 +198,26 @@ include/sylpheed-claws/undo.h
 include/sylpheed-claws/unmime.h
 include/sylpheed-claws/vcard.h
 include/sylpheed-claws/wizard.h
+%%CLAM_PLUG%%lib/sylpheed-claws/plugins/clamav_plugin.a
+%%CLAM_PLUG%%lib/sylpheed-claws/plugins/clamav_plugin.la
+%%CLAM_PLUG%%lib/sylpheed-claws/plugins/clamav_plugin.so
 lib/sylpheed-claws/plugins/dillo_viewer.a
 lib/sylpheed-claws/plugins/dillo_viewer.la
 lib/sylpheed-claws/plugins/dillo_viewer.so
+%%GPGME%%lib/sylpheed-claws/plugins/pgpcore.la
+%%GPGME%%lib/sylpheed-claws/plugins/pgpcore.so
+%%GPGME%%lib/sylpheed-claws/plugins/pgpcore.a
+%%GPGME%%lib/sylpheed-claws/plugins/pgpmime.deps
+%%GPGME%%lib/sylpheed-claws/plugins/pgpmime.a
+%%GPGME%%lib/sylpheed-claws/plugins/pgpmime.la
+%%GPGME%%lib/sylpheed-claws/plugins/pgpmime.so
+%%GPGME%%lib/sylpheed-claws/plugins/pgpinline.a
+%%GPGME%%lib/sylpheed-claws/plugins/pgpinline.deps
+%%GPGME%%lib/sylpheed-claws/plugins/pgpinline.la
+%%GPGME%%lib/sylpheed-claws/plugins/pgpinline.so
+%%SA_PLUG%%lib/sylpheed-claws/plugins/spamassassin.a
+%%SA_PLUG%%lib/sylpheed-claws/plugins/spamassassin.la
+%%SA_PLUG%%lib/sylpheed-claws/plugins/spamassassin.so
 lib/sylpheed-claws/plugins/trayicon.a
 lib/sylpheed-claws/plugins/trayicon.la
 lib/sylpheed-claws/plugins/trayicon.so
@@ -213,13 +230,6 @@ libdata/pkgconfig/sylpheed-claws.pc
 %%GPGME%%@dirrm include/sylpheed-claws/plugins/pgpmime
 @dirrmtry include/sylpheed-claws/plugins
 @dirrmtry include/sylpheed-claws
-%%CLAM_PLUG%%lib/sylpheed-claws/plugins/clamav_plugin.so
-%%GPGME%%lib/sylpheed-claws/plugins/pgpcore.so
-%%GPGME%%lib/sylpheed-claws/plugins/pgpmime.deps
-%%GPGME%%lib/sylpheed-claws/plugins/pgpmime.so
-%%GPGME%%lib/sylpheed-claws/plugins/pgpinline.deps
-%%GPGME%%lib/sylpheed-claws/plugins/pgpinline.so
-%%SA_PLUG%%lib/sylpheed-claws/plugins/spamassassin.so
 %%PORTDOCS%%%%DOCSDIR%%/NEWS
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/README.sylprint
@@ -253,7 +263,7 @@ share/locale/zh_TW/LC_MESSAGES/sylpheed-claws.mo
 share/pixmaps/sylpheed-claws-128x128.png
 share/pixmaps/sylpheed-claws-64x64.png
 share/pixmaps/sylpheed-claws.png
-%%GNOME%%share/gnome/applications/sylpheed-claws.desktop
+share/applications/sylpheed-claws.desktop
 %%DATADIR%%/OOo2sylpheed.pl
 %%DATADIR%%/acroread2sylpheed.pl
 %%DATADIR%%/calypso_convert.pl
@@ -2042,6 +2052,7 @@ share/pixmaps/sylpheed-claws.png
 %%THEMES%%@dirrm %%DATADIR%%/themes/tom_2.1.1
 %%THEMES%%@dirrm %%DATADIR%%/themes
 @dirrm %%DATADIR%%
+@dirrmtry share/applications
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/manual/en
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/manual
 %%PORTDOCS%%@dirrm %%DOCSDIR%%