- Rename ports

  irc/xchat -> irc/xchat1
  irc/xchat2 -> irc/xchat

22 files changed, 130 insertions, 304 deletions

diff --git a/CVSROOT/modules b/CVSROOT/modules
index 1c89523..57eeaa1 100644
--- a/CVSROOT/modules
+++ b/CVSROOT/modules
@@ -14039,7 +14039,7 @@ xchat-fish	ports/irc/xchat-fish
 xchat-gnome	ports/irc/xchat-gnome
 xchat-mircryption	ports/irc/xchat-mircryption
 xchat-systray-plugin	ports/irc/xchat-systray-plugin
-xchat2		ports/irc/xchat2
+xchat1		ports/irc/xchat1
 xcheckers	ports/games/xcheckers
 xchm		ports/deskutils/xchm
 xchomp		ports/games/xchomp
diff --git a/MOVED b/MOVED
index 25bc766..64f41a1 100644
--- a/MOVED
+++ b/MOVED
@@ -2314,3 +2314,4 @@ devel/pkgconfig|devel/pkg-config|2006-05-27|Renamed to use real vendor package n
 devel/py-orbit2|devel/py-orbit|2006-05-28|Renamed to use real vendor package name
 games/gcompris2|games/gcompris|2006-05-28|Renamed to use real vendor package name
 games/gnomegames2|games/gnome-games|2006-05-28|Renamed to use real vendor package name
+irc/xchat2|irc/xchat|2006-05-28|Use unversioned name for latest version
diff --git a/irc/Makefile b/irc/Makefile
index abaecd1..e491150 100644
--- a/irc/Makefile
+++ b/irc/Makefile
@@ -118,7 +118,7 @@
     SUBDIR += xchat-gnome
     SUBDIR += xchat-mircryption
     SUBDIR += xchat-systray-plugin
-    SUBDIR += xchat2
+    SUBDIR += xchat1
     SUBDIR += zircon
 
 .include <bsd.port.subdir.mk>
diff --git a/irc/xchat-ecl-plugin/Makefile b/irc/xchat-ecl-plugin/Makefile
index f36d452..534e8e1 100644
--- a/irc/xchat-ecl-plugin/Makefile
+++ b/irc/xchat-ecl-plugin/Makefile
@@ -17,7 +17,7 @@ MAINTAINER=	der_julian@web.de
 COMMENT=	X-Chat 2.x plugin to allow Common Lisp scripting
 
 BUILD_DEPENDS=	ecl:${PORTSDIR}/lang/ecl
-RUN_DEPENDS=	xchat:${PORTSDIR}/irc/xchat2
+RUN_DEPENDS=	xchat:${PORTSDIR}/irc/xchat
 
 BROKEN=		Does not build
 
diff --git a/irc/xchat-fish/Makefile b/irc/xchat-fish/Makefile
index e93dc66..3faf7f8 100644
--- a/irc/xchat-fish/Makefile
+++ b/irc/xchat-fish/Makefile
@@ -16,7 +16,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	An encryption plugin for XChat
 
 BUILD_DEPENDS=	${LOCALBASE}/lib/libmiracl.a:${PORTSDIR}/math/miracl
-RUN_DEPENDS=	xchat:${PORTSDIR}/irc/xchat2
+RUN_DEPENDS=	xchat:${PORTSDIR}/irc/xchat
 
 USE_X_PREFIX=	yes
 USE_ZIP=	yes
diff --git a/irc/xchat-mircryption/Makefile b/irc/xchat-mircryption/Makefile
index e7fcadb..7c141c4 100644
--- a/irc/xchat-mircryption/Makefile
+++ b/irc/xchat-mircryption/Makefile
@@ -15,7 +15,7 @@ DISTNAME=	mircryption_xchatsrc
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A free encryption add-on for the popular XChat irc client
 
-RUN_DEPENDS=	xchat:${PORTSDIR}/irc/xchat2
+RUN_DEPENDS=	xchat:${PORTSDIR}/irc/xchat
 
 USE_X_PREFIX=	yes
 USE_ZIP=	yes
