From dc808af2b344b4f447ba26d63568587724bcb97f Mon Sep 17 00:00:00 2001
From: Kirill Ponomarev <krion@FreeBSD.org>
Date: Mon, 14 Jun 2004 11:36:11 +0000
Subject: [PATCH] - Update to version 0.9.11.20040613

PR:		ports/67910
Submitted by:	maintainer
---
 mail/sylpheed-gtk2/Makefile                 | 10 +++----
 mail/sylpheed-gtk2/distinfo                 |  4 +--
 mail/sylpheed-gtk2/files/patch-src::prefs.c | 30 ---------------------
 mail/sylpheed-gtk2/pkg-plist                |  1 +
 4 files changed, 6 insertions(+), 39 deletions(-)
 delete mode 100644 mail/sylpheed-gtk2/files/patch-src::prefs.c

diff --git a/mail/sylpheed-gtk2/Makefile b/mail/sylpheed-gtk2/Makefile
index 27fb31ce39cd..f47bcb24899c 100644
--- a/mail/sylpheed-gtk2/Makefile
+++ b/mail/sylpheed-gtk2/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=		sylpheed-gtk2
-PORTVERSION=		0.9.9.20040229
-PORTREVISION=		2
+PORTVERSION=		0.9.11.20040613
 CATEGORIES=		mail ipv6
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -22,7 +21,7 @@ USE_ICONV=		yes
 USE_X_PREFIX=		yes
 USE_GNOME=		gtk20
 USE_OPENSSL=		yes
-USE_LIBTOOL_VER=	13
+USE_LIBTOOL_VER=	15
 USE_REINPLACE=		yes
 
 CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include" \
@@ -79,7 +78,7 @@ post-patch:
 		s|-lresolv||g; s|-lpisock\"|-liconv &|g' ${WRKSRC}/configure
 
 .if defined(NOPORTDOCS)
-	@${REINPLACE_CMD} -e 's|^SUBDIRS = ac po intl src manual faq$$|SUBDIRS = ac po intl src|g' \
+	@${REINPLACE_CMD} -e 's|^SUBDIRS = ac po src manual faq$$|SUBDIRS = ac po src|g' \
 		${WRKSRC}/Makefile.in
 .else
 .for i in ${MAKEFILES}
@@ -89,9 +88,6 @@ post-patch:
 .endfor
 .endif
 
-pre-build:
-	${LN} -sf ${LIBTOOL} ${WRKSRC}/libtool
-
 post-install:
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
diff --git a/mail/sylpheed-gtk2/distinfo b/mail/sylpheed-gtk2/distinfo
index d490d1760c70..1e8d0d7890bc 100644
--- a/mail/sylpheed-gtk2/distinfo
+++ b/mail/sylpheed-gtk2/distinfo
@@ -1,2 +1,2 @@
-MD5 (sylpheed-0.9.9-gtk2-20040229.tar.gz) = 902288ffea1cd18b2af4a044881c4120
-SIZE (sylpheed-0.9.9-gtk2-20040229.tar.gz) = 3275909
+MD5 (sylpheed-0.9.11-gtk2-20040613.tar.gz) = f652436eed105967c5faa6583695c89d
+SIZE (sylpheed-0.9.11-gtk2-20040613.tar.gz) = 3378496
diff --git a/mail/sylpheed-gtk2/files/patch-src::prefs.c b/mail/sylpheed-gtk2/files/patch-src::prefs.c
deleted file mode 100644
index e0ae6ee8a78f..000000000000
--- a/mail/sylpheed-gtk2/files/patch-src::prefs.c
+++ /dev/null
@@ -1,30 +0,0 @@
---- src/prefs.c.orig	Fri Jan 23 12:08:46 2004
-+++ src/prefs.c	Fri Jan 23 12:16:37 2004
-@@ -109,17 +109,18 @@
- 		case P_STRING:
- 		{
- #warning FIXME_GTK2
--			gchar *tmp;
-+			gchar *tmp = NULL;
- 
--			tmp = *value ?
--				conv_codeset_strdup(value,
--						    conv_get_current_charset_str(),
--						    CS_UTF_8)
--				: g_strdup("");
--			if (!tmp) {
--				g_warning("faild to convert character set.");
--				tmp = g_strdup(value);
-+			if (*value) {
-+				tmp = conv_codeset_strdup(value,
-+							  conv_get_current_charset_str(),
-+							  CS_UTF_8);
-+				if (!tmp) {
-+					g_warning("failed to convert character set.");
-+					tmp = g_strdup(value);
-+				}
- 			}
-+			
- 			g_free(*((gchar **)param[i].data));
- 			*((gchar **)param[i].data) = tmp;
- 			break;
diff --git a/mail/sylpheed-gtk2/pkg-plist b/mail/sylpheed-gtk2/pkg-plist
index 9a8eb5e3c340..f1a15e1347b7 100644
--- a/mail/sylpheed-gtk2/pkg-plist
+++ b/mail/sylpheed-gtk2/pkg-plist
@@ -31,6 +31,7 @@ share/locale/sl/LC_MESSAGES/sylpheed.mo
 share/locale/sr/LC_MESSAGES/sylpheed.mo
 share/locale/sv/LC_MESSAGES/sylpheed.mo
 share/locale/tr/LC_MESSAGES/sylpheed.mo
+share/locale/uk/LC_MESSAGES/sylpheed.mo
 share/locale/zh_CN/LC_MESSAGES/sylpheed.mo
 share/locale/zh_TW.Big5/LC_MESSAGES/sylpheed.mo
 %%PORTDOCS%%%%DOCSDIR%%/faq/de/sylpheed-faq-1.html