From 245395f4e73a20578f84ebee495ae0ddbac6be1b Mon Sep 17 00:00:00 2001
From: brad <brad@openbsd.org>
Date: Sat, 30 Mar 2002 04:50:09 +0000
Subject: [PATCH] upgrade to xchat 1.8.8 - NLS fixes - 64-bit fixes -- Ok'd by:
 maintainer

---
 net/xchat/Makefile                            | 26 +++++++------------
 net/xchat/distinfo                            |  6 ++---
 net/xchat/patches/patch-po_Makefile_in_in     | 12 ++++-----
 .../patches/patch-src_fe-text_Makefile_in     |  8 +++---
 4 files changed, 23 insertions(+), 29 deletions(-)

diff --git a/net/xchat/Makefile b/net/xchat/Makefile
index b22ceb67509..72d81a763e8 100644
--- a/net/xchat/Makefile
+++ b/net/xchat/Makefile
@@ -1,11 +1,10 @@
-# $OpenBSD: Makefile,v 1.38 2002/01/10 11:08:55 shell Exp $
+# $OpenBSD: Makefile,v 1.39 2002/03/30 04:50:09 brad Exp $
 # $FreeBSD: Makefile,v 1.12 1999/06/08 23:41:54 steve Exp $
 
-
 COMMENT=	"X-Chat is an X11 IRC client"
 
 MAJOR=		1.8
-VERSION=	${MAJOR}.7
+VERSION=	${MAJOR}.8
 DISTNAME=	xchat-${VERSION}
 CATEGORIES=	net x11
 NEED_VERSION=	1.504
@@ -24,23 +23,18 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
-CONFIGURE_STYLE= gnu
+LIB_DEPENDS=	gdk_pixbuf::graphics/gdk-pixbuf
 
-FLAVORS=	no_ssl
-FLAVOR?=
-
-CONFIGURE_ARGS+= --disable-imlib --disable-python \
-		 --disable-gnome --disable-zvt    \
-		 --disable-mmx --enable-ipv6
+MODULES=	iconv gettext
 
 USE_GMAKE=	Yes
 USE_X11=	Yes
-
-LIB_DEPENDS=	gdk_pixbuf::graphics/gdk-pixbuf
-
-.if ${FLAVOR} != "no_ssl"
-CONFIGURE_ARGS+= --enable-openssl="/usr"
-.endif
+CONFIGURE_STYLE= gnu
+CONFIGURE_ARGS+= --disable-python --disable-gnome \
+		 --disable-zvt --disable-mmx \
+		 --enable-ipv6 --enable-openssl="/usr" \
+		 --enable-japanese-conv \
+		 --with-libiconv-prefix="${LOCALBASE}"
 
 DOCDIR=		${PREFIX}/share/doc/xchat
 
diff --git a/net/xchat/distinfo b/net/xchat/distinfo
index c2980ce1732..7390092ebef 100644
--- a/net/xchat/distinfo
+++ b/net/xchat/distinfo
@@ -1,3 +1,3 @@
-MD5 (xchat-1.8.7.tar.bz2) = 2bdcf2b77f6bf1385bc63a17dcafbe90
-RMD160 (xchat-1.8.7.tar.bz2) = 708a84c383f192b1b147390c9a5c3d4c1cf29c23
-SHA1 (xchat-1.8.7.tar.bz2) = be69774757970ce0100d36ec769a64590c84cb78
+MD5 (xchat-1.8.8.tar.bz2) = 8496a0438c1062d3d8f96f92d5e48a52
+RMD160 (xchat-1.8.8.tar.bz2) = 264fe8fe08b97df4d07f1792c1de6fe9863a9a03
+SHA1 (xchat-1.8.8.tar.bz2) = c47dd8bfbc6f7f7a455fc183cc2208a45e2d1f52
diff --git a/net/xchat/patches/patch-po_Makefile_in_in b/net/xchat/patches/patch-po_Makefile_in_in
index 55bf778e65c..b30ef1d7e99 100644
--- a/net/xchat/patches/patch-po_Makefile_in_in
+++ b/net/xchat/patches/patch-po_Makefile_in_in
@@ -1,7 +1,7 @@
-$OpenBSD: patch-po_Makefile_in_in,v 1.2 2001/07/25 11:19:38 shell Exp $
---- po/Makefile.in.in.orig	Sun Oct 31 19:17:50 1999
-+++ po/Makefile.in.in	Fri Jul 20 05:58:39 2001
-@@ -18,7 +18,7 @@
+$OpenBSD: patch-po_Makefile_in_in,v 1.3 2002/03/30 04:50:09 brad Exp $
+--- po/Makefile.in.in.orig	Sun Oct 31 06:17:50 1999
++++ po/Makefile.in.in	Wed Mar 27 19:35:39 2002
+@@ -18,7 +18,7 @@ VPATH = @srcdir@
  
  prefix = @prefix@
  exec_prefix = @exec_prefix@
@@ -10,7 +10,7 @@ $OpenBSD: patch-po_Makefile_in_in,v 1.2 2001/07/25 11:19:38 shell Exp $
  localedir = $(datadir)/locale
  gnulocaledir = $(prefix)/share/locale
  gettextsrcdir = $(prefix)/share/gettext/po
-@@ -111,9 +111,9 @@
+@@ -111,9 +111,9 @@ install-data: install-data-@USE_NLS@
  install-data-no: all
  install-data-yes: all
  	if test -r "$(MKINSTALLDIRS)"; then \
@@ -22,7 +22,7 @@ $OpenBSD: patch-po_Makefile_in_in,v 1.2 2001/07/25 11:19:38 shell Exp $
  	fi
  	@catalogs='$(CATALOGS)'; \
  	for cat in $$catalogs; do \
-@@ -123,7 +123,7 @@
+@@ -123,7 +123,7 @@ install-data-yes: all
  	    *)     destdir=$(localedir);; \
  	  esac; \
  	  lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
diff --git a/net/xchat/patches/patch-src_fe-text_Makefile_in b/net/xchat/patches/patch-src_fe-text_Makefile_in
index e43ccddc87d..88b3fb62012 100644
--- a/net/xchat/patches/patch-src_fe-text_Makefile_in
+++ b/net/xchat/patches/patch-src_fe-text_Makefile_in
@@ -1,7 +1,7 @@
-$OpenBSD: patch-src_fe-text_Makefile_in,v 1.1 2001/07/25 11:19:38 shell Exp $
---- src/fe-text/Makefile.in.orig	Wed Jul 25 05:58:47 2001
-+++ src/fe-text/Makefile.in	Wed Jul 11 13:14:41 2001
-@@ -124,7 +124,7 @@
+$OpenBSD: patch-src_fe-text_Makefile_in,v 1.2 2002/03/30 04:50:09 brad Exp $
+--- src/fe-text/Makefile.in.orig	Tue Mar  5 21:25:20 2002
++++ src/fe-text/Makefile.in	Wed Mar 27 19:35:39 2002
+@@ -127,7 +127,7 @@ LIBS = @LIBS@
  @USE_MYGLIB_TRUE@xchat_text_OBJECTS =  fe-text.o glib.o
  xchat_text_DEPENDENCIES =  ../common/libxchatmain.a
  xchat_text_LDFLAGS =