Replace the outdated "xchat" package (version 1.8.11) with the

"xchat2" package (version 2.4.3).

15 files changed, 66 insertions, 398 deletions

diff --git a/chat/Makefile b/chat/Makefile
index 4c53b158f9a..bc014762b70 100644
--- a/chat/Makefile
+++ b/chat/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.111 2005/05/18 22:02:17 wiz Exp $
+# $NetBSD: Makefile,v 1.112 2005/06/06 11:35:39 tron Exp $
 #
 
 COMMENT=	Communication programs
@@ -91,7 +91,6 @@ SUBDIR+=	weechat
 SUBDIR+=	xaric
 SUBDIR+=	xchat
 SUBDIR+=	xchat-systray-integration
-SUBDIR+=	xchat2
 SUBDIR+=	ymessenger
 SUBDIR+=	ysm
 SUBDIR+=	zenicb
diff --git a/chat/xchat/DESCR b/chat/xchat/DESCR
index 5dba79f10e3..e47d8deeedb 100644
--- a/chat/xchat/DESCR
+++ b/chat/xchat/DESCR
@@ -1,3 +1,2 @@
-XChat is a graphical IRC client that runs on UNIX like systems. It
-uses the GTK+ toolkit for graphical abstraction.  (Use the chat/xchat2
-package for XChat version 2 using the GTK2 toolkit.)
+XChat is a graphical IRC client that runs on UNIX-like systems.
+It uses the GTK 2 library as its graphics toolkit.
diff --git a/chat/xchat/Makefile b/chat/xchat/Makefile
index 6bd1147721a..e6eb90d437f 100644
--- a/chat/xchat/Makefile
+++ b/chat/xchat/Makefile
@@ -1,37 +1,33 @@
-# $NetBSD: Makefile,v 1.30 2005/06/02 21:48:42 wiz Exp $
+# $NetBSD: Makefile,v 1.31 2005/06/06 11:35:39 tron Exp $
 
-DISTNAME=	xchat-1.8.11
-PKGREVISION=	11
-CATEGORIES=	chat x11
-MASTER_SITES=	${HOMEPAGE}files/source/1.8/
-EXTRACT_SUFX=	.tar.bz2
+MAINTAINER=		tron@NetBSD.org
 
-MAINTAINER=	tron@NetBSD.org
-HOMEPAGE=	http://xchat.org/
-COMMENT=	X11 (X Window System) IRC client, using the GTK+ toolkit
+.include "Makefile.common"
+
+COMMENT=	X11 (X Window System) IRC client, using the GTK2 toolkit
 
 BUILD_USES_MSGFMT=	YES
 
-USE_DIRS+=		gnome1-1.5
+CONFLICTS=		xchat-gnome-[0-9]*
+
+USE_DIRS+=		xdg-1.1
 USE_PKGLOCALEDIR=	YES
-USE_X11BASE=		YES
-USE_TOOLS+=		gmake grep perl
-CONFIGURE_ARGS+=	--enable-python
 
-CONFLICTS+=		xchat-gnome-[0-9]*
+CONFIGURE_ARGS+=	--enable-textfe
+CONFIGURE_ARGS+=	--enable-tcl=no
+CONFIGURE_ARGS+=	--disable-perl
+CONFIGURE_ARGS+=	--disable-python
 
-GNU_CONFIGURE=		YES
-CONFIGURE_ENV+=		ac_cv_path_perlpath=${PERL5} pythonpath=${PYTHONBIN}
-CONFIGURE_ARGS+=	--disable-gnome
-CONFIGURE_ARGS+=	--disable-zvt
+LDFLAGS.IRIX+=		-lX11
+LDFLAGS.Darwin+=	-lX11
 
+.include "../../mk/bsd.prefs.mk"
 .include "options.mk"
 
+.include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../x11/gtk2/buildlink3.mk"
+
 post-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/xchat
