5 files changed, 13 insertions, 54 deletions

diff --git a/net-im/gaim/Makefile b/net-im/gaim/Makefile
index 54fbab03bd53..6bf014294159 100644
--- a/net-im/gaim/Makefile
+++ b/net-im/gaim/Makefile
@@ -5,8 +5,7 @@
 #
 
 PORTNAME=	gaim
-PORTVERSION=	0.74
-PORTREVISION=	3
+PORTVERSION=	0.75
 CATEGORIES?=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/net-im/gaim/distinfo b/net-im/gaim/distinfo
index 37f71cc082b0..3800332b702a 100644
--- a/net-im/gaim/distinfo
+++ b/net-im/gaim/distinfo
@@ -1 +1 @@
-MD5 (gaim-0.74.tar.bz2) = 9af9287a96acea2b8a8937cfc9122412
+MD5 (gaim-0.75.tar.bz2) = 9935155985c25dfc9b59183de0da3c30
diff --git a/net-im/gaim/files/patch-log_free.diff b/net-im/gaim/files/patch-log_free.diff
deleted file mode 100644
index d8529f16efda..000000000000
--- a/net-im/gaim/files/patch-log_free.diff
+++ /dev/null
@@ -1,51 +0,0 @@
-Index: plugins/history.c
-===================================================================
-RCS file: /cvsroot/gaim/gaim/plugins/history.c,v
-retrieving revision 1.29
-diff -u -r1.29 history.c
---- plugins/history.c	30 Nov 2003 04:33:15 -0000	1.29
-+++ plugins/history.c	1 Dec 2003 23:09:47 -0000
-@@ -44,8 +44,7 @@
- 	while (logs) {
- 		GaimLog *log = logs->data;
- 		GList *logs2;
--		g_free(log->name);
--		g_free(log);
-+	    gaim_log_free(log);
- 		logs2 = logs->next;
- 		g_list_free_1(logs);
- 		logs = logs2;
-Index: src/gtklog.c
-===================================================================
-RCS file: /cvsroot/gaim/gaim/src/gtklog.c,v
-retrieving revision 1.9
-diff -u -r1.9 gtklog.c
---- src/gtklog.c	1 Dec 2003 00:09:48 -0000	1.9
-+++ src/gtklog.c	1 Dec 2003 23:09:47 -0000
-@@ -119,8 +119,7 @@
- 	while (lv->logs) {
- 		GaimLog *log = lv->logs->data;
- 		GList *logs2;
--		g_free(log->name);
--		g_free(log);
-+		gaim_log_free(log);
- 		logs2 = lv->logs->next;
- 		g_list_free_1(lv->logs);
- 		lv->logs = logs2;
-Index: src/log.c
-===================================================================
-RCS file: /cvsroot/gaim/gaim/src/log.c,v
-retrieving revision 1.69
-diff -u -r1.69 log.c
---- src/log.c	1 Dec 2003 00:09:48 -0000	1.69
-+++ src/log.c	1 Dec 2003 23:09:47 -0000
-@@ -100,8 +100,7 @@
- 		GList *logs2 = logs->next;
- 		GaimLog *log = (GaimLog*)(logs->data);
- 		size += gaim_log_get_size(log);
--		g_free(log->name);
--		g_free(log);
-+		gaim_log_free(log);
- 		g_list_free_1(logs);
- 		logs = logs2;
- 	}
diff --git a/net-im/gaim/files/patch-src_protocols_oscar_ft.c b/net-im/gaim/files/patch-src_protocols_oscar_ft.c
new file mode 100644
index 000000000000..926db5f44164
--- /dev/null
+++ b/net-im/gaim/files/patch-src_protocols_oscar_ft.c
@@ -0,0 +1,10 @@
+--- src/protocols/oscar/ft.c.orig	Sat Jan 10 14:05:46 2004
++++ src/protocols/oscar/ft.c	Sat Jan 10 14:07:58 2004
+@@ -49,6 +49,7 @@
+ #ifndef _WIN32
+ #include <stdio.h>
+ #include <netdb.h>
++#include <limits.h>
+ #include <sys/socket.h>
+ #include <netinet/in.h>
+ #include <sys/utsname.h> /* for aim_odc_initiate */
diff --git a/net-im/gaim/pkg-plist b/net-im/gaim/pkg-plist
index 8b58e53237fc..32e6e71f302f 100644
--- a/net-im/gaim/pkg-plist
+++ b/net-im/gaim/pkg-plist
@@ -272,6 +272,7 @@ share/locale/ca/LC_MESSAGES/gaim.mo
 share/locale/cs/LC_MESSAGES/gaim.mo
 share/locale/da/LC_MESSAGES/gaim.mo
 share/locale/de/LC_MESSAGES/gaim.mo
+share/locale/en_GB/LC_MESSAGES/gaim.mo
 share/locale/es/LC_MESSAGES/gaim.mo
 share/locale/fi/LC_MESSAGES/gaim.mo
 share/locale/fr/LC_MESSAGES/gaim.mo