Add INTLLIBS to LIBS spec when building the text based version.

Remove some other patches trying to achieve the same in a different way.
This fixes PR 13680 for me.

4 files changed, 11 insertions, 38 deletions

diff --git a/chat/xchat/distinfo b/chat/xchat/distinfo
index 8a9514dbe6a..93f3c0f030f 100644
--- a/chat/xchat/distinfo
+++ b/chat/xchat/distinfo
@@ -1,10 +1,8 @@
-$NetBSD: distinfo,v 1.6 2001/08/12 10:50:42 tron Exp $
+$NetBSD: distinfo,v 1.7 2001/08/12 11:08:12 martin Exp $
 
 SHA1 (xchat-1.8.2.tar.bz2) = 18fa80ddfe4863e92a03afbf5ea4302c82b14308
 Size (xchat-1.8.2.tar.bz2) = 618960 bytes
 SHA1 (patch-aa) = d870e35dae1fdfe976cbe9572146438ae0620dd3
 SHA1 (patch-ab) = 141689091f4533456050b1ab931af9390945d81f
 SHA1 (patch-ac) = 10dce1c565b8d95fd6b4941ddb1fbf7bb82e52ed
-SHA1 (patch-ad) = cfc8885c4de11a426739638b32d661d458e8915e
-SHA1 (patch-ae) = 49e7b9283fb6f499dedd123bdac3d2571e4ef44a
-SHA1 (patch-af) = 248017552da1189cb23c6ed26494b7395256217c
+SHA1 (patch-ad) = e34e451e6697452adc4af588fa48c11109788d7e
diff --git a/chat/xchat/patches/patch-ad b/chat/xchat/patches/patch-ad
index 9a1c779475c..c6ec27413f1 100644
--- a/chat/xchat/patches/patch-ad
+++ b/chat/xchat/patches/patch-ad
@@ -1,13 +1,14 @@
-$NetBSD: patch-ad,v 1.1 2001/08/07 14:57:58 tron Exp $
+$NetBSD: patch-ad,v 1.2 2001/08/12 11:08:12 martin Exp $
 
---- src/common/Makefile.in.orig	Wed Jul 25 06:22:38 2001
-+++ src/common/Makefile.in	Tue Aug  7 16:55:04 2001
-@@ -127,7 +127,7 @@
+--- src/fe-text/Makefile.in.orig	Sun Aug 12 12:44:53 2001
++++ src/fe-text/Makefile.in	Sun Aug 12 12:52:14 2001
+@@ -119,7 +119,7 @@
  DEFS = @DEFS@ -I. -I$(srcdir) -I../..
  CPPFLAGS = @CPPFLAGS@
  LDFLAGS = @LDFLAGS@
 -LIBS = @LIBS@
-+LIBS = @LIBS@ -lintl
- libxchatmain_a_LIBADD = 
- @DO_ICONV_FALSE@@DO_PYTHON_TRUE@@USE_OPENSSL_FALSE@@DO_PERL_FALSE@libxchatmain_a_OBJECTS =  \
- @DO_ICONV_FALSE@@DO_PYTHON_TRUE@@USE_OPENSSL_FALSE@@DO_PERL_FALSE@cfgfiles.o \
++LIBS = @LIBS@ ${INTLLIBS}
+ @USE_MYGLIB_FALSE@xchat_text_OBJECTS =  fe-text.o
+ @USE_MYGLIB_TRUE@xchat_text_OBJECTS =  fe-text.o glib.o
+ xchat_text_DEPENDENCIES =  ../common/libxchatmain.a
+
diff --git a/chat/xchat/patches/patch-ae b/chat/xchat/patches/patch-ae
deleted file mode 100644
index b9c3e90950b..00000000000
--- a/chat/xchat/patches/patch-ae
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2001/08/11 23:14:46 tron Exp $
-
---- src/fe-gtk/Makefile.in.orig	Sun Aug 12 01:05:18 2001
-+++ src/fe-gtk/Makefile.in	Sun Aug 12 01:09:32 2001
-@@ -104,7 +104,7 @@
- bin_PROGRAMS = xchat
- 
- CFLAGS = $(GUI_CFLAGS)
--LIBS = $(GUI_LIBS)
-+LIBS = $(GUI_LIBS) -lintl
- 
- INCLUDES = -I$(includedir)
- 
diff --git a/chat/xchat/patches/patch-af b/chat/xchat/patches/patch-af
deleted file mode 100644
index 7d2337db445..00000000000
--- a/chat/xchat/patches/patch-af
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-af,v 1.1 2001/08/12 10:50:43 tron Exp $
-
---- src/fe-text/Makefile.in.orig	Sun Aug 12 12:37:54 2001
-+++ src/fe-text/Makefile.in	Sun Aug 12 12:43:12 2001
-@@ -119,7 +119,7 @@
- DEFS = @DEFS@ -I. -I$(srcdir) -I../..
- CPPFLAGS = @CPPFLAGS@
- LDFLAGS = @LDFLAGS@
--LIBS = @LIBS@
-+LIBS = @LIBS@ -lintl
- @USE_MYGLIB_FALSE@xchat_text_OBJECTS =  fe-text.o
- @USE_MYGLIB_TRUE@xchat_text_OBJECTS =  fe-text.o glib.o
- xchat_text_DEPENDENCIES =  ../common/libxchatmain.a