4 files changed, 6 insertions, 62 deletions

diff --git a/mail/sylpheed-gtk2/Makefile b/mail/sylpheed-gtk2/Makefile
index 59f36193d639..e76d8ff3dacf 100644
--- a/mail/sylpheed-gtk2/Makefile
+++ b/mail/sylpheed-gtk2/Makefile
@@ -6,18 +6,12 @@
 #
 
 PORTNAME=		sylpheed-gtk2
-PORTVERSION=		0.9.12.20040918
-PORTREVISION=		2
+PORTVERSION=		0.9.99.20041024
 CATEGORIES=		mail ipv6
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 DISTNAME=		sylpheed-${PORTVERSION:R}-gtk2-${PORTVERSION:E}
 
-PATCH_SITES=		${MASTER_SITES}
-PATCH_SITE_SUBDIR=	${MASTER_SITE_SUBDIR}
-PATCHFILES=		${DISTNAME}-summary_search_fix.diff.gz
-PATCH_DIST_STRIP=	-p1
-
 MAINTAINER=		jylefort@brutele.be
 COMMENT=		The GTK+ 2.0 port of a lightweight, featureful and fast e-mail client
 
diff --git a/mail/sylpheed-gtk2/distinfo b/mail/sylpheed-gtk2/distinfo
index 2577edd02313..9317df8d4b62 100644
--- a/mail/sylpheed-gtk2/distinfo
+++ b/mail/sylpheed-gtk2/distinfo
@@ -1,4 +1,2 @@
-MD5 (sylpheed-0.9.12-gtk2-20040918.tar.gz) = 6bc29742ae661f08916b648b6cb59250
-SIZE (sylpheed-0.9.12-gtk2-20040918.tar.gz) = 3377968
-MD5 (sylpheed-0.9.12-gtk2-20040918-summary_search_fix.diff.gz) = f5b75703cb3f424c475e8a084c2addda
-SIZE (sylpheed-0.9.12-gtk2-20040918-summary_search_fix.diff.gz) = 838
+MD5 (sylpheed-0.9.99-gtk2-20041024.tar.gz) = 980e69d99457db9c75480c876af90c31
+SIZE (sylpheed-0.9.99-gtk2-20041024.tar.gz) = 3412783
diff --git a/mail/sylpheed-gtk2/files/patch-encoding b/mail/sylpheed-gtk2/files/patch-encoding
deleted file mode 100644
index 3522a934e587..000000000000
--- a/mail/sylpheed-gtk2/files/patch-encoding
+++ /dev/null
@@ -1,46 +0,0 @@
---- src/procmime.c.orig	Thu Oct 21 17:25:19 2004
-+++ src/procmime.c	Thu Oct 21 18:12:24 2004
-@@ -694,7 +694,7 @@
- 	if (mimeinfo->mime_type == MIME_TEXT) {
- 		while (fgets(buf, sizeof(buf), tmpfp) != NULL) {
- #warning FIXME_GTK2
--			str = conv_codeset_strdup(buf, src_codeset, NULL);
-+			str = conv_codeset_strdup(buf, src_codeset, CS_UTF_8);
- 			if (str) {
- 				fputs(str, outfp);
- 				g_free(str);
---- src/unmime.c.orig	Thu Oct 21 17:25:20 2004
-+++ src/unmime.c	Thu Oct 21 17:37:45 2004
-@@ -113,7 +113,7 @@
- 		}
- 
- 		/* convert to locale encoding */
--		conv_str = conv_codeset_strdup(decoded_text, charset, NULL);
-+		conv_str = conv_codeset_strdup(decoded_text, charset, CS_UTF_8);
- 		if (conv_str) {
- 			len = strlen(conv_str);
- 			memcpy(outp, conv_str, len);
---- src/codeconv.c.orig	Thu Oct 21 22:08:15 2004
-+++ src/codeconv.c	Thu Oct 21 22:08:34 2004
-@@ -1651,8 +1651,20 @@
- 		Xalloca(buf, buflen, return);
- 		conv_anytodisp(buf, buflen, str);
- 		unmime_header(outbuf, buf);
--	} else
-+	} else {
-+		gchar *tmp;
- 		unmime_header(outbuf, str);
-+		if (outbuf && !g_utf8_validate(outbuf, -1, NULL)) {
-+			tmp = conv_codeset_strdup(outbuf,
-+					conv_get_current_charset_str(),
-+					CS_UTF_8);
-+			if (tmp) {
-+				strncpy(outbuf, tmp, outlen-1);
-+				g_free(tmp);
-+			}
-+		}
-+	}
-+
- }
- 
- #define MAX_LINELEN		76
diff --git a/mail/sylpheed-gtk2/files/patch-src::main.c b/mail/sylpheed-gtk2/files/patch-src::main.c
index 9e5ca81a803f..71c8b9e8dcea 100644
--- a/mail/sylpheed-gtk2/files/patch-src::main.c
+++ b/mail/sylpheed-gtk2/files/patch-src::main.c
@@ -1,6 +1,6 @@
---- src/main.c.orig	Sat Jul  3 01:52:00 2004
-+++ src/main.c	Sat Jul  3 01:52:35 2004
-@@ -194,22 +194,6 @@
+--- src/main.c.orig	Tue Nov  2 15:29:14 2004
++++ src/main.c	Tue Nov  2 15:30:16 2004
+@@ -194,20 +194,6 @@
  
  	srandom((gint)time(NULL));
  
@@ -18,8 +18,6 @@
 -	gtk_rc_parse(userrc);
 -	g_free(userrc);
 -
--	gtk_rc_parse("./gtkrc-2.0");
--
  	userrc = g_strconcat(get_rc_dir(), G_DIR_SEPARATOR_S, MENU_RC, NULL);
  	gtk_accel_map_load (userrc);
  	g_free(userrc);