From b06319505763ed0b864a23031b434038f5573ad7 Mon Sep 17 00:00:00 2001
From: ajacoutot <ajacoutot@openbsd.org>
Date: Fri, 7 Oct 2016 12:59:42 +0000
Subject: [PATCH] Revert the cmake patch again and use LDFLAGS. We want to make
 sure libbind is used to prevent conflicts.

---
 net/bro/Makefile                           |  7 +++--
 net/bro/patches/patch-cmake_FindBIND_cmake | 30 ----------------------
 2 files changed, 5 insertions(+), 32 deletions(-)
 delete mode 100644 net/bro/patches/patch-cmake_FindBIND_cmake

diff --git a/net/bro/Makefile b/net/bro/Makefile
index b2e0315b42f..f7c51a88816 100644
--- a/net/bro/Makefile
+++ b/net/bro/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.25 2016/10/07 10:05:16 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.26 2016/10/07 12:59:42 ajacoutot Exp $
 
 COMMENT=		network analysis and security monitoring framework
 
 DISTNAME=		bro-2.4.1
-REVISION=		6
+REVISION=		7
 
 SHARED_LIBS +=  broccoli                  5.1 # 5.1
 
@@ -48,6 +48,9 @@ RUN_DEPENDS +=		net/curl
 
 CONFIGURE_STYLE=	simple
 
+CONFIGURE_ENV=		LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib/libbind \
+				-lbind -Wl,-rpath ${LOCALBASE}/lib/libbind"
+
 CONFIGURE_ARGS=		--prefix=${PREFIX} \
 			--conf-files-dir=${SYSCONFDIR}/bro \
 			--localstatedir=${LOCALSTATEDIR} \
diff --git a/net/bro/patches/patch-cmake_FindBIND_cmake b/net/bro/patches/patch-cmake_FindBIND_cmake
deleted file mode 100644
index d2f6dbda1ba..00000000000
--- a/net/bro/patches/patch-cmake_FindBIND_cmake
+++ /dev/null
@@ -1,30 +0,0 @@
-$OpenBSD: patch-cmake_FindBIND_cmake,v 1.3 2016/09/07 14:50:18 dcoppa Exp $
---- cmake/FindBIND.cmake.orig	Wed Sep  7 15:50:55 2016
-+++ cmake/FindBIND.cmake	Wed Sep  7 15:56:10 2016
-@@ -33,6 +33,8 @@ if (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
-     # exported in the shared library (strangely)
-     # see http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=291609
-     set(bind_libs none libresolv.a resolv bind)
-+elseif (${CMAKE_SYSTEM_NAME} MATCHES "OpenBSD")
-+    set(bind_libs bind)
- else ()
-     set(bind_libs none resolv bind)
- endif ()
-@@ -45,8 +47,16 @@ foreach (bindlib ${bind_libs})
-     if (NOT ${bindlib} MATCHES "none")
-         find_library(BIND_LIBRARY
-             NAMES ${bindlib}
--            HINTS ${BIND_ROOT_DIR}/lib
-+            if (${CMAKE_SYSTEM_NAME} MATCHES "OpenBSD")
-+              HINTS ${BIND_ROOT_DIR}/lib/libbind
-+            else ()
-+              HINTS ${BIND_ROOT_DIR}/lib
-+            endif ()
-         )
-+    endif ()
-+
-+    if (${CMAKE_SYSTEM_NAME} MATCHES "OpenBSD")
-+      link_directories(${BIND_ROOT_DIR}/lib/libbind)
-     endif ()
- 
-     set(CMAKE_REQUIRED_LIBRARIES ${BIND_LIBRARY})