Index: devel/oniguruma6/Makefile
===================================================================
--- devel/oniguruma6/Makefile	(revision 444901)
+++ devel/oniguruma6/Makefile	(working copy)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	oniguruma
-PORTVERSION=	6.1.3
+PORTVERSION=	6.3.0
 DISTVERSIONPREFIX=	v
 CATEGORIES=	devel textproc
 PKGNAMESUFFIX=	6
@@ -16,7 +16,9 @@
 USE_GITHUB=	yes
 GH_ACCOUNT=	kkos
 
-OPTIONS_DEFINE=	DOCS EXAMPLES
+OPTIONS_DEFINE=	COMBEXPL CRNL DOCS EXAMPLES
+COMBEXPL_DESC=	Perform combination explosion check
+CRNL_DESC=	Enable CR+NL as line terminator
 
 CONFLICTS_INSTALL=	oniguruma[45]-.*
 
@@ -23,16 +25,13 @@
 USES=		pathfix autoreconf libtool
 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
 
-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})
Index: devel/oniguruma6/distinfo
===================================================================
--- devel/oniguruma6/distinfo	(revision 444901)
+++ devel/oniguruma6/distinfo	(working copy)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1489970831
-SHA256 (kkos-oniguruma-v6.1.3_GH0.tar.gz) = 27fec91c6ba8333c1cd508a4b26ed29c232415724c68a9268207b6c7a5e8c20b
-SIZE (kkos-oniguruma-v6.1.3_GH0.tar.gz) = 567006
+TIMESTAMP = 1499032144
+SHA256 (kkos-oniguruma-v6.3.0_GH0.tar.gz) = 011ade26c9be99efeee7274e9a49e7f7b8cb12e98294dd712f258b95b53c74b9
+SIZE (kkos-oniguruma-v6.3.0_GH0.tar.gz) = 568392