Index: Makefile
===================================================================
--- Makefile	(revision 402868)
+++ Makefile	(working copy)
@@ -2,31 +2,38 @@
 # $FreeBSD$
 
 PORTNAME=	jq
-PORTVERSION=	1.4
+PORTVERSION=	1.5
+DISTVERSIONPREFIX=	${PORTNAME}-
 CATEGORIES=	textproc
-MASTER_SITES=	http://stedolan.github.io/jq/download/source/ \
-		http://mirrors.rit.edu/zi/
 
 MAINTAINER=	jnlin@csie.nctu.edu.tw
 COMMENT=	Lightweight and flexible command-line JSON processor
 
-OPTIONS_DEFINE=	DOCS
+LICENSE=	MIT
+LICENSE_FILE=	${WRKSRC}/COPYING
 
+USE_GITHUB=	yes
+GH_ACCOUNT=	stedolan
+
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--disable-docs --docdir="${DOCSDIR}"
+CONFIGURE_ARGS=	--docdir="${DOCSDIR}" \
+		--disable-maintainer-mode
 USE_CSTD=	gnu99
 USE_LDCONFIG=	yes
-USES=		libtool
+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=	*
 
+OPTIONS_DEFINE=	DOCS ONIGURUMA
+OPTIONS_DEFAULT=ONIGURUMA
+
 DOCS_MAKE_ARGS_OFF=	docdir=
+DOCS_CONFIGURE_ENABLE=	docs
 
-post-install:
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libjq.so.1.0.4
+ONIGURUMA_DESC=		With oniguruma BSDL regular expression library
+ONIGURUMA_LIB_DEPENDS=	libonig.so:${PORTSDIR}/devel/oniguruma5
+#ONIGURUMA_CONFIGURE_WITH=oniguruma=${LOCALBASE} # pending resolution of https://github.com/stedolan/jq/issues/1021, next line is the workaround
+ONIGURUMA_CONFIGURE_ON=	--with-oniguruma=${LOCALBASE}
 
 .include <bsd.port.mk>
Index: distinfo
===================================================================
--- distinfo	(revision 402868)
+++ 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
Index: pkg-plist
===================================================================
--- pkg-plist	(nonexistent)
+++ pkg-plist	(working copy)
@@ -0,0 +1,8 @@
+bin/jq
+include/jq.h
+include/jv.h
+lib/libjq.a
+lib/libjq.so
+lib/libjq.so.1
+lib/libjq.so.1.0.4
+man/man1/jq.1.gz