From owner-svn-ports-all@freebsd.org Fri Aug 19 09:40:52 2016 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 8F4D3BBFBFE; Fri, 19 Aug 2016 09:40:52 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 47E401ECE; Fri, 19 Aug 2016 09:40:52 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u7J9epxn043215; Fri, 19 Aug 2016 09:40:51 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u7J9epsX043213; Fri, 19 Aug 2016 09:40:51 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201608190940.u7J9epsX043213@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Fri, 19 Aug 2016 09:40:51 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r420452 - head/security/i2pd/files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 19 Aug 2016 09:40:52 -0000 Author: amdmi3 Date: Fri Aug 19 09:40:51 2016 New Revision: 420452 URL: https://svnweb.freebsd.org/changeset/ports/420452 Log: - Fix build with enabled UPNP - Switch to opt_CMAKE_BOOL PR: 211977 Reported by: arabesc@bk.ru Added: head/security/i2pd/files/ head/security/i2pd/files/patch-build_CMakeLists.txt (contents, props changed) head/security/i2pd/files/patch-build_cmake__modules_FindMiniUPnPc.cmake (contents, props changed) Added: head/security/i2pd/files/patch-build_CMakeLists.txt ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/security/i2pd/files/patch-build_CMakeLists.txt Fri Aug 19 09:40:51 2016 (r420452) @@ -0,0 +1,11 @@ +--- build/CMakeLists.txt.orig 2016-08-12 15:07:00 UTC ++++ build/CMakeLists.txt +@@ -357,7 +357,7 @@ if (WITH_BINARY) + endif () + + if (WITH_UPNP) +- target_link_libraries("${PROJECT_NAME}" "miniupnpc") ++ target_link_libraries("${PROJECT_NAME}" "${MINIUPNPC_LIBRARY}") + endif () + + # FindBoost pulls pthread for thread which is broken for static linking at least on Ubuntu 15.04 Added: head/security/i2pd/files/patch-build_cmake__modules_FindMiniUPnPc.cmake ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/security/i2pd/files/patch-build_cmake__modules_FindMiniUPnPc.cmake Fri Aug 19 09:40:51 2016 (r420452) @@ -0,0 +1,32 @@ +--- build/cmake_modules/FindMiniUPnPc.cmake.orig 2016-08-12 15:07:00 UTC ++++ build/cmake_modules/FindMiniUPnPc.cmake +@@ -1,6 +1,6 @@ + # - Find MINIUPNPC + +-if(MINIUPNPC_INCLUDE_DIR) ++if(MINIUPNPC_INCLUDE_DIR AND MINIUPNPC_LIBRARY) + set(MINIUPNPC_FOUND TRUE) + + else() +@@ -11,15 +11,18 @@ else() + $ENV{SystemDrive} + ${PROJECT_SOURCE_DIR}/../.. + ) +- +- if(MINIUPNPC_INCLUDE_DIR) ++ ++ find_library(MINIUPNPC_LIBRARY miniupnpc) ++ ++ if(MINIUPNPC_INCLUDE_DIR AND MINIUPNPC_LIBRARY) + set(MINIUPNPC_FOUND TRUE) + message(STATUS "Found MiniUPnP headers: ${MINIUPNPC_INCLUDE_DIR}") ++ message(STATUS "Found MiniUPnP library: ${MINIUPNPC_LIBRARY}") + else() + set(MINIUPNPC_FOUND FALSE) + message(STATUS "MiniUPnP not found.") + endif() + +- mark_as_advanced(MINIUPNPC_INCLUDE_DIR) ++ mark_as_advanced(MINIUPNPC_INCLUDE_DIR MINIUPNPC_LIBRARY) + + endif()