Index: head/www/nghttp2/Makefile
===================================================================
--- head/www/nghttp2/Makefile	(revision 425066)
+++ head/www/nghttp2/Makefile	(revision 425067)
@@ -1,74 +1,70 @@
 # Created by: Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	nghttp2
 PORTVERSION=	1.15.0
 DISTVERSIONPREFIX=	v
 CATEGORIES=	www net
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	HTTP/2.0 C Library
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-OPTIONS_DEFINE=	APP SPDY ASIO DOCS HPACK
+OPTIONS_DEFINE=	APP ASIO DOCS HPACK SPDY
 OPTIONS_DEFAULT=APP HPACK SPDY
 OPTIONS_SUB=	yes
+APP_DESC=	Build h2load, nghttp, nghttpd and nghttpx
+SPDY_DESC=	Enable SPDY in h2load and nghttpx
+SPDY_IMPLIES=	APP
 
-USE_RC_SUBR=	nghttpx
-
-USE_GITHUB=	yes
-
 CONFIGURE_ARGS=	--disable-python-bindings \
 		--disable-examples
 CONFIGURE_ENV=	OPENSSL_CFLAGS="-I${OPENSSLINC}" \
 		OPENSSL_LIBS="-L${OPENSSLLIB} -lcrypto -lssl" \
 		ZLIB_CFLAGS="-I${INCLUDEDIR}" \
 		ZLIB_LIBS="-L${LIBDIR} -lz"
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
 USE_CXXSTD=	c++11
 USE_LDCONFIG=	yes
+USE_RC_SUBR=	nghttpx
 USES=		autoreconf compiler:c++11-lib gmake libtool localbase pathfix pkgconfig ssl
 
 PORTDATA=	fetch-ocsp-response
 PORTDOCS=	*
 
-APP_DESC=		Build nghttp, nghttpd, nghttpx, h2load
+USE_GITHUB=	yes
+
 APP_BUILD_DEPENDS=	libev>=4.15:devel/libev
-APP_LIB_DEPENDS=	libev.so:devel/libev
+APP_CONFIGURE_OFF=	--without-libxml2
 APP_CONFIGURE_ENABLE=	app
+APP_LIB_DEPENDS=	libev.so:devel/libev
 APP_USE=		GNOME=libxml2
-APP_CONFIGURE_OFF=	--without-libxml2
-
 ASIO_BUILD_DEPENDS=	boost-libs>=1.54.0:devel/boost-libs
 ASIO_CONFIGURE_OFF=	--with-boost=no
 ASIO_CONFIGURE_ON=	--enable-asio-lib --with-boost-asio --with-boost-system --with-boost-thread
 ASIO_LIB_DEPENDS=	libboost_thread.so:devel/boost-libs
 ASIO_RUN_DEPENDS=	boost-libs>=1.54.0:devel/boost-libs
-
 HPACK_CONFIGURE_ENABLE=	hpack-tools
 HPACK_LIB_DEPENDS=	libjansson.so:devel/jansson
-
-SPDY_DESC=		Enable SPDY in nghttpx and h2load
 SPDY_BUILD_DEPENDS=	spdylay>=1.3.0:www/spdylay
-SPDY_LIB_DEPENDS=	libspdylay.so:www/spdylay
-SPDY_IMPLIES=		APP
 SPDY_CONFIGURE_WITH=	spdylay
+SPDY_LIB_DEPENDS=	libspdylay.so:www/spdylay
 
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} <= 1000000
 CPPFLAGS+=	-D_GLIBCXX_USE_C99
 .endif
 
 .if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1000000
 CONFIGURE_ARGS+=--with-jemalloc
 .endif
 
 post-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/etc/nghttpx
 	${INSTALL_DATA} ${FILESDIR}/nghttpx.conf.sample ${STAGEDIR}${PREFIX}/etc/nghttpx/nghttpx.conf.sample
 
 .include <bsd.port.post.mk>
Index: head/www/nghttp2/pkg-plist
===================================================================
--- head/www/nghttp2/pkg-plist	(revision 425066)
+++ head/www/nghttp2/pkg-plist	(revision 425067)
@@ -1,26 +1,26 @@
 %%HPACK%%bin/deflatehd
 %%APP%%bin/h2load
 %%HPACK%%bin/inflatehd
 %%APP%%bin/nghttp
 %%APP%%bin/nghttpd
 %%APP%%bin/nghttpx
-@sample etc/nghttpx/nghttpx.conf.sample etc/nghttpx/nghttpx.conf
+@sample etc/nghttpx/nghttpx.conf.sample
 %%ASIO%%include/nghttp2/asio_http2.h
 %%ASIO%%include/nghttp2/asio_http2_client.h
 %%ASIO%%include/nghttp2/asio_http2_server.h
 include/nghttp2/nghttp2.h
 include/nghttp2/nghttp2ver.h
 lib/libnghttp2.a
 lib/libnghttp2.so
 lib/libnghttp2.so.14
 lib/libnghttp2.so.14.11.0
 %%ASIO%%lib/libnghttp2_asio.a
 %%ASIO%%lib/libnghttp2_asio.so
 %%ASIO%%lib/libnghttp2_asio.so.1
 %%ASIO%%lib/libnghttp2_asio.so.1.0.0
 libdata/pkgconfig/libnghttp2.pc
 %%ASIO%%libdata/pkgconfig/libnghttp2_asio.pc
 %%APP%%man/man1/h2load.1.gz
 %%APP%%man/man1/nghttp.1.gz
 %%APP%%man/man1/nghttpd.1.gz
 %%APP%%man/man1/nghttpx.1.gz