8 files changed, 10 insertions, 62 deletions

diff --git a/net-im/gaim/Makefile b/net-im/gaim/Makefile
index 73c4585839d4..2047cadf1baf 100644
--- a/net-im/gaim/Makefile
+++ b/net-im/gaim/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	gaim
-PORTVERSION=	1.2.0
-PORTREVISION=	2
+PORTVERSION=	1.2.1
 CATEGORIES?=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/net-im/gaim/distinfo b/net-im/gaim/distinfo
index 56a8b526d2fb..190906b04a66 100644
--- a/net-im/gaim/distinfo
+++ b/net-im/gaim/distinfo
@@ -1,2 +1,2 @@
-MD5 (gaim-1.2.0.tar.bz2) = 220a1a61a67a621ce5b5d96b279c883b
-SIZE (gaim-1.2.0.tar.bz2) = 5200934
+MD5 (gaim-1.2.1.tar.bz2) = 5ff8161f8d0db48bf302bfb5d7e097ac
+SIZE (gaim-1.2.1.tar.bz2) = 5223019
diff --git a/net-im/gaim/files/patch-src_protocols_yahoo_yahoochat.c b/net-im/gaim/files/patch-src_protocols_yahoo_yahoochat.c
deleted file mode 100644
index dd31950d658c..000000000000
--- a/net-im/gaim/files/patch-src_protocols_yahoo_yahoochat.c
+++ /dev/null
@@ -1,26 +0,0 @@
---- src/protocols/yahoo/yahoochat.c.orig	Wed Mar 16 05:14:01 2005
-+++ src/protocols/yahoo/yahoochat.c	Sun Mar 20 15:59:34 2005
-@@ -342,8 +342,11 @@
- void yahoo_process_chat_join(GaimConnection *gc, struct yahoo_packet *pkt)
- {
- 	struct yahoo_data *yd = (struct yahoo_data *) gc->proto_data;
-+	GaimAccount *account;
- 	GaimConversation *c = NULL;
-+	GaimConversationUiOps *ops;
- 	GSList *l;
-+	GList *roomies = NULL;
- 	GList *members = NULL;
- 	char *room = NULL;
- 	char *topic = NULL;
-@@ -443,10 +446,8 @@
- 		yahoo_chat_add_users(GAIM_CONV_CHAT(c), members);
- 	}
- 
--	GList *roomies=NULL;
--	GaimConversationUiOps *ops;
- 	ops = gaim_conversation_get_ui_ops(c);
--	GaimAccount *account = gaim_connection_get_account(gc);
-+	account = gaim_connection_get_account(gc);
- 	for (l = account->deny; l != NULL; l = l->next) {
- 		for (roomies = members; roomies; roomies = roomies->next) {
- 			if (!gaim_utf8_strcasecmp((char *)l->data, roomies->data)) {
diff --git a/net-im/gaim/pkg-plist b/net-im/gaim/pkg-plist
index a654c1e38e1b..891980b56e2a 100644
--- a/net-im/gaim/pkg-plist
+++ b/net-im/gaim/pkg-plist
@@ -380,6 +380,7 @@ share/locale/en_AU/LC_MESSAGES/gaim.mo
 share/locale/en_CA/LC_MESSAGES/gaim.mo
 share/locale/en_GB/LC_MESSAGES/gaim.mo
 share/locale/es/LC_MESSAGES/gaim.mo
+share/locale/et/LC_MESSAGES/gaim.mo
 share/locale/fi/LC_MESSAGES/gaim.mo
 share/locale/fr/LC_MESSAGES/gaim.mo
 share/locale/he/LC_MESSAGES/gaim.mo
@@ -391,8 +392,8 @@ share/locale/ko/LC_MESSAGES/gaim.mo
 share/locale/lt/LC_MESSAGES/gaim.mo
 share/locale/mk/LC_MESSAGES/gaim.mo
 share/locale/my_MM/LC_MESSAGES/gaim.mo
+share/locale/nb/LC_MESSAGES/gaim.mo
 share/locale/nl/LC_MESSAGES/gaim.mo
-share/locale/no/LC_MESSAGES/gaim.mo
 share/locale/pl/LC_MESSAGES/gaim.mo
 share/locale/pt/LC_MESSAGES/gaim.mo
 share/locale/pt_BR/LC_MESSAGES/gaim.mo
diff --git a/net/gaim/Makefile b/net/gaim/Makefile
index 73c4585839d4..2047cadf1baf 100644
--- a/net/gaim/Makefile
+++ b/net/gaim/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	gaim
-PORTVERSION=	1.2.0
-PORTREVISION=	2
+PORTVERSION=	1.2.1
 CATEGORIES?=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/net/gaim/distinfo b/net/gaim/distinfo
index 56a8b526d2fb..190906b04a66 100644
--- a/net/gaim/distinfo
+++ b/net/gaim/distinfo
@@ -1,2 +1,2 @@
-MD5 (gaim-1.2.0.tar.bz2) = 220a1a61a67a621ce5b5d96b279c883b
-SIZE (gaim-1.2.0.tar.bz2) = 5200934
+MD5 (gaim-1.2.1.tar.bz2) = 5ff8161f8d0db48bf302bfb5d7e097ac
+SIZE (gaim-1.2.1.tar.bz2) = 5223019
diff --git a/net/gaim/files/patch-src_protocols_yahoo_yahoochat.c b/net/gaim/files/patch-src_protocols_yahoo_yahoochat.c
deleted file mode 100644
index dd31950d658c..000000000000
--- a/net/gaim/files/patch-src_protocols_yahoo_yahoochat.c
+++ /dev/null
@@ -1,26 +0,0 @@
---- src/protocols/yahoo/yahoochat.c.orig	Wed Mar 16 05:14:01 2005
-+++ src/protocols/yahoo/yahoochat.c	Sun Mar 20 15:59:34 2005
-@@ -342,8 +342,11 @@
- void yahoo_process_chat_join(GaimConnection *gc, struct yahoo_packet *pkt)
- {
- 	struct yahoo_data *yd = (struct yahoo_data *) gc->proto_data;
-+	GaimAccount *account;
- 	GaimConversation *c = NULL;
-+	GaimConversationUiOps *ops;
- 	GSList *l;
-+	GList *roomies = NULL;
- 	GList *members = NULL;
- 	char *room = NULL;
- 	char *topic = NULL;
-@@ -443,10 +446,8 @@
- 		yahoo_chat_add_users(GAIM_CONV_CHAT(c), members);
- 	}
- 
--	GList *roomies=NULL;
--	GaimConversationUiOps *ops;
- 	ops = gaim_conversation_get_ui_ops(c);
--	GaimAccount *account = gaim_connection_get_account(gc);
-+	account = gaim_connection_get_account(gc);
- 	for (l = account->deny; l != NULL; l = l->next) {
- 		for (roomies = members; roomies; roomies = roomies->next) {
- 			if (!gaim_utf8_strcasecmp((char *)l->data, roomies->data)) {
diff --git a/net/gaim/pkg-plist b/net/gaim/pkg-plist
index a654c1e38e1b..891980b56e2a 100644
--- a/net/gaim/pkg-plist
+++ b/net/gaim/pkg-plist
@@ -380,6 +380,7 @@ share/locale/en_AU/LC_MESSAGES/gaim.mo
 share/locale/en_CA/LC_MESSAGES/gaim.mo
 share/locale/en_GB/LC_MESSAGES/gaim.mo
 share/locale/es/LC_MESSAGES/gaim.mo
+share/locale/et/LC_MESSAGES/gaim.mo
 share/locale/fi/LC_MESSAGES/gaim.mo
 share/locale/fr/LC_MESSAGES/gaim.mo
 share/locale/he/LC_MESSAGES/gaim.mo
@@ -391,8 +392,8 @@ share/locale/ko/LC_MESSAGES/gaim.mo
 share/locale/lt/LC_MESSAGES/gaim.mo
 share/locale/mk/LC_MESSAGES/gaim.mo
 share/locale/my_MM/LC_MESSAGES/gaim.mo
+share/locale/nb/LC_MESSAGES/gaim.mo
 share/locale/nl/LC_MESSAGES/gaim.mo
-share/locale/no/LC_MESSAGES/gaim.mo
 share/locale/pl/LC_MESSAGES/gaim.mo
 share/locale/pt/LC_MESSAGES/gaim.mo
 share/locale/pt_BR/LC_MESSAGES/gaim.mo