CVS commit: pkgsrc/converters/libiconv

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

Module Name:    pkgsrc
Committed By:   adam
Date:           Tue Nov 14 17:51:58 UTC 2023

Modified Files:
        pkgsrc/converters/libiconv: builtin.mk hacks.mk

Log Message:
libiconv: allow Citrix built-in libiconv on Darwin 22+


To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 pkgsrc/converters/libiconv/builtin.mk
cvs rdiff -u -r1.4 -r1.5 pkgsrc/converters/libiconv/hacks.mk

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

Modified files:

Index: pkgsrc/converters/libiconv/builtin.mk
diff -u pkgsrc/converters/libiconv/builtin.mk:1.26 pkgsrc/converters/libiconv/builtin.mk:1.27
--- pkgsrc/converters/libiconv/builtin.mk:1.26  Mon Jan 23 15:22:24 2023
+++ pkgsrc/converters/libiconv/builtin.mk       Tue Nov 14 17:51:58 2023
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.26 2023/01/23 15:22:24 wiz Exp $
+# $NetBSD: builtin.mk,v 1.27 2023/11/14 17:51:58 adam Exp $
 #
 # Package-settable variables:
 #
@@ -30,7 +30,7 @@ BUILTIN_FIND_GREP.H_CITRUS_ICONV=     Copyri
 IS_BUILTIN.iconv=      no
 .  if empty(H_ICONV:M__nonexistent__) && \
       empty(H_ICONV:M${LOCALBASE}/*) && \
-      ${BUILTIN_LIB_FOUND.iconv:U:tl} == yes
+      ${BUILTIN_LIB_FOUND.iconv:tl} == yes
 IS_BUILTIN.iconv=      yes
 .  endif
 .endif
@@ -95,17 +95,18 @@ USE_BUILTIN.iconv!=                                                 \
 # XXX
 .    if empty(H_GLIBC_ICONV:M__nonexistent__) && \
        empty(H_GLIBC_ICONV:M${LOCALBASE}/*) && \
-       ${BUILTIN_LIB_FOUND.iconv:U:tl} == no
+       ${BUILTIN_LIB_FOUND.iconv:tl} == no
 USE_BUILTIN.iconv=     yes
 H_ICONV=               ${H_GLIBC_ICONV}
 .    endif
 # XXX
 # XXX By default, assume that the Citrus project iconv implementation
 # XXX (if it exists) is good enough to replace GNU libiconv.
+# XXX On Darwin, libiconv.* exists.
 # XXX
 .    if empty(H_CITRUS_ICONV:M__nonexistent__) && \
        empty(H_CITRUS_ICONV:M${LOCALBASE}/*) && \
-       ${BUILTIN_LIB_FOUND.iconv:U:tl} == no
+       (${BUILTIN_LIB_FOUND.iconv:tl} == no || ${OPSYS} == "Darwin")
 USE_BUILTIN.iconv=     yes
 H_ICONV=               ${H_CITRUS_ICONV}
 .    endif
@@ -135,7 +136,7 @@ USE_BUILTIN.iconv=  no
 # Define BUILTIN_LIBNAME.iconv to be the base name of the built-in
 # iconv library.
 #
-.if ${BUILTIN_LIB_FOUND.iconv:U:tl} == yes
+.if ${BUILTIN_LIB_FOUND.iconv:tl} == yes
 BUILTIN_LIBNAME.iconv= iconv
 .else
 BUILTIN_LIBNAME.iconv= # empty (part of the C library)
@@ -166,7 +167,7 @@ BUILDLINK_TRANSFORM+=               rm:-liconv
 .    endif
 .  endif
 
-.  if defined(GNU_CONFIGURE) && ${GNU_CONFIGURE_ICONV:Uyes:M[yY][eE][sS]}
+.  if defined(GNU_CONFIGURE) && ${GNU_CONFIGURE_ICONV:Uyes:tl} == yes
 .    if ${USE_BUILTIN.iconv:tl} == no
 CONFIGURE_ARGS+=       --with-libiconv-prefix=${BUILDLINK_PREFIX.iconv}
 .    endif

Index: pkgsrc/converters/libiconv/hacks.mk
diff -u pkgsrc/converters/libiconv/hacks.mk:1.4 pkgsrc/converters/libiconv/hacks.mk:1.5
--- pkgsrc/converters/libiconv/hacks.mk:1.4     Sun Nov  3 17:14:25 2019
+++ pkgsrc/converters/libiconv/hacks.mk Tue Nov 14 17:51:58 2023
@@ -1,4 +1,4 @@
-# $NetBSD: hacks.mk,v 1.4 2019/11/03 17:14:25 rillig Exp $
+# $NetBSD: hacks.mk,v 1.5 2023/11/14 17:51:58 adam Exp $
 
 .if !defined(LIBICONV_HACKS_MK)
 LIBICONV_HACKS_MK=     # defined
@@ -7,7 +7,7 @@ LIBICONV_HACKS_MK=      # defined
 ### make sys/types.h not conflict with inttypes.h
 ### (issue is specific to IRIX 5.3)
 ###
-.if !empty(MACHINE_PLATFORM:MIRIX-5.3-*)
+.if ${MACHINE_PLATFORM:MIRIX-5.3-*}
 PKG_HACKS+=            sys_types_h-inttypes_h-conflict
 post-wrapper:
        ${MKDIR} ${BUILDLINK_DIR}/include/sys && ${GREP} -v '^typedef.*[^u_]int[12368]*_t;' /usr/include/sys/types.h > ${BUILDLINK_DIR}/include/sys/types.h