net/shadowsocks-libev: update to 2.4.7

PR:		210090
Submitted by:	Samuel Tseng <samuel@tseng.pw>
Approved by:	xiaoding+freebsd@xiaoding.org (maintainer, timeout >4 months)

5 files changed, 16 insertions, 26 deletions

diff --git a/net/shadowsocks-libev/Makefile b/net/shadowsocks-libev/Makefile
index eb26f40a4bca..1c2077af0dcc 100644
--- a/net/shadowsocks-libev/Makefile
+++ b/net/shadowsocks-libev/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	shadowsocks-libev
-PORTVERSION=	1.6.4
+PORTVERSION=	2.4.7
 DISTVERSIONPREFIX=	v
 CATEGORIES=	net
 
@@ -13,7 +13,7 @@ LICENSE=	GPLv3
 
 # fetch from github repo
 USE_GITHUB=	yes
-GH_ACCOUNT=	madeye
+GH_ACCOUNT=	shadowsocks
 
 GNU_CONFIGURE=	yes
 USES=		gmake libtool:keepla pathfix ssl
diff --git a/net/shadowsocks-libev/distinfo b/net/shadowsocks-libev/distinfo
index 5cc857809461..d0c967eeebd5 100644
--- a/net/shadowsocks-libev/distinfo
+++ b/net/shadowsocks-libev/distinfo
@@ -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 = 1503421104
+SHA256 (shadowsocks-shadowsocks-libev-v2.4.7_GH0.tar.gz) = 957265cc5339e020d8c8bb7414ab14936e3939dc7355f334aec896ec9b03c6ed
+SIZE (shadowsocks-shadowsocks-libev-v2.4.7_GH0.tar.gz) = 1485472
diff --git a/net/shadowsocks-libev/files/patch-libev__ev.c b/net/shadowsocks-libev/files/patch-libev__ev.c
deleted file mode 100644
index f485717349ed..000000000000
--- a/net/shadowsocks-libev/files/patch-libev__ev.c
+++ /dev/null
@@ -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 */
diff --git a/net/shadowsocks-libev/pkg-descr b/net/shadowsocks-libev/pkg-descr
index efac4a49a03b..69bedc2ace61 100644
--- a/net/shadowsocks-libev/pkg-descr
+++ b/net/shadowsocks-libev/pkg-descr
@@ -1,7 +1,7 @@
 Shadowsocks is a lightweight tunnel proxy which can help you get through
 firewalls.
 
-Shadowsocks-libuv is a C implentment based on libuv. It targets mainly on
+Shadowsocks-libev is a C implentment based on libev. It targets mainly on
 embedded devices and low end boxes.
 
-WWW: https://github.com/madeye/shadowsocks-libev
+WWW: https://github.com/shadowsocks/shadowsocks-libev
diff --git a/net/shadowsocks-libev/pkg-plist b/net/shadowsocks-libev/pkg-plist
index cde2456bb8cb..7620ed9eaff4 100644
--- a/net/shadowsocks-libev/pkg-plist
+++ b/net/shadowsocks-libev/pkg-plist
@@ -1,9 +1,16 @@
 bin/ss-local
+bin/ss-manager
 bin/ss-server
 bin/ss-tunnel
 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