svn commit: r420452 - head/security/i2pd/files

[Dmitry Marakasov]

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 at 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()