converters/php-mbstring: add support for php81

Handle changed include files.

2 files changed, 57 insertions, 50 deletions

diff --git a/converters/php-mbstring/Makefile b/converters/php-mbstring/Makefile
index 856093c7155..fc6290c7773 100644
--- a/converters/php-mbstring/Makefile
+++ b/converters/php-mbstring/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2021/03/07 13:42:44 taca Exp $
+# $NetBSD: Makefile,v 1.8 2021/11/27 07:27:04 taca Exp $
 
 MODNAME=		mbstring
 CATEGORIES+=		converters
@@ -12,7 +12,7 @@ INSTALLATION_DIRS+=	${PREFIX}/include/php/ext/mbstring/libmbfl/mbfl
 INSTALLATION_DIRS+=	${PREFIX}/include/php/ext/mbstring/libmbfl/nls
 
 PLIST_SRC+=		${.CURDIR}/PLIST
-PLIST_VARS+=		php7
+PLIST_VARS+=		php7 php81 sbf
 
 CONFIGURE_ARGS+=	--enable-${MODNAME}=shared,${BUILDLINK_DIR}
 
@@ -25,6 +25,11 @@ post-install:
 .if ${PKG_PHP_VERSION} >= 74
 .include "../../textproc/oniguruma/buildlink3.mk"
 .endif
+.if ${PKG_PHP_VERSION} <=80
+PLIST.sbf=	yes
+.else
+PLIST.php81=	yes
+.endif
 .if ${PKG_PHP_MAJOR_VERS} < 8
 PLIST.php7=	yes
 .endif
diff --git a/converters/php-mbstring/PLIST b/converters/php-mbstring/PLIST
index ec03d4ef9b5..8f7e422fb18 100644
--- a/converters/php-mbstring/PLIST
+++ b/converters/php-mbstring/PLIST
@@ -1,21 +1,21 @@
-@comment $NetBSD: PLIST,v 1.2 2021/03/07 13:42:44 taca Exp $
+@comment $NetBSD: PLIST,v 1.3 2021/11/27 07:27:04 taca Exp $
 include/php/ext/mbstring/libmbfl/filters/cp932_table.h
 include/php/ext/mbstring/libmbfl/filters/emoji2uni.h
 include/php/ext/mbstring/libmbfl/filters/html_entities.h
 include/php/ext/mbstring/libmbfl/filters/mbfilter_7bit.h
-include/php/ext/mbstring/libmbfl/filters/mbfilter_armscii8.h
-include/php/ext/mbstring/libmbfl/filters/mbfilter_ascii.h
+${PLIST.sbf}include/php/ext/mbstring/libmbfl/filters/mbfilter_armscii8.h
+${PLIST.sbf}include/php/ext/mbstring/libmbfl/filters/mbfilter_ascii.h
 include/php/ext/mbstring/libmbfl/filters/mbfilter_base64.h
 include/php/ext/mbstring/libmbfl/filters/mbfilter_big5.h
-include/php/ext/mbstring/libmbfl/filters/mbfilter_byte2.h
-include/php/ext/mbstring/libmbfl/filters/mbfilter_byte4.h
-include/php/ext/mbstring/libmbfl/filters/mbfilter_cp1251.h
-include/php/ext/mbstring/libmbfl/filters/mbfilter_cp1252.h
-include/php/ext/mbstring/libmbfl/filters/mbfilter_cp1254.h
+${PLIST.sbf}include/php/ext/mbstring/libmbfl/filters/mbfilter_byte2.h
+${PLIST.sbf}include/php/ext/mbstring/libmbfl/filters/mbfilter_byte4.h
+${PLIST.sbf}include/php/ext/mbstring/libmbfl/filters/mbfilter_cp1251.h
+${PLIST.sbf}include/php/ext/mbstring/libmbfl/filters/mbfilter_cp1252.h
+${PLIST.sbf}include/php/ext/mbstring/libmbfl/filters/mbfilter_cp1254.h
 include/php/ext/mbstring/libmbfl/filters/mbfilter_cp5022x.h
 include/php/ext/mbstring/libmbfl/filters/mbfilter_cp51932.h
