From 6114dd1fc24f386774103d8b751794405f2470ad Mon Sep 17 00:00:00 2001
From: Rene Gollent <rene@gollent.com>
Date: Sun, 29 Sep 2013 19:42:12 -0400
Subject: [PATCH] Clean up FreeBSD build support as suggested by Ingo.

---
 build/jam/BuildSetup         | 8 ++++++++
 src/build/libpackage/Jamfile | 7 -------
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/build/jam/BuildSetup b/build/jam/BuildSetup
index 1abbfe47b7..ad8f2c3eb6 100644
--- a/build/jam/BuildSetup
+++ b/build/jam/BuildSetup
@@ -266,6 +266,10 @@ if $(HOST_PLATFORM) = cygwin {
 		--enable-auto-import ;
 }
 
+if $(HOST_PLATFORM) = freebsd {
+	HOST_LINKFLAGS += -L/usr/local/lib ;
+}
+
 HOST_CPU ?= $(OSPLAT:L) ;
 
 # Jam doesn't know x86_64, so override HOST_CPU, if 64 bit.
@@ -571,6 +575,10 @@ HOST_BE_API_C++FLAGS = ;
 # platform, e.g. containing missing POSIX/GNU headers.
 HOST_HDRS += [ FDirName $(HAIKU_TOP) headers build host $(HOST_PLATFORM) ] ;
 
+if $(HOST_PLATFORM) = freebsd {
+	HOST_HDRS += /usr/local/include ;
+}
+
 HOST_BE_API_HEADERS =
 	[ FDirName $(HAIKU_TOP) headers build ]
 	[ FDirName $(HAIKU_TOP) headers build os ]
diff --git a/src/build/libpackage/Jamfile b/src/build/libpackage/Jamfile
index 31876a0ab9..1d35d4cc2e 100644
--- a/src/build/libpackage/Jamfile
+++ b/src/build/libpackage/Jamfile
@@ -87,13 +87,6 @@ if $(HOST_PLATFORM) = haiku_host &&  $(HOST_GCC_VERSION[1]) < 3 {
 	SourceHdrs FetchFileJob.cpp : /boot/$(locations)/develop/headers/curl ;
 }
 
-# FreeBSD's gcc doesn't have /usr/local/include and /usr/local/lib in its
-# default search paths, but that's where its libcurl port gets installed to.
-if $(HOST_PLATFORM) = freebsd {
-	SourceHdrs FetchFileJob.cpp : /usr/local/include ;
-	LINKFLAGS on libpackage_build.so += -L/usr/local/lib ;
-}
-
 # locate the library
 MakeLocate libpackage_build.so : $(HOST_BUILD_COMPATIBILITY_LIB_DIR) ;