Attachment #175581 for bug #213329




# $FreeBSD$

PORTNAME=	cadabra2
PORTVERSION=	2.0.930
PORTREVISION=	2
CATEGORIES=	math

MAINTAINER=	yuri@rawbw.com

LICENSE=	LGPL3
LICENSE_FILE=	${WRKSRC}/doc/license.txt

PATCH_DEPENDS=${NONEXISTENT}:devel/boost-libs:extract
LIB_DEPENDS=	libboost_python.so:devel/boost-python-libs \
		libboost_system.so:devel/boost-libs \
		libpcrecpp.so:devel/pcre \
		libboost_system.so:devel/boost-libs \
		libjsoncpp.so:devel/jsoncpp \
		libgmp.so:math/gmp \
		libuuid.so:misc/e2fsprogs-libuuid


USE_GITHUB=	yes
GH_ACCOUNT=	kpeeters
GH_TAGNAME=	85ac041

BROKEN_FreeBSD_9=	does not build: fatal error: 'type_traits' file not found
GUI_BROKEN=	Builds but has a WebSockets communication problem in the runtime
GUI_CONFLICTS_BUILD=	websocketpp-*

OPTIONS_DEFINE=	GUI
OPTIONS_DEFAULT=GUI

USES=		compiler:c++14-lang cmake gettext-runtime gmake pkgconfig python:2 sqlite
GUI_USE=	GNOME=gtkmm30,gdkpixbuf2
USE_TEX=	base texmf texhash
USE_LDCONFIG=	yes
OPTIONS_SUB=	yes
GUI_INSTALLS_ICONS=	yes

CMAKE_ARGS+=	-DBOOST_ROOT=${LOCALBASE}
CMAKE_ARGS+=	-DUSE_PYTHON_3:BOOL=OFF
GUI_CMAKE_ON+=	-DENABLE_FRONTEND:BOOL=ON
CXXFLAGS+=	-I${WRKSRC}/override/include
CXXFLAGS+=	-I${LOCALBASE}/include
CXXFLAGS+=	-I${LOCALBASE}/include/jsoncpp
LDFLAGS+=	-L${LOCALBASE}/lib -ljsoncpp

CMAKE_INSTALL_PREFIX=${PREFIX}

post-extract:
	@${RM} -r ${WRKSRC}/client_server/jsoncpp

pre-patch: # workaround for https://github.com/zaphoyd/websocketpp/issues/563, so that the local patch can be applied
	@${MKDIR} ${WRKSRC}/override/include/boost/asio/detail/impl
	@${CP} `${MAKE} -C ${PORTSDIR}/devel/boost-libs -V WRKSRC`/boost/asio/detail/impl/socket_ops.ipp \
		${WRKSRC}/override/include/boost/asio/detail/impl/

post-install:
	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/cadabra2html
	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/cadabra-server


post-install-GUI-on:
	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/cadabra-gtk
	@${GZIP_CMD} ${GZIP} < ${STAGEDIR}${PREFIX}/share/icons/hicolor/scalable/apps/cadabra2.svg > ${STAGEDIR}${PREFIX}/share/icons/hicolor/scalable/apps/cadabra2.svgz
	@${RM} ${STAGEDIR}${PREFIX}/share/icons/hicolor/scalable/apps/cadabra2.svg
	@${LN} ${STAGEDIR}${PREFIX}/share/icons/hicolor/256x256/apps/cadabra2.png \
	       ${STAGEDIR}${PREFIX}/share/icons/hicolor/256x256/apps/cadabra-gtk.png
	@${LN} ${STAGEDIR}${PREFIX}/share/icons/hicolor/64x64/apps/cadabra2.png \
	       ${STAGEDIR}${PREFIX}/share/icons/hicolor/64x64/apps/cadabra-gtk.png
	@${LN} ${STAGEDIR}${PREFIX}/share/icons/hicolor/scalable/apps/cadabra2.svgz \
	       ${STAGEDIR}${PREFIX}/share/icons/hicolor/scalable/apps/cadabra-gtk.svgz

.include <bsd.port.mk>

Lines 1-3 Link Here

