Index: devel/Makefile
===================================================================
--- devel/Makefile
+++ devel/Makefile
@@ -1707,6 +1707,7 @@
     SUBDIR += omniNotify
     SUBDIR += omniORB
     SUBDIR += omniORB-4.1
+    SUBDIR += oniguruma
     SUBDIR += oniguruma4
     SUBDIR += oniguruma5
     SUBDIR += onscripter
Index: devel/oniguruma/Makefile
===================================================================
--- devel/oniguruma/Makefile
+++ devel/oniguruma/Makefile
@@ -2,32 +2,30 @@
 # $FreeBSD$
 
 PORTNAME=	oniguruma
-PORTVERSION=	5.9.6
+PORTVERSION=	6.1.2
 DISTVERSIONPREFIX=	v
-PORTREVISION=	1
 CATEGORIES=	devel textproc
-PKGNAMESUFFIX=	5
-DIST_SUBDIR=	ruby
 
-MAINTAINER=	rob@theseusnetworking.com
+MAINTAINER=	yuri@rawbw.com
 COMMENT=	BSDL Regular Expressions library compatible with POSIX/GNU/Perl
 
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-OPTIONS_DEFINE=	DOCS EXAMPLES
-
-CONFLICTS=	oniguruma-2.*
-
 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
-
-.include <bsd.port.options.mk>
+TEST_TARGET=	test
+TEST_WRKSRC=	${WRKSRC}/test
 
 post-patch:
 	@${REINPLACE_CMD} -e \
Index: devel/oniguruma/distinfo
===================================================================
--- devel/oniguruma/distinfo
+++ devel/oniguruma/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1480154293
-SHA256 (ruby/kkos-oniguruma-v5.9.6_GH0.tar.gz) = 0746ee6b889f9afe2fc0bf7cb9f21d7847821bbdf07bc938a3a5dfb3f91cc0d5
-SIZE (ruby/kkos-oniguruma-v5.9.6_GH0.tar.gz) = 325378
+TIMESTAMP = 1480711156
+SHA256 (kkos-oniguruma-v6.1.2_GH0.tar.gz) = 0c0c63ed17d20b6063fe07d34f5df5704b1134c2de22b3ce3c08889ba6b11e17
+SIZE (kkos-oniguruma-v6.1.2_GH0.tar.gz) = 566824
Index: devel/oniguruma/pkg-descr
===================================================================
--- devel/oniguruma/pkg-descr
+++ devel/oniguruma/pkg-descr
@@ -1,14 +1,5 @@
-Oniguruma is a BSDL Regular Expression library written for ruby-m17n,
-which implements all of Perl extensions, many of .NET extensions plus
-more.
+Oniguruma is a regular expressions library. The characteristics of this 
+library is that different character encoding for every regular 
+expression object can be specified.
 
-It provides multiple APIs for ease of use; GNU regex compatible API,
-POSIX regex compatible API and its own.
-
-This library is multilingualized by design and can have one encoding
-for each regex object.  Currently supported character encodings are
-ASCII, UTF-8, EUC-JP and Shift_JIS.
-
-4.x supports Ruby1.9.
-
-WWW: http://www.geocities.jp/kosako3/oniguruma/
+WWW: https://github.com/kkos/oniguruma
Index: devel/oniguruma/pkg-plist
===================================================================
--- devel/oniguruma/pkg-plist
+++ devel/oniguruma/pkg-plist
@@ -4,8 +4,8 @@
 include/oniguruma.h
 lib/libonig.a
 lib/libonig.so
-lib/libonig.so.2
-lib/libonig.so.2.0.0
+lib/libonig.so.4
+lib/libonig.so.4.0.0
 libdata/pkgconfig/oniguruma.pc
 %%PORTDOCS%%%%DOCSDIR%%/API
 %%PORTDOCS%%%%DOCSDIR%%/API.ja
@@ -15,11 +15,15 @@
 %%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