Index: Makefile
===================================================================
--- Makefile	(revision 424220)
+++ Makefile	(working copy)
@@ -2,34 +2,49 @@
 # $FreeBSD$
 
 PORTNAME=	shadowsocks-libev
-PORTVERSION=	1.6.4
+PORTVERSION=	2.5.5
 DISTVERSIONPREFIX=	v
 CATEGORIES=	net
 
 MAINTAINER=	xiaoding+freebsd@xiaoding.org
-COMMENT=	Lightweight tunnel proxy which can help you get through firewalls
+COMMENT=	Lightweight secured SOCKS5 proxy
 
 LICENSE=	GPLv3
 
+BUILD_DEPENDS=	asciidoc:textproc/asciidoc \
+		xmlto:textproc/xmlto
+
 # fetch from github repo
 USE_GITHUB=	yes
-GH_ACCOUNT=	madeye
+GH_ACCOUNT=	shadowsocks
 
 GNU_CONFIGURE=	yes
-USES=		gmake libtool:keepla ssl
-CPPFLAGS+=	-I${OPENSSLINC}
-CONFIGURE_ARGS+=	--with-openssl=${OPENSSLBASE}
+CONFIGURE_ARGS=	--enable-system-shared-lib
+USES=		gmake libtool:keepla
 
 # Help solve building error since the integrated libsodium enables this option.
 CFLAGS+=	-fstack-protector
 
+OPTIONS_SINGLE=		SSL
+OPTIONS_SINGLE_SSL=	OPENSSL POLARSSL MBEDTLS
+OPTIONS_DEFAULT=	OPENSSL
+OPENSSL_USES=		ssl
+OPENSSL_CONFIGURE_ON=	--with-crypto-library=openssl
+POLARSSL_CONFIGURE_ON=	--with-crypto-library=polarssl
+POLARSSL_LIB_DEPENDS=	libmbedtls.so.9:security/polarssl13
+MBEDTLS_CONFIGURE_ON=	--with-crypto-library=mbedtls
+MBEDTLS_LIB_DEPENDS=	libmbedcrypto.so.0:security/mbedtls
+
 USE_RC_SUBR=	shadowsocks_libev
 
+LIB_DEPENDS+=	libpcre.so:devel/pcre \
+		libev.so:devel/libev \
+		libsodium.so:security/libsodium \
+		libudns.so:dns/udns
+
 post-patch:
 	${REINPLACE_CMD} -e 's|^pkgconfiglibdir.*|pkgconfiglibdir = ${PREFIX}/libdata/pkgconfig|g' \
 		${WRKSRC}/Makefile.in
-	${REINPLACE_CMD} -e 's|^#ifdef TCP_FASTOPEN|#if defined(TCP_FASTOPEN) \&\& defined(__linux)|' \
-		${WRKSRC}/src/local.c ${WRKSRC}/src/server.c
 
 post-install:
 	${MKDIR} ${STAGEDIR}${ETCDIR}
Index: distinfo
===================================================================
--- distinfo	(revision 424220)
+++ distinfo	(working copy)
@@ -1,2 +1,3 @@
-SHA256 (madeye-shadowsocks-libev-v1.6.4_GH0.tar.gz) = 517b92e69e371efac4a9ca76e78095e3e866149a484ec4c88589dd4a3bdbb7b7
-SIZE (madeye-shadowsocks-libev-v1.6.4_GH0.tar.gz) = 2404815
+TIMESTAMP = 1476825689
+SHA256 (shadowsocks-shadowsocks-libev-v2.5.5_GH0.tar.gz) = 46a72367b7301145906185f1e4136e39d6792d27643826e409ab708351b6d0dd
+SIZE (shadowsocks-shadowsocks-libev-v2.5.5_GH0.tar.gz) = 1539044
Index: files/patch-libev__ev.c
===================================================================
--- files/patch-libev__ev.c	(revision 424220)
+++ files/patch-libev__ev.c	(nonexistent)
@@ -1,18 +0,0 @@
---- libev/ev.c.orig	2015-01-07 13:54:19.000000000 +0100
-+++ libev/ev.c	2015-03-02 20:39:18.150956000 +0100
-@@ -1022,12 +1022,12 @@
-   }
- #endif
- 
--#if ECB_GCC_VERSION(4,5)
-+#if ECB_GCC_VERSION(4,5) || defined __clang__
-   #define ecb_unreachable() __builtin_unreachable ()
- #else
-   /* this seems to work fine, but gcc always emits a warning for it :/ */
--  ecb_inline void ecb_unreachable (void) ecb_noreturn;
--  ecb_inline void ecb_unreachable (void) { }
-+  ecb_inline ecb_noreturn void ecb_unreachable (void);
-+  ecb_inline ecb_noreturn void ecb_unreachable (void) { }
- #endif
- 
- /* try to tell the compiler that some condition is definitely true */

Property changes on: files/patch-libev__ev.c
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: pkg-descr
===================================================================
--- pkg-descr	(revision 424220)
+++ pkg-descr	(working copy)
@@ -1,7 +1,6 @@
-Shadowsocks is a lightweight tunnel proxy which can help you get through
-firewalls.
+Shadowsocks-libev is a lightweight secured SOCKS5 proxy for embedded devices
+and low-end boxes.
 
-Shadowsocks-libuv is a C implentment based on libuv. It targets mainly on
-embedded devices and low end boxes.
+Shadowsocks-libev is written in pure C. It is a port of Shadowsocks.
 
-WWW: https://github.com/madeye/shadowsocks-libev
+WWW: https://github.com/shadowsocks/shadowsocks-libev
Index: pkg-plist
===================================================================
--- pkg-plist	(revision 424220)
+++ pkg-plist	(working copy)
@@ -1,9 +1,23 @@
 bin/ss-local
+bin/ss-manager
 bin/ss-server
 bin/ss-tunnel
+@sample %%ETCDIR%%/config.json.sample
 include/shadowsocks.h
-lib/libshadowsocks.a
-lib/libshadowsocks.la
+lib/libshadowsocks-libev.a
+lib/libshadowsocks-libev.la
 libdata/pkgconfig/shadowsocks-libev.pc
+man/man1/ss-local.1.gz
+man/man1/ss-manager.1.gz
+man/man1/ss-nat.1.gz
+man/man1/ss-redir.1.gz
+man/man1/ss-server.1.gz
+man/man1/ss-tunnel.1.gz
 man/man8/shadowsocks-libev.8.gz
-@sample etc/shadowsocks-libev/config.json.sample
+%%PORTDOCS%%%%DOCSDIR%%/shadowsocks-libev.html
+%%PORTDOCS%%%%DOCSDIR%%/ss-local.html
+%%PORTDOCS%%%%DOCSDIR%%/ss-manager.html
+%%PORTDOCS%%%%DOCSDIR%%/ss-nat.html
+%%PORTDOCS%%%%DOCSDIR%%/ss-redir.html
+%%PORTDOCS%%%%DOCSDIR%%/ss-server.html
+%%PORTDOCS%%%%DOCSDIR%%/ss-tunnel.html