From 86958397880e7dc0d937e9480a4a620bf3223b70 Mon Sep 17 00:00:00 2001
From: brad <brad@openbsd.org>
Date: Thu, 13 Jun 2002 03:45:57 +0000
Subject: [PATCH] fix installation of libiconv.

---
 converters/libiconv/Makefile                      |  7 ++++---
 converters/libiconv/patches/patch-src_Makefile_in | 12 ++++++++++++
 2 files changed, 16 insertions(+), 3 deletions(-)
 create mode 100644 converters/libiconv/patches/patch-src_Makefile_in

diff --git a/converters/libiconv/Makefile b/converters/libiconv/Makefile
index 81ae619d186..12f9356bf94 100644
--- a/converters/libiconv/Makefile
+++ b/converters/libiconv/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.13 2002/06/10 04:41:48 brad Exp $
+# $OpenBSD: Makefile,v 1.14 2002/06/13 03:45:57 brad Exp $
 
 COMMENT=	"character set conversion library"
 
@@ -20,8 +20,9 @@ SEPARATE_BUILD=	concurrent
 CONFIGURE_STYLE= gnu
 MODGNU_CONFIG_GUESS_DIRS= ${WRKSRC}/autoconf ${WRKSRC}/libcharset/autoconf
 CONFIGURE_ARGS+= ${CONFIGURE_SHARED}
-CONFIGURE_ARGS+= --enable-static --enable-extra-encodings
-CONFIGURE_ENV=	LDFLAGS="-L${WRKBUILD}/lib/.libs"
+CONFIGURE_ARGS+= --enable-static \
+		 --enable-extra-encodings \
+		 --disable-nls
 
 do-regress:
 	@cd ${WRKBUILD}/tests && \
diff --git a/converters/libiconv/patches/patch-src_Makefile_in b/converters/libiconv/patches/patch-src_Makefile_in
new file mode 100644
index 00000000000..dbc5c7875e5
--- /dev/null
+++ b/converters/libiconv/patches/patch-src_Makefile_in
@@ -0,0 +1,12 @@
+$OpenBSD: patch-src_Makefile_in,v 1.1 2002/06/13 03:45:57 brad Exp $
+--- src/Makefile.in.orig	Mon Jun 10 20:22:26 2002
++++ src/Makefile.in	Mon Jun 10 20:22:55 2002
+@@ -78,7 +78,7 @@ install : all force
+ 	if [ ! -d $(DESTDIR)$(bindir) ] ; then mkdir $(DESTDIR)$(bindir) ; fi
+ 	case "@host_os@" in \
+ 	  hpux*) $(CC) $(LDFLAGS) iconv.@OBJEXT@ -L$(libdir) -liconv @LIBINTL@ -o iconv;; \
+-	  *) $(LIBTOOL_LINK) $(CC) $(LDFLAGS) iconv.@OBJEXT@ $(libdir)/libiconv.la @LTLIBINTL@ -o iconv;; \
++	  *) $(LIBTOOL_LINK) $(CC) $(LDFLAGS) iconv.@OBJEXT@ $(DESTDIR)$(libdir)/libiconv.la @LTLIBINTL@ -o iconv;; \
+ 	esac
+ 	$(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) iconv $(DESTDIR)$(bindir)/iconv
+