-	${INSTALL_DATA} ${WRKSRC}/doc/*.html ${PREFIX}/share/doc/xchat
+	${INSTALL_DATA_DIR} ${PREFIX}/lib/xchat/plugins
 
-.include "../../graphics/gdk-pixbuf/buildlink3.mk"
-.include "../../x11/gtk/buildlink3.mk"
-.include "../../mk/x11.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/chat/xchat2/Makefile.common b/chat/xchat/Makefile.common
index d7f81b7b161..b3f29cb656a 100644
--- a/chat/xchat2/Makefile.common
+++ b/chat/xchat/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.6 2005/06/03 10:13:29 tron Exp $
+# $NetBSD: Makefile.common,v 1.40 2005/06/06 11:35:39 tron Exp $
 #
 # Please do not merge this file into "Makefile" because it is used by
 # packages in "pkgsrc-wip".
diff --git a/chat/xchat/PLIST b/chat/xchat/PLIST
index 0437cb1c1b9..65cf7f2a1e5 100644
--- a/chat/xchat/PLIST
+++ b/chat/xchat/PLIST
@@ -1,49 +1,46 @@
-@comment $NetBSD: PLIST,v 1.5 2003/01/27 12:54:56 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.6 2005/06/06 11:35:39 tron Exp $
 bin/xchat
 bin/xchat-text
-share/doc/xchat/xchat-1.html
-share/doc/xchat/xchat-10.html
-share/doc/xchat/xchat-2.html
-share/doc/xchat/xchat-3.html
-share/doc/xchat/xchat-4.html
-share/doc/xchat/xchat-5.html
-share/doc/xchat/xchat-6.html
-share/doc/xchat/xchat-7.html
-share/doc/xchat/xchat-8.html
-share/doc/xchat/xchat-9.html
-share/doc/xchat/xchat.html
-share/gnome/apps/Internet/xchat.desktop
+share/applications/xchat.desktop
+${PKGLOCALEDIR}/locale/am/LC_MESSAGES/xchat.mo
+${PKGLOCALEDIR}/locale/az/LC_MESSAGES/xchat.mo
+${PKGLOCALEDIR}/locale/bg/LC_MESSAGES/xchat.mo
 ${PKGLOCALEDIR}/locale/ca/LC_MESSAGES/xchat.mo
 ${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/xchat.mo
-${PKGLOCALEDIR}/locale/da/LC_MESSAGES/xchat.mo
 ${PKGLOCALEDIR}/locale/de/LC_MESSAGES/xchat.mo
 ${PKGLOCALEDIR}/locale/el/LC_MESSAGES/xchat.mo
+${PKGLOCALEDIR}/locale/en_GB/LC_MESSAGES/xchat.mo
 ${PKGLOCALEDIR}/locale/es/LC_MESSAGES/xchat.mo
+${PKGLOCALEDIR}/locale/et/LC_MESSAGES/xchat.mo
+${PKGLOCALEDIR}/locale/eu/LC_MESSAGES/xchat.mo
 ${PKGLOCALEDIR}/locale/fi/LC_MESSAGES/xchat.mo
 ${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/xchat.mo
-${PKGLOCALEDIR}/locale/he/LC_MESSAGES/xchat.mo
-${PKGLOCALEDIR}/locale/hu/LC_MESSAGES/xchat.mo
 ${PKGLOCALEDIR}/locale/it/LC_MESSAGES/xchat.mo
 ${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/xchat.mo
 ${PKGLOCALEDIR}/locale/ko/LC_MESSAGES/xchat.mo
 ${PKGLOCALEDIR}/locale/lt/LC_MESSAGES/xchat.mo
 ${PKGLOCALEDIR}/locale/lv/LC_MESSAGES/xchat.mo
+${PKGLOCALEDIR}/locale/mk/LC_MESSAGES/xchat.mo
+${PKGLOCALEDIR}/locale/ms/LC_MESSAGES/xchat.mo
+${PKGLOCALEDIR}/locale/nb/LC_MESSAGES/xchat.mo
 ${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/xchat.mo
 ${PKGLOCALEDIR}/locale/no/LC_MESSAGES/xchat.mo
-${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/xchat.mo
 ${PKGLOCALEDIR}/locale/pt/LC_MESSAGES/xchat.mo
 ${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/xchat.mo
-${PKGLOCALEDIR}/locale/ro/LC_MESSAGES/xchat.mo
 ${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/xchat.mo
 ${PKGLOCALEDIR}/locale/sk/LC_MESSAGES/xchat.mo
 ${PKGLOCALEDIR}/locale/sl/LC_MESSAGES/xchat.mo
+${PKGLOCALEDIR}/locale/sq/LC_MESSAGES/xchat.mo
 ${PKGLOCALEDIR}/locale/sr/LC_MESSAGES/xchat.mo
 ${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/xchat.mo
-${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/xchat.mo
 ${PKGLOCALEDIR}/locale/uk/LC_MESSAGES/xchat.mo
 ${PKGLOCALEDIR}/locale/vi/LC_MESSAGES/xchat.mo
+${PKGLOCALEDIR}/locale/wa/LC_MESSAGES/xchat.mo
 ${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/xchat.mo
-${PKGLOCALEDIR}/locale/zh_TW.Big5/LC_MESSAGES/xchat.mo
+${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/xchat.mo
 share/pixmaps/xchat.png
-@comment in gnome-dirs: @dirrm share/gnome/apps/Internet
-@dirrm share/doc/xchat
+@comment in xdg-dirs: @dirrm share/pixmaps
+@comment in xdg-dirs: @dirrm share/applications
+@exec ${MKDIR} %D/lib/xchat/plugins
+@dirrm lib/xchat/plugins
+@dirrm lib/xchat
diff --git a/chat/xchat/distinfo b/chat/xchat/distinfo
index 55f7019bf0e..1299314d166 100644
--- a/chat/xchat/distinfo
+++ b/chat/xchat/distinfo
@@ -1,8 +1,5 @@
-$NetBSD: distinfo,v 1.22 2005/02/23 15:59:14 agc Exp $
+$NetBSD: distinfo,v 1.23 2005/06/06 11:35:39 tron Exp $
 
-SHA1 (xchat-1.8.11.tar.bz2) = 331afd74bc20797c0dec1a7e32fe014efe6cdc0a
-RMD160 (xchat-1.8.11.tar.bz2) = 5055190942e28933e33b9f520a6811b86241daae
-Size (xchat-1.8.11.tar.bz2) = 850453 bytes
-SHA1 (patch-aa) = 1e9c5159fb241f79df26f8a4ce5f897faaa9052f
-SHA1 (patch-ad) = 7dec0bd4107febc923031b80b75a1a8a36b0255b
-SHA1 (patch-ae) = baee878728bb33317258e43919ccabfcf3fd2f4a
+SHA1 (xchat-2.4.3.tar.bz2) = 9cc9ed984d271feffca8ee0cee53404c05a10843
+RMD160 (xchat-2.4.3.tar.bz2) = 2222632f2c3db2eac260547e952047bcc450b731
+Size (xchat-2.4.3.tar.bz2) = 1259520 bytes
diff --git a/chat/xchat/options.mk b/chat/xchat/options.mk
index 19304984fbf..0278ba349a3 100644
--- a/chat/xchat/options.mk
+++ b/chat/xchat/options.mk
@@ -1,21 +1,32 @@
-# $NetBSD: options.mk,v 1.1 2005/06/02 21:48:42 wiz Exp $
+# $NetBSD: options.mk,v 1.2 2005/06/06 11:35:39 tron Exp $
 
-PKG_OPTIONS_VAR=	PKG_OPTIONS.xchat
-PKG_SUPPORTED_OPTIONS=	inet6 socks5 ssl
+PKG_OPTIONS_VAR=	PKG_OPTIONS.xchat2
+PKG_SUPPORTED_OPTIONS=	inet6 ssl socks5
 PKG_SUGGESTED_OPTIONS=	ssl
-PKG_OPTIONS_LEGACY_VARS+=	XCHAT_USE_SSL:ssl
+PKG_OPTIONS_LEGACY_OPTS+=	socks:socks5
 
 .include "../../mk/bsd.options.mk"
 
-.if !empty(PKG_OPTIONS:Minet6)
-CONFIGURE_ARGS+=	--enable-ipv6
-.endif
-
+###
+### Use OpenSSL libraries for connecting to ircs servers
+###
 .if !empty(PKG_OPTIONS:Mssl)
-.  include "../../security/openssl/buildlink3.mk"
+.	include "../../security/openssl/buildlink3.mk"
 CONFIGURE_ARGS+=	--enable-openssl=${SSLBASE}
+.else
+CONFIGURE_ARGS+=	--enable-openssl=no
 .endif
 
+###
+### Support for connecting thru SOCKS servers
+###
 .if !empty(PKG_OPTIONS:Msocks5)
 CONFIGURE_ARGS+=	--enable-socks
 .endif
+
+###
+### IPv6 support.
+###
+.if !empty(PKG_OPTIONS:Minet6)
+CONFIGURE_ARGS+=	--enable-ipv6
+.endif
diff --git a/chat/xchat/patches/patch-aa b/chat/xchat/patches/patch-aa
deleted file mode 100644
index 9ef97e40edf..00000000000
--- a/chat/xchat/patches/patch-aa
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-aa,v 1.8 2004/04/14 21:27:25 tron Exp $
-
---- src/common/server.c.orig	Tue Dec  3 08:06:31 2002
-+++ src/common/server.c	Wed Apr 14 23:18:45 2004
-@@ -837,7 +837,7 @@
- 	struct sock5_connect1 sc1;
- 	unsigned char *sc2;
- 	unsigned int packetlen, addrlen;
--	unsigned char buf[10];
-+	unsigned char buf[260];
- 
- 	sc1.version = 5;
- 	sc1.nmethods = 1;
-@@ -878,7 +878,7 @@
- 	{
- 		if (recv (sok, buf, 1, 0) != 1)
- 			return 1;
--		packetlen = buf[0] + 2;
-+		packetlen = buf[0] + 2;	/* can't exceed 260 */
- 		if (recv (sok, buf, packetlen, 0) != packetlen)
- 			return 1;
- 	}
diff --git a/chat/xchat/patches/patch-ad b/chat/xchat/patches/patch-ad
deleted file mode 100644
index 8240a707f05..00000000000
--- a/chat/xchat/patches/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.6 2003/01/12 21:49:07 tron Exp $
-
---- Makefile.in.orig    Sun Jan 12 00:53:53 2003
-+++ Makefile.in Sun Jan 12 00:54:15 2003
-@@ -131,7 +131,7 @@
- icondir = $(datadir)/pixmaps
- 
- util_DATA = xchat.desktop
--utildir = $(sysconfdir)/X11/applnk/Internet
-+utildir = $(datadir)/gnome/apps/Internet
- subdir = .
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
diff --git a/chat/xchat/patches/patch-ae b/chat/xchat/patches/patch-ae
deleted file mode 100644
index 95e0cf344bf..00000000000
--- a/chat/xchat/patches/patch-ae
+++ /dev/null
@@ -1,178 +0,0 @@
-$NetBSD: patch-ae,v 1.3 2002/07/19 05:22:52 mycroft Exp $
-
---- src/common/perl.c.orig	Fri Jul 19 05:14:48 2002
-+++ src/common/perl.c	Fri Jul 19 05:15:59 2002
-@@ -256,7 +256,8 @@
- execute_perl (char *function, char *args)
- {
- 	char *perl_args[2] = { args, NULL }, buf[512];
--	int count, ret_value = 1;
-+	int ret_value = 1;
-+	STRLEN count;
- 	SV *sv;
- 
- 	dSP;
-@@ -273,7 +274,7 @@
- 		POPs;
- 	} else if (count != 1) {
- 		snprintf(buf, 512, "Perl error: expected 1 value from %s, "
--			"got: %d\n", function, count);
-+			"got: %ld\n", function, (long)count);
- 		PrintText(perl_sess, buf);
- 	} else {
- 		ret_value = POPi;
-@@ -656,7 +657,7 @@
- static XS (XS_IRC_register)
- {
- 	char *name, *ver, *callback, *unused;
--	int junk;
-+	STRLEN junk;
- 	struct perlscript *scp;
- 	dXSARGS;
- 
-@@ -680,7 +681,7 @@
- /* IRC::main_print(output) */
- static XS (XS_IRC_print)
- {
--	int junk;
-+	STRLEN junk;
- 	int i;
- 	char *output;
- 	dXSARGS;
-@@ -706,7 +707,7 @@
- 
- static XS (XS_IRC_print_with_channel)
- {
--	int junk;
-+	STRLEN junk;
- 	char *output;
- 	struct session *sess;
- 	GSList *list = sess_list;
-@@ -784,7 +785,7 @@
- /* IRC::get_prefs(var) */
- static XS (XS_IRC_get_prefs)
- {
--	int junk;
-+	STRLEN junk;
- 	char *var;
- 	int i = 0;
- 	dXSARGS;
-@@ -827,7 +828,7 @@
- /* IRC::add_message_handler(message_type, handler_name) */
- static XS (XS_IRC_add_message_handler)
- {
--	int junk;
-+	STRLEN junk;
- 	struct _perl_inbound_handlers *handler;
- 	dXSARGS;
- 
-@@ -842,7 +843,7 @@
- /* IRC::add_command_handler(command_name, handler_name) */
- static XS (XS_IRC_add_command_handler)
- {
--	int junk;
-+	STRLEN junk;
- 	struct _perl_command_handlers *handler;
- 	dXSARGS;
- 
-@@ -857,7 +858,7 @@
- /* IRC::add_print_handler(print_name, handler_name) */
- static XS (XS_IRC_add_print_handler)
- {
--	int junk;
-+	STRLEN junk;
- 	struct _perl_print_handlers *handler;
- 	dXSARGS;
- 
-@@ -870,7 +871,7 @@
- 
- static XS (XS_IRC_add_timeout_handler)
- {
--	int junk;
-+	STRLEN junk;
- 	struct _perl_timeout_handlers *handler;
- 	dXSARGS;
- 
-@@ -886,7 +887,7 @@
- static XS (XS_IRC_send_raw)
- {
- 	char *data;
--	int junk;
-+	STRLEN junk;
- 	dXSARGS;
- 
- 	if (perl_sess)
-@@ -1033,7 +1034,7 @@
- 
- static XS (XS_IRC_user_info)
- {
--	int junk;
-+	STRLEN junk;
- 	struct User *user;
- 	char *nick;
- 	dXSARGS;
-@@ -1065,7 +1066,7 @@
-  */
- static XS (XS_IRC_add_user_list)
- {
--	int junk;
-+	STRLEN junk;
- 	char *ul_channel;
- 	char *ul_server;
- 	char *nick;
-@@ -1104,7 +1105,7 @@
-  */
- static XS (XS_IRC_sub_user_list)
- {
--	int junk;
-+	STRLEN junk;
- 	char *channel;
- 	char *server;
- 	char *nick;
-@@ -1135,7 +1136,7 @@
-  */
- static XS (XS_IRC_clear_user_list)
- {
--	int junk;
-+	STRLEN junk;
- 	char *channel, *server;
- 	struct session *sess;
- 	GSList *list = sess_list;
-@@ -1170,7 +1171,8 @@
- 	struct session *sess;
- 	char *channel, *server;
- 	GSList *list = sess_list;
--	int i = 0, junk;
-+	int i = 0;
-+	STRLEN junk;
- 	int MinStk = 10;
- 	dXSARGS;
- 
-@@ -1267,7 +1269,7 @@
- static XS (XS_IRC_command)
- {
- 	char *command;
--	int junk;
-+	STRLEN junk;
- 	dXSARGS;
- 
- 	if (perl_sess)
-@@ -1284,7 +1286,7 @@
- 	GSList *list = serv_list;
- 	struct server *serv;
- 	char *server, *command;
--	int junk;
-+	STRLEN junk;
- 	dXSARGS;
- 
- 	server = strdup (SvPV (ST (1), junk));
-@@ -1338,7 +1340,8 @@
- 	struct session *sess;
- 	char *channel, *server;
- 	GSList *list = sess_list;
--	int i = 0, junk;
-+	int i = 0;
-+	STRLEN junk;
- 	int MinStk = 10;
- 	dXSARGS;
- 
diff --git a/chat/xchat2/DESCR b/chat/xchat2/DESCR
deleted file mode 100644
index e47d8deeedb..00000000000
--- a/chat/xchat2/DESCR
+++ /dev/null
@@ -1,2 +0,0 @@
-XChat is a graphical IRC client that runs on UNIX-like systems.
-It uses the GTK 2 library as its graphics toolkit.
diff --git a/chat/xchat2/Makefile b/chat/xchat2/Makefile
deleted file mode 100644
index 68e4facdd90..00000000000
--- a/chat/xchat2/Makefile
+++ /dev/null
@@ -1,33 +0,0 @@
-# $NetBSD: Makefile,v 1.45 2005/06/03 10:13:29 tron Exp $
-
-MAINTAINER=		tron@NetBSD.org
-
-.include "Makefile.common"
-
-COMMENT=	X11 (X Window System) IRC client, using the GTK2 toolkit
-
-BUILD_USES_MSGFMT=	YES
-
-CONFLICTS=		xchat-gnome-[0-9]*
-
-USE_DIRS+=		xdg-1.1
-USE_PKGLOCALEDIR=	YES
-
-CONFIGURE_ARGS+=	--enable-textfe
-CONFIGURE_ARGS+=	--enable-tcl=no
-CONFIGURE_ARGS+=	--disable-perl
-CONFIGURE_ARGS+=	--disable-python
-
-LDFLAGS.IRIX+=		-lX11
-LDFLAGS.Darwin+=	-lX11
-
-.include "../../mk/bsd.prefs.mk"
-.include "options.mk"
-
-.include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../x11/gtk2/buildlink3.mk"
-
-post-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/lib/xchat/plugins
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/chat/xchat2/PLIST b/chat/xchat2/PLIST
deleted file mode 100644
index a73925c15b9..00000000000
--- a/chat/xchat2/PLIST
+++ /dev/null
@@ -1,46 +0,0 @@
-@comment $NetBSD: PLIST,v 1.11 2005/06/02 23:33:14 tron Exp $
-bin/xchat
-bin/xchat-text
-share/applications/xchat.desktop
-${PKGLOCALEDIR}/locale/am/LC_MESSAGES/xchat.mo
-${PKGLOCALEDIR}/locale/az/LC_MESSAGES/xchat.mo
-${PKGLOCALEDIR}/locale/bg/LC_MESSAGES/xchat.mo
-${PKGLOCALEDIR}/locale/ca/LC_MESSAGES/xchat.mo
-${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/xchat.mo
-${PKGLOCALEDIR}/locale/de/LC_MESSAGES/xchat.mo
-${PKGLOCALEDIR}/locale/el/LC_MESSAGES/xchat.mo
-${PKGLOCALEDIR}/locale/en_GB/LC_MESSAGES/xchat.mo
-${PKGLOCALEDIR}/locale/es/LC_MESSAGES/xchat.mo
-${PKGLOCALEDIR}/locale/et/LC_MESSAGES/xchat.mo
-${PKGLOCALEDIR}/locale/eu/LC_MESSAGES/xchat.mo
-${PKGLOCALEDIR}/locale/fi/LC_MESSAGES/xchat.mo
-${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/xchat.mo
-${PKGLOCALEDIR}/locale/it/LC_MESSAGES/xchat.mo
-${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/xchat.mo
-${PKGLOCALEDIR}/locale/ko/LC_MESSAGES/xchat.mo
-${PKGLOCALEDIR}/locale/lt/LC_MESSAGES/xchat.mo
-${PKGLOCALEDIR}/locale/lv/LC_MESSAGES/xchat.mo
-${PKGLOCALEDIR}/locale/mk/LC_MESSAGES/xchat.mo
-${PKGLOCALEDIR}/locale/ms/LC_MESSAGES/xchat.mo
-${PKGLOCALEDIR}/locale/nb/LC_MESSAGES/xchat.mo
-${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/xchat.mo
-${PKGLOCALEDIR}/locale/no/LC_MESSAGES/xchat.mo
-${PKGLOCALEDIR}/locale/pt/LC_MESSAGES/xchat.mo
-${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/xchat.mo
-${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/xchat.mo
-${PKGLOCALEDIR}/locale/sk/LC_MESSAGES/xchat.mo
-${PKGLOCALEDIR}/locale/sl/LC_MESSAGES/xchat.mo
-${PKGLOCALEDIR}/locale/sq/LC_MESSAGES/xchat.mo
-${PKGLOCALEDIR}/locale/sr/LC_MESSAGES/xchat.mo
-${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/xchat.mo
-${PKGLOCALEDIR}/locale/uk/LC_MESSAGES/xchat.mo
-${PKGLOCALEDIR}/locale/vi/LC_MESSAGES/xchat.mo
-${PKGLOCALEDIR}/locale/wa/LC_MESSAGES/xchat.mo
-${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/xchat.mo
-${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/xchat.mo
-share/pixmaps/xchat.png
-@comment in xdg-dirs: @dirrm share/pixmaps
-@comment in xdg-dirs: @dirrm share/applications
-@exec ${MKDIR} %D/lib/xchat/plugins
-@dirrm lib/xchat/plugins
-@dirrm lib/xchat
diff --git a/chat/xchat2/distinfo b/chat/xchat2/distinfo
deleted file mode 100644
index 49076f3cb35..00000000000
--- a/chat/xchat2/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.17 2005/06/02 23:33:14 tron Exp $
-
-SHA1 (xchat-2.4.3.tar.bz2) = 9cc9ed984d271feffca8ee0cee53404c05a10843
-RMD160 (xchat-2.4.3.tar.bz2) = 2222632f2c3db2eac260547e952047bcc450b731
-Size (xchat-2.4.3.tar.bz2) = 1259520 bytes
diff --git a/chat/xchat2/options.mk b/chat/xchat2/options.mk
deleted file mode 100644
index 3f4513a3fa0..00000000000
--- a/chat/xchat2/options.mk
+++ /dev/null
@@ -1,32 +0,0 @@
-# $NetBSD: options.mk,v 1.5 2005/06/03 10:24:05 wiz Exp $
-
-PKG_OPTIONS_VAR=	PKG_OPTIONS.xchat2
-PKG_SUPPORTED_OPTIONS=	inet6 ssl socks5
-PKG_SUGGESTED_OPTIONS=	ssl
-PKG_OPTIONS_LEGACY_OPTS+=	socks:socks5
-
-.include "../../mk/bsd.options.mk"
-
-###
-### Use OpenSSL libraries for connecting to ircs servers
-###
-.if !empty(PKG_OPTIONS:Mssl)
-.	include "../../security/openssl/buildlink3.mk"
-CONFIGURE_ARGS+=	--enable-openssl=${SSLBASE}
-.else
-CONFIGURE_ARGS+=	--enable-openssl=no
-.endif
-
-###
-### Support for connecting thru SOCKS servers
-###
-.if !empty(PKG_OPTIONS:Msocks5)
-CONFIGURE_ARGS+=	--enable-socks
-.endif
-
-###
-### IPv6 support.
-###
-.if !empty(PKG_OPTIONS:Minet6)
-CONFIGURE_ARGS+=	--enable-ipv6
-.endif