Update to 0.63.

Submitted by:	Matthew Luckie <mjl@luckie.org.nz>

8 files changed, 10 insertions, 80 deletions

diff --git a/net-im/gaim/Makefile b/net-im/gaim/Makefile
index 2449c4693cc..c8437588ddf 100644
--- a/net-im/gaim/Makefile
+++ b/net-im/gaim/Makefile
@@ -5,8 +5,7 @@
 #
 
 PORTNAME=	gaim
-PORTVERSION=	0.62
-PORTREVISION=	1
+PORTVERSION=	0.63
 CATEGORIES?=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -21,7 +20,7 @@ USE_GNOME=	gnomeprefix gnomehack gtk20
 USE_PERL5=	yes
 USE_LIBTOOL=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
-		LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
+		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
 
 MAN1=		gaim.1
 
diff --git a/net-im/gaim/distinfo b/net-im/gaim/distinfo
index c1be43a635d..d2651db0af7 100644
--- a/net-im/gaim/distinfo
+++ b/net-im/gaim/distinfo
@@ -1 +1 @@
-MD5 (gaim-0.62.tar.gz) = baad962a67c23e0f27cc9bcd99a5b82f
+MD5 (gaim-0.63.tar.gz) = 771a256245f1563eb39b5046d39bef56
diff --git a/net-im/gaim/files/patch-src_protocols_irc_irc.c b/net-im/gaim/files/patch-src_protocols_irc_irc.c
deleted file mode 100644
index e042b2e7a1e..00000000000
--- a/net-im/gaim/files/patch-src_protocols_irc_irc.c
+++ /dev/null
@@ -1,35 +0,0 @@
---- src/protocols/irc/irc.c.orig	Wed Mar 12 11:50:45 2003
-+++ src/protocols/irc/irc.c	Wed Mar 12 12:20:56 2003
-@@ -699,9 +699,11 @@
- 
- 	if ((c = irc_find_chat(gc, text))) {
- 		char buf[IRC_BUF_LEN];
--		gaim_chat_set_topic(GAIM_CHAT(c), NULL, po);
-+		char *utf8 = irc_recv_convert(gc, po);
-+		gaim_chat_set_topic(GAIM_CHAT(c), NULL, utf8);
- 		g_snprintf(buf, sizeof(buf), _("<B>%s has changed the topic to: %s</B>"),
--			   text, po);
-+			   text, utf8);
-+		g_free(utf8);
- 
- 		gaim_conversation_write(c, NULL, buf, -1, WFLAG_SYSTEM, time(NULL));
- 	}
-@@ -1616,12 +1618,14 @@
- {
- 	struct gaim_conversation *c = irc_find_chat(gc, word[3]);
- 	char *topic = *word_eol[4] == ':' ? word_eol[4] + 1 : word_eol[4];
--	char buf[IRC_BUF_LEN];
- 
- 	if (c) {
--		gaim_chat_set_topic(GAIM_CHAT(c), nick, topic);
-+		char buf[IRC_BUF_LEN];
-+		char *utf8 = irc_recv_convert(gc, topic);
-+		gaim_chat_set_topic(GAIM_CHAT(c), nick, utf8);
- 		g_snprintf(buf, sizeof(buf),
--				   _("<B>%s has changed the topic to: %s</B>"), nick, topic);
-+				   _("<B>%s has changed the topic to: %s</B>"), nick, utf8);
-+		g_free(utf8);
- 
- 		gaim_conversation_write(c, NULL, buf, -1, WFLAG_SYSTEM, time(NULL));
- 	}
-
diff --git a/net-im/gaim/pkg-plist b/net-im/gaim/pkg-plist
index 5b00db908cb..1e4acc9ebf0 100644
--- a/net-im/gaim/pkg-plist
+++ b/net-im/gaim/pkg-plist
@@ -7,7 +7,6 @@ lib/gaim/history.so
 lib/gaim/iconaway.so
 lib/gaim/idle.so
 lib/gaim/libgg.so
-lib/gaim/libicq.so
 lib/gaim/libirc.so
 lib/gaim/libjabber.so
 lib/gaim/libmsn.so
@@ -17,7 +16,9 @@ lib/gaim/libtoc.so
 lib/gaim/libyahoo.so
 lib/gaim/libzephyr.so
 lib/gaim/notify.so
+lib/gaim/perl.so
 lib/gaim/spellchk.so
