Fix build on Cygwin.

5 files changed, 60 insertions, 2 deletions

diff --git a/www/cppcms/Makefile b/www/cppcms/Makefile
index 4d4ad77fba9..b8eb90a15a5 100644
--- a/www/cppcms/Makefile
+++ b/www/cppcms/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2013/09/16 15:46:07 joerg Exp $
+# $NetBSD: Makefile,v 1.4 2013/10/04 18:27:48 joerg Exp $
 
 DISTNAME=	cppcms-1.0.4
 PKGREVISION=	1
@@ -21,6 +21,8 @@ CMAKE_ARGS+=	-DPYTHON=${PYTHONBIN} -DDISABLE_GCRYPT=yes
 CXXFLAGS+=	-std=c++11
 .endif
 
+CXXFLAGS.Cygwin+=	-std=gnu++11
+
 LDFLAGS+=	${EXPORT_SYMBOLS_LDFLAGS}
 
 TEST_TARGET=	test
diff --git a/www/cppcms/PLIST.Cygwin b/www/cppcms/PLIST.Cygwin
new file mode 100644
index 00000000000..e35449a73d1
--- /dev/null
+++ b/www/cppcms/PLIST.Cygwin
@@ -0,0 +1,2 @@
+bin/cygbooster-0.dll
+bin/cygcppcms-1.dll
diff --git a/www/cppcms/distinfo b/www/cppcms/distinfo
index 37dd9538c10..cab7760b4ad 100644
--- a/www/cppcms/distinfo
+++ b/www/cppcms/distinfo
@@ -1,10 +1,12 @@
-$NetBSD: distinfo,v 1.2 2013/09/16 15:46:07 joerg Exp $
+$NetBSD: distinfo,v 1.3 2013/10/04 18:27:48 joerg Exp $
 
 SHA1 (cppcms-1.0.4.tar.bz2) = 470a3eedbd568b457fe6516b78a9c1f464cdc276
 RMD160 (cppcms-1.0.4.tar.bz2) = 6efa445f8da113ba870010c3a770592587e4198f
 Size (cppcms-1.0.4.tar.bz2) = 2331505 bytes
 SHA1 (patch-bin_cppcms__run) = 2b9033c82fab2c9aa11acbb200e9a44f9c6364cb
+SHA1 (patch-booster_CMakeLists.txt) = 25bfe48385f06f88a2edb10879da4ed53fdd2297
 SHA1 (patch-booster_lib_locale_test_test__std__formatting.cpp) = 62564e7e8bfcb90cd19195f5ce2296b8b03c02d6
+SHA1 (patch-booster_lib_system_src_posix__error.cpp) = 8f1e050ffb1b37b664893864d29508984e82e42c
 SHA1 (patch-cppcms__boost_cppcms__boost_detail_container__fwd.hpp) = 1de84e42f0b0dfbb9b8c9013c1c515727a917998
 SHA1 (patch-cppcms__boost_cppcms__boost_interprocess_containers_container_container__fwd.hpp) = 77de309397fc180556ac80031fffe70a0aa24e86
 SHA1 (patch-cppcms__boost_cppcms__boost_interprocess_detail_managed__memory__impl.hpp) = 434d6c50cb3a8f5a1ae00d83e63341f6c24dbfcd
diff --git a/www/cppcms/patches/patch-booster_CMakeLists.txt b/www/cppcms/patches/patch-booster_CMakeLists.txt
new file mode 100644
index 00000000000..e2af91b67d9
--- /dev/null
+++ b/www/cppcms/patches/patch-booster_CMakeLists.txt
@@ -0,0 +1,40 @@
+$NetBSD: patch-booster_CMakeLists.txt,v 1.1 2013/10/04 18:27:48 joerg Exp $
+
+--- booster/CMakeLists.txt.orig	2013-10-02 10:28:22.012853400 +0000
++++ booster/CMakeLists.txt
+@@ -251,6 +251,7 @@ endif()
+ 
+ if(IS_WINDOWS)
+ 	find_library(WS2_32 ws2_32)
++	find_library(WSOCK32 wsock32)
+ else()
+ 	check_function_exists(socket HAVE_SOCKET)
+ 	if(NOT HAVE_SOCKET)
+@@ -326,7 +327,7 @@ check_cxx_source_compiles(
+ 	BOOSTER_HAVE_INTTYPES_H)
+ 
+ if(IS_WINDOWS)
+-	set(CMAKE_REQUIRED_LIBRARIES ${WS2_32})
++	set(CMAKE_REQUIRED_LIBRARIES ${WS2_32} ${WSOCK32})
+ 	check_cxx_source_compiles(
+ 	"#include <winsock2.h>
+ 	#include <windows.h>
+@@ -531,9 +532,6 @@ foreach(ALIB ${LINK_LIBS})
+ 	if(LIB_PTHREAD)
+ 		target_link_libraries(${ALIB} ${LIB_PTHREAD})
+ 	endif(LIB_PTHREAD)
+-	if(WS2_32)
+-		target_link_libraries(${ALIB} ${WS2_32})
+-	endif()
+ 	target_link_libraries(${ALIB} ${PCRE_LIB})
+ 
+ 	if(NOT DISABLE_ICU_LOCALE)
+@@ -556,6 +554,8 @@ foreach(ALIB ${LINK_LIBS})
+ 
+   	if(IS_WINDOWS)
+ 		target_link_libraries(${ALIB} psapi)
++		target_link_libraries(${ALIB} ws2_32)
++		target_link_libraries(${ALIB} wsock32)
+ 	endif()
+ 	
+ 	if(USE_STLPORT AND STLPORT_LIB)
diff --git a/www/cppcms/patches/patch-booster_lib_system_src_posix__error.cpp b/www/cppcms/patches/patch-booster_lib_system_src_posix__error.cpp
new file mode 100644
index 00000000000..97ee0de6c10
--- /dev/null
+++ b/www/cppcms/patches/patch-booster_lib_system_src_posix__error.cpp
@@ -0,0 +1,12 @@
+$NetBSD: patch-booster_lib_system_src_posix__error.cpp,v 1.1 2013/10/04 18:27:48 joerg Exp $
+
+--- booster/lib/system/src/posix_error.cpp.orig	2013-10-02 08:26:29.475306600 +0000
++++ booster/lib/system/src/posix_error.cpp
+@@ -5,6 +5,7 @@
+ //  accompanying file LICENSE_1_0.txt or copy at
+ //  http://www.boost.org/LICENSE_1_0.txt)
+ //
++#define _GNU_SOURCE
+ #define BOOSTER_SOURCE
+ #include <booster/config.h>
+ #include <booster/system_error.h>