7 files changed, 117 insertions, 82 deletions

diff --git a/irc/xchat2/Makefile b/irc/xchat2/Makefile
index db2aa6c788cc..cbdb80b458c6 100644
--- a/irc/xchat2/Makefile
+++ b/irc/xchat2/Makefile
@@ -1,87 +1,74 @@
-# 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.9
-CATEGORIES+=		irc gnome ipv6
-MASTER_SITES=		http://xchat.org/files/source/1.8/ \
-			http://xchat.linuxpower.org/files/source/1.8/
+PORTNAME=	xchat2
+PORTVERSION=	1.9.2
+CATEGORIES=	irc gnome ipv6
+MASTER_SITES=	http://xchat.org/files/source/1.9/ \
+		http://xchat.linuxpower.org/files/source/1.9/
+DISTNAME=	xchat-${PORTVERSION}
 
-MAINTAINER?=		jim@FreeBSD.org
+MAINTAINER=	gnome@FreeBSD.org
 
-LIB_DEPENDS=		iconv.3:${PORTSDIR}/converters/libiconv
+LIB_DEPENDS=	gtk-x11-2.0.0:${PORTSDIR}/x11-toolkits/gtk20
 
-# 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_PERL5=		yes
-USE_IMLIB=		yes
-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
+USE_X_PREFIX=	yes
+USE_BZIP2=	yes
+USE_GMAKE=	yes
+USE_PERL5=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gnomeprefix gnomehack
+GNU_CONFIGURE=	yes
+USE_REINPLACE=	yes
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LIBS="-L${LOCALBASE}/lib"
+CONFIGURE_ARGS=	--enable-nls \
+		--enable-ipv6 \
+		--enable-perl
 
 .include <bsd.port.pre.mk>
 
 .if defined(WITH_SOCKS)
-# Assign with `+=' for slave ports
-BUILD_DEPENDS+=		${LOCALBASE}/lib/libsocks5.a:${PORTSDIR}/net/socks5
+BUILD_DEPENDS+=	${LOCALBASE}/lib/libsocks5.a:${PORTSDIR}/net/socks5
 CONFIGURE_ARGS+=	--enable-socks
 .endif
 
 .if defined(WITH_SSL)
-USE_OPENSSL=		YES
+USE_OPENSSL=	yes
 CONFIGURE_ARGS+=	--enable-openssl
 .endif
 
-.if defined(WITH_TRANSPARENCY)
-BUILD_DEPENDS+=		${X11BASE}/bin/gdk-pixbuf-config:${PORTSDIR}/graphics/gdk-pixbuf
-CONFIGURE_ARGS+=	--enable-gdk-pixbuf
-.endif
-
-.if defined(HAVE_GNOME)
-USE_GNOME=		yes
-CONFIGURE_ARGS+=	--enable-gnome --enable-panel --enable-gdk-pixbuf \
-			--enable-zvt
-MAKE_ARGS=		icondir="${PREFIX}/share/gnome/pixmaps" \
-			utildir="${PREFIX}/share/gnome/apps/Internet"
-.else
-CONFIGURE_ARGS+=	--disable-gnome --disable-zvt
-.endif
-
 .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
+
+pre-everything::
+.if !defined(WITH_PYTHON) || !defined(WITH_SSL) || !defined(WITH_SOCKS)
+	@${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_SSL)
+	@${ECHO_MSG} "WITH_SSL=yes for OpenSSL support"
+.endif
+.if !defined(WITH_SOCKS)
+	@${ECHO_MSG} "WITH_SOCKS=yes for SOCKS5 proxy support"
 .endif
 
 post-patch:
-	@${PERL} -pi \
+	@${REINPLACE_CMD} \
 		-e 's|-lpthread|${PTHREAD_LIBS}|g;' \
 		${WRKSRC}/configure
 
-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
-
 .include <bsd.port.post.mk>