diff --git a/irc/xchat-systray-plugin/Makefile b/irc/xchat-systray-plugin/Makefile
index 8e6a824..8e81060 100644
--- a/irc/xchat-systray-plugin/Makefile
+++ b/irc/xchat-systray-plugin/Makefile
@@ -16,7 +16,7 @@ DISTNAME=	xchat-systray-integration-${PORTVERSION}-src
 MAINTAINER=	pav@FreeBSD.org
 COMMENT=	Systray icon plugin for X-Chat
 
-RUN_DEPENDS=	xchat:${PORTSDIR}/irc/xchat2
+RUN_DEPENDS=	xchat:${PORTSDIR}/irc/xchat
 
 WRKSRC=		${WRKDIR}/xchat-systray-integration-${PORTVERSION}
 USE_X_PREFIX=	yes
diff --git a/irc/xchat/Makefile b/irc/xchat/Makefile
index f58a714..4e13846 100644
--- a/irc/xchat/Makefile
+++ b/irc/xchat/Makefile
@@ -1,88 +1,112 @@
-# New ports collection makefile for:	xchat
-# Date created:			17 Nov 1998
-# Whom:				Jim Mock <jim@FreeBSD.org>
+# New ports collection makefile for:	xchat2
+# Date created:			17 Aug 2002
+# Whom:				Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
-PORTNAME=		xchat
-PORTVERSION=		1.8.11
-PORTREVISION=		6
-CATEGORIES+=		irc gnome ipv6
-MASTER_SITES=		http://xchat.org/files/source/1.8/ \
-			http://xchat.linuxpower.org/files/source/1.8/
+PORTNAME=	xchat
+PORTVERSION=	2.6.2
+CATEGORIES=	irc gnome ipv6
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
+		http://xchat.org/files/source/2.6/
+MASTER_SITE_SUBDIR=	${PORTNAME:S|2||}
+DISTNAME=	xchat-${PORTVERSION}
 
-MAINTAINER?=		ports@FreeBSD.org
-COMMENT=	An X11 IRC client using the GTK+ toolkit, and optionally, GNOME
+MAINTAINER=	gnome@FreeBSD.org
+COMMENT=	An X11 IRC client using the GTK+ 2 toolkit
 
-# This port has a slave port japanese/xchat.  Do not carelessly overwrite
-# the variables or the targets defined in it.  When you need to, please
-# contact its maintainer.
+USE_X_PREFIX=	yes
+USE_BZIP2=	yes
+USE_GMAKE=	yes
+USE_GNOME=	gnomehack gtk20
+USE_GETTEXT=	yes
+GNU_CONFIGURE=	yes
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
+		LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+CONFIGURE_ARGS=	--enable-nls \
+		--enable-ipv6
 
-USE_X_PREFIX=		yes
-USE_BZIP2=		yes
-USE_GMAKE=		yes
-USE_ICONV=		yes
-USE_PERL5=		yes
-USE_GNOME=		gtk12
-WANT_GNOME=		yes
-GNU_CONFIGURE=		yes
-# Assign with `+=' for slave ports
-CONFIGURE_ENV+=		CPPFLAGS="-I${LOCALBASE}/include" \
-			LIBS="-L${LOCALBASE}/lib -lintl -liconv"
-CONFIGURE_ARGS+=	--without-included-gettext \
-			--enable-nls \
-			--enable-ipv6 \
-			--datadir="${PREFIX}/share" \
-			--enable-perl
+CONFLICTS=	xchat-1*
 
-.if defined(WITH_SSL)
-USE_OPENSSL=		YES
-CONFIGURE_ARGS+=	--enable-openssl
+.if defined(WITH_SOCKS)
+BUILD_DEPENDS+=	${LOCALBASE}/lib/libsocks5.a:${PORTSDIR}/net/socks5
+CONFIGURE_ARGS+=	--enable-socks
 .endif
 
+# openssl in now default in configure
+
 .if defined(WITH_PYTHON)
-USE_PYTHON=	yes
+USE_PYTHON=		yes
 CONFIGURE_ARGS+=	--enable-python
+PLIST_SUB+=		PYTHON=""
 .else
 CONFIGURE_ARGS+=	--disable-python
+PLIST_SUB+=		PYTHON="@comment "
 .endif
 