-include/php/ext/mbstring/libmbfl/filters/mbfilter_cp850.h
-include/php/ext/mbstring/libmbfl/filters/mbfilter_cp866.h
+${PLIST.sbf}include/php/ext/mbstring/libmbfl/filters/mbfilter_cp850.h
+${PLIST.sbf}include/php/ext/mbstring/libmbfl/filters/mbfilter_cp866.h
 include/php/ext/mbstring/libmbfl/filters/mbfilter_cp932.h
 include/php/ext/mbstring/libmbfl/filters/mbfilter_cp936.h
 include/php/ext/mbstring/libmbfl/filters/mbfilter_euc_cn.h
@@ -31,29 +31,30 @@ include/php/ext/mbstring/libmbfl/filters/mbfilter_iso2022_jp_ms.h
 include/php/ext/mbstring/libmbfl/filters/mbfilter_iso2022_kr.h
 include/php/ext/mbstring/libmbfl/filters/mbfilter_iso2022jp_2004.h
 include/php/ext/mbstring/libmbfl/filters/mbfilter_iso2022jp_mobile.h
-include/php/ext/mbstring/libmbfl/filters/mbfilter_iso8859_1.h
-include/php/ext/mbstring/libmbfl/filters/mbfilter_iso8859_10.h
-include/php/ext/mbstring/libmbfl/filters/mbfilter_iso8859_13.h
-include/php/ext/mbstring/libmbfl/filters/mbfilter_iso8859_14.h
-include/php/ext/mbstring/libmbfl/filters/mbfilter_iso8859_15.h
-include/php/ext/mbstring/libmbfl/filters/mbfilter_iso8859_16.h
-include/php/ext/mbstring/libmbfl/filters/mbfilter_iso8859_2.h
-include/php/ext/mbstring/libmbfl/filters/mbfilter_iso8859_3.h
-include/php/ext/mbstring/libmbfl/filters/mbfilter_iso8859_4.h
-include/php/ext/mbstring/libmbfl/filters/mbfilter_iso8859_5.h
-include/php/ext/mbstring/libmbfl/filters/mbfilter_iso8859_6.h
-include/php/ext/mbstring/libmbfl/filters/mbfilter_iso8859_7.h
-include/php/ext/mbstring/libmbfl/filters/mbfilter_iso8859_8.h
-include/php/ext/mbstring/libmbfl/filters/mbfilter_iso8859_9.h
+${PLIST.sbf}include/php/ext/mbstring/libmbfl/filters/mbfilter_iso8859_1.h
+${PLIST.sbf}include/php/ext/mbstring/libmbfl/filters/mbfilter_iso8859_10.h
+${PLIST.sbf}include/php/ext/mbstring/libmbfl/filters/mbfilter_iso8859_13.h
+${PLIST.sbf}include/php/ext/mbstring/libmbfl/filters/mbfilter_iso8859_14.h
+${PLIST.sbf}include/php/ext/mbstring/libmbfl/filters/mbfilter_iso8859_15.h
+${PLIST.sbf}include/php/ext/mbstring/libmbfl/filters/mbfilter_iso8859_16.h
+${PLIST.sbf}include/php/ext/mbstring/libmbfl/filters/mbfilter_iso8859_2.h
+${PLIST.sbf}include/php/ext/mbstring/libmbfl/filters/mbfilter_iso8859_3.h
+${PLIST.sbf}include/php/ext/mbstring/libmbfl/filters/mbfilter_iso8859_4.h
+${PLIST.sbf}include/php/ext/mbstring/libmbfl/filters/mbfilter_iso8859_5.h
+${PLIST.sbf}include/php/ext/mbstring/libmbfl/filters/mbfilter_iso8859_6.h
+${PLIST.sbf}include/php/ext/mbstring/libmbfl/filters/mbfilter_iso8859_7.h
+${PLIST.sbf}include/php/ext/mbstring/libmbfl/filters/mbfilter_iso8859_8.h
+${PLIST.sbf}include/php/ext/mbstring/libmbfl/filters/mbfilter_iso8859_9.h
 include/php/ext/mbstring/libmbfl/filters/mbfilter_jis.h
