[pkgsrc/trunk]: pkgsrc the trick with setting PHP_ICONV in environment doesn'...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/90dae5d47761
branches:  trunk
changeset: 477920:90dae5d47761
user:      jdolecek <jdolecek%pkgsrc.org@localhost>
date:      Mon Jul 12 04:32:21 2004 +0000

description:
the trick with setting PHP_ICONV in environment doesn't work with
more recent PHP anymore, so use USE_BUILDIN.iconv test to select
the appropriate iconv parameter value

fixes compilation on NetBSD 1.6.x and other systems without builtin
iconv, and thus PR pkg/26212 and PR pkg/26213

package behaviour unchanged, so no PKGREVISION bump done

diffstat:

 converters/php4-iconv/Makefile |  16 +++++++++++-----
 textproc/php4-xslt/Makefile    |  15 ++++++++++++---
 2 files changed, 23 insertions(+), 8 deletions(-)

diffs (60 lines):

diff -r 6f865557e092 -r 90dae5d47761 converters/php4-iconv/Makefile
--- a/converters/php4-iconv/Makefile    Sun Jul 11 21:17:00 2004 +0000
+++ b/converters/php4-iconv/Makefile    Mon Jul 12 04:32:21 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2004/06/03 23:07:29 heinz Exp $
+# $NetBSD: Makefile,v 1.6 2004/07/12 04:32:21 jdolecek Exp $
 
 MODNAME=               iconv
 CATEGORIES+=           converters
@@ -12,10 +12,16 @@
 # this is necessary so that PHP would find either the libc iconv
 # or use the packaged iconv, as appropriate; using
 # --with-iconv=shared,${BUILDLINK_PREFIX.iconv} assumes libiconv exists
-# the PHP_ICONV in environment is to make configure find alternative
-# libiconv
-CONFIGURE_ARGS+=       --with-iconv
-CONFIGURE_ENV+=                PHP_ICONV=${BUILDLINK_PREFIX.iconv:Q}
 
 .include "../../converters/libiconv/buildlink3.mk"
+.include "../../mk/buildlink3/bsd.builtin.mk"
+
+.if !empty(USE_BUILTIN.iconv:M[nN][oO])
+# use libiconv
+CONFIGURE_ARGS+=       --with-iconv=shared,${BUILDLINK_PREFIX.iconv}
+.else
+# use libc-provided iconv
+CONFIGURE_ARGS+=       --with-iconv
+.endif
+
 .include "../../mk/bsd.pkg.mk"
diff -r 6f865557e092 -r 90dae5d47761 textproc/php4-xslt/Makefile
--- a/textproc/php4-xslt/Makefile       Sun Jul 11 21:17:00 2004 +0000
+++ b/textproc/php4-xslt/Makefile       Mon Jul 12 04:32:21 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2004/07/06 19:52:01 jdolecek Exp $
+# $NetBSD: Makefile,v 1.12 2004/07/12 04:32:21 jdolecek Exp $
 
 MODNAME=               xslt
 CATEGORIES+=           textproc
@@ -14,9 +14,18 @@
 CONFIGURE_ARGS+=       --with-expat-dir=${BUILDLINK_PREFIX.expat}
 
 # this is necessary so that PHP would find either the libc iconv
-# or use the packaged iconv, as appropriate; see also converters/php4-iconv
+# or use the packaged iconv, as appropriate; using
+# --with-iconv=shared,${BUILDLINK_PREFIX.iconv} assumes libiconv exists
+
+.include "../../converters/libiconv/buildlink3.mk"
+.include "../../mk/buildlink3/bsd.builtin.mk"
+
+.if !empty(USE_BUILTIN.iconv:M[nN][oO])
+# use libiconv
+CONFIGURE_ARGS+=       --with-iconv-dir=${BUILDLINK_PREFIX.iconv:Q}
+.else
 CONFIGURE_ARGS+=       --with-iconv-dir
-CONFIGURE_ENV+=                PHP_ICONV=${BUILDLINK_PREFIX.iconv:Q}
+.endif
 
 PLIST_SRC+=            ${.CURDIR}/PLIST.extras
 DOCDIR=                        ${PREFIX}/share/doc/${PKGBASE}