diff -ruN /usr/ports/devel/oniguruma6/distinfo /usr/ports/devel/oniguruma6/distinfo
--- /usr/ports/devel/oniguruma6/distinfo	1969-12-31 16:00:00.000000000 -0800
+++ /usr/ports/devel/oniguruma6/distinfo	2016-12-02 12:24:37.664328000 -0800
@@ -0,0 +1,3 @@
+TIMESTAMP = 1480710274
+SHA256 (ruby/onig-6.1.2_GH0.tar.gz) = a6b16d57f027f9804a4aebe38222ae796e7104a9c51afbbc4a15182f8604e720
+SIZE (ruby/onig-6.1.2_GH0.tar.gz) = 566225
diff -ruN /usr/ports/devel/oniguruma6/Makefile /usr/ports/devel/oniguruma6/Makefile
--- /usr/ports/devel/oniguruma6/Makefile	1969-12-31 16:00:00.000000000 -0800
+++ /usr/ports/devel/oniguruma6/Makefile	2016-12-02 12:24:25.375469000 -0800
@@ -0,0 +1,51 @@
+# Created by: Akinori MUSHA aka knu <knu@idaemons.org>
+# $FreeBSD$
+
+PORTNAME=	oniguruma
+PORTVERSION=	6.1.2
+DISTVERSIONPREFIX=	v
+CATEGORIES=	devel textproc
+PKGNAMESUFFIX=	6
+DISTNAME=	onig-${PORTVERSION}
+DIST_SUBDIR=	ruby
+
+USE_GITHUB=     yes
+GH_ACCOUNT=     kkos
+GH_PROJECT=     oniguruma
+GH_TAGNAME=     v6.1.1
+
+
+MAINTAINER=	rob@theseusnetworking.com
+COMMENT=	BSDL Regular Expressions library compatible with POSIX/GNU/Perl
+
+LICENSE=	BSD2CLAUSE
+LICENSE_FILE=	${WRKSRC}/COPYING
+
+OPTIONS_DEFINE=	DOCS EXAMPLES
+
+CONFLICTS=	oniguruma-2.*
+
+USES=		pathfix autoreconf libtool
+PATHFIX_MAKEFILEIN=	Makefile.am
+GNU_CONFIGURE=	yes
+INSTALL_TARGET=	install-strip
+USE_LDCONFIG=	yes
+
+.include <bsd.port.options.mk>
+
+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})
+
+test:
+	(cd ${WRKSRC}/test && gmake test)
+
+.include <bsd.port.mk>
diff -ruN /usr/ports/devel/oniguruma6/pkg-descr /usr/ports/devel/oniguruma6/pkg-descr
--- /usr/ports/devel/oniguruma6/pkg-descr	1969-12-31 16:00:00.000000000 -0800
+++ /usr/ports/devel/oniguruma6/pkg-descr	2016-12-02 12:18:49.142205000 -0800
@@ -0,0 +1,28 @@
+Oniguruma is a regular expressions library. The characteristics of this 
+library is that different character encoding for every regular 
+expression object can be specified.
+
+Supported character encodings:
+
+ASCII, UTF-8, UTF-16BE, UTF-16LE, UTF-32BE, UTF-32LE, EUC-JP, EUC-TW, 
+EUC-KR, EUC-CN, Shift_JIS, Big5, GB18030, KOI8-R, CP1251, ISO-8859-1, 
+ISO-8859-2, ISO-8859-3, ISO-8859-4, ISO-8859-5, ISO-8859-6, ISO-8859-7, 
+ISO-8859-8, ISO-8859-9, ISO-8859-10, ISO-8859-11, ISO-8859-13, 
+ISO-8859-14, ISO-8859-15, ISO-8859-16
+
+GB18030: contributed by KUBO Takehiro
+CP1251: contributed by Byte
+New feature of version 6.1
+
+improved doc/RE
+NEW API: onig_scan()
+New feature of version 6.0
+
+Update Unicode 8.0 Property/Case-folding
+NEW API: onig_unicode_define_user_property()
+
+License:
+
+BSD license.
+
+WWW: https://github.com/kkos/oniguruma
diff -ruN /usr/ports/devel/oniguruma6/pkg-plist /usr/ports/devel/oniguruma6/pkg-plist
--- /usr/ports/devel/oniguruma6/pkg-plist	1969-12-31 16:00:00.000000000 -0800
+++ /usr/ports/devel/oniguruma6/pkg-plist	2016-12-02 12:18:49.142439000 -0800
@@ -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
Index: devel/Makefile
===================================================================
--- devel/Makefile	(revision 427473)
+++ devel/Makefile	(working copy)
@@ -1702,6 +1702,7 @@
     SUBDIR += omniORB-4.1
     SUBDIR += oniguruma4
     SUBDIR += oniguruma5
+    SUBDIR += oniguruma6
     SUBDIR += onscripter
     SUBDIR += onscripter-1byte
     SUBDIR += oozie