[pkgsrc/trunk]: pkgsrc/lang/gauche Try to fix iconv breakage when USE_BUILTIN...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/46f604437e75
branches:  trunk
changeset: 539211:46f604437e75
user:      tnn <tnn%pkgsrc.org@localhost>
date:      Sat Mar 01 19:50:13 2008 +0000

description:
Try to fix iconv breakage when USE_BUILTIN.iconv=no

diffstat:

 lang/gauche/Makefile |  17 +++++++++--------
 1 files changed, 9 insertions(+), 8 deletions(-)

diffs (47 lines):

diff -r 6c80d01e962d -r 46f604437e75 lang/gauche/Makefile
--- a/lang/gauche/Makefile      Sat Mar 01 19:07:27 2008 +0000
+++ b/lang/gauche/Makefile      Sat Mar 01 19:50:13 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.44 2008/02/25 23:14:19 tnn Exp $
+# $NetBSD: Makefile,v 1.45 2008/03/01 19:50:13 tnn Exp $
 #
 
 DISTNAME=      Gauche-0.8.13
@@ -10,7 +10,7 @@
 HOMEPAGE=      http://www.shiro.dreamhost.com/scheme/gauche/index.html
 COMMENT=       R5RS Scheme implementation aimed to be a handy tool for daily works
 
-DEPENDS+=      slib-[0-9]*:../../devel/slib
+DEPENDS+=              slib-[0-9]*:../../devel/slib
 
 PKG_DESTDIR_SUPPORT=   user-destdir
 
@@ -18,16 +18,16 @@
 
 EVAL_PREFIX+=          SLIB_PREFIX=slib
 
-GNU_CONFIGURE= yes
+GNU_CONFIGURE=         yes
 CONFIGURE_ARGS+=       --with-slib=${SLIB_PREFIX}/share/slib
 CONFIGURE_ARGS+=       --enable-threads=pthreads
 CONFIGURE_ARGS+=       --with-iconv=${BUILDLINK_PREFIX.iconv}
-.include "../../converters/libiconv/buildlink3.mk"
-.if defined(BUILDLINK_LDADD.iconv) && !empty(BUILDLINK_LDADD.iconv:M-l*)
-CONFIGURE_ARGS+=       --with-iconv-lib=${BUILDLINK_LDADD.iconv:M-l*:S/-l//:Q}
-MAKE_ENV+=             ICONV_LDFLAGS=${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.iconv}/lib
+.include "../../converters/libiconv/builtin.mk"
+.if !empty(USE_BUILTIN.iconv:M[nN][oO])
+CONFIGURE_ARGS+=       --with-iconv-lib=${BUILDLINK_LIBNAME.iconv}
+ALL_ENV+=              ICONV_LDFLAGS="${COMPILER_RPATH_FLAG}${PREFIX}/lib"
 .endif
-MAKE_JOBS_SAFE=        no
+MAKE_JOBS_SAFE=                no
 
 USE_LIBTOOL=   yes
 USE_TOOLS+=    gzip makeinfo
@@ -40,4 +40,5 @@
 post-install:
        gzip -d ${DESTDIR}${PREFIX}/${PKGINFODIR}/gauche-ref*gz
 
+.include "../../converters/libiconv/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"