Index: head/devel/Makefile
===================================================================
--- head/devel/Makefile
+++ head/devel/Makefile
@@ -1709,6 +1709,7 @@
     SUBDIR += omniORB-4.1
     SUBDIR += oniguruma4
     SUBDIR += oniguruma5
+    SUBDIR += oniguruma6
     SUBDIR += onscripter
     SUBDIR += onscripter-1byte
     SUBDIR += oozie
Index: head/devel/oniguruma6/Makefile
===================================================================
--- head/devel/oniguruma6/Makefile
+++ head/devel/oniguruma6/Makefile
@@ -0,0 +1,43 @@
+# Created by: Akinori MUSHA aka knu <knu@idaemons.org>
+# $FreeBSD$
+
+PORTNAME=	oniguruma
+PORTVERSION=	6.1.2
+DISTVERSIONPREFIX=	v
+CATEGORIES=	devel textproc
+PKGNAMESUFFIX=	6
+
+MAINTAINER=	rob@theseusnetworking.com
+COMMENT=	BSDL Regular Expressions library compatible with POSIX/GNU/Perl
+
+LICENSE=	BSD2CLAUSE
+LICENSE_FILE=	${WRKSRC}/COPYING
+
+USE_GITHUB=	yes
+GH_ACCOUNT=	kkos
+
+OPTIONS_DEFINE=	DOCS EXAMPLES
+
+CONFLICTS_INSTALL=	oniguruma[45]-.*
+
+USES=		pathfix autoreconf libtool
+PATHFIX_MAKEFILEIN=	Makefile.am
+GNU_CONFIGURE=	yes
+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})
+	(cd ${WRKSRC}/doc && ${INSTALL_DATA} * ${STAGEDIR}${DOCSDIR})
+	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
+	(cd ${WRKSRC}/sample && ${INSTALL_DATA} *.c ${STAGEDIR}${EXAMPLESDIR})
+
+.include <bsd.port.mk>
Index: head/devel/oniguruma6/distinfo
===================================================================
--- head/devel/oniguruma6/distinfo
+++ head/devel/oniguruma6/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1480711156
+SHA256 (kkos-oniguruma-v6.1.2_GH0.tar.gz) = 0c0c63ed17d20b6063fe07d34f5df5704b1134c2de22b3ce3c08889ba6b11e17
+SIZE (kkos-oniguruma-v6.1.2_GH0.tar.gz) = 566824
Index: head/devel/oniguruma6/pkg-descr
===================================================================
--- head/devel/oniguruma6/pkg-descr
+++ head/devel/oniguruma6/pkg-descr
@@ -0,0 +1,5 @@
+Oniguruma is a regular expressions library. The characteristics of this 
+library is that different character encoding for every regular 
+expression object can be specified.
+
+WWW: https://github.com/kkos/oniguruma
Index: head/devel/oniguruma6/pkg-plist
===================================================================
--- head/devel/oniguruma6/pkg-plist
+++ head/devel/oniguruma6/pkg-plist
@@ -0,0 +1,29 @@
+bin/onig-config
+include/oniggnu.h
+include/onigposix.h
+include/oniguruma.h
+lib/libonig.a
+lib/libonig.so
+lib/libonig.so.4
+lib/libonig.so.4.0.0
+libdata/pkgconfig/oniguruma.pc
+%%PORTDOCS%%%%DOCSDIR%%/API
+%%PORTDOCS%%%%DOCSDIR%%/API.ja
+%%PORTDOCS%%%%DOCSDIR%%/FAQ
+%%PORTDOCS%%%%DOCSDIR%%/FAQ.ja
+%%PORTDOCS%%%%DOCSDIR%%/HISTORY
+%%PORTDOCS%%%%DOCSDIR%%/RE
+%%PORTDOCS%%%%DOCSDIR%%/RE.ja
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/UNICODE_PROPERTIES
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/bug_fix.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/crnl.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/encode.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/listcap.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/names.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/posix.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/scan.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/simple.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sql.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/syntax.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/user_property.c