diff -uNr /usr/ports/net/shadowsocks-libev/Makefile shadowsocks-libev/Makefile --- /usr/ports/net/shadowsocks-libev/Makefile 2016-10-21 23:21:13.000000000 +0800 +++ shadowsocks-libev/Makefile 2017-07-20 14:07:08.000000000 +0800 @@ -1,36 +1,28 @@ -# Created by: Xiaoding Liu -# $FreeBSD: head/net/shadowsocks-libev/Makefile 424427 2016-10-21 15:21:13Z mat $ +# $FreeBSD$ PORTNAME= shadowsocks-libev -PORTVERSION= 1.6.4 -DISTVERSIONPREFIX= v -CATEGORIES= net +PORTVERSION= 3.0.7 +MASTER_SITES=https://github.com/shadowsocks/shadowsocks-libev/releases/download/v${PORTVERSION}/ -MAINTAINER= xiaoding+freebsd@xiaoding.org -COMMENT= Lightweight tunnel proxy which can help you get through firewalls +CATEGORIES= net +MAINTAINER= yp2008cn@gmail.com +COMMENT= Lightweight tunnel proxy which can help you get through firewalls LICENSE= GPLv3 -# fetch from github repo -USE_GITHUB= yes -GH_ACCOUNT= madeye - -GNU_CONFIGURE= yes -USES= gmake libtool:keepla pathfix ssl -CPPFLAGS+= -I${OPENSSLINC} -CONFIGURE_ARGS+= --with-openssl=${OPENSSLBASE} - -# Help solve building error since the integrated libsodium enables this option. -CFLAGS+= -fstack-protector +LIB_DEPENDS= libudns.so:dns/udns \ + libev.so:devel/libev \ + libsodium.so:security/libsodium \ + libmbedcrypto.so:security/mbedtls \ + libpcre.so:devel/pcre USE_RC_SUBR= shadowsocks_libev -post-patch: - ${REINPLACE_CMD} -e 's|^#ifdef TCP_FASTOPEN|#if defined(TCP_FASTOPEN) \&\& defined(__linux)|' \ - ${WRKSRC}/src/local.c ${WRKSRC}/src/server.c +HAS_CONFIGURE= yes +CONFIGURE_ARGS= --disable-documentation post-install: ${MKDIR} ${STAGEDIR}${ETCDIR} - ${CP} ${WRKSRC}/debian/config.json ${STAGEDIR}${ETCDIR}/config.json.sample + ${CP} ${WRKSRC}/debian/config.json ${STAGEDIR}${ETCDIR}/config.json.sample .include diff -uNr /usr/ports/net/shadowsocks-libev/distinfo shadowsocks-libev/distinfo --- /usr/ports/net/shadowsocks-libev/distinfo 2015-04-29 02:44:04.000000000 +0800 +++ shadowsocks-libev/distinfo 2017-07-20 14:08:12.000000000 +0800 @@ -1,2 +1,2 @@ -SHA256 (madeye-shadowsocks-libev-v1.6.4_GH0.tar.gz) = 517b92e69e371efac4a9ca76e78095e3e866149a484ec4c88589dd4a3bdbb7b7 -SIZE (madeye-shadowsocks-libev-v1.6.4_GH0.tar.gz) = 2404815 +SHA256 (shadowsocks-libev-3.0.7.tar.gz) = 024f2ff501e15ad0cd03dcbac5ca1842aad13dbd51788e522818ff4c129dee18 +SIZE (shadowsocks-libev-3.0.7.tar.gz) = 1903218 diff -uNr /usr/ports/net/shadowsocks-libev/files/patch-libev__ev.c shadowsocks-libev/files/patch-libev__ev.c --- /usr/ports/net/shadowsocks-libev/files/patch-libev__ev.c 2015-03-22 23:22:23.000000000 +0800 +++ shadowsocks-libev/files/patch-libev__ev.c 1970-01-01 08:00:00.000000000 +0800 @@ -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 -uNr /usr/ports/net/shadowsocks-libev/files/shadowsocks_libev.in shadowsocks-libev/files/shadowsocks_libev.in --- /usr/ports/net/shadowsocks-libev/files/shadowsocks_libev.in 2013-11-28 06:04:32.000000000 +0800 +++ shadowsocks-libev/files/shadowsocks_libev.in 2017-04-01 16:45:23.000000000 +0800 @@ -1,5 +1,5 @@ #!/bin/sh -# $FreeBSD: head/net/shadowsocks-libev/files/shadowsocks_libev.in 335066 2013-11-27 22:04:32Z delphij $ +# $FreeBSD$ # PROVIDE: shadowsocks-libev # REQUIRE: LOGIN cleanvar @@ -23,7 +23,7 @@ : ${shadowsocks_libev_enable:="NO"} : ${shadowsocks_libev_config="%%PREFIX%%/etc/shadowsocks-libev/config.json"} -command="%%PREFIX%%/bin/ss-server" +command="%%PREFIX%%/bin/ss-server" pidfile="/var/run/shadowsocks-libev.pid" required_files="${shadowsocks_libev_config}" diff -uNr /usr/ports/net/shadowsocks-libev/pkg-descr shadowsocks-libev/pkg-descr --- /usr/ports/net/shadowsocks-libev/pkg-descr 2014-01-22 23:44:51.000000000 +0800 +++ shadowsocks-libev/pkg-descr 2017-04-01 16:45:23.000000000 +0800 @@ -4,4 +4,4 @@ Shadowsocks-libuv is a C implentment based on libuv. It targets mainly on embedded devices and low end boxes. -WWW: https://github.com/madeye/shadowsocks-libev +WWW: https://github.com/shadowsocks/shadowsocks-libev \ No newline at end of file diff -uNr /usr/ports/net/shadowsocks-libev/pkg-plist shadowsocks-libev/pkg-plist --- /usr/ports/net/shadowsocks-libev/pkg-plist 2015-08-28 23:58:06.000000000 +0800 +++ shadowsocks-libev/pkg-plist 2017-04-01 16:45:23.000000000 +0800 @@ -1,9 +1,9 @@ -bin/ss-local bin/ss-server +bin/ss-manager +bin/ss-local bin/ss-tunnel include/shadowsocks.h -lib/libshadowsocks.a -lib/libshadowsocks.la -libdata/pkgconfig/shadowsocks-libev.pc -man/man8/shadowsocks-libev.8.gz +lib/pkgconfig/shadowsocks-libev.pc +lib/libshadowsocks-libev.la +lib/libshadowsocks-libev.a @sample etc/shadowsocks-libev/config.json.sample