Pullup ticket 138 - requested by Thomas Klausner

remove gaim1 packages, they have been vulnerable for a long time,
and no fixes will be forthcoming.

14 files changed, 1 insertions, 343 deletions

diff --git a/chat/Makefile b/chat/Makefile
index 620a5fea100..1e9ce5ef3dc 100644
--- a/chat/Makefile
+++ b/chat/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.96 2004/06/26 14:29:47 abs Exp $
+# $NetBSD: Makefile,v 1.96.2.1 2004/11/10 20:46:45 salo Exp $
 #
 
 COMMENT=	Communication programs
@@ -23,8 +23,6 @@ SUBDIR+=	fisg
 SUBDIR+=	fugu
 SUBDIR+=	gabber
 SUBDIR+=	gaim
-SUBDIR+=	gaim-gnome
-SUBDIR+=	gaim-gtk1
 SUBDIR+=	gale
 SUBDIR+=	gnomeicu
 SUBDIR+=	goofey
diff --git a/chat/gaim-gnome/MESSAGE b/chat/gaim-gnome/MESSAGE
deleted file mode 100644
index 3c9f89fe276..00000000000
--- a/chat/gaim-gnome/MESSAGE
+++ /dev/null
@@ -1,9 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.2 2002/09/24 12:29:57 wiz Exp $
-
-This package does not install a standalone gaim binary. You must add
-the gaim applet to your GNOME pannel by right clicking on the pannel
-and selecting it from the Applets menu. Otherwise, you can launch it
-by running gaim_applet from the command line.
-
-===========================================================================
diff --git a/chat/gaim-gnome/Makefile b/chat/gaim-gnome/Makefile
deleted file mode 100644
index 202ec80bf9e..00000000000
--- a/chat/gaim-gnome/Makefile
+++ /dev/null
@@ -1,22 +0,0 @@
-# $NetBSD: Makefile,v 1.14 2004/05/03 22:38:40 snj Exp $
-
-.include "../gaim-gtk1/Makefile.common"
-
-PKGNAME=	${DISTNAME:S/-/-gnome-/}
-PKGREVISION=	9
-CONFLICTS+=	gaim-[0-9]*
-COMMENT+=	with GNOME support
-
-PLIST_SRC+=	${.CURDIR}/../gaim-gnome/PLIST
-MESSAGE_SRC=	${.CURDIR}/../gaim-gnome/MESSAGE
-
-CONFIGURE_ARGS+= --enable-gnome
-CONFIGURE_ARGS+= --enable-panel
-
-USE_BUILDLINK3=	YES
-
-.include "../../audio/esound/buildlink3.mk"
-.include "../../graphics/gdk-pixbuf/buildlink3.mk"
-.include "../../lang/perl5/buildlink3.mk"
-.include "../../x11/gnome-core/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/chat/gaim-gnome/PLIST b/chat/gaim-gnome/PLIST
deleted file mode 100644
index 005c59f5dbb..00000000000
--- a/chat/gaim-gnome/PLIST
+++ /dev/null
@@ -1,11 +0,0 @@
-@comment $NetBSD: PLIST,v 1.4 2003/01/27 14:31:43 jmmv Exp $
-bin/gaim_applet
-etc/CORBA/servers/gaim_applet.gnorba
-share/applets/Network/gaim_applet.desktop
-share/pixmaps/gaim/away.png
-share/pixmaps/gaim/connect.png
-share/pixmaps/gaim/msgpend.png
-share/pixmaps/gaim/offline.png
-share/pixmaps/gaim/online.png
-@dirrm share/pixmaps/gaim
-@comment in gnome-core: @dirrm share/applets/Network
diff --git a/chat/gaim-gtk1/DESCR b/chat/gaim-gtk1/DESCR
deleted file mode 100644
index 54c83f33c2d..00000000000
--- a/chat/gaim-gtk1/DESCR
+++ /dev/null
@@ -1,6 +0,0 @@
-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
deleted file mode 100644
index f7212381440..00000000000
--- a/chat/gaim-gtk1/Makefile
+++ /dev/null
@@ -1,19 +0,0 @@
-# $NetBSD: Makefile,v 1.5 2004/05/03 22:38:40 snj Exp $
-#
-
-.include "Makefile.common"
-
-CONFLICTS+=		gaim-gnome-[0-9]*
-
-USE_BUILDLINK3=		YES
-
-CONFIGURE_ARGS+=	--disable-gnome
-CONFIGURE_ARGS+=	--disable-panel
-
-PLIST_SRC+=		${.CURDIR}/PLIST
-
-.include "../../audio/esound/buildlink3.mk"
-.include "../../graphics/gdk-pixbuf/buildlink3.mk"
-.include "../../lang/perl5/buildlink3.mk"
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/chat/gaim-gtk1/Makefile.common b/chat/gaim-gtk1/Makefile.common
deleted file mode 100644
index 8cbdec758c1..00000000000
--- a/chat/gaim-gtk1/Makefile.common
+++ /dev/null
@@ -1,48 +0,0 @@
-# $NetBSD: Makefile.common,v 1.13 2004/05/03 22:46:05 wiz Exp $
-#
-
-DISTNAME=	gaim-0.59.8
-PKGREVISION=	6
-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-gtk1/distinfo
-FILESDIR=	${.CURDIR}/../gaim-gtk1/files
-PATCHDIR=	${.CURDIR}/../gaim-gtk1/patches
-PKGDIR=		${.CURDIR}/../gaim-gtk1
-PLIST_SRC=      ${.CURDIR}/../gaim-gtk1/PLIST.common
-
-USE_DIRS+=		gnome1-1.5
-USE_GNU_TOOLS+=		make
-USE_X11BASE=		YES
-USE_PKGLOCALEDIR=	YES
-USE_LIBTOOL=		YES
-
-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/buildlink3.mk
-# can't currently handle.
-#
-CONFIGURE_ARGS+=	--without-included-gettext
-CONFIGURE_ENV+=		gt_cv_func_gnugettext1_libc=yes
-
-.include "../../converters/libiconv/buildlink3.mk"
diff --git a/chat/gaim-gtk1/PLIST b/chat/gaim-gtk1/PLIST
deleted file mode 100644
index e2f0fb26c94..00000000000
--- a/chat/gaim-gtk1/PLIST
+++ /dev/null
@@ -1,2 +0,0 @@
-@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
deleted file mode 100644
index 388185a4866..00000000000
--- a/chat/gaim-gtk1/PLIST.common
+++ /dev/null
@@ -1,53 +0,0 @@
-@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
deleted file mode 100644
index 73728e98c4e..00000000000
--- a/chat/gaim-gtk1/distinfo
+++ /dev/null
@@ -1,8 +0,0 @@
-$NetBSD: distinfo,v 1.2 2004/05/03 22:38:40 snj 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
-SHA1 (patch-ac) = bf8bcb89d474db730c33e0d9d5fd1feccfeedb78
-SHA1 (patch-ad) = 74603f8d139a91ca5f886edb411a9a041c7011ba
diff --git a/chat/gaim-gtk1/patches/patch-aa b/chat/gaim-gtk1/patches/patch-aa
deleted file mode 100644
index ac6cece9c02..00000000000
--- a/chat/gaim-gtk1/patches/patch-aa
+++ /dev/null
@@ -1,18 +0,0 @@
-$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
deleted file mode 100644
index 20aedc4c1af..00000000000
--- a/chat/gaim-gtk1/patches/patch-ab
+++ /dev/null
@@ -1,119 +0,0 @@
-$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;
diff --git a/chat/gaim-gtk1/patches/patch-ac b/chat/gaim-gtk1/patches/patch-ac
deleted file mode 100644
index 9cbb4743c4b..00000000000
--- a/chat/gaim-gtk1/patches/patch-ac
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2004/05/03 22:38:40 snj Exp $
-
---- configure.orig	2003-01-08 03:21:24.000000000 +0100
-+++ configure
-@@ -12479,7 +12479,6 @@ rm -f conftest.$ac_objext conftest.$ac_e
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- 
--CFLAGS="$CFLAGS -I/usr/local/include -I/opt/include -I\$(top_srcdir)"
- 
- # Check whether --enable-distrib or --disable-distrib was given.
- if test "${enable_distrib+set}" = set; then
diff --git a/chat/gaim-gtk1/patches/patch-ad b/chat/gaim-gtk1/patches/patch-ad
deleted file mode 100644
index 3992633e742..00000000000
--- a/chat/gaim-gtk1/patches/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2004/05/03 22:38:40 snj Exp $
-
---- Makefile.in.orig	2003-01-08 03:21:47.000000000 +0100
-+++ Makefile.in
-@@ -66,7 +66,7 @@ AS = @AS@
- BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
- CATOBJEXT = @CATOBJEXT@
- CC = @CC@
--CFLAGS = @CFLAGS@
-+CFLAGS = @CFLAGS@ -I$(top_srcdir)
- DATADIRNAME = @DATADIRNAME@
- DLLTOOL = @DLLTOOL@
- ECHO = @ECHO@