-.include <bsd.port.pre.mk>
-
-.if defined(WITH_SOCKS)
-# Assign with `+=' for slave ports
-BUILD_DEPENDS+=		${LOCALBASE}/lib/libsocks5.a:${PORTSDIR}/net/socks5
-CONFIGURE_ARGS+=	--enable-socks
+.if defined(WITH_TCL)
+LIB_DEPENDS+=	tcl83.1:${PORTSDIR}/lang/tcl83
+CONFIGURE_ARGS+=--enable-tcl=${LOCALBASE}/lib/tcl8.3
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS} \
+		-I${LOCALBASE}/include/tcl8.3" \
+		LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS} \
+		-L${LOCALBASE}/lib/tcl8.3"
+PLIST_SUB+=	TCL=""
+.else
+CONFIGURE_ARGS+=--enable-tcl=no
+PLIST_SUB+=	TCL="@comment "
 .endif
 
-.if defined(WITH_TRANSPARENCY)
-BUILD_DEPENDS+=		${X11BASE}/bin/gdk-pixbuf-config:${PORTSDIR}/graphics/gdk-pixbuf
-CONFIGURE_ARGS+=	--enable-gdk-pixbuf
+.if !defined(WITHOUT_DBUS)
+LIB_DEPENDS+=	dbus-1.2:${PORTSDIR}/devel/dbus
+CONFIGURE_ARGS+=--enable-dbus
+USE_GNOME+=	gconf2
+GCONF_SCHEMAS=	apps_xchat_url_handler.schemas
+PLIST_SUB+=	DBUS=""
+.else
+CONFIGURE_ARGS+=--disable-dbus
+PLIST_SUB+=	DBUS="@comment "
 .endif
 
-.if ${HAVE_GNOME:Mimlib}!=""
-USE_GNOME=		imlib
-CONFIGURE_ARGS+=	--enable-gnome --enable-panel --enable-gdk-pixbuf \
-			--enable-zvt
-MAKE_ARGS=		icondir="${PREFIX}/share/gnome/pixmaps" \
-			utildir="${PREFIX}/share/gnome/apps/Internet"
+.include <bsd.port.pre.mk>
+
+.if ${PERL_LEVEL} < 500600 || defined(WITHOUT_PERL)
+CONFIGURE_ARGS+=--disable-perl
+PLIST_SUB+=	PERL="@comment "
 .else
-CONFIGURE_ARGS+=	--disable-gnome --disable-zvt
+USE_PERL5=	yes
+CONFIGURE_ARGS+=--enable-perl
+PLIST_SUB+=	PERL=""
+.endif
+
+pre-everything::
+.if !defined(WITH_PYTHON) || !defined(WITH_SOCKS) || !defined(WITH_TCL) || !defined(WITHOUT_PERL) || !defined(WITHOUT_DBUS)
+	@${ECHO_MSG} "You may specify the following on the command line:"
+	@${ECHO_MSG} ""
+.endif
+.if !defined(WITH_PYTHON)
+	@${ECHO_MSG} "WITH_PYTHON=yes for Python support"
+.endif
+.if !defined(WITH_SOCKS)
+	@${ECHO_MSG} "WITH_SOCKS=yes for SOCKS5 proxy support"
+.endif
+.if !defined(WITH_TCL)
+	@${ECHO_MSG} "WITH_TCL=yes for tcl support"
+.endif
+.if !defined(WITHOUT_PERL)
+	@${ECHO_MSG} "WITHOUT_PERL=yes to disable Perl support"
+.endif
+.if !defined(WITHOUT_DBUS)
+	@${ECHO_MSG} "WITHOUT_DBUS=yes to disable dbus support"
 .endif
 
 post-patch:
-	@${PERL} -pi \
-		-e 's|-lpthread|${PTHREAD_LIBS}|g;' \
+	@${REINPLACE_CMD} -E -e 's|PY_LIBS=.*|PY_LIBS="-L\$$PY_EXEC_PREFIX/lib/python\$$PY_VER/config -lpython\$$PY_VER ${PTHREAD_LIBS} -lutil"|' \
 		${WRKSRC}/configure
 