(-)math/cadabra2/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1466580644	1	TIMESTAMP = 1476032351
2	SHA256 (kpeeters-cadabra2-2.0.816-8258bfc_GH0.tar.gz) = ca8b8179b9745737aaa5185825b00031ec5fa79ad23f27bc287254963a17e318	2	SHA256 (kpeeters-cadabra2-2.0.930-85ac041_GH0.tar.gz) = 3d07c5e72fd3ae79214e9472d44c12e2b304ad91d992ced2377a0484a5c494b2
3	SIZE (kpeeters-cadabra2-2.0.816-8258bfc_GH0.tar.gz) = 3880224	3	SIZE (kpeeters-cadabra2-2.0.930-85ac041_GH0.tar.gz) = 3908288




--- CMakeLists.txt.orig	2016-06-20 20:19:43 UTC
+++ CMakeLists.txt
@@ -107,7 +107,11 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PAT
 
 add_subdirectory(core)
 add_subdirectory(client_server)
-add_subdirectory(frontend)
 add_subdirectory(tests)
 add_subdirectory(web2 EXCLUDE_FROM_ALL)
 
+option(ENABLE_FRONTEND "Enable the UI frontend" OFF)
+if(ENABLE_FRONTEND)
+  add_subdirectory(frontend)
+endif()
+

Lines 1-4 Link Here

