--- b/www/aria2/Makefile	
+++ b/www/aria2/Makefile	
@@ -2,7 +2,8 @@ 
 # $FreeBSD$
 
 PORTNAME=	aria2
-PORTVERSION=	1.35.0
+DISTVERSION=	1.35.0
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	https://github.com/${PORTNAME}/${PORTNAME}/releases/download/release-${PORTVERSION}/ \
 		LOCAL/sunpoet
@@ -13,46 +14,57 @@ COMMENT=	Yet another download tool
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-OPTIONS_DEFINE=	CA_BUNDLE CARES DOCS NLS SQLITE SSH2
-OPTIONS_DEFAULT=CA_BUNDLE SQLITE
-OPTIONS_SUB=	yes
-CA_BUNDLE_DESC=	Use CA bundle from Mozilla Project
-SSH2_DESC=	SSH2 protocol support
+LIB_DEPENDS=	libexpat.so:textproc/expat2
 
-CONFIGURE_ARGS=	--disable-epoll --enable-bittorrent --enable-libaria2 \
-		--enable-metalink --enable-shared --enable-ssl --enable-static \
-		--enable-threads=posix --enable-websocket \
-		--with-disk-cache=${ARIA2_DISK_CACHE} \
-		--with-libxml2 --with-libz --with-openssl \
-		--without-appletls --without-gnutls \
-		--without-libexpat --without-libgcrypt --without-libgmp \
-		--without-libnettle --without-libuv
-CONFIGURE_ENV=	OPENSSL_CFLAGS=-I${OPENSSLINC} \
-		OPENSSL_LIBS="-L${OPENSSLLIB} -lcrypto -lssl" \
-		ac_cv_path_RST2HTML=no
+USES=		compiler:c++11-lib libtool pathfix pkgconfig ssl tar:xz
 GNU_CONFIGURE=	yes
-INSTALL_TARGET=	install-strip
-USE_CXXSTD=	c++11
-USE_GNOME=	libxml2
 USE_LDCONFIG=	yes
 USE_RC_SUBR=	${PORTNAME}
-USES=		compiler:c++11-lib gnome libtool pathfix pkgconfig ssl tar:xz
+
+INSTALL_TARGET=	install-strip
+
+CONFIGURE_ARGS=	--enable-bittorrent --enable-libaria2 \
+		--enable-metalink --enable-ssl --enable-websocket \
+		--without-gnutls --without-libgcrypt --without-libgmp \
+		--without-libnettle --without-libxml2 \
+		--with-disk-cache=${ARIA2_DISK_CACHE}
+
+CONFIGURE_ENV=	OPENSSL_CFLAGS=-I${OPENSSLINC} \
+		OPENSSL_LIBS="-L${OPENSSLLIB} -lcrypto -lssl" \
+		ac_cv_path_RST2HTML=no
+
+OPTIONS_DEFINE=	CA_BUNDLE CARES DOCS LIBUV NLS SQLITE SSH2 STATIC
+OPTIONS_DEFAULT=CA_BUNDLE SQLITE
+OPTIONS_SUB=	yes
+
+CA_BUNDLE_DESC=	Use CA bundle from Mozilla Project
+SSH2_DESC=	SSH2 protocol support
+LIBUV_DESC=	Asynchronous I/O support via libuv
 
 PORTDOCS=	*
 
 CA_BUNDLE_CONFIGURE_OFF=--without-ca-bundle
 CA_BUNDLE_CONFIGURE_ON=	--with-ca-bundle=${LOCALBASE}/share/certs/ca-root-nss.crt
 CA_BUNDLE_RUN_DEPENDS=	${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss
-CARES_CONFIGURE_WITH=	libcares
+
 CARES_LIB_DEPENDS=	libcares.so:dns/c-ares
+CARES_CONFIGURE_WITH=	libcares
+
+LIBUV_LIB_DEPENDS=	libuv.so:devel/libuv
+LIBUV_CONFIGURE_WITH=	libuv
+
+NLS_USES=		gettext localbase
+NLS_LDFLAGS=		-lintl
 NLS_CONFIGURE_OFF=	--disable-nls --without-libintl-prefix
 NLS_CONFIGURE_ON=	--with-libintl-prefix=${LOCALBASE}
-NLS_LDFLAGS=		-lintl
-NLS_USES=		gettext localbase
-SQLITE_CONFIGURE_WITH=	sqlite3
+
 SQLITE_USES=		sqlite
-SSH2_CONFIGURE_WITH=	libssh2
+SQLITE_CONFIGURE_WITH=	sqlite3
+
 SSH2_LIB_DEPENDS=	libssh2.so:security/libssh2
+SSH2_CONFIGURE_WITH=	libssh2
+
+STATIC_CONFIGURE_ENABLE=static
 
 ARIA2_DISK_CACHE?=	16M
 
--- b/www/aria2/pkg-plist	
+++ b/www/aria2/pkg-plist	
@@ -1,7 +1,7 @@ 
 bin/aria2c
 etc/bash_completion.d/aria2c
 include/aria2/aria2.h
-lib/libaria2.a
+%%STATIC%%lib/libaria2.a
 lib/libaria2.so
 lib/libaria2.so.0
 lib/libaria2.so.0.0.0