-include/php/ext/mbstring/libmbfl/filters/mbfilter_koi8r.h
-include/php/ext/mbstring/libmbfl/filters/mbfilter_koi8u.h
+${PLIST.sbf}include/php/ext/mbstring/libmbfl/filters/mbfilter_koi8r.h
+${PLIST.sbf}include/php/ext/mbstring/libmbfl/filters/mbfilter_koi8u.h
 include/php/ext/mbstring/libmbfl/filters/mbfilter_qprint.h
+${PLIST.php81}include/php/ext/mbstring/libmbfl/filters/mbfilter_singlebyte.h
 include/php/ext/mbstring/libmbfl/filters/mbfilter_sjis.h
 include/php/ext/mbstring/libmbfl/filters/mbfilter_sjis_2004.h
 include/php/ext/mbstring/libmbfl/filters/mbfilter_sjis_mac.h
 include/php/ext/mbstring/libmbfl/filters/mbfilter_sjis_mobile.h
-include/php/ext/mbstring/libmbfl/filters/mbfilter_sjis_open.h
+${PLIST.sbf}include/php/ext/mbstring/libmbfl/filters/mbfilter_sjis_open.h
 include/php/ext/mbstring/libmbfl/filters/mbfilter_tl_jisx0201_jisx0208.h
 include/php/ext/mbstring/libmbfl/filters/mbfilter_ucs2.h
 include/php/ext/mbstring/libmbfl/filters/mbfilter_ucs4.h
@@ -68,34 +69,35 @@ include/php/ext/mbstring/libmbfl/filters/mbfilter_uuencode.h
 include/php/ext/mbstring/libmbfl/filters/sjis_mac2uni.h
 include/php/ext/mbstring/libmbfl/filters/translit_kana_jisx0201_jisx0208.h
 include/php/ext/mbstring/libmbfl/filters/unicode_prop.h
-include/php/ext/mbstring/libmbfl/filters/unicode_table_armscii8.h
+${PLIST.sbf}include/php/ext/mbstring/libmbfl/filters/unicode_table_armscii8.h
 include/php/ext/mbstring/libmbfl/filters/unicode_table_big5.h
 include/php/ext/mbstring/libmbfl/filters/unicode_table_cns11643.h
-include/php/ext/mbstring/libmbfl/filters/unicode_table_cp1251.h
+${PLIST.sbf}include/php/ext/mbstring/libmbfl/filters/unicode_table_cp1251.h
 include/php/ext/mbstring/libmbfl/filters/unicode_table_cp1252.h
-include/php/ext/mbstring/libmbfl/filters/unicode_table_cp1254.h
-include/php/ext/mbstring/libmbfl/filters/unicode_table_cp850.h
-include/php/ext/mbstring/libmbfl/filters/unicode_table_cp866.h
+${PLIST.sbf}include/php/ext/mbstring/libmbfl/filters/unicode_table_cp1254.h
+${PLIST.sbf}include/php/ext/mbstring/libmbfl/filters/unicode_table_cp850.h
+${PLIST.sbf}include/php/ext/mbstring/libmbfl/filters/unicode_table_cp866.h
 include/php/ext/mbstring/libmbfl/filters/unicode_table_cp932_ext.h
 include/php/ext/mbstring/libmbfl/filters/unicode_table_cp936.h
 include/php/ext/mbstring/libmbfl/filters/unicode_table_gb18030.h
