CVS commit: pkgsrc/converters/php-iconv

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

Module Name:    pkgsrc
Committed By:   adam
Date:           Thu Oct  3 12:29:52 UTC 2024

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

Log Message:
php-iconv: fix Darwin hack: cannot use BUILDLINK_PREFIX.iconv


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 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.14 pkgsrc/converters/php-iconv/Makefile:1.15
--- pkgsrc/converters/php-iconv/Makefile:1.14   Wed Sep 25 07:30:54 2024
+++ pkgsrc/converters/php-iconv/Makefile        Thu Oct  3 12:29:52 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2024/09/25 07:30:54 adam Exp $
+# $NetBSD: Makefile,v 1.15 2024/10/03 12:29:52 adam Exp $
 
 MODNAME=               iconv
 CATEGORIES+=           converters
@@ -24,7 +24,7 @@ CHECK_BUILTIN.iconv:= no
 
 .if ${USE_BUILTIN.iconv:U:tl} == no || ${BUILTIN_LIB_FOUND.iconv:U:tl} == yes
 # Hack: allow building on Darwin without Command Line Tools.
-.  if ${OPSYS} == "Darwin" && ${BUILDLINK_PREFIX.iconv} == "/usr" && !exists(/usr/include/iconv.h)
+.  if ${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}