Index: head/net-mgmt/fastnetmon/Makefile =================================================================== --- head/net-mgmt/fastnetmon/Makefile (revision 441456) +++ head/net-mgmt/fastnetmon/Makefile (revision 441457) @@ -1,65 +1,65 @@ # Created by: Babak Farrokhi # $FreeBSD$ PORTNAME= fastnetmon PORTVERSION= 1.1.3 DISTVERSIONPREFIX= v -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= net-mgmt security MAINTAINER= farrokhi@FreeBSD.org COMMENT= Very fast DDoS analyzer with sflow/netflow/mirror support LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/LICENSE LIB_DEPENDS= libboost_regex.so:devel/boost-libs \ liblog4cpp.so:devel/log4cpp \ - libndpi.so:net/ndpi \ libluajit-5.1.so:lang/luajit \ libmongoc-1.0.so:devel/mongo-c-driver \ - libjson-c.so:devel/json-c + libjson-c.so:devel/json-c \ + libbson-1.0.so:devel/libbson USE_GITHUB= yes GH_ACCOUNT= pavel-odintsov USERS= ${PORTNAME} GROUPS= ${PORTNAME} USES= cmake CMAKE_SOURCE_PATH= ${WRKSRC}/src CMAKE_ARGS+= -DDISABLE_PF_RING_SUPPORT=ON CMAKE_INSTALL_PREFIX= ${PREFIX} BROKEN_armv6= Does not build: invokes x86 assembler BROKEN_powerpc64= Does not build USE_RC_SUBR= ${PORTNAME} OPTIONS_DEFINE= DOCS REDIS REDIS_LIB_DEPENDS= libhiredis.so:databases/hiredis PORTDOCS= * CFLAGS_i386= -march=i586 post-patch: @${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|' ${WRKSRC}/src/CMakeLists.txt @${REINPLACE_CMD} -e 's|/usr/local|${PREFIX}|; \ s|/var/run|&/fastnetmon|g; s|/var/log|&/fastnetmon|g; \ s|"/etc/|"${PREFIX}/etc/|g; s|/root/fastnetmon|${DATADIR}|g' \ ${WRKSRC}/src/fastnetmon.conf ${WRKSRC}/src/fastnetmon.cpp post-install: ${MV} ${STAGEDIR}${PREFIX}/etc/${PORTNAME}.conf \ ${STAGEDIR}${PREFIX}/etc/${PORTNAME}.conf.sample ${MKDIR} ${STAGEDIR}/var/run/fastnetmon ${STAGEDIR}/var/log/fastnetmon ${INSTALL_MAN} ${WRKSRC}/src/man/fastnetmon.1 ${STAGEDIR}${MANPREFIX}/man/man1 ${INSTALL_MAN} ${WRKSRC}/src/man/fastnetmon_client.1 ${STAGEDIR}${MANPREFIX}/man/man1 post-install-DOCS-on: cd ${WRKSRC} && ${COPYTREE_SHARE} "README.md docs" ${STAGEDIR}${DOCSDIR} .include Index: head/net-mgmt/fastnetmon/files/patch-src_CMakeLists.txt =================================================================== --- head/net-mgmt/fastnetmon/files/patch-src_CMakeLists.txt (revision 441456) +++ head/net-mgmt/fastnetmon/files/patch-src_CMakeLists.txt (revision 441457) @@ -1,99 +1,106 @@ --- src/CMakeLists.txt.orig 2016-06-22 05:22:26 UTC +++ src/CMakeLists.txt @@ -27,6 +27,13 @@ project(FastNetMon) set (FASTNETMON_VERSION_MAJOR 1) set (FASTNETMON_VERSION_MINOR 1) +# Respect PREFIX variable in FreeBSD +if($ENV{PREFIX}) + set(PREFIX $ENV{PREFIX}) +else() + set(PREFIX "/usr/local") +endif() + if (ENABLE_GOBGP_SUPPORT) # We could not compile gRPC without C++ 11 set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -std=c++11") @@ -59,12 +66,14 @@ SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL message(STATUS "C++ compilation flags: ${CMAKE_CXX_FLAGS_RELEASE}") -set(HIREDIS_CUSTOM_INSTALL_PATH "/opt/libhiredis_0_13") -set(LOG4CPP_CUSTOM_INSTALL_PATH "/opt/log4cpp1.1.1") -set(JSONC_CUSTOM_INSTALL_PATH "/opt/json-c-0.12") -set(PFRING_CUSTOM_INSTALL_PATH "/opt/pf_ring_6.0.3") -set(LIBPCAP_CUSTOM_INSTALL_PATH "/opt/libpcap_1.7.4") -set(MONGO_C_CUSTOM_INSTALL_PATH "/opt/mongo_c_driver_1_1_9") +set(HIREDIS_CUSTOM_INSTALL_PATH ${PREFIX}) +set(LOG4CPP_CUSTOM_INSTALL_PATH ${PREFIX}) +set(JSONC_CUSTOM_INSTALL_PATH ${PREFIX}) +set(PFRING_CUSTOM_INSTALL_PATH ${PREFIX}) +set(LIBPCAP_CUSTOM_INSTALL_PATH ${PREFIX}) +set(MONGO_C_CUSTOM_INSTALL_PATH ${PREFIX}) +set(NDPI_CUSTOM_INSTALL_PATH ${PREFIX}) +set(LUAJIT_CUSTOM_INSTALL_PATH ${PREFIX}) set(FASTNETMON_PROFILER OFF) -@@ -190,15 +199,15 @@ if (ENABLE_DPI_SUPPORT) +@@ -184,21 +193,21 @@ add_library(sflow_plugin STATIC sflow_pl + add_library(netflow_plugin STATIC netflow_plugin/netflow_collector.cpp) + target_link_libraries(netflow_plugin ipfix_rfc) + +-set(ENABLE_DPI_SUPPORT YES) ++#set(ENABLE_DPI_SUPPORT YES) + if (ENABLE_DPI_SUPPORT) + message(STATUS "We will enable nDPI support") add_library(fast_dpi STATIC fast_dpi.cpp) - set(NDPI_INCLUDE_DIRS "/opt/ndpi/include/libndpi-1.7.1") - - find_library(NDPI_LIBRARIES NAMES ndpi PATHS "/opt/ndpi/lib" NO_DEFAULT_PATH) + file(GLOB NDPI_SEARCH_PATHS "${NDPI_CUSTOM_INSTALL_PATH}/include/libndpi-*") + find_path(NDPI_INCLUDE_DIRS NAMES libndpi/ndpi_api.h PATHS ${NDPI_SEARCH_PATHS} NO_DEFAULT_PATH) + find_library(NDPI_LIBRARIES NAMES ndpi PATHS "${NDPI_CUSTOM_INSTALL_PATH}/lib" NO_DEFAULT_PATH) if (NOT NDPI_LIBRARIES) message(FATAL_ERROR "Could not find nDPI library") endif() - link_directories("/opt/ndpi/lib") + link_directories(${NDPI_LIBRARIES}) include_directories(${NDPI_INCLUDE_DIRS}) add_definitions(-DENABLE_DPI) @@ -215,8 +224,6 @@ if (ENABLE_LUA_SUPPORT) add_definitions(-DENABLE_LUA_HOOKS) - set(LUAJIT_CUSTOM_INSTALL_PATH "/opt/luajit_2.0.4") - link_directories("${LUAJIT_CUSTOM_INSTALL_PATH}/lib") include_directories("${LUAJIT_CUSTOM_INSTALL_PATH}/include") @@ -578,14 +585,14 @@ if (BUILD_TESTS) endif() if (${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD" OR ${CMAKE_SYSTEM_NAME} STREQUAL "DragonFly") - install(TARGETS fastnetmon DESTINATION bin) - install(TARGETS fastnetmon_client DESTINATION bin) + install(TARGETS fastnetmon DESTINATION ${CMAKE_INSTALL_PREFIX}/bin) + install(TARGETS fastnetmon_client DESTINATION ${CMAKE_INSTALL_PREFIX}/bin) - install(FILES fastnetmon.conf DESTINATION etc) + install(FILES fastnetmon.conf DESTINATION ${CMAKE_INSTALL_PREFIX}/etc) # Install blank files for networks list and whitelist - install(FILES networks_list DESTINATION etc) - install(FILES networks_whitelist DESTINATION etc) + install(FILES networks_list DESTINATION ${CMAKE_INSTALL_PREFIX}/etc) + install(FILES networks_whitelist DESTINATION ${CMAKE_INSTALL_PREFIX}/etc) else() # Linux install(TARGETS fastnetmon DESTINATION /usr/sbin) @@ -599,8 +606,10 @@ else() endif() # man pages -install(FILES man/fastnetmon.1 DESTINATION /usr/share/man/man1) -install(FILES man/fastnetmon_client.1 DESTINATION /usr/share/man/man1) +#install(FILES man/fastnetmon.1 DESTINATION /usr/share/man/man1) +#install(FILES man/fastnetmon_client.1 DESTINATION /usr/share/man/man1) + +install(FILES fastnetmon.conf DESTINATION ${CMAKE_INSTALL_PREFIX}/etc) # Configure cpack package builder # Run it with: cd build; cpack -G DEB ..