-include/php/ext/mbstring/libmbfl/filters/unicode_table_iso8859_10.h
-include/php/ext/mbstring/libmbfl/filters/unicode_table_iso8859_13.h
-include/php/ext/mbstring/libmbfl/filters/unicode_table_iso8859_14.h
-include/php/ext/mbstring/libmbfl/filters/unicode_table_iso8859_15.h
-include/php/ext/mbstring/libmbfl/filters/unicode_table_iso8859_16.h
-include/php/ext/mbstring/libmbfl/filters/unicode_table_iso8859_2.h
-include/php/ext/mbstring/libmbfl/filters/unicode_table_iso8859_3.h
-include/php/ext/mbstring/libmbfl/filters/unicode_table_iso8859_4.h
-include/php/ext/mbstring/libmbfl/filters/unicode_table_iso8859_5.h
-include/php/ext/mbstring/libmbfl/filters/unicode_table_iso8859_6.h
-include/php/ext/mbstring/libmbfl/filters/unicode_table_iso8859_7.h
-include/php/ext/mbstring/libmbfl/filters/unicode_table_iso8859_8.h
-include/php/ext/mbstring/libmbfl/filters/unicode_table_iso8859_9.h
+${PLIST.php81}include/php/ext/mbstring/libmbfl/filters/unicode_table_gb2312.h
+${PLIST.sbf}include/php/ext/mbstring/libmbfl/filters/unicode_table_iso8859_10.h
+${PLIST.sbf}include/php/ext/mbstring/libmbfl/filters/unicode_table_iso8859_13.h
+${PLIST.sbf}include/php/ext/mbstring/libmbfl/filters/unicode_table_iso8859_14.h
+${PLIST.sbf}include/php/ext/mbstring/libmbfl/filters/unicode_table_iso8859_15.h
+${PLIST.sbf}include/php/ext/mbstring/libmbfl/filters/unicode_table_iso8859_16.h
+${PLIST.sbf}include/php/ext/mbstring/libmbfl/filters/unicode_table_iso8859_2.h
+${PLIST.sbf}include/php/ext/mbstring/libmbfl/filters/unicode_table_iso8859_3.h
+${PLIST.sbf}include/php/ext/mbstring/libmbfl/filters/unicode_table_iso8859_4.h
+${PLIST.sbf}include/php/ext/mbstring/libmbfl/filters/unicode_table_iso8859_5.h
+${PLIST.sbf}include/php/ext/mbstring/libmbfl/filters/unicode_table_iso8859_6.h
+${PLIST.sbf}include/php/ext/mbstring/libmbfl/filters/unicode_table_iso8859_7.h
+${PLIST.sbf}include/php/ext/mbstring/libmbfl/filters/unicode_table_iso8859_8.h
+${PLIST.sbf}include/php/ext/mbstring/libmbfl/filters/unicode_table_iso8859_9.h
 include/php/ext/mbstring/libmbfl/filters/unicode_table_jis.h
 include/php/ext/mbstring/libmbfl/filters/unicode_table_jis2004.h
-include/php/ext/mbstring/libmbfl/filters/unicode_table_koi8r.h
-include/php/ext/mbstring/libmbfl/filters/unicode_table_koi8u.h
+${PLIST.sbf}include/php/ext/mbstring/libmbfl/filters/unicode_table_koi8r.h
+${PLIST.sbf}include/php/ext/mbstring/libmbfl/filters/unicode_table_koi8u.h
 include/php/ext/mbstring/libmbfl/filters/unicode_table_uhc.h
 include/php/ext/mbstring/libmbfl/mbfl/eaw_table.h
 include/php/ext/mbstring/libmbfl/mbfl/mbfilter.h
@@ -108,7 +110,7 @@ include/php/ext/mbstring/libmbfl/mbfl/mbfl_convert.h
 include/php/ext/mbstring/libmbfl/mbfl/mbfl_defs.h
 include/php/ext/mbstring/libmbfl/mbfl/mbfl_encoding.h
 include/php/ext/mbstring/libmbfl/mbfl/mbfl_filter_output.h
-include/php/ext/mbstring/libmbfl/mbfl/mbfl_ident.h
+${PLIST.sbf}include/php/ext/mbstring/libmbfl/mbfl/mbfl_ident.h
 include/php/ext/mbstring/libmbfl/mbfl/mbfl_language.h
 include/php/ext/mbstring/libmbfl/mbfl/mbfl_memory_device.h
 include/php/ext/mbstring/libmbfl/mbfl/mbfl_string.h