diff --git a/irc/xchat2/distinfo b/irc/xchat2/distinfo
index 3f86d7df67b9..c1b17c96f3ff 100644
--- a/irc/xchat2/distinfo
+++ b/irc/xchat2/distinfo
@@ -1 +1 @@
-MD5 (xchat-1.8.9.tar.bz2) = a7d3723053fbee23399647f88afd15fa
+MD5 (xchat-1.9.2.tar.bz2) = c7f0b4bd82622c280299ddf6c415b281
diff --git a/irc/xchat2/files/patch-Makefile.in b/irc/xchat2/files/patch-Makefile.in
new file mode 100644
index 000000000000..1d4ec6ca1aae
--- /dev/null
+++ b/irc/xchat2/files/patch-Makefile.in
@@ -0,0 +1,11 @@
+--- Makefile.in.orig	Sat Aug 17 23:57:01 2002
++++ Makefile.in	Sat Aug 17 23:57:45 2002
+@@ -122,7 +122,7 @@
+ icondir = $(datadir)/pixmaps
+ 
+ util_DATA = xchat.desktop
+-utildir = $(sysconfdir)/X11/applnk/Internet
++utildir = $(datadir)/apps/Internet
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = config.h
diff --git a/irc/xchat2/files/patch-configure b/irc/xchat2/files/patch-configure
new file mode 100644
index 000000000000..e9036bdc9622
--- /dev/null
+++ b/irc/xchat2/files/patch-configure
@@ -0,0 +1,51 @@
+--- configure.orig	Sat Aug 17 23:42:13 2002
++++ configure	Sat Aug 17 23:42:55 2002
+@@ -3211,10 +3211,10 @@
+ #include "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 (int) gettext ("") + _nl_msg_cat_cntr + *_nl_domain_bindings
++return (int) gettext ("") + _nl_msg_cat_cntr + *libintl_nl_domain_bindings
+ ; return 0; }
+ EOF
+ if { (eval echo configure:3221: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+@@ -3600,7 +3600,7 @@
+ #include "confdefs.h"
+ #include <libintl.h>
+ extern int _nl_msg_cat_cntr;
+-extern int *_nl_domain_bindings;
++extern int *libintl_nl_domain_bindings;
+ extern
+ #ifdef __cplusplus
+ "C"
+@@ -3608,7 +3608,7 @@
+ const char *_nl_expand_alias ();
+ int main() {
+ bindtextdomain ("", "");
+-return (int) gettext ("") + _nl_msg_cat_cntr + *_nl_domain_bindings + *_nl_expand_alias (0)
++return (int) gettext ("") + _nl_msg_cat_cntr + *libintl_nl_domain_bindings + *_nl_expand_alias (0)
+ ; return 0; }
+ EOF
+ if { (eval echo configure:3615: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+@@ -3628,7 +3628,7 @@
+ #include "confdefs.h"
+ #include <libintl.h>
+ extern int _nl_msg_cat_cntr;
+-extern int *_nl_domain_bindings;
++extern int *libintl_nl_domain_bindings;
+ extern
+ #ifdef __cplusplus
+ "C"
+@@ -3636,7 +3636,7 @@
+ const char *_nl_expand_alias ();
+ int main() {
+ bindtextdomain ("", "");
+-return (int) gettext ("") + _nl_msg_cat_cntr + *_nl_domain_bindings + *_nl_expand_alias (0)
++return (int) gettext ("") + _nl_msg_cat_cntr + *libintl_nl_domain_bindings + *_nl_expand_alias (0)
+ ; return 0; }
+ EOF
+ if { (eval echo configure:3643: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
diff --git a/irc/xchat2/pkg-comment b/irc/xchat2/pkg-comment
index ead8c7eac2b8..87bec7c9208c 100644
--- a/irc/xchat2/pkg-comment
+++ b/irc/xchat2/pkg-comment
@@ -1 +1 @@
-An X11 IRC client using the GTK+ toolkit, and optionally, GNOME
+An X11 IRC client using the GTK+ 2 toolkit
diff --git a/irc/xchat2/pkg-descr b/irc/xchat2/pkg-descr
index 8fb4ab1a14da..3f1e9f0e9f6a 100644
--- a/irc/xchat2/pkg-descr
+++ b/irc/xchat2/pkg-descr
@@ -1,8 +1,7 @@
 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/
+This is still a very early development version!
 
-- Jim <jim@FreeBSD.org>
+WWW:	http://xchat.org/
diff --git a/irc/xchat2/pkg-plist b/irc/xchat2/pkg-plist
index 1b2b386036a1..ef2b9ae6ae04 100644
--- a/irc/xchat2/pkg-plist
+++ b/irc/xchat2/pkg-plist
@@ -1,22 +1,9 @@
 bin/xchat
 bin/xchat-text
-%%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
+lib/xchat/plugins/perl.so
+%%PYTHON%%lib/xchat/plugins/python.so
+share/gnome/apps/Internet/xchat.desktop
+share/gnome/pixmaps/xchat.png
 share/locale/ca/LC_MESSAGES/xchat.mo
 share/locale/cs/LC_MESSAGES/xchat.mo
 share/locale/da/LC_MESSAGES/xchat.mo