*/*: Fix build with llvm16 on 13.2-STABLE

As like as HEAD(14.0-RELEASE) llvm16 was merged in base for 13.2-STABLE
with the OSVERSION 1302507.

- Utilize USE_CXXSTD=c++14 or similar solution where applicable
- Update conditionals to addtionally check for OSVERSION greater than
  1302507 and less than 1400000

Approved by:	portmgr (blanket)
Sponsored by:	The FreeBSD Foundation

6 files changed, 17 insertions, 28 deletions

diff --git a/japanese/FreeWnn-lib/Makefile b/japanese/FreeWnn-lib/Makefile
index 1ccf40166e6c..32da107e1cc4 100644
--- a/japanese/FreeWnn-lib/Makefile
+++ b/japanese/FreeWnn-lib/Makefile
@@ -21,7 +21,7 @@ MANLANG?=		ja
 .include "${.CURDIR}/../../japanese/FreeWnn-lib/Makefile.common"
 .include <bsd.port.options.mk>
 
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091
+.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 ))
 CFLAGS+=	-Wno-error=incompatible-function-pointer-types
 .endif
 
diff --git a/japanese/edict/Makefile b/japanese/edict/Makefile
index c2466a49c56a..82913c79a868 100644
--- a/japanese/edict/Makefile
+++ b/japanese/edict/Makefile
@@ -44,7 +44,7 @@ OPTIONS_DEFINE=	DOCS
 
 .include <bsd.port.options.mk>
 
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091
+.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 ))
 CFLAGS+=	-Wno-error=incompatible-function-pointer-types
 .endif
 
diff --git a/japanese/groff/Makefile b/japanese/groff/Makefile
index c67f05c6f1b4..20e6af8b63d9 100644
--- a/japanese/groff/Makefile
+++ b/japanese/groff/Makefile
@@ -15,7 +15,8 @@ COMMENT=	Japanese enhancement of GNU groff
 
 LICENSE=	GPLv2
 
-USES=		iconv:wchar_t cpe gmake makeinfo shebangfix
+USES=		iconv:wchar_t cpe gmake localbase makeinfo shebangfix
+USE_CXXSTD=	c++14
 
 SHEBANG_FILES=	src/utils/afmtodit/afmtodit.pl \
 		contrib/mm/mmroff.pl
@@ -23,8 +24,7 @@ CPE_VENDOR=	gnu
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-multibyte
 CONFIGURE_ENV=	INSTALL_MAN="${INSTALL_MAN}"
-CPPFLAGS+=	-I${LOCALBASE}/include
-LIBS+=		-L${LOCALBASE}/lib ${ICONV_LIB}
+LIBS+=		${ICONV_LIB}
 MAKE_JOBS_UNSAFE=	yes
 INSTALL_TARGET=	install install_doc
 PLIST_SUB=	GROFF_VERSION=${PORTVERSION}
@@ -45,12 +45,6 @@ MDOCFILES=	ja.eucJP doc-common doc-syms
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
-.include <bsd.port.options.mk>
-
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091
-CPPFLAGS+=  -Dregister=
-.endif
-
 post-patch:
 	${REINPLACE_CMD} -E -e 's|^@setfilename +groff|&.info|g;' \
 	    ${WRKSRC}/doc/groff.texinfo
@@ -71,11 +65,13 @@ post-install:
 	${INSTALL_DATA} ${WRKDIR}/mdoc.local ${STAGEDIR}${DATADIR}/site-tmac
 	${INSTALL_DATA} ${WRKSRC}/doc/groff.info \
 	    ${STAGEDIR}${PREFIX}/${INFO_PATH}
-	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	cd ${INSTALL_WRKSRC} && ${INSTALL_DATA} \
-	    ChangeLog.jp NEWS PROBLEMS README README.jp ${STAGEDIR}${DOCSDIR}
 	for F in eqn neqn pic tbl; do \
 		${LN} -sf $$F ${STAGEDIR}${PREFIX}/bin/g$$F; \
 	done
 
+post-install-DOCS-on:
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	cd ${INSTALL_WRKSRC} && ${INSTALL_DATA} \
+	    ChangeLog.jp NEWS PROBLEMS README README.jp ${STAGEDIR}${DOCSDIR}
+
 .include <bsd.port.mk>
diff --git a/japanese/libskk/Makefile b/japanese/libskk/Makefile
index d045e9d70004..bdf75d878837 100644
--- a/japanese/libskk/Makefile
+++ b/japanese/libskk/Makefile
@@ -35,7 +35,7 @@ NLS_USES_OFF=	gettext-tools
 
 .include <bsd.port.options.mk>
 
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091
+.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 ))
 CFLAGS+=	-Wno-error=incompatible-function-pointer-types
 .endif
 
diff --git a/japanese/mecab/Makefile b/japanese/mecab/Makefile
index a86e474e22b1..9fc3ec3c931c 100644
--- a/japanese/mecab/Makefile
+++ b/japanese/mecab/Makefile
@@ -15,6 +15,7 @@ BROKEN_mips=		fails to link: Nonrepresentable section on output
 BROKEN_mips64=		fails to link: Nonrepresentable section on output
 
 USES=		gettext-tools iconv libtool localbase perl5
+USE_CXXSTD=	c++14
 USE_LDCONFIG=	yes
 USE_PERL5=	build
 
@@ -27,12 +28,6 @@ PORTDOCS=	AUTHORS README *.html
 
 OPTIONS_DEFINE=	DOCS
 
-.include <bsd.port.options.mk>
-
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091
-CPPFLAGS+=  -Dregister=
-.endif
-
 post-patch:
 	@${REINPLACE_CMD} '/^libmecab_la_LIBADD =/s/$$/ $$(LTLIBICONV)/' \
 		${WRKSRC}/src/Makefile.in
@@ -40,16 +35,14 @@ post-patch:
 		-e '/CFLAGS/s|-O3|${CFLAGS}|' \
 		-e '/CXXFLAGS/s|-O3|${CXXFLAGS}|' \
 		${WRKSRC}/configure
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091
-	@${REINPLACE_CMD} -e 's|std::binary_function|std::__binary_function|' \
-		${WRKSRC}/src/dictionary.cpp
-.endif
 
 post-install:
+	${MV} ${STAGEDIR}${PREFIX}/etc/mecabrc \
+		${STAGEDIR}${PREFIX}/etc/mecabrc.sample
+
+post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:N*.html:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/*.html ${STAGEDIR}${DOCSDIR}
-	${MV} ${STAGEDIR}${PREFIX}/etc/mecabrc \
-		${STAGEDIR}${PREFIX}/etc/mecabrc.sample
 
 .include <bsd.port.mk>
diff --git a/japanese/ruby-uconv/Makefile b/japanese/ruby-uconv/Makefile
index d41ed161e394..b372f90ba99d 100644
--- a/japanese/ruby-uconv/Makefile
+++ b/japanese/ruby-uconv/Makefile
@@ -26,7 +26,7 @@ OPTIONS_DEFINE=	DOCS
 PKGNAMEPREFIX:=	${PKGNAMEPREFIX}${RUBY_PKGNAMEPREFIX}
 
 post-patch:
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091
+.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 ))
 	@${REINPLACE_CMD} -e 's|fdeclspec|fdeclspec -Wno-error=incompatible-function-pointer-types|g' \
 				${WRKSRC}/extconf.rb
 .endif