[pkgsrc/trunk]: pkgsrc/textproc/eb Properly locate -liconv when linking ebinf...

[jlam <jlam%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/afbc956c49b9
branches:  trunk
changeset: 510995:afbc956c49b9
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Fri Apr 07 18:40:46 2006 +0000

description:
Properly locate -liconv when linking ebinfo in the case where we use
the pkgsrc libiconv implementation.

diffstat:

 textproc/eb/Makefile         |   9 +++++----
 textproc/eb/distinfo         |   3 ++-
 textproc/eb/patches/patch-ab |  20 ++++++++++++++++++++
 3 files changed, 27 insertions(+), 5 deletions(-)

diffs (66 lines):

diff -r fc97232c8761 -r afbc956c49b9 textproc/eb/Makefile
--- a/textproc/eb/Makefile      Fri Apr 07 17:41:43 2006 +0000
+++ b/textproc/eb/Makefile      Fri Apr 07 18:40:46 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2006/02/20 23:12:21 wiz Exp $
+# $NetBSD: Makefile,v 1.39 2006/04/07 18:40:46 jlam Exp $
 
 DISTNAME=      eb-4.1.3
 PKGREVISION=   2
@@ -74,6 +74,10 @@
 
 INSTALLATION_DIRS=     share/eb/appendix
 
+.include "../../converters/libiconv/buildlink3.mk"
+.include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../devel/zlib/buildlink3.mk"
+
 post-extract:
        ${RM} -rf ${WRKSRC}/zlib
 
@@ -87,7 +91,4 @@
        ${INSTALL_DATA_DIR} ${EGDIR}
        ${INSTALL_DATA} ${WRKSRC}/eb.conf ${EGDIR}/eb.conf.default
 
-.include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../devel/zlib/buildlink3.mk"
-
 .include "../../mk/bsd.pkg.mk"
diff -r fc97232c8761 -r afbc956c49b9 textproc/eb/distinfo
--- a/textproc/eb/distinfo      Fri Apr 07 17:41:43 2006 +0000
+++ b/textproc/eb/distinfo      Fri Apr 07 18:40:46 2006 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.14 2006/02/20 23:12:21 wiz Exp $
+$NetBSD: distinfo,v 1.15 2006/04/07 18:40:46 jlam Exp $
 
 SHA1 (eb-4.1.3/eb-4.1.3.tar.gz) = e0d997c14fc729e7e104b99dc8292a1bc09ecbe2
 RMD160 (eb-4.1.3/eb-4.1.3.tar.gz) = 9249fd014142c32d4b56b8127e8cae4a6aa2edc4
@@ -100,3 +100,4 @@
 RMD160 (eb-4.1.3/superdic98-1.0.tar.gz) = 7b597ee6a67974f7eb74dfe551dd8888ca696403
 Size (eb-4.1.3/superdic98-1.0.tar.gz) = 5252 bytes
 SHA1 (patch-aa) = 265c1e80bad1e94c11d4771909d7b643660a90de
+SHA1 (patch-ab) = c1ea5427597f95e12d96cf22518169b3e9f3b9de
diff -r fc97232c8761 -r afbc956c49b9 textproc/eb/patches/patch-ab
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/textproc/eb/patches/patch-ab      Fri Apr 07 18:40:46 2006 +0000
@@ -0,0 +1,20 @@
+$NetBSD: patch-ab,v 1.4 2006/04/07 18:40:46 jlam Exp $
+
+--- configure.orig     2006-04-07 13:48:25.000000000 -0400
++++ configure
+@@ -19840,6 +19840,7 @@ if test $ac_cv_lib_iconv_iconv_open = ye
+ _ACEOF
+ 
+   LIBS="-liconv $LIBS"
++  iconv_libraries="-liconv"
+ 
+ fi
+ 
+@@ -19914,6 +19915,7 @@ if test $ac_cv_lib_iconv_libiconv_open =
+ _ACEOF
+ 
+   LIBS="-liconv $LIBS"
++  iconv_libraries="-liconv"
+ 
+ fi
+