CVS commit: pkgsrc/converters/php-iconv

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Mon Oct  7 09:18:46 UTC 2024

Modified Files:
        pkgsrc/converters/php-iconv: Makefile

Log Message:
php-iconv: slightly better libiconv detection on Darwin


To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 pkgsrc/converters/php-iconv/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/converters/php-iconv/Makefile
diff -u pkgsrc/converters/php-iconv/Makefile:1.15 pkgsrc/converters/php-iconv/Makefile:1.16
--- pkgsrc/converters/php-iconv/Makefile:1.15   Thu Oct  3 12:29:52 2024
+++ pkgsrc/converters/php-iconv/Makefile        Mon Oct  7 09:18:46 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2024/10/03 12:29:52 adam Exp $
+# $NetBSD: Makefile,v 1.16 2024/10/07 09:18:46 adam Exp $
 
 MODNAME=               iconv
 CATEGORIES+=           converters
@@ -22,9 +22,9 @@ CHECK_BUILTIN.iconv:= no
 
 .include "../../mk/bsd.prefs.mk"
 
-.if ${USE_BUILTIN.iconv:U:tl} == no || ${BUILTIN_LIB_FOUND.iconv:U:tl} == yes
+.if ${BUILTIN_LIB_FOUND.iconv:U:tl} == yes
 # Hack: allow building on Darwin without Command Line Tools.
-.  if ${OPSYS} == "Darwin" && !exists(/usr/include/iconv.h)
+.  if ${USE_BUILTIN.iconv:U:tl} == yes && ${OPSYS} == "Darwin" && !exists(/usr/include/iconv.h)
 CONFIGURE_ARGS+=       --with-iconv=shared,${OSX_SDK_PATH:Q}/${BUILDLINK_PREFIX.iconv}
 .  else
 CONFIGURE_ARGS+=       --with-iconv=shared,${BUILDLINK_PREFIX.iconv}