[pkgsrc/trunk]: pkgsrc Revert the change to put -liconv into BUILDLINK_LDFLAG...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/9a91e85a1379
branches:  trunk
changeset: 475595:9a91e85a1379
user:      danw <danw%pkgsrc.org@localhost>
date:      Thu May 20 16:13:05 2004 +0000

description:
Revert the change to put -liconv into BUILDLINK_LDFLAGS.iconv (which
breaks some things on Darwin) and fix audio/musicpd so it doesn't need
it (by faking out a configure check that gets confused by the
iconv_open -> libiconv_open renaming)

diffstat:

 audio/musicpd/Makefile            |  3 ++-
 converters/libiconv/buildlink3.mk |  3 +--
 2 files changed, 3 insertions(+), 3 deletions(-)

diffs (34 lines):

diff -r 24b6dd297013 -r 9a91e85a1379 audio/musicpd/Makefile
--- a/audio/musicpd/Makefile    Thu May 20 15:05:46 2004 +0000
+++ b/audio/musicpd/Makefile    Thu May 20 16:13:05 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/04/30 10:48:21 grant Exp $
+# $NetBSD: Makefile,v 1.2 2004/05/20 16:13:05 danw Exp $
 
 DISTNAME=              mpd-${PKGVERSION}
 PKGNAME=               musicpd-0.10.3
@@ -53,6 +53,7 @@
 .if ${MUSICPD_WITH_AUDIOFILE} == "YES"
 .  include "../../audio/libaudiofile/buildlink3.mk"
 CONFIGURE_ARGS+=       --with-audiofile=${BUILDLINK_PREFIX.audiofile}
+CONFIGURE_ENV+=                ac_cv_lib_iconv_iconv_open=yes
 .else
 CONFIGURE_ARGS+=       --disable-audiofile
 .endif
diff -r 24b6dd297013 -r 9a91e85a1379 converters/libiconv/buildlink3.mk
--- a/converters/libiconv/buildlink3.mk Thu May 20 15:05:46 2004 +0000
+++ b/converters/libiconv/buildlink3.mk Thu May 20 16:13:05 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.19 2004/05/17 21:32:34 seb Exp $
+# $NetBSD: buildlink3.mk,v 1.20 2004/05/20 16:13:05 danw Exp $
 
 BUILDLINK_DEPTH:=      ${BUILDLINK_DEPTH}+
 ICONV_BUILDLINK3_MK:=  ${ICONV_BUILDLINK3_MK}+
@@ -13,7 +13,6 @@
 .if !empty(ICONV_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.iconv+=      libiconv>=1.9.1
 BUILDLINK_PKGSRCDIR.iconv?=    ../../converters/libiconv
-BUILDLINK_LDFLAGS.iconv=       ${BUILDLINK_LDADD.iconv}
 .endif # ICONV_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=      ${BUILDLINK_DEPTH:S/+$//}