(-)math/cadabra2/files/patch-client__server_CMakeLists.txt (-1 / +1 lines)
1	--- client_server/CMakeLists.txt.orig 2016-06-23 23:50:35 UTC	1	--- client_server/CMakeLists.txt.orig 2016-10-08 21:27:12 UTC
2	+++ client_server/CMakeLists.txt	2	+++ client_server/CMakeLists.txt
3	@@ -78,15 +78,15 @@ add_definitions("-D_WEBSOCKETPP_CPP11_ST	3	@@ -78,15 +78,15 @@ add_definitions("-D_WEBSOCKETPP_CPP11_ST
4		4




--- client_server/websocketpp/websocketpp/transport/asio/endpoint.hpp.orig	2016-10-08 21:27:12 UTC
+++ client_server/websocketpp/websocketpp/transport/asio/endpoint.hpp
@@ -491,7 +491,7 @@ public:
      * @param ec Set to indicate what error occurred, if any.
      */
     void listen(uint16_t port, lib::error_code & ec) {
-        listen(lib::asio::ip::tcp::v6(), port, ec);
+        listen(lib::asio::ip::tcp::v4(), port, ec);
     }
 
     /// Set up endpoint for listening on a port
@@ -507,7 +507,7 @@ public:
      * @param ec Set to indicate what error occurred, if any.
      */
     void listen(uint16_t port) {
-        listen(lib::asio::ip::tcp::v6(), port);
+        listen(lib::asio::ip::tcp::v4(), port);
     }
 
     /// Set up endpoint for listening on a host and service (exception free)




--- override/include/boost/asio/detail/impl/socket_ops.ipp.orig	2016-10-08 22:51:31 UTC
+++ override/include/boost/asio/detail/impl/socket_ops.ipp
@@ -469,7 +469,15 @@ template <typename SockLenType>
 inline int call_connect(SockLenType msghdr::*,
     socket_type s, const socket_addr_type* addr, std::size_t addrlen)
 {
-  return ::connect(s, addr, (SockLenType)addrlen);
+  int res = ::connect(s, addr, (SockLenType)addrlen);
+  if (res == -1 && errno==EINPROGRESS) {
+    fd_set write_fd;
+    FD_ZERO(&write_fd);
+    FD_SET(s, &write_fd);
+    res = ::select (s+1, NULL, &write_fd,NULL,NULL);
+    res = res > 0 ? 0 : res;
+  }
+  return res;
 }
 
 int connect(socket_type s, const socket_addr_type* addr,

Lines 13-19 Link Here

(-)math/cadabra2/pkg-plist (-1 / +75 lines)
13	%%GUI%%%%DATADIR%%/manual/algorithms/distribute.cnb	13	%%GUI%%%%DATADIR%%/manual/algorithms/distribute.cnb
14	%%GUI%%share/icons/hicolor/256x256/apps/cadabra2.png	14	%%GUI%%share/icons/hicolor/256x256/apps/cadabra2.png
15	%%GUI%%share/icons/hicolor/64x64/apps/cadabra2.png	15	%%GUI%%share/icons/hicolor/64x64/apps/cadabra2.png
16	%%GUI%%share/icons/hicolor/scalable/apps/cadabra2.svg	16	%%GUI%%share/icons/hicolor/scalable/apps/cadabra2.svgz
		17	%%GUI%%share/icons/hicolor/256x256/apps/cadabra-gtk.png
		18	%%GUI%%share/icons/hicolor/64x64/apps/cadabra-gtk.png
		19	%%GUI%%share/icons/hicolor/scalable/apps/cadabra-gtk.svgz
17	%%GUI%%%%TEXMFLOCALDIR%%/tex/latex/cadabra2/breqn.sty	20	%%GUI%%%%TEXMFLOCALDIR%%/tex/latex/cadabra2/breqn.sty
18	%%GUI%%%%TEXMFLOCALDIR%%/tex/latex/cadabra2/cmbase.sym	21	%%GUI%%%%TEXMFLOCALDIR%%/tex/latex/cadabra2/cmbase.sym
19	%%GUI%%%%TEXMFLOCALDIR%%/tex/latex/cadabra2/flexisym.sty	22	%%GUI%%%%TEXMFLOCALDIR%%/tex/latex/cadabra2/flexisym.sty
Lines 23-25 Link Here
23	%%GUI%%%%TEXMFLOCALDIR%%/tex/latex/cadabra2/msabm.sym	26	%%GUI%%%%TEXMFLOCALDIR%%/tex/latex/cadabra2/msabm.sym
24	%%GUI%%%%TEXMFLOCALDIR%%/tex/latex/cadabra2/tableaux.sty	27	%%GUI%%%%TEXMFLOCALDIR%%/tex/latex/cadabra2/tableaux.sty
25	%%GUI%%@dir %%DATADIR%%/manual/properties	28	%%GUI%%@dir %%DATADIR%%/manual/properties
		29	%%DATADIR%%/manual/algorithms/asym.cnb
		30	%%DATADIR%%/manual/algorithms/canonicalise.cnb
		31	%%DATADIR%%/manual/algorithms/collect_factors.cnb
		32	%%DATADIR%%/manual/algorithms/collect_terms.cnb
		33	%%DATADIR%%/manual/algorithms/combine.cnb
		34	%%DATADIR%%/manual/algorithms/complete.cnb
		35	%%DATADIR%%/manual/algorithms/decompose_product.cnb
		36	%%DATADIR%%/manual/algorithms/drop_weight.cnb
		37	%%DATADIR%%/manual/algorithms/eliminate_kronecker.cnb
		38	%%DATADIR%%/manual/algorithms/eliminate_metric.cnb
		39	%%DATADIR%%/manual/algorithms/epsilon_to_delta.cnb
		40	%%DATADIR%%/manual/algorithms/evaluate.cnb
		41	%%DATADIR%%/manual/algorithms/expand.cnb
		42	%%DATADIR%%/manual/algorithms/expand_delta.cnb
		43	%%DATADIR%%/manual/algorithms/expand_diracbar.cnb
		44	%%DATADIR%%/manual/algorithms/expand_power.cnb
		45	%%DATADIR%%/manual/algorithms/factor_in.cnb
		46	%%DATADIR%%/manual/algorithms/factor_out.cnb
		47	%%DATADIR%%/manual/algorithms/fierz.cnb
		48	%%DATADIR%%/manual/algorithms/integrate_by_parts.cnb
		49	%%DATADIR%%/manual/algorithms/join_gamma.cnb
		50	%%DATADIR%%/manual/algorithms/keep_weight.cnb
		51	%%DATADIR%%/manual/algorithms/product_rule.cnb
		52	%%DATADIR%%/manual/algorithms/reduce_delta.cnb
		53	%%DATADIR%%/manual/algorithms/rename_dummies.cnb
		54	%%DATADIR%%/manual/algorithms/rewrite_indices.cnb
		55	%%DATADIR%%/manual/algorithms/sort_product.cnb
		56	%%DATADIR%%/manual/algorithms/sort_sum.cnb
		57	%%DATADIR%%/manual/algorithms/split_gamma.cnb
		58	%%DATADIR%%/manual/algorithms/split_index.cnb
		59	%%DATADIR%%/manual/algorithms/substitute.cnb
		60	%%DATADIR%%/manual/algorithms/take_match.cnb
		61	%%DATADIR%%/manual/algorithms/unwrap.cnb
		62	%%DATADIR%%/manual/algorithms/vary.cnb
		63	%%DATADIR%%/manual/algorithms/young_project_product.cnb
		64	%%DATADIR%%/manual/algorithms/young_project_tensor.cnb
		65	%%DATADIR%%/manual/properties/Accent.cnb
		66	%%DATADIR%%/manual/properties/AntiCommuting.cnb
		67	%%DATADIR%%/manual/properties/AntiSymmetric.cnb
		68	%%DATADIR%%/manual/properties/Commuting.cnb
		69	%%DATADIR%%/manual/properties/CommutingAsProduct.cnb
		70	%%DATADIR%%/manual/properties/CommutingAsSum.cnb
		71	%%DATADIR%%/manual/properties/Coordinate.cnb
		72	%%DATADIR%%/manual/properties/DAntiSymmetric.cnb
		73	%%DATADIR%%/manual/properties/Depends.cnb
		74	%%DATADIR%%/manual/properties/Derivative.cnb
		75	%%DATADIR%%/manual/properties/Diagonal.cnb
		76	%%DATADIR%%/manual/properties/DiracBar.cnb
		77	%%DATADIR%%/manual/properties/Distributable.cnb
		78	%%DATADIR%%/manual/properties/EpsilonTensor.cnb
		79	%%DATADIR%%/manual/properties/FilledTableau.cnb
		80	%%DATADIR%%/manual/properties/GammaMatrix.cnb
		81	%%DATADIR%%/manual/properties/ImplicitIndex.cnb
		82	%%DATADIR%%/manual/properties/IndexInherit.cnb
		83	%%DATADIR%%/manual/properties/Indices.cnb
		84	%%DATADIR%%/manual/properties/Integer.cnb
		85	%%DATADIR%%/manual/properties/InverseMetric.cnb
		86	%%DATADIR%%/manual/properties/KroneckerDelta.cnb
		87	%%DATADIR%%/manual/properties/LaTeXForm.cnb
		88	%%DATADIR%%/manual/properties/Metric.cnb
		89	%%DATADIR%%/manual/properties/NonCommuting.cnb
		90	%%DATADIR%%/manual/properties/PartialDerivative.cnb
		91	%%DATADIR%%/manual/properties/RiemannTensor.cnb
		92	%%DATADIR%%/manual/properties/SatisfiesBianchi.cnb
93	%%DATADIR%%/manual/properties/SelfAntiCommuting.cnb
94	%%DATADIR%%/manual/properties/SelfCommuting.cnb
95	%%DATADIR%%/manual/properties/SelfNonCommuting.cnb
96	%%DATADIR%%/manual/properties/SortOrder.cnb
97	%%DATADIR%%/manual/properties/Spinor.cnb
98	%%DATADIR%%/manual/properties/Symmetric.cnb
99	%%DATADIR%%/manual/properties/TableauSymmetry.cnb

Return to bug 213329

Lines 2-9 Link Here

(-)math/cadabra2/Makefile (-8 / +22 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= cadabra2	4	PORTNAME= cadabra2
5	PORTVERSION= 2.0.816	5	PORTVERSION= 2.0.930
6	PORTREVISION= 2
7	CATEGORIES= math	6	CATEGORIES= math
8		7
9	MAINTAINER= yuri@rawbw.com	8	MAINTAINER= yuri@rawbw.com
Lines 12-20 Link Here
12	LICENSE= LGPL3	11	LICENSE= LGPL3
13	LICENSE_FILE= ${WRKSRC}/doc/license.txt	12	LICENSE_FILE= ${WRKSRC}/doc/license.txt
14		13
		14	PATCH_DEPENDS=${NONEXISTENT}:devel/boost-libs:extract
15	LIB_DEPENDS= libboost_python.so:devel/boost-python-libs \	15	LIB_DEPENDS= libboost_python.so:devel/boost-python-libs \
		16	libboost_system.so:devel/boost-libs \
16	libpcrecpp.so:devel/pcre \	17	libpcrecpp.so:devel/pcre \
17	libboost_system.so:devel/boost-libs \
18	libjsoncpp.so:devel/jsoncpp \	18	libjsoncpp.so:devel/jsoncpp \
19	libgmp.so:math/gmp \	19	libgmp.so:math/gmp \
20	libuuid.so:misc/e2fsprogs-libuuid	20	libuuid.so:misc/e2fsprogs-libuuid
Lines 23-39 Link Here
23		23
24	USE_GITHUB= yes	24	USE_GITHUB= yes
25	GH_ACCOUNT= kpeeters	25	GH_ACCOUNT= kpeeters
26	GH_TAGNAME= 8258bfc	26	GH_TAGNAME= 85ac041
27		27
28	BROKEN_FreeBSD_9= does not build: fatal error: 'type_traits' file not found	28	BROKEN_FreeBSD_9= does not build: fatal error: 'type_traits' file not found
29	GUI_BROKEN= Builds but has a WebSockets communication problem in the runtime
30	GUI_CONFLICTS_BUILD= websocketpp-*	29	GUI_CONFLICTS_BUILD= websocketpp-*
31		30
32	OPTIONS_DEFINE= GUI	31	OPTIONS_DEFINE= GUI
		32	OPTIONS_DEFAULT=GUI
33		33
34	USES= compiler:c++14-lang cmake gettext gmake pkgconfig python:2 sqlite	34	USES= compiler:c++14-lang cmake gettext-runtime gmake pkgconfig python:2 sqlite
35	GUI_USE= GNOME=gtkmm30,gdkpixbuf2	35	GUI_USE= GNOME=gtkmm30,gdkpixbuf2
36	USE_TEX= base	36	USE_TEX= base texmf texhash
37	USE_LDCONFIG= yes	37	USE_LDCONFIG= yes
38	OPTIONS_SUB= yes	38	OPTIONS_SUB= yes
39	GUI_INSTALLS_ICONS= yes	39	GUI_INSTALLS_ICONS= yes
Lines 41-46 Link Here
41	CMAKE_ARGS+= -DBOOST_ROOT=${LOCALBASE}	41	CMAKE_ARGS+= -DBOOST_ROOT=${LOCALBASE}
42	CMAKE_ARGS+= -DUSE_PYTHON_3:BOOL=OFF	42	CMAKE_ARGS+= -DUSE_PYTHON_3:BOOL=OFF
43	GUI_CMAKE_ON+= -DENABLE_FRONTEND:BOOL=ON	43	GUI_CMAKE_ON+= -DENABLE_FRONTEND:BOOL=ON
		44	CXXFLAGS+= -I${WRKSRC}/override/include
44	CXXFLAGS+= -I${LOCALBASE}/include	45	CXXFLAGS+= -I${LOCALBASE}/include
45	CXXFLAGS+= -I${LOCALBASE}/include/jsoncpp	46	CXXFLAGS+= -I${LOCALBASE}/include/jsoncpp
46	LDFLAGS+= -L${LOCALBASE}/lib -ljsoncpp	47	LDFLAGS+= -L${LOCALBASE}/lib -ljsoncpp
Lines 48-55 Link Here
48	CMAKE_INSTALL_PREFIX=${PREFIX}	49	CMAKE_INSTALL_PREFIX=${PREFIX}
49		50
50	post-extract:	51	post-extract:
51	${RM} -r ${WRKSRC}/client_server/jsoncpp	52	@${RM} -r ${WRKSRC}/client_server/jsoncpp
52		53
		54	pre-patch: # workaround for https://github.com/zaphoyd/websocketpp/issues/563, so that the local patch can be applied
		55	@${MKDIR} ${WRKSRC}/override/include/boost/asio/detail/impl
		56	@${CP} `${MAKE} -C ${PORTSDIR}/devel/boost-libs -V WRKSRC`/boost/asio/detail/impl/socket_ops.ipp \
		57	${WRKSRC}/override/include/boost/asio/detail/impl/
		58
53	post-install:	59	post-install:
54	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/cadabra2html	60	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/cadabra2html
55	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/cadabra-server	61	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/cadabra-server
Lines 57-61 Link Here
57		63
58	post-install-GUI-on:	64	post-install-GUI-on:
59	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/cadabra-gtk	65	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/cadabra-gtk
		66	@${GZIP_CMD} ${GZIP} < ${STAGEDIR}${PREFIX}/share/icons/hicolor/scalable/apps/cadabra2.svg > ${STAGEDIR}${PREFIX}/share/icons/hicolor/scalable/apps/cadabra2.svgz
		67	@${RM} ${STAGEDIR}${PREFIX}/share/icons/hicolor/scalable/apps/cadabra2.svg
		68	@${LN} ${STAGEDIR}${PREFIX}/share/icons/hicolor/256x256/apps/cadabra2.png \
		69	${STAGEDIR}${PREFIX}/share/icons/hicolor/256x256/apps/cadabra-gtk.png
		70	@${LN} ${STAGEDIR}${PREFIX}/share/icons/hicolor/64x64/apps/cadabra2.png \
		71	${STAGEDIR}${PREFIX}/share/icons/hicolor/64x64/apps/cadabra-gtk.png
		72	@${LN} ${STAGEDIR}${PREFIX}/share/icons/hicolor/scalable/apps/cadabra2.svgz \
		73	${STAGEDIR}${PREFIX}/share/icons/hicolor/scalable/apps/cadabra-gtk.svgz
60		74
61	.include <bsd.port.mk>	75	.include <bsd.port.mk>

Lines 1-15 Link Here

(-)math/cadabra2/files/patch-CMakeLists.txt (-15 lines)
1	--- CMakeLists.txt.orig 2016-06-20 20:19:43 UTC
2	+++ CMakeLists.txt
3	@@ -107,7 +107,11 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PAT
4
5	add_subdirectory(core)
6	add_subdirectory(client_server)
7	-add_subdirectory(frontend)
8	add_subdirectory(tests)
9	add_subdirectory(web2 EXCLUDE_FROM_ALL)
10
11	+option(ENABLE_FRONTEND "Enable the UI frontend" OFF)
12	+if(ENABLE_FRONTEND)
13	+ add_subdirectory(frontend)
14	+endif()
15	+

Line 0 Link Here

(-)math/cadabra2/files/patch-client__server_websocketpp_websocketpp_transport_asio_endpoint.hpp (+20 lines)
	1	--- client_server/websocketpp/websocketpp/transport/asio/endpoint.hpp.orig 2016-10-08 21:27:12 UTC
	2	+++ client_server/websocketpp/websocketpp/transport/asio/endpoint.hpp
	3	@@ -491,7 +491,7 @@ public:
	4	* @param ec Set to indicate what error occurred, if any.
	5	*/
	6	void listen(uint16_t port, lib::error_code & ec) {
	7	- listen(lib::asio::ip::tcp::v6(), port, ec);
	8	+ listen(lib::asio::ip::tcp::v4(), port, ec);
	9	}
	10
	11	/// Set up endpoint for listening on a port
	12	@@ -507,7 +507,7 @@ public:
	13	* @param ec Set to indicate what error occurred, if any.
	14	*/
	15	void listen(uint16_t port) {
	16	- listen(lib::asio::ip::tcp::v6(), port);
	17	+ listen(lib::asio::ip::tcp::v4(), port);
	18	}
	19
	20	/// Set up endpoint for listening on a host and service (exception free)

Line 0 Link Here

(-)math/cadabra2/files/patch-override_include_boost_asio_detail_impl_socket__ops.ipp (+19 lines)
	1	--- override/include/boost/asio/detail/impl/socket_ops.ipp.orig 2016-10-08 22:51:31 UTC
	2	+++ override/include/boost/asio/detail/impl/socket_ops.ipp
	3	@@ -469,7 +469,15 @@ template <typename SockLenType>
	4	inline int call_connect(SockLenType msghdr::*,
	5	socket_type s, const socket_addr_type* addr, std::size_t addrlen)
	6	{
	7	- return ::connect(s, addr, (SockLenType)addrlen);
	8	+ int res = ::connect(s, addr, (SockLenType)addrlen);
	9	+ if (res == -1 && errno==EINPROGRESS) {
	10	+ fd_set write_fd;
	11	+ FD_ZERO(&write_fd);
	12	+ FD_SET(s, &write_fd);
	13	+ res = ::select (s+1, NULL, &write_fd,NULL,NULL);
	14	+ res = res > 0 ? 0 : res;
	15	+ }
	16	+ return res;
	17	}
	18
	19	int connect(socket_type s, const socket_addr_type* addr,