Index: textproc/jq/Makefile
===================================================================
--- textproc/jq/Makefile	(revision 402141)
+++ textproc/jq/Makefile	(working copy)
@@ -1,32 +1,42 @@
 # Created by: Jui-Nan Lin <jnlin@csie.nctu.edu.tw>
 # $FreeBSD$
 
-PORTNAME=	jq
-PORTVERSION=	1.4
-CATEGORIES=	textproc
-MASTER_SITES=	http://stedolan.github.io/jq/download/source/ \
-		http://mirrors.rit.edu/zi/
+PORTNAME=		jq
+PORTVERSION=		1.5
+DISTVERSIONPREFIX=	${PORTNAME}-
+CATEGORIES=		textproc
 
-MAINTAINER=	jnlin@csie.nctu.edu.tw
-COMMENT=	Lightweight and flexible command-line JSON processor
+MAINTAINER=		jnlin@csie.nctu.edu.tw
+COMMENT=		Lightweight and flexible command-line JSON processor
 
-OPTIONS_DEFINE=	DOCS
+OPTIONS_DEFINE=		DOCS ONIGURUMA
+OPTIONS_DEFAULT=	ONIGURUMA
+ONIGURUMA_DESC=		With oniguruma BSDL regular expression library
 
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--disable-docs --docdir="${DOCSDIR}"
-USE_CSTD=	gnu99
-USE_LDCONFIG=	yes
-USES=		libtool
+ONIGURUMA_LIB_DEPENDS=	libonig.so:${PORTSDIR}/devel/oniguruma5
 
-PLIST_FILES=	bin/${PORTNAME} \
-		include/jq.h include/jv.h \
-		lib/libjq.a lib/libjq.so lib/libjq.so.1 lib/libjq.so.1.0.4 \
-		man/man1/${PORTNAME}.1.gz
-PORTDOCS=	*
+USE_GITHUB=		yes
+GH_ACCOUNT=		stedolan
 
+.include <bsd.port.options.mk>
+
+GNU_CONFIGURE=		yes
+CONFIGURE_ARGS=		--docdir="${DOCSDIR}" --disable-maintainer-mode
+DOCS_CONFIGURE_ENABLE=	docs
+.if ${PORT_OPTIONS:MONIGURUMA}
+CONFIGURE_ARGS+=	--with-oniguruma=${LOCALBASE}
+.endif
+USE_CSTD=		gnu99
+USE_LDCONFIG=		yes
+USES=			gmake libtool
+INSTALL_TARGET=		install-strip
+
+PLIST_FILES=		bin/${PORTNAME} \
+			include/jq.h include/jv.h \
+			lib/libjq.a lib/libjq.so lib/libjq.so.1 lib/libjq.so.1.0.4 \
+			man/man1/${PORTNAME}.1.gz
+PORTDOCS=		*
+
 DOCS_MAKE_ARGS_OFF=	docdir=
 
-post-install:
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libjq.so.1.0.4
-
 .include <bsd.port.mk>
Index: textproc/jq/distinfo
===================================================================
--- textproc/jq/distinfo	(revision 402141)
+++ textproc/jq/distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (jq-1.4.tar.gz) = 998c41babeb57b4304e65b4eb73094279b3ab1e63801b6b4bddd487ce009b39d
-SIZE (jq-1.4.tar.gz) = 578317
+SHA256 (stedolan-jq-jq-1.5_GH0.tar.gz) = d5667641d28c27d0c1e70de83e7f9bd8b2fed7fbf6a1d68731177d400a533c65
+SIZE (stedolan-jq-jq-1.5_GH0.tar.gz) = 1118086