6 files changed, 75 insertions, 49 deletions

diff --git a/net-im/gaim/Makefile b/net-im/gaim/Makefile
index 484c89f2ee94..39a5a8907449 100644
--- a/net-im/gaim/Makefile
+++ b/net-im/gaim/Makefile
@@ -5,8 +5,7 @@
 #
 
 PORTNAME=	gaim
-PORTVERSION=	0.78
-PORTREVISION=	1
+PORTVERSION=	0.79
 CATEGORIES?=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/net-im/gaim/distinfo b/net-im/gaim/distinfo
index 5e2dd99e354f..f6a5d4a03157 100644
--- a/net-im/gaim/distinfo
+++ b/net-im/gaim/distinfo
@@ -1,2 +1,2 @@
-MD5 (gaim-0.78.tar.bz2) = 079f3286333ed51cc72c65b5efe1b989
-SIZE (gaim-0.78.tar.bz2) = 4219726
+MD5 (gaim-0.79.tar.bz2) = 8d8758e4ef00187fcfe3ab14e4a3283e
+SIZE (gaim-0.79.tar.bz2) = 4377687
diff --git a/net-im/gaim/files/patch-src::util.c b/net-im/gaim/files/patch-src::util.c
deleted file mode 100644
index f573f29d971c..000000000000
--- a/net-im/gaim/files/patch-src::util.c
+++ /dev/null
@@ -1,19 +0,0 @@
---- src/util.c.orig	Wed May 26 19:24:44 2004
-+++ src/util.c	Sun May 30 17:57:02 2004
-@@ -2328,9 +2328,14 @@
- static size_t
- parse_content_len(const char *data, size_t data_len)
- {
--	size_t content_len = 0;
-+	int content_len = 0;
-+	char *tmp;
- 
--	sscanf(data, "Content-Length: %d", (int *)&content_len);
-+	tmp = g_malloc(data_len + 1);
-+	memcpy(tmp, data, data_len);
-+	tmp[data_len] = '\0';
-+	sscanf(tmp, "Content-Length: %d", &content_len);
-+	g_free(tmp);
- 
- 	return content_len;
- }
diff --git a/net-im/gaim/files/patch-src_protocols_gg_libgg.h b/net-im/gaim/files/patch-src_protocols_gg_libgg.h
deleted file mode 100644
index 7cb0f3eec670..000000000000
--- a/net-im/gaim/files/patch-src_protocols_gg_libgg.h
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/protocols/gg/libgg.h.orig	Sun May 30 18:01:35 2004
-+++ src/protocols/gg/libgg.h	Sun May 30 18:01:58 2004
-@@ -29,7 +29,9 @@
-   #define INADDR_NONE 0xffffffff
- #endif
- 
-+#ifdef HAVE_STDINT_H
- #include <stdint.h>
-+#endif
- #include <sys/types.h>
- 
- /*
diff --git a/net-im/gaim/files/patch-src_protocols_silc_chat.c b/net-im/gaim/files/patch-src_protocols_silc_chat.c
deleted file mode 100644
index 6038346fd5d0..000000000000
--- a/net-im/gaim/files/patch-src_protocols_silc_chat.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/protocols/silc/chat.c.orig	Wed Jun  2 14:36:55 2004
-+++ src/protocols/silc/chat.c	Wed Jun  2 14:37:03 2004
-@@ -1081,7 +1081,7 @@
- 	   do both 1 and 2 with default keys. */
- 
- 	/* Call JOIN */
--	if (passphrase)
-+	if (passphrase && strlen(passphrase))
- 		silc_client_command_call(client, conn, NULL, "JOIN",
- 					 channel, passphrase, "-auth", "-founder", NULL);
- 	else
diff --git a/net-im/gaim/pkg-plist b/net-im/gaim/pkg-plist
index 0009610778ed..2c6a61791d9c 100644
--- a/net-im/gaim/pkg-plist
+++ b/net-im/gaim/pkg-plist
@@ -1,9 +1,77 @@
 bin/gaim
 bin/gaim-remote
-include/gaim-remote/remote-socket.h
-include/gaim-remote/remote.h
+include/gaim/account.h
+include/gaim/accountopt.h
+include/gaim/away.h
+include/gaim/blist.h
+include/gaim/buddyicon.h
+include/gaim/cmds.h
+include/gaim/config.h
+include/gaim/connection.h
+include/gaim/conversation.h
+include/gaim/core.h
+include/gaim/debug.h
+include/gaim/dnd-hints.h
+include/gaim/eventloop.h
+include/gaim/ft.h
+include/gaim/gaim-disclosure.h
+include/gaim/gaim.h
+include/gaim/gtkaccount.h
+include/gaim/gtkblist.h
+include/gaim/gtkcellrendererprogress.h
+include/gaim/gtkconn.h
+include/gaim/gtkconv.h
+include/gaim/gtkdebug.h
+include/gaim/gtkeventloop.h
+include/gaim/gtkft.h
+include/gaim/gtkimhtml.h
+include/gaim/gtkimhtmltoolbar.h
+include/gaim/gtkinternal.h
+include/gaim/gtklog.h
+include/gaim/gtknotify.h
+include/gaim/gtkplugin.h
+include/gaim/gtkpluginpref.h
+include/gaim/gtkpounce.h
+include/gaim/gtkprefs.h
+include/gaim/gtkprivacy.h
+include/gaim/gtkrequest.h
+include/gaim/gtkroomlist.h
+include/gaim/gtksound.h
+include/gaim/gtksourceiter.h
+include/gaim/gtkutils.h
+include/gaim/imgstore.h
+include/gaim/internal.h
+include/gaim/log.h
+include/gaim/md5.h
+include/gaim/multi.h
+include/gaim/network.h
+include/gaim/notify.h
+include/gaim/plugin.h
+include/gaim/pluginpref.h
+include/gaim/pounce.h
+include/gaim/prefs.h
+include/gaim/privacy.h
+include/gaim/proxy.h
+include/gaim/prpl.h
+include/gaim/remote-socket.h
+include/gaim/remote.h
+include/gaim/request.h
+include/gaim/roomlist.h
+include/gaim/server.h
+include/gaim/sha.h
+include/gaim/signals.h
+include/gaim/sound.h
+include/gaim/sslconn.h
+include/gaim/status.h
+include/gaim/stock.h
+include/gaim/stringref.h
+include/gaim/ui.h
+include/gaim/util.h
+include/gaim/value.h
+include/gaim/xmlnode.h
 lib/gaim/autorecon.so
 lib/gaim/docklet.so
+lib/gaim/extplacement.so
 lib/gaim/gaim-remote.so
 lib/gaim/gestures.so
 lib/gaim/history.so
@@ -33,6 +101,7 @@ lib/gaim/timestamp.so
 lib/libgaim-remote.a
 lib/libgaim-remote.so
 lib/libgaim-remote.so.0
+libdata/pkgconfig/gaim.pc
 share/gnome/applications/gaim.desktop
 share/gnome/pixmaps/gaim.png
 share/gnome/pixmaps/gaim/buttons/about_menu.png
@@ -336,7 +405,7 @@ share/locale/zh_TW/LC_MESSAGES/gaim.mo
 @dirrm share/gnome/pixmaps/gaim/buttons
 @dirrm share/gnome/pixmaps/gaim
 @dirrm lib/gaim
-@dirrm include/gaim-remote
+@dirrm include/gaim
 %%PERL:%%@cwd %%LOCALBASE%%
 %%PERL:%%lib/perl5/%%PERL_VER%%/man/man3/Gaim.3
 %%PERL:%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/Gaim/autosplit.ix