Attachment #171125 for bug #210090




# $FreeBSD$

PORTNAME=	shadowsocks-libev
PORTVERSION=	2.4.7
DISTVERSIONPREFIX=	v
CATEGORIES=	net



# fetch from github repo
USE_GITHUB=	yes
GH_ACCOUNT=	shadowsocks

GNU_CONFIGURE=	yes
USES=		gmake libtool:keepla

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}

Lines 1-2 Link Here

(-)distinfo (-2 / +2 lines)
1	SHA256 (madeye-shadowsocks-libev-v1.6.4_GH0.tar.gz) = 517b92e69e371efac4a9ca76e78095e3e866149a484ec4c88589dd4a3bdbb7b7	1	SHA256 (shadowsocks-shadowsocks-libev-v2.4.7_GH0.tar.gz) = 957265cc5339e020d8c8bb7414ab14936e3939dc7355f334aec896ec9b03c6ed
2	SIZE (madeye-shadowsocks-libev-v1.6.4_GH0.tar.gz) = 2404815	2	SIZE (shadowsocks-shadowsocks-libev-v2.4.7_GH0.tar.gz) = 1485472




--- 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 */

Lines 1-7 Link Here

(-)pkg-descr (-2 / +2 lines)
1	Shadowsocks is a lightweight tunnel proxy which can help you get through	1	Shadowsocks is a lightweight tunnel proxy which can help you get through
2	firewalls.	2	firewalls.
3		3
4	Shadowsocks-libuv is a C implentment based on libuv. It targets mainly on	4	Shadowsocks-libev is a C implentment based on libev. It targets mainly on
5	embedded devices and low end boxes.	5	embedded devices and low end boxes.
6		6
7	WWW: https://github.com/madeye/shadowsocks-libev	7	WWW: https://github.com/shadowsocks/shadowsocks-libev

Lines 1-9 Link Here

(-)pkg-plist (-2 / +7 lines)
1	bin/ss-local	1	bin/ss-local
		2	bin/ss-manager
2	bin/ss-server	3	bin/ss-server
3	bin/ss-tunnel	4	bin/ss-tunnel
4	include/shadowsocks.h	5	include/shadowsocks.h
5	lib/libshadowsocks.a	6	lib/libshadowsocks-libev.a
6	lib/libshadowsocks.la	7	lib/libshadowsocks-libev.la
7	libdata/pkgconfig/shadowsocks-libev.pc	8	libdata/pkgconfig/shadowsocks-libev.pc
		9	man/man1/ss-local.1.gz
		10	man/man1/ss-manager.1.gz
		11	man/man1/ss-server.1.gz
		12	man/man1/ss-tunnel.1.gz
8	man/man8/shadowsocks-libev.8.gz	13	man/man8/shadowsocks-libev.8.gz
9	@sample etc/shadowsocks-libev/config.json.sample	14	@sample etc/shadowsocks-libev/config.json.sample

Return to bug 210090

Lines 2-8 Link Here

(-)Makefile (-4 / +2 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= shadowsocks-libev	4	PORTNAME= shadowsocks-libev
5	PORTVERSION= 1.6.4	5	PORTVERSION= 2.4.7
6	DISTVERSIONPREFIX= v	6	DISTVERSIONPREFIX= v
7	CATEGORIES= net	7	CATEGORIES= net
8		8
Lines 13-19 Link Here
13		13
14	# fetch from github repo	14	# fetch from github repo
15	USE_GITHUB= yes	15	USE_GITHUB= yes
16	GH_ACCOUNT= madeye	16	GH_ACCOUNT= shadowsocks
17		17
18	GNU_CONFIGURE= yes	18	GNU_CONFIGURE= yes
19	USES= gmake libtool:keepla	19	USES= gmake libtool:keepla
Lines 25-32 Link Here
25	post-patch:	25	post-patch:
26	${REINPLACE_CMD} -e 's\|^pkgconfiglibdir.*\|pkgconfiglibdir = ${PREFIX}/libdata/pkgconfig\|g' \	26	${REINPLACE_CMD} -e 's\|^pkgconfiglibdir.*\|pkgconfiglibdir = ${PREFIX}/libdata/pkgconfig\|g' \
27	${WRKSRC}/Makefile.in	27	${WRKSRC}/Makefile.in
28	${REINPLACE_CMD} -e 's\|^#ifdef TCP_FASTOPEN\|#if defined(TCP_FASTOPEN) \&\& defined(__linux)\|' \
29	${WRKSRC}/src/local.c ${WRKSRC}/src/server.c
30		28
31	post-install:	29	post-install:
32	${MKDIR} ${STAGEDIR}${ETCDIR}	30	${MKDIR} ${STAGEDIR}${ETCDIR}

Lines 1-18 Link Here

(-)files/patch-libev__ev.c (-18 lines)
1	--- libev/ev.c.orig 2015-01-07 13:54:19.000000000 +0100
2	+++ libev/ev.c 2015-03-02 20:39:18.150956000 +0100
3	@@ -1022,12 +1022,12 @@
4	}
5	#endif
6
7	-#if ECB_GCC_VERSION(4,5)
8	+#if ECB_GCC_VERSION(4,5) \|\| defined __clang__
9	#define ecb_unreachable() __builtin_unreachable ()
10	#else
11	/* this seems to work fine, but gcc always emits a warning for it :/ */
12	- ecb_inline void ecb_unreachable (void) ecb_noreturn;
13	- ecb_inline void ecb_unreachable (void) { }
14	+ ecb_inline ecb_noreturn void ecb_unreachable (void);
15	+ ecb_inline ecb_noreturn void ecb_unreachable (void) { }
16	#endif
17
18	/* try to tell the compiler that some condition is definitely true */