Reimport of gaim (0.59.8) as gaim-gtk1. Newer versions of gaim are going

to use gtk2, but people may still one the gtk1 based version (which will
receive bugfixes only).

Gaim is a clone of AOL's Instant Messenger client.  It features nearly all
of the functionality of the official AIM client while also being smaller
and faster. Gaim also has plugins that let you use ICQ, Yahoo, MSN, IRC,
Jabber, Napster, and Zephyr.

8 files changed, 274 insertions, 0 deletions

diff --git a/chat/gaim-gtk1/DESCR b/chat/gaim-gtk1/DESCR
new file mode 100644
index 00000000000..4ec58285a40
--- /dev/null
+++ b/chat/gaim-gtk1/DESCR
@@ -0,0 +1,6 @@
+Gaim is a clone of AOL's Instant Messenger client.  It features nearly all
+of the functionality of the official AIM client while also being smaller
+and faster. Gaim also has plugins that let you use ICQ, Yahoo, MSN, IRC,
+Jabber, Napster, and Zephyr. 
+
+Check out http://www.aol.com/aim/ to sign on!
diff --git a/chat/gaim-gtk1/Makefile b/chat/gaim-gtk1/Makefile
new file mode 100644
index 00000000000..ed1de78f10a
--- /dev/null
+++ b/chat/gaim-gtk1/Makefile
@@ -0,0 +1,19 @@
+# $NetBSD: Makefile,v 1.1.1.1 2003/04/11 15:39:02 jmmv Exp $
+#
+
+.include "Makefile.common"
+
+CONFLICTS+=		gaim-[0-9]* gaim-gnome-[0-9]*
+
+USE_BUILDLINK2=		YES
+
+CONFIGURE_ARGS+=	--disable-gnome
+CONFIGURE_ARGS+=	--disable-panel
+
+PLIST_SRC+=		${.CURDIR}/../gaim/PLIST
+
+.include "../../audio/esound/buildlink2.mk"
+.include "../../graphics/gdk-pixbuf/buildlink2.mk"
+.include "../../lang/perl5/buildlink2.mk"
+
+.include "../../mk/bsd.pkg.mk"
diff --git a/chat/gaim-gtk1/Makefile.common b/chat/gaim-gtk1/Makefile.common
new file mode 100644
index 00000000000..1c66831ec13
--- /dev/null
+++ b/chat/gaim-gtk1/Makefile.common
@@ -0,0 +1,51 @@
+# $NetBSD: Makefile.common,v 1.1.1.1 2003/04/11 15:39:03 jmmv Exp $
+#
+
+DISTNAME=	gaim-0.59.8
+PKGREVISION=	2
+CATEGORIES=	chat x11
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=gaim/} \
+		ftp://ftp.marko.net/pub/gaim/
+
+MAINTAINER=	rafal@netbsd.org
+HOMEPAGE=	http://gaim.sourceforge.net/
+COMMENT=	GTK1-based client for the AOL Instant Messenger chat system
+
+DISTINFO_FILE=	${.CURDIR}/../gaim/distinfo
+FILESDIR=	${.CURDIR}/../gaim/files
+PATCHDIR=	${.CURDIR}/../gaim/patches
+PKGDIR=		${.CURDIR}/../gaim
+PLIST_SRC=      ${.CURDIR}/../gaim/PLIST.common
+
+DEPENDS+=	gnome1-dirs>=1.0:../../misc/gnome1-dirs
+
+USE_GMAKE=		YES
+USE_X11BASE=		YES
+USE_PKGLOCALEDIR=	YES
+
+USE_LIBTOOL=		YES
+LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
+
+GNU_CONFIGURE=		YES
+CONFIGURE_ARGS+=	--disable-artsc
+CONFIGURE_ARGS+=	--disable-nas
+CONFIGURE_ARGS+=	--disable-perl
+CONFIGURE_ARGS+=	--with-libiconv-prefix=${BUILDLINK_PREFIX.libiconv}
+
+CONFIGURE_ARGS+=	--enable-esd
+CONFIGURE_ARGS+=	--enable-perl
+CONFIGURE_ARGS+=	--enable-pixbuf
+
+.include "../../mk/bsd.prefs.mk"
+
+.if !exists(${X11BASE}/include/X11/extensions/scrnsaver.h)
+CONFIGURE_ARGS+=	--disable-screensaver
+.endif
+
+# Newer versions of gaim use gettext checks that gettext-lib/buildlink2.mk
+# can't currently handle.
+#
+CONFIGURE_ARGS+=	--without-included-gettext
+CONFIGURE_ENV+=		gt_cv_func_gnugettext1_libc=yes
+
+.include "../../converters/libiconv/buildlink2.mk"
diff --git a/chat/gaim-gtk1/PLIST b/chat/gaim-gtk1/PLIST
new file mode 100644
index 00000000000..e2f0fb26c94
--- /dev/null
+++ b/chat/gaim-gtk1/PLIST
@@ -0,0 +1,2 @@
+@comment $NetBSD: PLIST,v 1.1.1.1 2003/04/11 15:39:03 jmmv Exp $
+bin/gaim
diff --git a/chat/gaim-gtk1/PLIST.common b/chat/gaim-gtk1/PLIST.common
new file mode 100644
index 00000000000..388185a4866
--- /dev/null
+++ b/chat/gaim-gtk1/PLIST.common
@@ -0,0 +1,53 @@
+@comment $NetBSD: PLIST.common,v 1.1.1.1 2003/04/11 15:39:03 jmmv Exp $
+lib/gaim/autorecon.so
+lib/gaim/chatlist.so
+lib/gaim/iconaway.so
+lib/gaim/libgg.a
+lib/gaim/libgg.la
+lib/gaim/libgg.so
+lib/gaim/libicq.a
+lib/gaim/libicq.la
+lib/gaim/libicq.so
+lib/gaim/libirc.a
+lib/gaim/libirc.la
+lib/gaim/libirc.so
+lib/gaim/libjabber.a
+lib/gaim/libjabber.la
+lib/gaim/libjabber.so
+lib/gaim/libmsn.a
+lib/gaim/libmsn.la
+lib/gaim/libmsn.so
+lib/gaim/libnapster.a
+lib/gaim/libnapster.la
+lib/gaim/libnapster.so
+lib/gaim/libyahoo.a
+lib/gaim/libyahoo.la
+lib/gaim/libyahoo.so
+lib/gaim/libzephyr.a
+lib/gaim/libzephyr.la
+lib/gaim/libzephyr.so
+lib/gaim/notify.so
+lib/gaim/spellchk.so
+man/man1/gaim.1
+share/gnome/apps/Internet/gaim.desktop
+${PKGLOCALEDIR}/locale/bg/LC_MESSAGES/gaim.mo
+${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/gaim.mo
+${PKGLOCALEDIR}/locale/da/LC_MESSAGES/gaim.mo
+${PKGLOCALEDIR}/locale/de/LC_MESSAGES/gaim.mo
+${PKGLOCALEDIR}/locale/es/LC_MESSAGES/gaim.mo
+${PKGLOCALEDIR}/locale/fi/LC_MESSAGES/gaim.mo
+${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/gaim.mo
+${PKGLOCALEDIR}/locale/hu/LC_MESSAGES/gaim.mo
+${PKGLOCALEDIR}/locale/it/LC_MESSAGES/gaim.mo
+${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/gaim.mo
+${PKGLOCALEDIR}/locale/ko/LC_MESSAGES/gaim.mo
+${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/gaim.mo
+${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/gaim.mo
+${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/gaim.mo
+${PKGLOCALEDIR}/locale/sk/LC_MESSAGES/gaim.mo
+${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/gaim.mo
+${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/gaim.mo
+${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/gaim.mo
+share/pixmaps/gaim.png
+@comment in gnome-dirs: @dirrm share/gnome/apps/Internet
+@dirrm lib/gaim
diff --git a/chat/gaim-gtk1/distinfo b/chat/gaim-gtk1/distinfo
new file mode 100644
index 00000000000..a1cdabeeb3a
--- /dev/null
+++ b/chat/gaim-gtk1/distinfo
@@ -0,0 +1,6 @@
+$NetBSD: distinfo,v 1.1.1.1 2003/04/11 15:39:03 jmmv Exp $
+
+SHA1 (gaim-0.59.8.tar.gz) = d1d81fd634bc206433982eb19cd76492a79a1834
+Size (gaim-0.59.8.tar.gz) = 2126403 bytes
+SHA1 (patch-aa) = d1eba622e65507f657d602e497601e38140c5963
+SHA1 (patch-ab) = 0a635d9c7b89b5ce87c3a0bb37fa05280c66c6c2
diff --git a/chat/gaim-gtk1/patches/patch-aa b/chat/gaim-gtk1/patches/patch-aa
new file mode 100644
index 00000000000..ac6cece9c02
--- /dev/null
+++ b/chat/gaim-gtk1/patches/patch-aa
@@ -0,0 +1,18 @@
+$NetBSD: patch-aa,v 1.1.1.1 2003/04/11 15:39:03 jmmv Exp $
+
+--- src/Makefile.in.orig	Sat Sep 14 22:28:40 2002
++++ src/Makefile.in	Mon Oct 28 19:24:10 2002
+@@ -150,11 +150,11 @@
+ @GNOMEAPPLET_TRUE@gaim_applet_SOURCES = about.c 			aim.c 			applet.c 			away.c 			browser.c 			buddy.c 			buddy_chat.c 			conversation.c 			core.c 			dialogs.c 			gaimrc.c 			gtkimhtml.c 			gtkspell.c 			gtkticker.c 			html.c 			idle.c 			list.c 			md5.c 			module.c 			multi.c 			perl.c 			plugins.c 			prefs.c 			proxy.c 			prpl.c 			server.c 			sound.c 			ticker.c 			util.c
+ @GNOMEAPPLET_TRUE@gaim_applet_DEPENDENCIES = @LIBOBJS@ $(STATIC_LINK_LIBS)
+ @GNOMEAPPLET_TRUE@gaim_applet_LDFLAGS = -export-dynamic
+-@GNOMEAPPLET_TRUE@gaim_applet_LDADD = @LDADD@ @LIBOBJS@
++@GNOMEAPPLET_TRUE@gaim_applet_LDADD = @LDADD@ @LIBOBJS@ -liconv
+ @GNOMEAPPLET_FALSE@gaim_SOURCES = about.c 		aim.c 		applet.c 		away.c 		browser.c 		buddy.c 		buddy_chat.c 		conversation.c 		core.c 		dialogs.c 		gaimrc.c 		gtkimhtml.c 		gtkspell.c 		gtkticker.c 		html.c 		idle.c 		list.c 		md5.c 		module.c 		multi.c 		perl.c 		plugins.c 		prefs.c 		proxy.c 		prpl.c 		server.c 		sound.c 		ticker.c 		util.c
+ @GNOMEAPPLET_FALSE@gaim_DEPENDENCIES = @LIBOBJS@ $(STATIC_LINK_LIBS)
+ @GNOMEAPPLET_FALSE@gaim_LDFLAGS = -export-dynamic
+-@GNOMEAPPLET_FALSE@gaim_LDADD = @LDADD@ @LIBOBJS@
++@GNOMEAPPLET_FALSE@gaim_LDADD = @LDADD@ @LIBOBJS@ -liconv
+ CFLAGS = @CFLAGS@ $(PERL_CFLAGS) -DLOCALEDIR=\"$(datadir)/locale\" -DLIBDIR=\"$(libdir)/gaim/\" $(DEBUG_CFLAGS)
+ 
+ LIBS = @LIBS@ $(UI_LIBS) $(SOUND_LIBS) $(STATIC_LINK_LIBS) $(PERL_LIBS) $(XSS_LIBS) $(INTLLIBS) $(DEBUG_LIBS)
diff --git a/chat/gaim-gtk1/patches/patch-ab b/chat/gaim-gtk1/patches/patch-ab
new file mode 100644
index 00000000000..20aedc4c1af
--- /dev/null
+++ b/chat/gaim-gtk1/patches/patch-ab
@@ -0,0 +1,119 @@
+$NetBSD: patch-ab,v 1.1.1.1 2003/04/11 15:39:03 jmmv Exp $
+
+--- src/perl.c.orig	Sat Dec 21 20:08:19 2002
++++ src/perl.c	Thu Jan  9 16:03:03 2003
+@@ -178,15 +178,13 @@
+ {
+ 	DIR *dir;
+ 	struct dirent *ent;
+-	struct dirent *dirent_buf;
+ 	char *buf;
+ 	char *path;
+ 
+ 	path = gaim_user_dir();
+ 	dir = opendir(path);
+ 	if (dir) {
+-		dirent_buf = g_malloc(sizeof(struct dirent) + NAME_MAX);
+-		while ((readdir_r(dir,dirent_buf,&ent),ent)) {
++ 		while ((ent = readdir(dir))) {
+ 			if (strcmp(ent->d_name, ".") && strcmp(ent->d_name, "..")) {
+ 				if (is_pl_file(ent->d_name)) {
+ 					buf = g_malloc(strlen(path) + strlen(ent->d_name) + 2);
+@@ -197,7 +195,6 @@
+ 			}
+ 		}
+ 		closedir(dir);
+-		g_free(dirent_buf);
+ 	}
+ 	g_free(path);
+ }
+@@ -295,7 +292,7 @@
+ XS (XS_GAIM_register)
+ {
+ 	char *name, *ver, *callback, *unused; /* exactly like X-Chat, eh? :) */
+-	unsigned int junk;
++	STRLEN junk;
+ 	struct perlscript *scp;
+ 	dXSARGS;
+ 	items = 0;
+@@ -406,7 +403,7 @@
+ {
+ 	char *title;
+ 	char *message;
+-	unsigned int junk;
++	STRLEN junk;
+ 	dXSARGS;
+ 	items = 0;
+ 
+@@ -474,7 +471,7 @@
+ 
+ XS (XS_GAIM_command)
+ {
+-	unsigned int junk;
++	STRLEN junk;
+ 	char *command = NULL;
+ 	dXSARGS;
+ 	items = 0;
+@@ -526,7 +523,7 @@
+ XS (XS_GAIM_user_info)
+ {
+ 	struct gaim_connection *gc;
+-	unsigned int junk;
++	STRLEN junk;
+ 	struct buddy *buddy = NULL;
+ 	dXSARGS;
+ 	items = 0;
+@@ -552,7 +549,7 @@
+ {
+ 	char *nick, *who, *what;
+ 	struct conversation *c;
+-	int junk;
++	STRLEN junk;
+ 	int send, wflags;
+ 	dXSARGS;
+ 	items = 0;
+@@ -584,7 +581,7 @@
+ 	struct gaim_connection *gc;
+ 	char *nick, *what;
+ 	int isauto;
+-	int junk;
++	STRLEN junk;
+ 	dXSARGS;
+ 	items = 0;
+ 
+@@ -607,7 +604,7 @@
+ 	char *nick, *what;
+ 	int isauto;
+ 	struct conversation *c;
+-	unsigned int junk;
++	STRLEN junk;
+ 	dXSARGS;
+ 	items = 0;
+ 
+@@ -637,7 +634,7 @@
+ 	char *what;
+ 	struct conversation *b = NULL;
+ 	GSList *bcs;
+-	unsigned int junk;
++	STRLEN junk;
+ 	dXSARGS;
+ 	items = 0;
+ 
+@@ -803,7 +800,7 @@
+ 
+ XS (XS_GAIM_add_event_handler)
+ {
+-	unsigned int junk;
++	STRLEN junk;
+ 	struct _perl_event_handlers *handler;
+ 	dXSARGS;
+ 	items = 0;
+@@ -830,7 +827,7 @@
+ 
+ XS (XS_GAIM_add_timeout_handler)
+ {
+-	unsigned int junk;
++	STRLEN junk;
+ 	long timeout;
+ 	struct _perl_timeout_handlers *handler;
+ 	dXSARGS;