[pkgsrc/trunk]: pkgsrc/textproc/php4-xslt Don't include bsd.builtin.mk... jus...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/75a3679aadb9
branches:  trunk
changeset: 495024:75a3679aadb9
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Wed Jun 01 19:13:24 2005 +0000

description:
Don't include bsd.builtin.mk... just include the builtin.mk file for
the package that we're interested in (iconv).  Also, fix the logic so
that we don't assume that built-in libiconv.so doesn't exist.

diffstat:

 textproc/php4-xslt/Makefile |  20 +++++++++++---------
 1 files changed, 11 insertions(+), 9 deletions(-)

diffs (39 lines):

diff -r 3ca71320bf85 -r 75a3679aadb9 textproc/php4-xslt/Makefile
--- a/textproc/php4-xslt/Makefile       Wed Jun 01 19:11:41 2005 +0000
+++ b/textproc/php4-xslt/Makefile       Wed Jun 01 19:13:24 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2005/04/11 21:47:41 tv Exp $
+# $NetBSD: Makefile,v 1.16 2005/06/01 19:13:24 jlam Exp $
 
 MODNAME=               xslt
 CATEGORIES+=           textproc
@@ -10,19 +10,21 @@
 CONFIGURE_ARGS+=       --with-${MODNAME}-sablot=${BUILDLINK_PREFIX.sablotron}
 CONFIGURE_ARGS+=       --with-expat-dir=${BUILDLINK_PREFIX.expat}
 
+.include "../../converters/libiconv/buildlink3.mk"
+
 # 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
-
-.include "../../mk/bsd.prefs.mk"
-.include "../../converters/libiconv/buildlink3.mk"
-.include "../../mk/buildlink3/bsd.builtin.mk"
+#
+CHECK_BUILTIN.iconv:=  yes
+.include "../../converters/libiconv/builtin.mk"
+CHECK_BUILTIN.iconv:=  no
 
-.if !empty(USE_BUILTIN.iconv:M[nN][oO])
-# use libiconv
-CONFIGURE_ARGS+=       --with-iconv-dir=${BUILDLINK_PREFIX.iconv:Q}
+.if !empty(USE_BUILTIN.iconv:M[nN][oO]) || \
+    !empty(BUILTIN_LIB_FOUND.iconv:M[yY][eE][sS])
+CONFIGURE_ARGS+=       --with-iconv=shared,${BUILDLINK_PREFIX.iconv}
 .else
-CONFIGURE_ARGS+=       --with-iconv-dir
+CONFIGURE_ARGS+=       --with-iconv
 .endif
 
 PLIST_SRC+=            ${.CURDIR}/PLIST.extras