CVS commit: pkgsrc/converters/php-iconv

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Wed Dec  4 10:59:52 UTC 2024

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

Log Message:
php-iconv: Overhaul iconv selection.

I noted a while back that this looked very wrong, and yes, it turns out to
be very wrong indeed, with over 70% of tests failing and php dumping core.

Simplify the selection so that the correct arguments are used for pkgsrc
libiconv as well as native iconv.  Remove confusing comments, and add the
correct TEST_TARGET while here.

Tested on SmartOS with pkgsrc libiconv, and on NetBSD and macOS with both
native iconv and pkgsrc libiconv.  It should be noted that pkgsrc libiconv
passes all tests, while both NetBSD and macOS native iconv have a number
of failures.

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 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.16 pkgsrc/converters/php-iconv/Makefile:1.17
--- pkgsrc/converters/php-iconv/Makefile:1.16   Mon Oct  7 09:18:46 2024
+++ pkgsrc/converters/php-iconv/Makefile        Wed Dec  4 10:59:52 2024
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.16 2024/10/07 09:18:46 adam Exp $
+# $NetBSD: Makefile,v 1.17 2024/12/04 10:59:52 jperkin Exp $
 
 MODNAME=               iconv
+PKGREVISION=           1
 CATEGORIES+=           converters
 COMMENT=               PHP extension for character set conversion
 
@@ -10,25 +11,19 @@ INSTALLATION_DIRS+= ${PREFIX}/include/ph
 
 PLIST_SRC+=            ${.CURDIR}/PLIST
 
-.include "../../converters/libiconv/buildlink3.mk"
+TEST_TARGET=           test
 
-# 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 "../../mk/bsd.prefs.mk"
 
-.if ${BUILTIN_LIB_FOUND.iconv:U:tl} == yes
+.if ${USE_BUILTIN.iconv:U:tl} == no
+CONFIGURE_ARGS+=       --with-iconv=shared,${BUILDLINK_PREFIX.iconv}
 # Hack: allow building on Darwin without Command Line Tools.
-.  if ${USE_BUILTIN.iconv:U:tl} == yes && ${OPSYS} == "Darwin" && !exists(/usr/include/iconv.h)
+.elif ${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}
-.  endif
 .else
 CONFIGURE_ARGS+=       --with-iconv
 .endif
@@ -36,5 +31,6 @@ CONFIGURE_ARGS+=      --with-iconv
 post-install:
        ${INSTALL_DATA} ${WRKSRC}/php_iconv.h ${DESTDIR}${PREFIX}/include/php/ext/iconv
 
+.include "../../converters/libiconv/buildlink3.mk"
 .include "../../lang/php/ext.mk"
 .include "../../mk/bsd.pkg.mk"