diff -urN /usr/ports/devel/oniguruma5/Makefile devel/oniguruma5/Makefile
--- /usr/ports/devel/oniguruma5/Makefile	2013-01-16 19:39:42.000000000 +0900
+++ devel/oniguruma5/Makefile	2013-04-06 10:15:42.000000000 +0900
@@ -2,42 +2,43 @@
 # $FreeBSD: head/devel/oniguruma5/Makefile 310482 2013-01-16 08:16:20Z araujo $
 
 PORTNAME=	oniguruma
-PORTVERSION=	5.9.3
+PORTVERSION=	5.9.4
 CATEGORIES=	devel textproc
 MASTER_SITES=	http://www.geocities.jp/kosako3/oniguruma/archive/
 DISTNAME=	onig-${PORTVERSION}
 DIST_SUBDIR=	ruby
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	A BSDL Regular Expressions library compatible with POSIX/GNU/Perl
+COMMENT=	BSDL Regular Expressions library compatible with POSIX/GNU/Perl
 
 LICENSE=	BSD
 LICENSE_FILE=	${WRKSRC}/COPYING
 
+OPTIONS_DEFINE=	DOCS EXAMPLES
+
 CONFLICTS=	oniguruma-2.*
 
+USES=		pathfix
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 MAKE_JOBS_SAFE=	yes
 
+.include <bsd.port.options.mk>
+
 post-patch:
 	@${REINPLACE_CMD} -e \
-		'/^INCLUDES/s|$$(includedir)||' ${WRKSRC}/Makefile.in
-
-post-configure:
-	@${SED} -e 's|%%PREFIX%%|${PREFIX}|' \
-		${FILESDIR}/onig-config > ${WRKSRC}/onig-config
+		'/^INCLUDES/s|$$(includedir)|| ; \
+		 s|$$(<)|$$(@).in|' ${WRKSRC}/Makefile.in
 
 post-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/onig-config ${PREFIX}/bin
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}
 	(cd ${WRKSRC} && ${INSTALL_DATA} HISTORY README ${DOCSDIR})
 	(cd ${WRKSRC}/doc && ${INSTALL_DATA} * ${DOCSDIR})
 .endif
-.if !defined(NOPORTEXAMPLES)
+.if ${PORT_OPTIONS:MEXAMPLES}
 	@${MKDIR} ${EXAMPLESDIR}
-	(cd ${WRKSRC}/sample && ${INSTALL_DATA} *.c Makefile* ${EXAMPLESDIR})
+	(cd ${WRKSRC}/sample && ${INSTALL_DATA} *.c ${EXAMPLESDIR})
 .endif
 
 .include <bsd.port.mk>
diff -urN /usr/ports/devel/oniguruma5/distinfo devel/oniguruma5/distinfo
--- /usr/ports/devel/oniguruma5/distinfo	2013-01-16 19:39:42.000000000 +0900
+++ devel/oniguruma5/distinfo	2013-04-06 00:35:43.000000000 +0900
@@ -1,2 +1,2 @@
-SHA256 (ruby/onig-5.9.3.tar.gz) = c3bba66b2a84760e6582c40881db97c839d94f327870009724bb8b4d0c051f2a
-SIZE (ruby/onig-5.9.3.tar.gz) = 566875
+SHA256 (ruby/onig-5.9.4.tar.gz) = 988221911ff865941a859096c39a532df77418cb6df513857428a41605130697
+SIZE (ruby/onig-5.9.4.tar.gz) = 567985
diff -urN /usr/ports/devel/oniguruma5/files/onig-config devel/oniguruma5/files/onig-config
--- /usr/ports/devel/oniguruma5/files/onig-config	2012-11-08 04:42:43.000000000 +0900
+++ devel/oniguruma5/files/onig-config	1970-01-01 09:00:00.000000000 +0900
@@ -1,54 +0,0 @@
-#!/bin/sh
-
-prefix=%%PREFIX%%
-exec_prefix=${prefix}
-exec_prefix_set=no
-
-usage="\
-Usage: onig-config [--prefix[=DIR]] [--exec-prefix[=DIR]] [--version] [--cflags] [--libs] [--static-libs]"
-
-if test $# -eq 0; then
-      echo "${usage}" 1>&2
-      exit 1
-fi
-
-while test $# -gt 0; do
-  case "$1" in
-  -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
-  *) optarg= ;;
-  esac
-
-  case $1 in
-    --prefix=*)
-      prefix=$optarg
-      if test $exec_prefix_set = no ; then
-        exec_prefix=$optarg
-      fi
-      ;;
-    --prefix)
-      echo $prefix
-      ;;
-    --exec-prefix=*)
-      exec_prefix=$optarg
-      exec_prefix_set=yes
-      ;;
-    --exec-prefix)
-      echo $exec_prefix
-      ;;
-    --version)
-      echo 5.2.9
-      ;;
-    --cflags)
-      echo -I${prefix}/include
-      ;;
-    --libs|--static-libs)
-      libdirs="-L${exec_prefix}/lib -Wl,-rpath,${exec_prefix}/lib"
-      echo $libdirs -lonig
-      ;;
-    *)
-      echo "${usage}" 1>&2
-      exit 1
-      ;;
-  esac
-  shift
-done
diff -urN /usr/ports/devel/oniguruma5/pkg-plist devel/oniguruma5/pkg-plist
--- /usr/ports/devel/oniguruma5/pkg-plist	2012-11-08 04:42:43.000000000 +0900
+++ devel/oniguruma5/pkg-plist	2013-04-06 09:58:35.000000000 +0900
@@ -6,6 +6,7 @@
 lib/libonig.la
 lib/libonig.so
 lib/libonig.so.2
+libdata/pkgconfig/oniguruma.pc
 %%PORTDOCS%%%%DOCSDIR%%/API
 %%PORTDOCS%%%%DOCSDIR%%/API.ja
 %%PORTDOCS%%%%DOCSDIR%%/FAQ
@@ -14,10 +15,6 @@
 %%PORTDOCS%%%%DOCSDIR%%/RE
 %%PORTDOCS%%%%DOCSDIR%%/RE.ja
 %%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Makefile
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Makefile.am
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Makefile.in
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/crnl.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/encode.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/listcap.c
@@ -27,3 +24,4 @@
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/sql.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/syntax.c
 %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
+%%PORTDOCS%%@dirrm %%DOCSDIR%%