diff --git a/net/shadowsocks/Makefile b/net/shadowsocks/Makefile index 2132e0d6..597000d1 100644 --- a/net/shadowsocks/Makefile +++ b/net/shadowsocks/Makefile @@ -1,5 +1,4 @@ -PORTNAME= shadowsocks -DISTNAME= shadowsocks-libev +PORTNAME= shadowsocks DISTVERSIONPREFIX= v DISTVERSION= 3.3.5 CATEGORIES= net @@ -10,7 +9,7 @@ WWW= https://github.com/shadowsocks/shadowsocks-libev LIB_DEPENDS= libev.so:devel/libev \ - libmbedcrypto.so:security/mbedtls \ + libmbedcrypto.so:crypto/libmbedtls \ libpcre.so:text/libpcre \ libsodium.so:crypto/libsodium \ libcares.so:net/libcares @@ -19,6 +18,7 @@ USES= autoreconf compiler:c11 gmake pathfix GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-shared USE_GITHUB= yes +GH_PROJECT= shadowsocks-libev GH_ACCOUNT= shadowsocks GH_TUPLE= shadowsocks:libbloom:437e1ad:libbloom/libbloom \ shadowsocks:libcork:074e074:libcork/libcork \ diff --git a/net/shadowsocks/files/shadowsocks.in b/net/shadowsocks/files/shadowsocks.in index afa5c54f..0b319d70 100644 --- a/net/shadowsocks/files/shadowsocks.in +++ b/net/shadowsocks/files/shadowsocks.in @@ -13,19 +13,19 @@ . /etc/rc.subr -name="shadowsocks_libev" -rcvar=shadowsocks_libev_enable +name="shadowsocks" +rcvar=shadowsocks_enable load_rc_config $name -: ${shadowsocks_libev_enable:="NO"} -: ${shadowsocks_libev_config="%%PREFIX%%/etc/shadowsocks-libev/config.json"} +: ${shadowsocks_enable:="NO"} +: ${shadowsocks_config="%%PREFIX%%/etc/shadowsocks/config.json"} command="%%PREFIX%%/bin/ss-server" -pidfile="/var/run/shadowsocks-libev.pid" -required_files="${shadowsocks_libev_config}" +pidfile="/var/run/shadowsocks.pid" +required_files="${shadowsocks_config}" -command_args="-f $pidfile -c $shadowsocks_libev_config" +command_args="-f $pidfile -c $shadowsocks_config" run_rc_command "$1"