+lib/gaim/statenotify.so
 lib/gaim/ticker.so
 lib/gaim/timestamp.so
 share/gnome/applications/gaim.desktop
diff --git a/net/gaim/Makefile b/net/gaim/Makefile
index 2449c4693cc..c8437588ddf 100644
--- a/net/gaim/Makefile
+++ b/net/gaim/Makefile
@@ -5,8 +5,7 @@
 #
 
 PORTNAME=	gaim
-PORTVERSION=	0.62
-PORTREVISION=	1
+PORTVERSION=	0.63
 CATEGORIES?=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -21,7 +20,7 @@ USE_GNOME=	gnomeprefix gnomehack gtk20
 USE_PERL5=	yes
 USE_LIBTOOL=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
-		LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
+		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
 
 MAN1=		gaim.1
 
diff --git a/net/gaim/distinfo b/net/gaim/distinfo
index c1be43a635d..d2651db0af7 100644
--- a/net/gaim/distinfo
+++ b/net/gaim/distinfo
@@ -1 +1 @@
-MD5 (gaim-0.62.tar.gz) = baad962a67c23e0f27cc9bcd99a5b82f
+MD5 (gaim-0.63.tar.gz) = 771a256245f1563eb39b5046d39bef56
diff --git a/net/gaim/files/patch-src_protocols_irc_irc.c b/net/gaim/files/patch-src_protocols_irc_irc.c
deleted file mode 100644
index e042b2e7a1e..00000000000
--- a/net/gaim/files/patch-src_protocols_irc_irc.c
+++ /dev/null
@@ -1,35 +0,0 @@
---- src/protocols/irc/irc.c.orig	Wed Mar 12 11:50:45 2003
-+++ src/protocols/irc/irc.c	Wed Mar 12 12:20:56 2003
-@@ -699,9 +699,11 @@
- 
- 	if ((c = irc_find_chat(gc, text))) {
- 		char buf[IRC_BUF_LEN];
--		gaim_chat_set_topic(GAIM_CHAT(c), NULL, po);
-+		char *utf8 = irc_recv_convert(gc, po);
-+		gaim_chat_set_topic(GAIM_CHAT(c), NULL, utf8);
- 		g_snprintf(buf, sizeof(buf), _("<B>%s has changed the topic to: %s</B>"),
--			   text, po);
-+			   text, utf8);
-+		g_free(utf8);
- 
- 		gaim_conversation_write(c, NULL, buf, -1, WFLAG_SYSTEM, time(NULL));
- 	}
-@@ -1616,12 +1618,14 @@
- {
- 	struct gaim_conversation *c = irc_find_chat(gc, word[3]);
- 	char *topic = *word_eol[4] == ':' ? word_eol[4] + 1 : word_eol[4];
--	char buf[IRC_BUF_LEN];
- 
- 	if (c) {
--		gaim_chat_set_topic(GAIM_CHAT(c), nick, topic);
-+		char buf[IRC_BUF_LEN];
-+		char *utf8 = irc_recv_convert(gc, topic);
-+		gaim_chat_set_topic(GAIM_CHAT(c), nick, utf8);
- 		g_snprintf(buf, sizeof(buf),
--				   _("<B>%s has changed the topic to: %s</B>"), nick, topic);
-+				   _("<B>%s has changed the topic to: %s</B>"), nick, utf8);
-+		g_free(utf8);
- 
- 		gaim_conversation_write(c, NULL, buf, -1, WFLAG_SYSTEM, time(NULL));
- 	}
-
diff --git a/net/gaim/pkg-plist b/net/gaim/pkg-plist
index 5b00db908cb..1e4acc9ebf0 100644
--- a/net/gaim/pkg-plist
+++ b/net/gaim/pkg-plist
@@ -7,7 +7,6 @@ lib/gaim/history.so
 lib/gaim/iconaway.so
 lib/gaim/idle.so
 lib/gaim/libgg.so
-lib/gaim/libicq.so
 lib/gaim/libirc.so
 lib/gaim/libjabber.so
 lib/gaim/libmsn.so
@@ -17,7 +16,9 @@ lib/gaim/libtoc.so
 lib/gaim/libyahoo.so
 lib/gaim/libzephyr.so
 lib/gaim/notify.so
+lib/gaim/perl.so
 lib/gaim/spellchk.so
+lib/gaim/statenotify.so
 lib/gaim/ticker.so
 lib/gaim/timestamp.so
 share/gnome/applications/gaim.desktop