[pkgsrc/trunk]: pkgsrc/converters/php-iconv Don't include bsd.builtin.mk... j...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/2252a8c3d0f3
branches:  trunk
changeset: 495020:2252a8c3d0f3
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Wed Jun 01 19:03:45 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:

 converters/php-iconv/Makefile |  19 ++++++++++---------
 1 files changed, 10 insertions(+), 9 deletions(-)

diffs (38 lines):

diff -r 4f36e6d34684 -r 2252a8c3d0f3 converters/php-iconv/Makefile
--- a/converters/php-iconv/Makefile     Wed Jun 01 18:54:20 2005 +0000
+++ b/converters/php-iconv/Makefile     Wed Jun 01 19:03:45 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2005/04/11 21:45:09 tv Exp $
+# $NetBSD: Makefile,v 1.5 2005/06/01 19:03:45 jlam Exp $
 
 MODNAME=               iconv
 CATEGORIES+=           converters
@@ -6,19 +6,20 @@
 COMMENT=               PHP extension for character set conversion
 
 
-# this is necessary so that PHP would find either the libc iconv
+.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
+#
+CHECK_BUILTIN.iconv:=  yes
+.include "../../converters/libiconv/builtin.mk"
+CHECK_BUILTIN.iconv:=  no
 
-.include "../../converters/libiconv/buildlink3.mk"
-.include "../../mk/bsd.prefs.mk"
-.include "../../mk/buildlink3/bsd.builtin.mk"
-
-.if !empty(USE_BUILTIN.iconv:M[nN][oO])
-# use libiconv
+.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
-# use libc-provided iconv
 CONFIGURE_ARGS+=       --with-iconv
 .endif