From 4e5e149a9525debd89d11e1f94f78bf26938bedc Mon Sep 17 00:00:00 2001
From: drbob <retroshare.project@gmail.com>
Date: Sun, 29 Jan 2012 14:27:14 +0000
Subject: [PATCH] Patch from Peter - to build Retroshare on FreeBSD.  - Fixup
 BSD qmake parameters: mainly library locations.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4863 b45a01b8-16f6-495d-af2f-9b41ad6348cc
---
 libbitdht/src/libbitdht.pro               |  6 ++++++
 libretroshare/src/libretroshare.pro       |  4 +++-
 retroshare-gui/src/RetroShare.pro         | 17 ++++++++---------
 retroshare-nogui/src/retroshare-nogui.pro | 12 ++++++++++++
 4 files changed, 29 insertions(+), 10 deletions(-)

diff --git a/libbitdht/src/libbitdht.pro b/libbitdht/src/libbitdht.pro
index 2e120942d..c2f6c8874 100644
--- a/libbitdht/src/libbitdht.pro
+++ b/libbitdht/src/libbitdht.pro
@@ -79,6 +79,12 @@ mac {
 		DESTDIR = lib
 }
 
+################################# FreeBSD ##########################################
+
+freebsd-* {
+		DESTDIR = lib
+}
+
 ################################### COMMON stuff ##################################
 ################################### COMMON stuff ##################################
 
diff --git a/libretroshare/src/libretroshare.pro b/libretroshare/src/libretroshare.pro
index 246fb005f..dd060a7a3 100644
--- a/libretroshare/src/libretroshare.pro
+++ b/libretroshare/src/libretroshare.pro
@@ -327,6 +327,8 @@ mac {
 		#INCLUDEPATH += . $${UPNPC_DIR} $${GPGME_DIR}/src $${GPG_ERROR_DIR}/src
 }
 
+################################# FreeBSD ##########################################
+
 freebsd-* {
 	INCLUDEPATH *= /usr/local/include/gpgme
 	INCLUDEPATH *= /usr/local/include/glib-2.0
@@ -336,7 +338,7 @@ freebsd-* {
 	#libupnp implementation files
 	HEADERS += upnp/UPnPBase.h
 	SOURCES += upnp/UPnPBase.cpp
-
+	DESTDIR = lib
 }
 
 ################################### COMMON stuff ##################################
diff --git a/retroshare-gui/src/RetroShare.pro b/retroshare-gui/src/RetroShare.pro
index 5a1df80ca..0099eb072 100644
--- a/retroshare-gui/src/RetroShare.pro
+++ b/retroshare-gui/src/RetroShare.pro
@@ -146,13 +146,16 @@ macx {
 
 }
 
+##################################### FreeBSD ######################################
+
 freebsd-* {
 	INCLUDEPATH *= /usr/local/include/gpgme
-	LIBS *= ../../libretroshare/src/libretroshare.a
-        LIBS *= -lssl
-        LIBS *= -lgpgme
-        LIBS *= -lupnp
-        LIBS *= -lgnome-keyring
+	LIBS *= ../../libretroshare/src/lib/libretroshare.a
+	LIBS *= -lssl
+	LIBS *= -lgpgme
+	LIBS *= -lupnp
+	LIBS *= -lgnome-keyring
+	PRE_TARGETDEPS *= ../../libretroshare/src/lib/libretroshare.a
 }
 
 ############################## Common stuff ######################################
@@ -165,10 +168,6 @@ freebsd-* {
 bitdht {
 	LIBS += ../../libbitdht/src/lib/libbitdht.a
 	PRE_TARGETDEPS *= ../../libbitdht/src/lib/libbitdht.a
-
-	#For FreeBSD to need to use these ones.
-	#LIBS += ../../libbitdht/src/libbitdht.a
-	#PRE_TARGETDEPS *= ../../libbitdht/src/libbitdht.a
 }
 
 win32 {
diff --git a/retroshare-nogui/src/retroshare-nogui.pro b/retroshare-nogui/src/retroshare-nogui.pro
index 238c941eb..e2cf77b88 100644
--- a/retroshare-nogui/src/retroshare-nogui.pro
+++ b/retroshare-nogui/src/retroshare-nogui.pro
@@ -75,6 +75,18 @@ macx {
     LIBS += -Wl,-search_paths_first
 }
 
+##################################### FreeBSD ######################################
+
+freebsd-* {
+	INCLUDEPATH *= /usr/local/include/gpgme
+	LIBS *= ../../libretroshare/src/lib/libretroshare.a
+	LIBS *= -lssl
+	LIBS *= -lgpgme
+	LIBS *= -lupnp
+	LIBS *= -lgnome-keyring
+	PRE_TARGETDEPS *= ../../libretroshare/src/lib/libretroshare.a
+}
+
 ############################## Common stuff ######################################
 
 # bitdht config