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.

3 files changed, 9 insertions, 34 deletions

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