Index: head/net/kea/Makefile =================================================================== --- head/net/kea/Makefile (revision 460153) +++ head/net/kea/Makefile (revision 460154) @@ -1,55 +1,54 @@ # $FreeBSD$ PORTNAME= kea PORTVERSION= 1.2.0 PORTREVISION= 4 CATEGORIES= net ipv6 MASTER_SITES= ISC/kea/${PORTVERSION} MAINTAINER= hrs@FreeBSD.org COMMENT= Alternative DHCP implementation by ISC LICENSE= MPL20 LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= liblog4cplus.so:devel/log4cplus \ libboost_system.so:devel/boost-libs -BROKEN= fails to build with boost 1.66, see bug 224184 BROKEN_powerpc64= fails to configure: checking for log4cplus library... no USES= autoreconf compiler:c++11-lang libtool pathfix python:3.3+ ssl USE_LDCONFIG= yes USE_RC_SUBR= ${PORTNAME} GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-openssl=${OPENSSLBASE} \ --with-log4cplus=${LOCALBASE} \ --with-boost-include=${LOCALBASE}/include \ --with-boost-lib-dir=${LOCALBASE}/lib \ --without-werror INSTALL_TARGET= install-strip TEST_TARGET= check PORTDOCS= AUTHORS COPYING ChangeLog README \ kea-guide.css kea-guide.html kea-guide.txt \ kea-messages.html kea-logo-100x70.png \ examples OPTIONS_DEFINE= DOCS MYSQL PGSQL DOCS_MAKE_ARGS_OFF= \ INSTALL_STRIP_PROGRAM="${WRKSRC}/install-sh -c -s" \ INSTALL_STRIP_FLAG="-s" \ INSTALL_PROGRAM_ENV="STRIPPROG=${STRIP}" DOCS_INSTALL_TARGET_OFF= \ install-exec-am \ install-pkgconfigDATA \ install-pkgincludeHEADERS MYSQL_USE= MYSQL=client MYSQL_CONFIGURE_ON= --with-dhcp-mysql=${LOCALBASE}/bin/mysql_config MYSQL_CONFIGURE_OFF= --without-dhcp-mysql PGSQL_USES= pgsql WANT_PGSQL= client PGSQL_CONFIGURE_ON= --with-dhcp-pgsql=${LOCALBASE}/bin/pg_config PGSQL_CONFIGURE_OFF= --without-dhcp-pgsql .include Index: head/net/kea/files/patch-asiolink-boost-1.66 =================================================================== --- head/net/kea/files/patch-asiolink-boost-1.66 (nonexistent) +++ head/net/kea/files/patch-asiolink-boost-1.66 (revision 460154) @@ -0,0 +1,86 @@ +From 4fd11ef050438adeb1e0ae0d9d2d8ec3a2cb659c Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Bart=C5=82omiej=20Piotrowski?= +Date: Sat, 30 Dec 2017 14:40:24 +0100 +Subject: [PATCH] asiolink: fix build with boost 1.66 + +- use native_handle() for getting native socket type +- use io_context instead of io_service +--- + src/lib/asiolink/io_acceptor.h | 4 ++++ + src/lib/asiolink/io_service.h | 5 +++++ + src/lib/asiolink/tcp_socket.h | 4 ++++ + src/lib/asiolink/udp_socket.h | 4 ++++ + src/lib/asiolink/unix_domain_socket.cc | 4 ++++ + 5 files changed, 21 insertions(+) + +--- src/lib/asiolink/io_service.h.orig 2017-04-24 23:28:20 UTC ++++ src/lib/asiolink/io_service.h +@@ -11,7 +11,12 @@ + + namespace boost { + namespace asio { ++#if BOOST_VERSION < 106600 + class io_service; ++#else ++ class io_context; ++ typedef io_context io_service; ++#endif + } + } + +--- src/lib/asiolink/tcp_acceptor.h.orig 2017-04-24 23:28:20 UTC ++++ src/lib/asiolink/tcp_acceptor.h +@@ -44,7 +44,11 @@ class TCPAcceptor : public IOSocket { (public) + + /// @brief Returns file descriptor of the underlying socket. + virtual int getNative() const final { ++#if BOOST_VERSION < 106600 + return (acceptor_->native()); ++#else ++ return (acceptor_->native_handle()); ++#endif + } + + /// @brief Returns protocol of the socket. +--- src/lib/asiolink/tcp_socket.h.orig 2017-04-24 23:28:20 UTC ++++ src/lib/asiolink/tcp_socket.h +@@ -75,7 +75,11 @@ class TCPSocket : public IOAsioSocket { (public) + + /// \brief Return file descriptor of underlying socket + virtual int getNative() const { ++#if BOOST_VERSION < 106600 + return (socket_.native()); ++#else ++ return (socket_.native_handle()); ++#endif + } + + /// \brief Return protocol of socket +--- src/lib/asiolink/udp_socket.h.orig 2017-04-24 23:28:20 UTC ++++ src/lib/asiolink/udp_socket.h +@@ -61,7 +61,11 @@ class UDPSocket : public IOAsioSocket { (public) + + /// \brief Return file descriptor of underlying socket + virtual int getNative() const { ++#if BOOST_VERSION < 106600 + return (socket_.native()); ++#else ++ return (socket_.native_handle()); ++#endif + } + + /// \brief Return protocol of socket +--- src/lib/asiolink/unix_domain_socket.cc.orig 2017-04-24 23:28:20 UTC ++++ src/lib/asiolink/unix_domain_socket.cc +@@ -48,7 +48,11 @@ UnixDomainSocket::UnixDomainSocket(IOService& io_servi + + int + UnixDomainSocket::getNative() const { ++#if BOOST_VERSION < 106600 + return (impl_->socket_.native()); ++#else ++ return (impl_->socket_.native_handle()); ++#endif + } + + int Property changes on: head/net/kea/files/patch-asiolink-boost-1.66 ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property