Index: devel/oniguruma6/Makefile
===================================================================
--- devel/oniguruma6/Makefile	(revision 445730)
+++ devel/oniguruma6/Makefile	(working copy)
@@ -13,26 +13,27 @@
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-USE_GITHUB=	yes
-GH_ACCOUNT=	kkos
+OPTIONS_DEFINE=	COMBEXPL CRNL DOCS EXAMPLES
+COMBEXPL_DESC=	Perform combination explosion check
+CRNL_DESC=	Enable CR+NL as line terminator
 
-OPTIONS_DEFINE=	DOCS EXAMPLES
-
 CONFLICTS_INSTALL=	oniguruma[45]
+COMBEXPL_BROKEN=	Build fails: https://github.com/kkos/oniguruma/issues/66
 
 USES=		pathfix autoreconf libtool
+USE_GITHUB=	yes
+GH_ACCOUNT=	kkos
+USE_LDCONFIG=	yes
 PATHFIX_MAKEFILEIN=	Makefile.am
 GNU_CONFIGURE=	yes
+COMBEXPL_CONFIGURE_ON=	--enable-combination-explosion-check
+CRNL_CONFIGURE_ON=	--enable-crnl-as-line-terminator
 INSTALL_TARGET=	install-strip
-USE_LDCONFIG=	yes
 TEST_TARGET=	test
 TEST_WRKSRC=	${WRKSRC}/test
+# Ignore testcases with the Japanese character set
+CFLAGS+=	-DIGNORE_EUC_JP
 
-post-patch:
-	@${REINPLACE_CMD} -e \
-		'/^INCLUDES/s|$$(includedir)|| ; \
-		 s|$$(<)|$$(@).in|' ${WRKSRC}/Makefile.am
-
 post-install:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	(cd ${WRKSRC} && ${INSTALL_DATA} HISTORY README ${STAGEDIR}${DOCSDIR})