+# Create plugins directory even when no plugins are installed
 post-install:
-.if !defined(NOPORTDOCS)
-	@${ECHO_MSG} "===>   Installing xchat docs in ${PREFIX}/share/doc/xchat"
-	@${MKDIR} ${PREFIX}/share/doc/xchat && ${CHMOD} a+rx ${PREFIX}/share/doc/xchat
-	${INSTALL_DATA} ${WRKSRC}/doc/*.* ${PREFIX}/share/doc/xchat
-	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/xchat
-	${INSTALL_DATA} ${WRKSRC}/ChangeLog ${PREFIX}/share/doc/xchat
-.endif
+	@${MKDIR} ${PREFIX}/lib/xchat/plugins
 
 .include <bsd.port.post.mk>
diff --git a/irc/xchat/distinfo b/irc/xchat/distinfo
index 0e2f124..913c1c2 100644
--- a/irc/xchat/distinfo
+++ b/irc/xchat/distinfo
@@ -1,3 +1,3 @@
-MD5 (xchat-1.8.11.tar.bz2) = 951f5b2fe2d5deef08f7f519414072a1
-SHA256 (xchat-1.8.11.tar.bz2) = b3d457e014649e4b25ba5241e6dde600ffe2c8c6c4d462b8d4392b9f38b5abed
-SIZE (xchat-1.8.11.tar.bz2) = 850453
+MD5 (xchat-2.6.2.tar.bz2) = 6b534baf9a4df6bf23d7d16f7e4eb379
+SHA256 (xchat-2.6.2.tar.bz2) = a184d42a8130e5a4151e0190ba45dc3440c49270818fec02f35bca932da64f9c
+SIZE (xchat-2.6.2.tar.bz2) = 1046910
diff --git a/irc/xchat/files/patch-configure b/irc/xchat/files/patch-configure
index 1d6df50..a48d5cb 100644
--- a/irc/xchat/files/patch-configure
+++ b/irc/xchat/files/patch-configure
@@ -1,11 +1,17 @@
---- configure.orig	Wed Jan 15 23:38:08 2003
-+++ configure	Wed Jan 15 23:38:08 2003
-@@ -6017,4 +6017,4 @@
- #include "confdefs.h"
+--- configure.orig	Sun Apr  2 19:17:32 2006
++++ configure	Sun Apr  2 19:18:07 2006
+@@ -24741,12 +24741,12 @@ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
  #include <libintl.h>
  extern int _nl_msg_cat_cntr;
 -extern int *_nl_domain_bindings;
 +extern int *libintl_nl_domain_bindings;
-@@ -6031,2 +6031,2 @@
--return (int) gettext ("") + _nl_msg_cat_cntr + *_nl_domain_bindings
-+return (int) gettext ("") + _nl_msg_cat_cntr + *libintl_nl_domain_bindings
+ int
+ main ()
+ {
+ bindtextdomain ("", "");
+-return * gettext ("") + _nl_msg_cat_cntr + *_nl_domain_bindings
++return * gettext ("") + _nl_msg_cat_cntr + *libintl_nl_domain_bindings
+   ;
+   return 0;
+ }
diff --git a/irc/xchat2/files/patch-fixtabcomp b/irc/xchat/files/patch-fixtabcomp
index 9498dd6..9498dd6 100644
--- a/irc/xchat2/files/patch-fixtabcomp
+++ b/irc/xchat/files/patch-fixtabcomp
diff --git a/irc/xchat/files/patch-src::common::cfgfiles.c b/irc/xchat/files/patch-src::common::cfgfiles.c
deleted file mode 100644
index d33af11..0000000
--- a/irc/xchat/files/patch-src::common::cfgfiles.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/common/cfgfiles.c.orig	Mon Mar 29 15:46:01 2004
-+++ src/common/cfgfiles.c	Mon Mar 29 15:46:20 2004
-@@ -600,7 +600,7 @@
- 
- 		prefs.autoresume = 1;
- 		prefs.show_away_once = 1;
--		prefs.show_away_message = 1;
-+		prefs.show_away_message = 0;
- 		prefs.indent_pixels = 80;
- 		prefs.dialog_indent_pixels = 80;
- 		prefs.indent_nicks = 1;
diff --git a/irc/xchat/pkg-descr b/irc/xchat/pkg-descr
index 8fb4ab1..f93552a 100644
--- a/irc/xchat/pkg-descr
+++ b/irc/xchat/pkg-descr
@@ -1,8 +1,5 @@
 XChat is a graphical IRC client.  It requires a computer running a
-UNIX-like OS and the X Window System (X11), and the GTK library.  It can
-also (optionally) take advantage of GNOME and use Perl and Python
-scripts.
+UNIX-like OS and the X Window System (X11), and the GTK 2 library.  It can
+also use Perl and (optionally) Python scripts.
 
 WWW:	http://xchat.org/
-
-- Jim <jim@FreeBSD.org>
diff --git a/irc/xchat/pkg-plist b/irc/xchat/pkg-plist
index feeacf1..3589681 100644
--- a/irc/xchat/pkg-plist
+++ b/irc/xchat/pkg-plist
@@ -1,55 +1,30 @@
 bin/xchat
-bin/xchat-text
-%%NOGNOME:%%etc/X11/applnk/Internet/xchat.desktop
-%%PORTDOCS%%share/doc/xchat/ChangeLog
-%%PORTDOCS%%share/doc/xchat/README
-%%PORTDOCS%%share/doc/xchat/xchat-1.html
-%%PORTDOCS%%share/doc/xchat/xchat-10.html
-%%PORTDOCS%%share/doc/xchat/xchat-2.html
-%%PORTDOCS%%share/doc/xchat/xchat-3.html
-%%PORTDOCS%%share/doc/xchat/xchat-4.html
-%%PORTDOCS%%share/doc/xchat/xchat-5.html
-%%PORTDOCS%%share/doc/xchat/xchat-6.html
-%%PORTDOCS%%share/doc/xchat/xchat-7.html
-%%PORTDOCS%%share/doc/xchat/xchat-8.html
-%%PORTDOCS%%share/doc/xchat/xchat-9.html
-%%PORTDOCS%%share/doc/xchat/xchat.html
-%%PORTDOCS%%share/doc/xchat/xchat.sgml
-%%GNOME:%%share/gnome/apps/Internet/xchat.desktop
-%%GNOME:%%share/gnome/pixmaps/xchat.png
-%%PORTDOCS%%@dirrm share/doc/xchat
-share/locale/ca/LC_MESSAGES/xchat.mo
-share/locale/cs/LC_MESSAGES/xchat.mo
-share/locale/da/LC_MESSAGES/xchat.mo
+bin/xchat-remote
+%%DBUS%%lib/xchat/plugins/dbus.la
+%%DBUS%%lib/xchat/plugins/dbus.so
+%%PERL%%lib/xchat/plugins/perl.la
+%%PERL%%lib/xchat/plugins/perl.so
+%%PYTHON%%lib/xchat/plugins/python.la
+%%PYTHON%%lib/xchat/plugins/python.so
+%%TCL%%lib/xchat/plugins/tcl.la
+%%TCL%%lib/xchat/plugins/tcl.so
+share/applications/xchat.desktop
 share/locale/de/LC_MESSAGES/xchat.mo
 share/locale/el/LC_MESSAGES/xchat.mo
-share/locale/es/LC_MESSAGES/xchat.mo
 share/locale/fi/LC_MESSAGES/xchat.mo
 share/locale/fr/LC_MESSAGES/xchat.mo
-share/locale/he/LC_MESSAGES/xchat.mo
+share/locale/gl/LC_MESSAGES/xchat.mo
 share/locale/hu/LC_MESSAGES/xchat.mo
-share/locale/it/LC_MESSAGES/xchat.mo
 share/locale/ja/LC_MESSAGES/xchat.mo
 share/locale/ko/LC_MESSAGES/xchat.mo
-share/locale/lt/LC_MESSAGES/xchat.mo
-share/locale/lv/LC_MESSAGES/xchat.mo
 share/locale/nl/LC_MESSAGES/xchat.mo
-share/locale/no/LC_MESSAGES/xchat.mo
-share/locale/pl/LC_MESSAGES/xchat.mo
-share/locale/pt/LC_MESSAGES/xchat.mo
-share/locale/pt_BR/LC_MESSAGES/xchat.mo
-share/locale/ro/LC_MESSAGES/xchat.mo
-share/locale/ru/LC_MESSAGES/xchat.mo
-share/locale/sk/LC_MESSAGES/xchat.mo
-share/locale/sl/LC_MESSAGES/xchat.mo
-share/locale/sr/LC_MESSAGES/xchat.mo
+share/locale/pa/LC_MESSAGES/xchat.mo
+share/locale/sq/LC_MESSAGES/xchat.mo
 share/locale/sv/LC_MESSAGES/xchat.mo
-share/locale/tr/LC_MESSAGES/xchat.mo
-share/locale/uk/LC_MESSAGES/xchat.mo
 share/locale/vi/LC_MESSAGES/xchat.mo
-share/locale/zh_CN/LC_MESSAGES/xchat.mo
-share/locale/zh_TW.Big5/LC_MESSAGES/xchat.mo
-%%NOGNOME:%%share/pixmaps/xchat.png
-%%NOGNOME:%%@dirrmtry etc/X11/applnk/Internet
-%%NOGNOME:%%@dirrmtry etc/X11/applnk
-%%NOGNOME:%%@dirrmtry etc/X11
+share/locale/zh_TW/LC_MESSAGES/xchat.mo
+share/pixmaps/xchat.png
+@dirrmtry share/applications
+@exec mkdir -p %D/lib/xchat/plugins
+@dirrm lib/xchat/plugins
+@dirrm lib/xchat
diff --git a/irc/xchat1/Makefile b/irc/xchat1/Makefile
index f58a714..a613cb4 100644
--- a/irc/xchat1/Makefile
+++ b/irc/xchat1/Makefile
@@ -35,6 +35,7 @@ CONFIGURE_ARGS+=	--without-included-gettext \
 			--enable-ipv6 \
 			--datadir="${PREFIX}/share" \
 			--enable-perl
+LATEST_LINK=		xchat1
 
 .if defined(WITH_SSL)
 USE_OPENSSL=		YES
diff --git a/irc/xchat2/Makefile b/irc/xchat2/Makefile
deleted file mode 100644
index eb8d8b1..0000000
--- a/irc/xchat2/Makefile
+++ /dev/null
@@ -1,112 +0,0 @@
-# New ports collection makefile for:	xchat2
-# Date created:			17 Aug 2002
-# Whom:				Joe Marcus Clarke <marcus@FreeBSD.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	xchat2
-PORTVERSION=	2.6.2
-CATEGORIES=	irc gnome ipv6
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
-		http://xchat.org/files/source/2.6/
-MASTER_SITE_SUBDIR=	${PORTNAME:S|2||}
-DISTNAME=	xchat-${PORTVERSION}
-
-MAINTAINER=	gnome@FreeBSD.org
-COMMENT=	An X11 IRC client using the GTK+ 2 toolkit
-
-USE_X_PREFIX=	yes
-USE_BZIP2=	yes
-USE_GMAKE=	yes
-USE_GNOME=	gnomehack gtk20
-USE_GETTEXT=	yes
-GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
-		LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
-CONFIGURE_ARGS=	--enable-nls \
-		--enable-ipv6
-
-CONFLICTS=	xchat-1*
-
-.if defined(WITH_SOCKS)
-BUILD_DEPENDS+=	${LOCALBASE}/lib/libsocks5.a:${PORTSDIR}/net/socks5
-CONFIGURE_ARGS+=	--enable-socks
-.endif
-
-# openssl in now default in configure
-
-.if defined(WITH_PYTHON)
-USE_PYTHON=		yes
-CONFIGURE_ARGS+=	--enable-python
-PLIST_SUB+=		PYTHON=""
-.else
-CONFIGURE_ARGS+=	--disable-python
-PLIST_SUB+=		PYTHON="@comment "
-.endif
-
-.if defined(WITH_TCL)
-LIB_DEPENDS+=	tcl83.1:${PORTSDIR}/lang/tcl83
-CONFIGURE_ARGS+=--enable-tcl=${LOCALBASE}/lib/tcl8.3
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS} \
-		-I${LOCALBASE}/include/tcl8.3" \
-		LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS} \
-		-L${LOCALBASE}/lib/tcl8.3"
-PLIST_SUB+=	TCL=""
-.else
-CONFIGURE_ARGS+=--enable-tcl=no
-PLIST_SUB+=	TCL="@comment "
-.endif
-
-.if !defined(WITHOUT_DBUS)
-LIB_DEPENDS+=	dbus-1.2:${PORTSDIR}/devel/dbus
-CONFIGURE_ARGS+=--enable-dbus
-USE_GNOME+=	gconf2
-GCONF_SCHEMAS=	apps_xchat_url_handler.schemas
-PLIST_SUB+=	DBUS=""
-.else
-CONFIGURE_ARGS+=--disable-dbus
-PLIST_SUB+=	DBUS="@comment "
-.endif
-
-.include <bsd.port.pre.mk>
-
-.if ${PERL_LEVEL} < 500600 || defined(WITHOUT_PERL)
-CONFIGURE_ARGS+=--disable-perl
-PLIST_SUB+=	PERL="@comment "
-.else
-USE_PERL5=	yes
-CONFIGURE_ARGS+=--enable-perl
-PLIST_SUB+=	PERL=""
-.endif
-
-pre-everything::
-.if !defined(WITH_PYTHON) || !defined(WITH_SOCKS) || !defined(WITH_TCL) || !defined(WITHOUT_PERL) || !defined(WITHOUT_DBUS)
-	@${ECHO_MSG} "You may specify the following on the command line:"
-	@${ECHO_MSG} ""
-.endif
-.if !defined(WITH_PYTHON)
-	@${ECHO_MSG} "WITH_PYTHON=yes for Python support"
-.endif
-.if !defined(WITH_SOCKS)
-	@${ECHO_MSG} "WITH_SOCKS=yes for SOCKS5 proxy support"
-.endif
-.if !defined(WITH_TCL)
-	@${ECHO_MSG} "WITH_TCL=yes for tcl support"
-.endif
-.if !defined(WITHOUT_PERL)
-	@${ECHO_MSG} "WITHOUT_PERL=yes to disable Perl support"
-.endif
-.if !defined(WITHOUT_DBUS)
-	@${ECHO_MSG} "WITHOUT_DBUS=yes to disable dbus support"
-.endif
-
-post-patch:
-	@${REINPLACE_CMD} -E -e 's|PY_LIBS=.*|PY_LIBS="-L\$$PY_EXEC_PREFIX/lib/python\$$PY_VER/config -lpython\$$PY_VER ${PTHREAD_LIBS} -lutil"|' \
-		${WRKSRC}/configure
-
-# Create plugins directory even when no plugins are installed
-post-install:
-	@${MKDIR} ${PREFIX}/lib/xchat/plugins
-
-.include <bsd.port.post.mk>
diff --git a/irc/xchat2/distinfo b/irc/xchat2/distinfo
deleted file mode 100644
index 913c1c2..0000000
--- a/irc/xchat2/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (xchat-2.6.2.tar.bz2) = 6b534baf9a4df6bf23d7d16f7e4eb379
-SHA256 (xchat-2.6.2.tar.bz2) = a184d42a8130e5a4151e0190ba45dc3440c49270818fec02f35bca932da64f9c
-SIZE (xchat-2.6.2.tar.bz2) = 1046910
diff --git a/irc/xchat2/files/patch-configure b/irc/xchat2/files/patch-configure
deleted file mode 100644
index a48d5cb..0000000
--- a/irc/xchat2/files/patch-configure
+++ /dev/null
@@ -1,17 +0,0 @@
---- configure.orig	Sun Apr  2 19:17:32 2006
-+++ configure	Sun Apr  2 19:18:07 2006
-@@ -24741,12 +24741,12 @@ cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- #include <libintl.h>
- extern int _nl_msg_cat_cntr;
--extern int *_nl_domain_bindings;
-+extern int *libintl_nl_domain_bindings;
- int
- main ()
- {
- bindtextdomain ("", "");
--return * gettext ("") + _nl_msg_cat_cntr + *_nl_domain_bindings
-+return * gettext ("") + _nl_msg_cat_cntr + *libintl_nl_domain_bindings
-   ;
-   return 0;
- }
diff --git a/irc/xchat2/pkg-descr b/irc/xchat2/pkg-descr
deleted file mode 100644
index f93552a..0000000
--- a/irc/xchat2/pkg-descr
+++ /dev/null
@@ -1,5 +0,0 @@
-XChat is a graphical IRC client.  It requires a computer running a
-UNIX-like OS and the X Window System (X11), and the GTK 2 library.  It can
-also use Perl and (optionally) Python scripts.
-
-WWW:	http://xchat.org/
diff --git a/irc/xchat2/pkg-plist b/irc/xchat2/pkg-plist
deleted file mode 100644
index 3589681..0000000
--- a/irc/xchat2/pkg-plist
+++ /dev/null
@@ -1,30 +0,0 @@
-bin/xchat
-bin/xchat-remote
-%%DBUS%%lib/xchat/plugins/dbus.la
-%%DBUS%%lib/xchat/plugins/dbus.so
-%%PERL%%lib/xchat/plugins/perl.la
-%%PERL%%lib/xchat/plugins/perl.so
-%%PYTHON%%lib/xchat/plugins/python.la
-%%PYTHON%%lib/xchat/plugins/python.so
-%%TCL%%lib/xchat/plugins/tcl.la
-%%TCL%%lib/xchat/plugins/tcl.so
-share/applications/xchat.desktop
-share/locale/de/LC_MESSAGES/xchat.mo
-share/locale/el/LC_MESSAGES/xchat.mo
-share/locale/fi/LC_MESSAGES/xchat.mo
-share/locale/fr/LC_MESSAGES/xchat.mo
-share/locale/gl/LC_MESSAGES/xchat.mo
-share/locale/hu/LC_MESSAGES/xchat.mo
-share/locale/ja/LC_MESSAGES/xchat.mo
-share/locale/ko/LC_MESSAGES/xchat.mo
-share/locale/nl/LC_MESSAGES/xchat.mo
-share/locale/pa/LC_MESSAGES/xchat.mo
-share/locale/sq/LC_MESSAGES/xchat.mo
-share/locale/sv/LC_MESSAGES/xchat.mo
-share/locale/vi/LC_MESSAGES/xchat.mo
-share/locale/zh_TW/LC_MESSAGES/xchat.mo
-share/pixmaps/xchat.png
-@dirrmtry share/applications
-@exec mkdir -p %D/lib/xchat/plugins
-@dirrm lib/xchat/plugins
-@dirrm lib/xchat
diff --git a/japanese/xchat/Makefile b/japanese/xchat/Makefile
index f04526d..dbf57f4 100644
--- a/japanese/xchat/Makefile
+++ b/japanese/xchat/Makefile
@@ -12,6 +12,6 @@ COMMENT=	An X11 IRC client using the GTK+ toolkit, and optionally, GNOME
 
 CONFIGURE_ARGS=	--enable-japanese-conv
 
-MASTERDIR=	${.CURDIR}/../../irc/xchat
+MASTERDIR=	${.CURDIR}/../../irc/xchat1
 
 .include "${MASTERDIR}/Makefile"
diff --git a/x11/gnome2-fifth-toe/Makefile b/x11/gnome2-fifth-toe/Makefile
index ec6c427..97a1feb 100644
--- a/x11/gnome2-fifth-toe/Makefile
+++ b/x11/gnome2-fifth-toe/Makefile
@@ -13,7 +13,7 @@ PKGNAMESUFFIX=	-fifth-toe
 COMMENT=	Additional GNOME 2 applications not included in the core desktop
 
 RUN_DEPENDS=	pan:${PORTSDIR}/news/pan2 \
-		xchat:${PORTSDIR}/irc/xchat2 \
+		xchat:${PORTSDIR}/irc/xchat \
 		gimp-2.2:${PORTSDIR}/graphics/gimp \
 		sodipodi:${PORTSDIR}/graphics/sodipodi \
 		gnomeicu:${PORTSDIR}/net-im/gnomeicu2 \