Attachment #167753 for bug #207550




# $FreeBSD: head/net-p2p/retroshare/Makefile 386312 2015-05-14 10:15:04Z mat $

PORTNAME=	retroshare
PORTVERSION=	0.6.0
DISTVERSIONPREFIX=	v
CATEGORIES=	net-p2p
MASTER_SITES=	SF/${PORTNAME}/${BINARY}/${PORTVERSION}
DISTNAME=	${PORTNAME}_${SRC_VERSION}-${SRC_REVISION}

MAINTAINER=	peter@netkey.at
COMMENT=	Private and secure decentralised communication platform

LICENSE=	GPLv2

LIB_DEPENDS=	libsqlcipher.so:${PORTSDIR}/databases/sqlcipher \
LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl \
		libupnp.so:${PORTSDIR}/devel/upnp \
		libgnome-keyring.so:${PORTSDIR}/security/libgnome-keyring \
		libspeex.so:${PORTSDIR}/audio/speex \
		libupnp.so:${PORTSDIR}/devel/upnp \
		libgpgme.so:${PORTSDIR}/security/gpgme \
		libopencv_highgui.so:${PORTSDIR}/graphics/opencv \
		libavcodec.so:${PORTSDIR}/multimedia/ffmpeg \
		libmicrohttpd.so:${PORTSDIR}/www/libmicrohttpd

USES=		qmake compiler:features dos2unix execinfo
USE_GNOME=	glib20 libxml2 libxslt
USE_QT5=	buildtools_build uitools_build core gui network xml \
		widgets multimedia printsupport
DOS2UNIX_FILES=	retroshare-nogui/src/retroshare-nogui.pro
USE_GITHUB=	yes
GH_ACCOUNT=	RetroShare
GH_PROJECT=	RetroShare

INSTALLS_ICONS=	yes
WRKSRC=		${WRKDIR}/${PORTNAME}-${SRC_VERSION}/src

MAKE_JOBS_UNSAFE=yes
USE_LDCONFIG=	yes

DESKTOP_ENTRIES="${BINARY}" "${COMMENT}" "${DATADIR}/retrosharelogo1.png" \
		"${BINARY}" "Network;FileTransfer;" true

DOS2UNIX_FILES=	retroshare-gui/src/retroshare-gui.pro \
	retroshare-nogui/src/retroshare-nogui.pro \
	retroshare-gui/src/gui/RetroShareLink.h \
	retroshare-gui/src/gui/common/GroupTreeWidget.cpp

.include <bsd.port.pre.mk>


		${WRKSRC}/retroshare-gui/src/retroshare-gui.pro
	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|' \
		${WRKSRC}/retroshare-nogui/src/retroshare-nogui.pro
	@${REINPLACE_CMD} -e 's|/usr/bin|${PREFIX}/bin|' \
		${WRKSRC}/data/retroshare06.desktop
	@${REINPLACE_CMD} -e 's|/usr/share|${PREFIX}/share|' \
		${WRKSRC}/data/retroshare06.desktop
	@${REINPLACE_CMD} -e 's|/usr/local/share/retroshare|${DATADIR}|' \
		${WRKSRC}/libretroshare/src/rsserver/rsinit.cc
	@${REINPLACE_CMD} -e 's|/usr/lib|${LOCALBASE}/lib|' \
		${WRKSRC}/libretroshare/src/rsserver/rsinit.cc

post-install:
	${INSTALL_PROGRAM} ${WRKSRC}/retroshare-gui/src/${BINARY} \
		${STAGEDIR}${PREFIX}/bin
	${INSTALL_PROGRAM} ${WRKSRC}/retroshare-nogui/src/retroshare-nogui \
		${STAGEDIR}${PREFIX}/bin
	${MKDIR} ${STAGEDIR}${DATADIR}
	${INSTALL_MAN} ${WRKSRC}/libbitdht/src/example/bdboot.txt \
		${STAGEDIR}${DATADIR}
	${INSTALL_DATA} ${WRKSRC}/retroshare-gui/src/gui/images/retrosharelogo1.png \
		${STAGEDIR}${DATADIR}
	${MKDIR} ${STAGEDIR}${PREFIX}/lib/retroshare
	${MKDIR} ${STAGEDIR}${PREFIX}/lib/retroshare/extensions
	${INSTALL_LIB} ${WRKSRC}/plugins/LinksCloud/libLinksCloud.so.1.0.0 \
		${STAGEDIR}${PREFIX}/lib/retroshare/extensions/libLinksCloud.so.1
	${INSTALL_LIB} ${WRKSRC}/plugins/VOIP/libVOIP.so.1.0.0 \
		${STAGEDIR}${PREFIX}/lib/retroshare/extensions/libVOIP.so.1
	${INSTALL_LIB} ${WRKSRC}/plugins/FeedReader/libFeedReader.so.1.0.0 \
		${STAGEDIR}${PREFIX}/lib/retroshare/extensions/libFeedReader.so.1
	@cd ${STAGEDIR}${PREFIX}/lib/retroshare/extensions && \
		${LN} -s libLinksCloud.so.1 libLinksCloud.so && \
		${LN} -s libVOIP.so.1 libVOIP.so && \
		${LN} -s libFeedReader.so.1 libFeedReader.so

.include <bsd.port.post.mk>

Lines 1-2 Link Here

(-)retroshare-0.6/distinfo (-2 / +2 lines)
1	SHA256 (retroshare_0.5.5-0.7068.tar.gz) = 772b0d7916137e81fc0f5ea14f0a8fa70d3d7acb701ca0b0c1c66018f2255650	1	SHA256 (RetroShare-RetroShare-v0.6.0_GH0.tar.gz) = 50b9157bbe407aaefcbf9af1f29392e63148dc060bf78a3b200c9bc09998cf7c
2	SIZE (retroshare_0.5.5-0.7068.tar.gz) = 11899395	2	SIZE (RetroShare-RetroShare-v0.6.0_GH0.tar.gz) = 17436205




--- libretroshare/src/retroshare/rsconfig.h.orig
+++ libretroshare/src/retroshare/rsconfig.h
@@ -31,6 +31,8 @@
 #include <list>
 #include <map>
 
+#include <time.h>
+
 /* The New Config Interface Class */
 class RsServerConfig;
 extern RsServerConfig *rsConfig;
--- libretroshare/src/retroshare/rsflags.h.orig
+++ libretroshare/src/retroshare/rsflags.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <stdint.h>
+#include <ostream>
 
 // This class provides a representation for flags that can be combined with bitwise
 // operations. However, because the class is templated with an id, it's not possible to 
--- libretroshare/src/retroshare/rsgxsifacetypes.h.orig
+++ libretroshare/src/retroshare/rsgxsifacetypes.h
@@ -12,6 +12,8 @@
 #include <vector>
 #include <string>
 #include <inttypes.h>
+
+#include <time.h>
 
 
 typedef std::string RsGxsGroupId;
--- plugins/FeedReader/interface/rsFeedReader.h.orig
+++ plugins/FeedReader/interface/rsFeedReader.h
@@ -26,6 +26,8 @@
 #include <string>
 #include <list>
 
+#include <time.h>
+
 class RsFeedReader;
 extern RsFeedReader *rsFeedReader;
 
--- plugins/LinksCloud/rsrank.h.orig
+++ plugins/LinksCloud/rsrank.h
@@ -30,6 +30,8 @@
 #include <string>
 #include <list>
 
+#include <time.h>
+
 /* The Main Interface Class - for information about your Peers */
 class RsRanks;
 extern RsRanks   *rsRanks;
--- retroshare-gui/src/gui/CreateMsgLinkDialog.h.orig
+++ retroshare-gui/src/gui/CreateMsgLinkDialog.h
@@ -23,6 +23,8 @@
 
 #include "ui_CreateMsgLinkDialog.h"
 
+#include <time.h>
+
 class FriendSelectionWidget ;
 
 class CreateMsgLinkDialog : public QDialog, public Ui::CreateMsgLinkDialog
--- retroshare-gui/src/gui/RetroShareLink.h.orig
+++ retroshare-gui/src/gui/RetroShareLink.h
@@ -33,6 +33,7 @@
 //    -------------+----------------+--------------------------+------------------+-------------+-------------
 //
 #include <stdint.h>
+#include <time.h>
 #include <QString>
 #include <QVector>
 #include <QUrl>
--- retroshare-gui/src/gui/common/GroupTreeWidget.cpp.orig
+++ retroshare-gui/src/gui/common/GroupTreeWidget.cpp
@@ -502,7 +502,7 @@ void GroupTreeWidget::calculateScore(QTr
 
 	/* Find out which has given word in it */
 	QTreeWidgetItemIterator itemIterator(ui->treeWidget);
-	QTreeWidgetItem *item;
+	// QTreeWidgetItem *item;
 	while ((item = *itemIterator) != NULL) {
 		itemIterator++;
 
--- retroshare-gui/src/gui/connect/ConnectProgressDialog.h.orig
+++ retroshare-gui/src/gui/connect/ConnectProgressDialog.h
@@ -29,6 +29,7 @@
 #include "ui_ConnectProgressDialog.h"
 
 #include <stdint.h>
+#include <time.h>
 
 class ConnectProgressDialog : public QDialog
 {
--- retroshare-gui/src/./util/DateTime.h.orig
+++ retroshare-gui/src/./util/DateTime.h
@@ -24,6 +24,8 @@
 
 #include <QString>
 
+#include <time.h>
+
 class QDateTime;
 class QDate;
 class QTime;
--- libretroshare/src/util/argstream.h.orig
+++ libretroshare/src/util/argstream.h
@@ -141,9 +141,9 @@ namespace 
 			inline OptionHolder(char s,
 					const char* l,
 					const char* desc);  
-			friend OptionHolder help(char s='h',
-					const char* l="help",
-					const char* desc="Display this help");
+			friend OptionHolder help(char s,
+					const char* l,
+					const char* desc);
 		private:
 			std::string shortName_;
 			std::string longName_;
@@ -173,9 +173,9 @@ namespace 
 			return OptionHolder(l,b,desc);
 		}
 	inline OptionHolder
-		help(char s,
-				const char* l,
-				const char* desc)
+		help(char s='h',
+				const char* l="help",
+				const char* desc="Display this help")
 		{
 			return OptionHolder(s,l,desc);
 		}
--- retroshare-nogui/src/menu/menu.h.orig	2014-01-28 22:57:11.000000000 +0100
+++ retroshare-nogui/src/menu/menu.h	2014-04-10 13:51:23.670843012 +0200
@@ -27,6 +27,7 @@
 #define RSNOGUI_MENU_H
 
 #include <inttypes.h>
+#include <time.h>
 
 #include <string>
 #include <map>

Lines 1-10 Link Here

(-)retroshare-0.6/files/patch-libbitdht-src-libbitdht.pro (-10 lines)
1	--- libbitdht/src/libbitdht.pro.orig 2012-08-16 18:59:51.000000000 +0200
2	+++ libbitdht/src/libbitdht.pro 2012-10-08 18:41:49.000000000 +0200
3	@@ -91,6 +91,7 @@
4
5	freebsd-* {
6	DESTDIR = lib
7	+ INCLUDEPATH += ../../openpgpsdk/src \
8	}
9
10	################################### COMMON stuff ##################################




--- libbitdht/src/bitdht/bencode.c.orig	2016-02-05 19:04:46 UTC
+++ libbitdht/src/bitdht/bencode.c
@@ -20,7 +20,6 @@
  */
 
 #include <stdio.h>
-#include <iostream>
 #include <stdlib.h> /* malloc() realloc() free() strtoll() */
 #include <string.h> /* memset() */
 #include "util/bdstring.h"
@@ -115,7 +114,7 @@ static char *_be_decode_str(const char *
         
     	if(_ret == NULL)
         {
-            std::cerr << "(EE) " << __PRETTY_FUNCTION__ << ": ERROR. cannot allocate memory for " << len+1+sizeof(sllen) << " bytes." << std::endl;
+            //std::cerr << "(EE) " << __PRETTY_FUNCTION__ << ": ERROR. cannot allocate memory for " << len+1+sizeof(sllen) << " bytes." << std::endl;
             return NULL;
         }
                          
@@ -511,7 +510,7 @@ be_node *be_create_str(const char *str)
     
     	if(_ret == NULL)
         {
-            std::cerr << "(EE) " << __PRETTY_FUNCTION__ << ": ERROR. cannot allocate memory for " << len+1+sizeof(sllen) << " bytes." << std::endl;
+            //std::cerr << "(EE) " << __PRETTY_FUNCTION__ << ": ERROR. cannot allocate memory for " << len+1+sizeof(sllen) << " bytes." << std::endl;
             return NULL;
         }
 	char *ret = NULL;
@@ -536,7 +535,7 @@ be_node *be_create_str_wlen(const char *
     
     	if(_ret == NULL)
         {
-            std::cerr << "(EE) " << __PRETTY_FUNCTION__ << ": ERROR. cannot allocate memory for " << len+1+sizeof(sllen) << " bytes." << std::endl;
+            //std::cerr << "(EE) " << __PRETTY_FUNCTION__ << ": ERROR. cannot allocate memory for " << len+1+sizeof(sllen) << " bytes." << std::endl;
             return NULL;
         }
 	char *ret = NULL;
@@ -584,7 +583,7 @@ int be_add_keypair(be_node *dict, const 
     
     	if(_ret == NULL)
         {
-            std::cerr << "(EE) " << __PRETTY_FUNCTION__ << ": ERROR. cannot allocate memory for " << len+1+sizeof(sllen) << " bytes." << std::endl;
+            //std::cerr << "(EE) " << __PRETTY_FUNCTION__ << ": ERROR. cannot allocate memory for " << len+1+sizeof(sllen) << " bytes." << std::endl;
             return 0;
         }
 	char *ret = NULL;

Lines 1-11 Link Here

(-)retroshare-0.6/files/patch-libretroshare-src-libretroshare.pro (-11 lines)
1	--- libretroshare/src/libretroshare.pro.orig 2014-01-28 22:56:57.000000000 +0100
2	+++ libretroshare/src/libretroshare.pro 2014-10-01 18:48:38.445003534 +0200
3	@@ -305,6 +305,8 @@
4	freebsd-* {
5	INCLUDEPATH *= /usr/local/include/gpgme
6	INCLUDEPATH *= /usr/local/include/glib-2.0
7	+ INCLUDEPATH *= /usr/local/lib/glib-2.0/include
8	+ INCLUDEPATH += ../../openpgpsdk/src
9
10	QMAKE_CXXFLAGS *= -Dfseeko64=fseeko -Dftello64=ftello -Dstat64=stat -Dstatvfs64=statvfs -Dfopen64=fopen
11




--- libretroshare/src/grouter/p3grouter.h.orig	2016-02-05 19:04:46 UTC
+++ libretroshare/src/grouter/p3grouter.h
@@ -225,7 +225,7 @@ private:
     void handleLowLevelTransactionAckItem(RsGRouterTransactionAcknItem*) ;
 
     static Sha1CheckSum computeDataItemHash(RsGRouterGenericDataItem *data_item);
-#ifdef __APPLE__
+#if defined(__APPLE__) || defined(__FreeBSD__)
 public:
 #endif
     class nullstream: public std::ostream {};
@@ -236,7 +236,7 @@ public:
 
         return _debug_enabled?(std::cerr):null;
     }
-#ifdef __APPLE__
+#if defined(__APPLE__) || defined(__FreeBSD__)
 private:
 #endif
     void routePendingObjects() ;

Line 0 Link Here

(-)retroshare-0.6/files/patch-libretroshare_src_libretroshare.pro (+11 lines)
	1	--- libretroshare/src/libretroshare.pro.orig 2016-02-05 19:04:46 UTC
	2	+++ libretroshare/src/libretroshare.pro
	3	@@ -293,7 +293,7 @@ mac {
	4
	5	freebsd-* {
	6	INCLUDEPATH *= /usr/local/include/gpgme
	7	- INCLUDEPATH *= /usr/local/include/glib-2.0
	8	+ INCLUDEPATH += $$system(pkg-config --cflags glib-2.0 \| sed -e "s/-I//g")
	9
	10	QMAKE_CXXFLAGS *= -Dfseeko64=fseeko -Dftello64=ftello -Dstat64=stat -Dstatvfs64=statvfs -Dfopen64=fopen
	11

Line 0 Link Here

(-)retroshare-0.6/files/patch-libretroshare_src_rsserver_rsinit.cc (+11 lines)
	1	--- libretroshare/src/rsserver/rsinit.cc.orig 2016-02-05 19:04:46 UTC
	2	+++ libretroshare/src/rsserver/rsinit.cc
	3	@@ -367,7 +367,7 @@ int RsInit::InitRetroShare(int argcIgnor
	4	#ifdef LOCALNET_TESTING
	5	>> parameter('R',"restrict-port" ,portRestrictions ,"port1-port2","Apply port restriction" ,false)
	6	#endif
	7	-#ifdef __APPLE__
	8	+#if defined(__APPLE__) \|\| defined(__FreeBSD__)
	9	>> help('h',"help","Display this Help") ;
	10	#else
	11	>> help() ;

Line 0 Link Here

(-)retroshare-0.6/files/patch-libretroshare_src_util_argstream.h (+11 lines)
	1	--- libretroshare/src/util/argstream.h.orig 2016-02-05 19:04:46 UTC
	2	+++ libretroshare/src/util/argstream.h
	3	@@ -141,7 +141,7 @@ namespace
	4	inline OptionHolder(char s,
	5	const char* l,
	6	const char* desc);
	7	-#ifdef __APPLE__
	8	+#if defined(__APPLE__) \|\| defined(__FreeBSD__)
	9	friend OptionHolder help(char s,
	10	const char* l,
	11	const char* desc);




--- plugins/FeedReader/FeedReader.pro.orig	2013-10-22 11:53:29.000000000 +0200
+++ plugins/FeedReader/FeedReader.pro	2013-10-22 11:54:10.000000000 +0200
@@ -101,3 +101,9 @@
 	LIBS += -lcurl -lxml2 -lxslt
 }
 
+freebsd-* {
+
+	INCLUDEPATH += /usr/local/include/libxml2
+
+	LIBS += -lcurl -lxml2 -lxslt
+}

Line 0 Link Here

(-)retroshare-0.6/files/patch-plugins_FeedReader_FeedReader.pro (+11 lines)
	1	--- plugins/FeedReader/FeedReader.pro.orig 2016-02-05 19:04:46 UTC
	2	+++ plugins/FeedReader/FeedReader.pro
	3	@@ -134,3 +134,8 @@ haiku-* {
	4
	5	LIBS += -lcurl -lxml2 -lxslt
	6	}
	7	+
	8	+freebsd-* {
	9	+ INCLUDEPATH += $$system(pkg-config --cflags libxml-2.0 \| sed -e "s/-I//g")
	10	+ LIBS += -lcurl -lxml2 -lxslt
	11	+}

Line 0 Link Here

(-)retroshare-0.6/files/patch-plugins_VOIP_VOIP.pro (+10 lines)
	1	--- plugins/VOIP/VOIP.pro.orig 2016-03-05 21:47:58 UTC
	2	+++ plugins/VOIP/VOIP.pro
	3	@@ -26,6 +26,7 @@ linux-* {
	4	PKGCONFIG += opencv
	5	} else {
	6	LIBS += -lspeex -lspeexdsp -lavcodec -lavutil
	7	+ LIBS += -lopencv_core -lopencv_highgui -lopencv_imgproc
	8	}
	9
	10	#################################### Windows #####################################




--- plugins/VOIP/gui/VideoProcessor.cpp.orig	2016-02-05 19:04:46 UTC
+++ plugins/VOIP/gui/VideoProcessor.cpp
@@ -3,7 +3,7 @@
 #ifdef __MACH__
 #include <malloc/malloc.h>
 #else
-#include <malloc.h>
+#include <stdlib.h>
 #endif
 
 #include <QByteArray>
@@ -737,7 +737,8 @@ bool FFmpegVideo::decodeData(const RsVOI
 	//Mac OS X appears to be 16-byte mem aligned.
 	unsigned char *tmp = (unsigned char*)malloc(s + AV_INPUT_BUFFER_PADDING_SIZE) ;
 #else //MAC
-	unsigned char *tmp = (unsigned char*)memalign(16, s + AV_INPUT_BUFFER_PADDING_SIZE) ;
+	unsigned char *tmp ;
+	int unused_error = posix_memalign((void **)tmp, 16, s + AV_INPUT_BUFFER_PADDING_SIZE) ;
 #endif //MAC
 #endif //MINGW
 	if (tmp == NULL) {




--- retroshare-gui/src/retroshare-gui.pro.orig	2014-04-10 13:28:51.661832058 +0200
+++ retroshare-gui/src/retroshare-gui.pro	2014-04-10 13:29:31.092831413 +0200
@@ -215,17 +215,22 @@ macx {
 freebsd-* {
 	INCLUDEPATH *= /usr/local/include/gpgme
 	LIBS *= ../../libretroshare/src/lib/libretroshare.a
+	LIBS *= ../../openpgpsdk/src/lib/libops.a -lbz2
 	LIBS *= -lssl
-	LIBS *= -lgpgme
-	LIBS *= -lupnp
+	LIBS *= -lcrypto
+	LIBS *= -lz
+	LIBS *= -lupnp -lixml
+	LIBS *= -lXss -lX11
 	LIBS *= -lgnome-keyring
 	PRE_TARGETDEPS *= ../../libretroshare/src/lib/libretroshare.a
+	PRE_TARGETDEPS *= ../../openpgpsdk/src/lib/libops.a
 
         gxs {
                 LIBS += ../../supportlibs/pegmarkdown/lib/libpegmarkdown.a
-                LIBS += -lsqlite3
+                LIBS += ../../../lib/sqlcipher/.libs/libsqlcipher.a
         }
-
+	LIBS *= -rdynamic
+	DEFINES *= HAVE_XSS # for idle time, libx screensaver extensions
 }
 
 ##################################### OpenBSD ######################################




--- retroshare-gui/src/retroshare-gui.pro.orig	2016-02-05 19:04:46 UTC
+++ retroshare-gui/src/retroshare-gui.pro
@@ -239,12 +239,16 @@ macx {
 
 freebsd-* {
 	INCLUDEPATH *= /usr/local/include/gpgme
-	LIBS *= -lssl
+	LIBS *= -lssl -lcrypto
 	LIBS *= -lgpgme
 	LIBS *= -lupnp
 	LIBS *= -lgnome-keyring
+	LIBS *= -lz
+	LIBS *= -lixml
+	LIBS *= -lexecinfo
 
-	LIBS += -lsqlite3
+	LIBS += -lsqlcipher
+	LIBS *= -rdynamic
 }
 
 ##################################### Haiku ######################################

Line 0 Link Here

(-)retroshare-0.6/files/patch-retroshare-gui_src_util_RsNetUtil.cpp (+11 lines)
	1	--- retroshare-gui/src/util/RsNetUtil.cpp.orig 2016-02-05 19:04:46 UTC
	2	+++ retroshare-gui/src/util/RsNetUtil.cpp
	3	@@ -29,6 +29,8 @@
	4	#ifdef WINDOWS_SYS
	5	#include <ws2tcpip.h>
	6	#else
	7	+#include <sys/types.h>
	8	+#include <sys/socket.h>
	9	#include <netinet/in.h>
	10	#endif
	11




--- retroshare-nogui/src/retroshare-nogui.pro.orig	2014-04-10 14:14:22.622840778 +0200
+++ retroshare-nogui/src/retroshare-nogui.pro	2014-04-10 14:14:55.384836372 +0200
@@ -114,12 +114,20 @@ macx {
 
 freebsd-* {
 	INCLUDEPATH *= /usr/local/include/gpgme
+	QMAKE_CXXFLAGS *= -Dfseeko64=fseeko -Dftello64=ftello -Dstat64=stat -Dstatvfs64=statvfs -Dfopen64=fopen
 	LIBS *= ../../libretroshare/src/lib/libretroshare.a
-	LIBS *= -lssl
-	LIBS *= -lgpgme
-	LIBS *= -lupnp
+	LIBS *= ../../openpgpsdk/src/lib/libops.a -lbz2
+	LIBS *= -lssl -lcrypto
+	LIBS *= -lz
+	LIBS *= -lupnp -lixml
 	LIBS *= -lgnome-keyring
 	PRE_TARGETDEPS *= ../../libretroshare/src/lib/libretroshare.a
+	PRE_TARGETDEPS *= ../../openpgpsdk/src/lib/libops.a
+	LIBS *= -rdynamic
+	gxs {
+		# We need a explicit path here, to force using the home version
+		LIBS += ../../../lib/sqlcipher/.libs/libsqlcipher.a
+	}
 }
 
 ##################################### OpenBSD  ######################################




--- retroshare-nogui/src/retroshare-nogui.pro.orig	2016-03-05 21:29:14 UTC
+++ retroshare-nogui/src/retroshare-nogui.pro
@@ -126,10 +126,16 @@ macx {
 
 freebsd-* {
 	INCLUDEPATH *= /usr/local/include/gpgme
-	LIBS *= -lssl
+	LIBS *= -lssl -lcrypto
 	LIBS *= -lgpgme
 	LIBS *= -lupnp
 	LIBS *= -lgnome-keyring
+	LIBS *= -lz
+	LIBS *= -lixml
+	LIBS *= -lthr
+	LIBS += -lsqlcipher
+	LIBS *= -lexecinfo
+	LIBS *= -rdynamic
 }
 
 ##################################### OpenBSD  ######################################

Line 0 Link Here

(-)retroshare-0.6/files/patch-retroshare-nogui_src_retroshare.cc (+11 lines)
	1	--- retroshare-nogui/src/retroshare.cc.orig 2016-02-05 19:04:46 UTC
	2	+++ retroshare-nogui/src/retroshare.cc
	3	@@ -86,7 +86,7 @@ int main(int argc, char **argv)
	4	// unfinished
	5	//args >> parameter("http-listen", listenAddress, "ipv6 address", "Listen only on the specified address.", false);
	6	args >> option("http-allow-all", allowAllIps, "allow connections from all IP adresses (default= localhost only)");
	7	-#ifdef __APPLE__
	8	+#if defined(__APPLE__) \|\| defined(__FreeBSD__)
	9	args >> help('h',"help","Display this Help");
	10	#else
	11	args >> help();

Lines 1-10 Link Here

(-)retroshare-0.6/files/patch-supportlibs__pegmarkdown__pegmarkdown.pro (-10 lines)
1	--- ./supportlibs/pegmarkdown/pegmarkdown.pro.orig 2013-12-11 16:08:42.000000000 +0100
2	+++ ./supportlibs/pegmarkdown/pegmarkdown.pro 2013-12-11 16:09:21.000000000 +0100
3	@@ -55,6 +55,7 @@
4	################################# FreeBSD ##########################################
5
6	freebsd-* {
7	+ QMAKE_CC = cc
8	DESTDIR = lib
9	}
10




bin/RetroShare06
bin/RetroShare06-nogui
%%QT_LIBDIR%%/retroshare/extensions6/%%QT_LIBDIR%%FeedReader.so
%%QT_LIBDIR%%/retroshare/extensions6/%%QT_LIBDIR%%VOIP.so
share/RetroShare06/bdboot.txt
share/RetroShare06/qss/blacknight.qss
share/RetroShare06/qss/blacknight/check_sel.png
share/RetroShare06/qss/blacknight/check_unsel.png
share/RetroShare06/qss/blacknight/clbg.png
share/RetroShare06/qss/blacknight/down.png
share/RetroShare06/qss/blacknight/radio_sel.png
share/RetroShare06/qss/blacknight/radio_unsel.png
share/RetroShare06/qss/blacknight/up.png
share/RetroShare06/qss/blue.qss
share/RetroShare06/qss/blue/blue.png
share/RetroShare06/qss/blue/blue2.png
share/RetroShare06/qss/blue/tab1.png
share/RetroShare06/qss/blue/tabselected.png
share/RetroShare06/qss/groove.qss
share/RetroShare06/qss/orangesurfer.qss
share/RetroShare06/qss/orangesurfer/border.png
share/RetroShare06/qss/orangesurfer/main.png
share/RetroShare06/qss/orangesurfer/main2.png
share/RetroShare06/qss/orangesurfer/sizegrip.png
share/RetroShare06/qss/orangesurfer/tab_hover.png
share/RetroShare06/qss/orangesurfer/tab_normal.png
share/RetroShare06/qss/orangesurfer/tab_pressed.png
share/RetroShare06/qss/orangesurfer/toolbar.png
share/RetroShare06/qss/qdarkstyle.qss
share/RetroShare06/qss/qdarkstyle/Hmovetoolbar.png
share/RetroShare06/qss/qdarkstyle/Hsepartoolbar.png
share/RetroShare06/qss/qdarkstyle/Vmovetoolbar.png
share/RetroShare06/qss/qdarkstyle/Vsepartoolbar.png
share/RetroShare06/qss/qdarkstyle/branch_closed-on.png
share/RetroShare06/qss/qdarkstyle/branch_closed.png
share/RetroShare06/qss/qdarkstyle/branch_open-on.png
share/RetroShare06/qss/qdarkstyle/branch_open.png
share/RetroShare06/qss/qdarkstyle/checkbox.png
share/RetroShare06/qss/qdarkstyle/close.png
share/RetroShare06/qss/qdarkstyle/down_arrow.png
share/RetroShare06/qss/qdarkstyle/down_arrow_disabled.png
share/RetroShare06/qss/qdarkstyle/left_arrow.png
share/RetroShare06/qss/qdarkstyle/left_arrow_disabled.png
share/RetroShare06/qss/qdarkstyle/right_arrow.png
share/RetroShare06/qss/qdarkstyle/right_arrow_disabled.png
share/RetroShare06/qss/qdarkstyle/sizegrip.png
share/RetroShare06/qss/qdarkstyle/stylesheet-branch-end.png
share/RetroShare06/qss/qdarkstyle/stylesheet-branch-more.png
share/RetroShare06/qss/qdarkstyle/stylesheet-vline.png
share/RetroShare06/qss/qdarkstyle/transparent.png
share/RetroShare06/qss/qdarkstyle/undock.png
share/RetroShare06/qss/qdarkstyle/up_arrow.png
share/RetroShare06/qss/qdarkstyle/up_arrow_disabled.png
share/RetroShare06/qss/qlive.qss
share/RetroShare06/qss/qlive/qb.png
share/RetroShare06/qss/qlive/qb2.png
share/RetroShare06/qss/redscorpion.qss
share/RetroShare06/qss/redscorpion/red.png
share/RetroShare06/qss/redscorpion/red2.png
share/RetroShare06/qss/silver.qss
share/RetroShare06/qss/silver/silver.png
share/RetroShare06/qss/silver/silver2.png
share/RetroShare06/qss/silvergrey.qss
share/RetroShare06/qss/uus.qss
share/RetroShare06/qss/uus/uus.png
share/RetroShare06/qss/uus/uus2.png
share/RetroShare06/qss/wx.qss
share/RetroShare06/qss/wx/wx.png
share/RetroShare06/qss/yaba.qss
share/RetroShare06/qss/yaba/yaba.png
share/RetroShare06/qss/yaba/yaba2.png
share/RetroShare06/qss/yaba/yaba3.png
share/RetroShare06/qss/yeah.qss
share/RetroShare06/qss/yeah/yeah.png
share/RetroShare06/sounds/alert.wav
share/RetroShare06/sounds/chat1.wav
share/RetroShare06/sounds/chat2.wav
share/RetroShare06/sounds/file.wav
share/RetroShare06/sounds/ft_complete.wav
share/RetroShare06/sounds/ft_incoming.wav
share/RetroShare06/sounds/incomingchat.wav
share/RetroShare06/sounds/notify.wav
share/RetroShare06/sounds/offline.wav
share/RetroShare06/sounds/online1.wav
share/RetroShare06/sounds/online2.wav
share/RetroShare06/sounds/receive.wav
share/RetroShare06/sounds/send1.wav
share/RetroShare06/sounds/send2.wav
share/RetroShare06/sounds/startup.wav
share/RetroShare06/stylesheets/Bubble/history/hincoming.htm
share/RetroShare06/stylesheets/Bubble/history/houtgoing.htm
share/RetroShare06/stylesheets/Bubble/history/images.sh
share/RetroShare06/stylesheets/Bubble/history/img/bubble-blue/bubble_BC.png
share/RetroShare06/stylesheets/Bubble/history/img/bubble-blue/bubble_BL.png
share/RetroShare06/stylesheets/Bubble/history/img/bubble-blue/bubble_BR.png
share/RetroShare06/stylesheets/Bubble/history/img/bubble-blue/bubble_CC.png
share/RetroShare06/stylesheets/Bubble/history/img/bubble-blue/bubble_CL.png
share/RetroShare06/stylesheets/Bubble/history/img/bubble-blue/bubble_CR.png
share/RetroShare06/stylesheets/Bubble/history/img/bubble-blue/bubble_TC.png
share/RetroShare06/stylesheets/Bubble/history/img/bubble-blue/bubble_TL.png
share/RetroShare06/stylesheets/Bubble/history/img/bubble-blue/bubble_TR.png
share/RetroShare06/stylesheets/Bubble/history/img/bubble-blue/bubble_tick-left.png
share/RetroShare06/stylesheets/Bubble/history/img/bubble-blue/bubble_tick-right.png
share/RetroShare06/stylesheets/Bubble/history/img/bubble-blue/bubble_tick.png
share/RetroShare06/stylesheets/Bubble/history/img/bubble-green/bubble_BC.png
share/RetroShare06/stylesheets/Bubble/history/img/bubble-green/bubble_BL.png
share/RetroShare06/stylesheets/Bubble/history/img/bubble-green/bubble_BR.png
share/RetroShare06/stylesheets/Bubble/history/img/bubble-green/bubble_CC.png
share/RetroShare06/stylesheets/Bubble/history/img/bubble-green/bubble_CL.png
share/RetroShare06/stylesheets/Bubble/history/img/bubble-green/bubble_CR.png
share/RetroShare06/stylesheets/Bubble/history/img/bubble-green/bubble_TC.png
share/RetroShare06/stylesheets/Bubble/history/img/bubble-green/bubble_TL.png
share/RetroShare06/stylesheets/Bubble/history/img/bubble-green/bubble_TR.png
share/RetroShare06/stylesheets/Bubble/history/img/bubble-green/bubble_tick-left.png
share/RetroShare06/stylesheets/Bubble/history/img/bubble-green/bubble_tick-right.png
share/RetroShare06/stylesheets/Bubble/history/img/bubble-green/bubble_tick.png
share/RetroShare06/stylesheets/Bubble/history/img/bubble-grey/bubble_BC.png
share/RetroShare06/stylesheets/Bubble/history/img/bubble-grey/bubble_BL.png
share/RetroShare06/stylesheets/Bubble/history/img/bubble-grey/bubble_BR.png
share/RetroShare06/stylesheets/Bubble/history/img/bubble-grey/bubble_CC.png
share/RetroShare06/stylesheets/Bubble/history/img/bubble-grey/bubble_CL.png
share/RetroShare06/stylesheets/Bubble/history/img/bubble-grey/bubble_CR.png
share/RetroShare06/stylesheets/Bubble/history/img/bubble-grey/bubble_TC.png
share/RetroShare06/stylesheets/Bubble/history/img/bubble-grey/bubble_TL.png
share/RetroShare06/stylesheets/Bubble/history/img/bubble-grey/bubble_TR.png
share/RetroShare06/stylesheets/Bubble/history/img/bubble-grey/bubble_tick-left.png
share/RetroShare06/stylesheets/Bubble/history/img/bubble-grey/bubble_tick-right.png
share/RetroShare06/stylesheets/Bubble/history/img/bubble-grey/bubble_tick.png
share/RetroShare06/stylesheets/Bubble/history/img/bubble-orange/bubble_BC.png
share/RetroShare06/stylesheets/Bubble/history/img/bubble-orange/bubble_BL.png
share/RetroShare06/stylesheets/Bubble/history/img/bubble-orange/bubble_BR.png
share/RetroShare06/stylesheets/Bubble/history/img/bubble-orange/bubble_CC.png
share/RetroShare06/stylesheets/Bubble/history/img/bubble-orange/bubble_CL.png
share/RetroShare06/stylesheets/Bubble/history/img/bubble-orange/bubble_CR.png
share/RetroShare06/stylesheets/Bubble/history/img/bubble-orange/bubble_TC.png
share/RetroShare06/stylesheets/Bubble/history/img/bubble-orange/bubble_TL.png
share/RetroShare06/stylesheets/Bubble/history/img/bubble-orange/bubble_TR.png
share/RetroShare06/stylesheets/Bubble/history/img/bubble-orange/bubble_tick-left.png
share/RetroShare06/stylesheets/Bubble/history/img/bubble-orange/bubble_tick-right.png
share/RetroShare06/stylesheets/Bubble/history/img/bubble-orange/bubble_tick.png
share/RetroShare06/stylesheets/Bubble/history/img/bubble-red/bubble_BC.png
share/RetroShare06/stylesheets/Bubble/history/img/bubble-red/bubble_BL.png
share/RetroShare06/stylesheets/Bubble/history/img/bubble-red/bubble_BR.png
share/RetroShare06/stylesheets/Bubble/history/img/bubble-red/bubble_CC.png
share/RetroShare06/stylesheets/Bubble/history/img/bubble-red/bubble_CL.png
share/RetroShare06/stylesheets/Bubble/history/img/bubble-red/bubble_CR.png
share/RetroShare06/stylesheets/Bubble/history/img/bubble-red/bubble_TC.png
share/RetroShare06/stylesheets/Bubble/history/img/bubble-red/bubble_TL.png
share/RetroShare06/stylesheets/Bubble/history/img/bubble-red/bubble_TR.png
share/RetroShare06/stylesheets/Bubble/history/img/bubble-red/bubble_tick-left.png
share/RetroShare06/stylesheets/Bubble/history/img/bubble-red/bubble_tick-right.png
share/RetroShare06/stylesheets/Bubble/history/img/bubble-red/bubble_tick.png
share/RetroShare06/stylesheets/Bubble/history/incoming.htm
share/RetroShare06/stylesheets/Bubble/history/info.xml
share/RetroShare06/stylesheets/Bubble/history/main.css
share/RetroShare06/stylesheets/Bubble/history/ooutgoing.htm
share/RetroShare06/stylesheets/Bubble/history/outgoing.htm
share/RetroShare06/stylesheets/Bubble/history/system.htm
share/RetroShare06/stylesheets/Bubble/history/variants/color.css
share/RetroShare06/stylesheets/Bubble/history/variants/standard.css
share/RetroShare06/stylesheets/Bubble/private/hincoming.htm
share/RetroShare06/stylesheets/Bubble/private/houtgoing.htm
share/RetroShare06/stylesheets/Bubble/private/images.sh
share/RetroShare06/stylesheets/Bubble/private/img/bubble-blue/bubble_BC.png
share/RetroShare06/stylesheets/Bubble/private/img/bubble-blue/bubble_BL.png
share/RetroShare06/stylesheets/Bubble/private/img/bubble-blue/bubble_BR.png
share/RetroShare06/stylesheets/Bubble/private/img/bubble-blue/bubble_CC.png
share/RetroShare06/stylesheets/Bubble/private/img/bubble-blue/bubble_CL.png
share/RetroShare06/stylesheets/Bubble/private/img/bubble-blue/bubble_CR.png
share/RetroShare06/stylesheets/Bubble/private/img/bubble-blue/bubble_TC.png
share/RetroShare06/stylesheets/Bubble/private/img/bubble-blue/bubble_TL.png
share/RetroShare06/stylesheets/Bubble/private/img/bubble-blue/bubble_TR.png
share/RetroShare06/stylesheets/Bubble/private/img/bubble-blue/bubble_tick-left.png
share/RetroShare06/stylesheets/Bubble/private/img/bubble-blue/bubble_tick-right.png
share/RetroShare06/stylesheets/Bubble/private/img/bubble-blue/bubble_tick.png
share/RetroShare06/stylesheets/Bubble/private/img/bubble-green/bubble_BC.png
share/RetroShare06/stylesheets/Bubble/private/img/bubble-green/bubble_BL.png
share/RetroShare06/stylesheets/Bubble/private/img/bubble-green/bubble_BR.png
share/RetroShare06/stylesheets/Bubble/private/img/bubble-green/bubble_CC.png
share/RetroShare06/stylesheets/Bubble/private/img/bubble-green/bubble_CL.png
share/RetroShare06/stylesheets/Bubble/private/img/bubble-green/bubble_CR.png
share/RetroShare06/stylesheets/Bubble/private/img/bubble-green/bubble_TC.png
share/RetroShare06/stylesheets/Bubble/private/img/bubble-green/bubble_TL.png
share/RetroShare06/stylesheets/Bubble/private/img/bubble-green/bubble_TR.png
share/RetroShare06/stylesheets/Bubble/private/img/bubble-green/bubble_tick-left.png
share/RetroShare06/stylesheets/Bubble/private/img/bubble-green/bubble_tick-right.png
share/RetroShare06/stylesheets/Bubble/private/img/bubble-green/bubble_tick.png
share/RetroShare06/stylesheets/Bubble/private/img/bubble-grey/bubble_BC.png
share/RetroShare06/stylesheets/Bubble/private/img/bubble-grey/bubble_BL.png
share/RetroShare06/stylesheets/Bubble/private/img/bubble-grey/bubble_BR.png
share/RetroShare06/stylesheets/Bubble/private/img/bubble-grey/bubble_CC.png
share/RetroShare06/stylesheets/Bubble/private/img/bubble-grey/bubble_CL.png
share/RetroShare06/stylesheets/Bubble/private/img/bubble-grey/bubble_CR.png
share/RetroShare06/stylesheets/Bubble/private/img/bubble-grey/bubble_TC.png
share/RetroShare06/stylesheets/Bubble/private/img/bubble-grey/bubble_TL.png
share/RetroShare06/stylesheets/Bubble/private/img/bubble-grey/bubble_TR.png
share/RetroShare06/stylesheets/Bubble/private/img/bubble-grey/bubble_tick-left.png
share/RetroShare06/stylesheets/Bubble/private/img/bubble-grey/bubble_tick-right.png
share/RetroShare06/stylesheets/Bubble/private/img/bubble-grey/bubble_tick.png
share/RetroShare06/stylesheets/Bubble/private/img/bubble-orange/bubble_BC.png
share/RetroShare06/stylesheets/Bubble/private/img/bubble-orange/bubble_BL.png
share/RetroShare06/stylesheets/Bubble/private/img/bubble-orange/bubble_BR.png
share/RetroShare06/stylesheets/Bubble/private/img/bubble-orange/bubble_CC.png
share/RetroShare06/stylesheets/Bubble/private/img/bubble-orange/bubble_CL.png
share/RetroShare06/stylesheets/Bubble/private/img/bubble-orange/bubble_CR.png
share/RetroShare06/stylesheets/Bubble/private/img/bubble-orange/bubble_TC.png
share/RetroShare06/stylesheets/Bubble/private/img/bubble-orange/bubble_TL.png
share/RetroShare06/stylesheets/Bubble/private/img/bubble-orange/bubble_TR.png
share/RetroShare06/stylesheets/Bubble/private/img/bubble-orange/bubble_tick-left.png
share/RetroShare06/stylesheets/Bubble/private/img/bubble-orange/bubble_tick-right.png
share/RetroShare06/stylesheets/Bubble/private/img/bubble-orange/bubble_tick.png
share/RetroShare06/stylesheets/Bubble/private/img/bubble-red/bubble_BC.png
share/RetroShare06/stylesheets/Bubble/private/img/bubble-red/bubble_BL.png
share/RetroShare06/stylesheets/Bubble/private/img/bubble-red/bubble_BR.png
share/RetroShare06/stylesheets/Bubble/private/img/bubble-red/bubble_CC.png
share/RetroShare06/stylesheets/Bubble/private/img/bubble-red/bubble_CL.png
share/RetroShare06/stylesheets/Bubble/private/img/bubble-red/bubble_CR.png
share/RetroShare06/stylesheets/Bubble/private/img/bubble-red/bubble_TC.png
share/RetroShare06/stylesheets/Bubble/private/img/bubble-red/bubble_TL.png
share/RetroShare06/stylesheets/Bubble/private/img/bubble-red/bubble_TR.png
share/RetroShare06/stylesheets/Bubble/private/img/bubble-red/bubble_tick-left.png
share/RetroShare06/stylesheets/Bubble/private/img/bubble-red/bubble_tick-right.png
share/RetroShare06/stylesheets/Bubble/private/img/bubble-red/bubble_tick.png
share/RetroShare06/stylesheets/Bubble/private/incoming.htm
share/RetroShare06/stylesheets/Bubble/private/info.xml
share/RetroShare06/stylesheets/Bubble/private/main.css
share/RetroShare06/stylesheets/Bubble/private/ooutgoing.htm
share/RetroShare06/stylesheets/Bubble/private/outgoing.htm
share/RetroShare06/stylesheets/Bubble/private/system.htm
share/RetroShare06/stylesheets/Bubble/private/variants/color.css
share/RetroShare06/stylesheets/Bubble/private/variants/standard.css
share/RetroShare06/stylesheets/Bubble/public/hincoming.htm
share/RetroShare06/stylesheets/Bubble/public/houtgoing.htm
share/RetroShare06/stylesheets/Bubble/public/images.sh
share/RetroShare06/stylesheets/Bubble/public/img/bubble-blue/bubble_BC.png
share/RetroShare06/stylesheets/Bubble/public/img/bubble-blue/bubble_BL.png
share/RetroShare06/stylesheets/Bubble/public/img/bubble-blue/bubble_BR.png
share/RetroShare06/stylesheets/Bubble/public/img/bubble-blue/bubble_CC.png
share/RetroShare06/stylesheets/Bubble/public/img/bubble-blue/bubble_CL.png
share/RetroShare06/stylesheets/Bubble/public/img/bubble-blue/bubble_CR.png
share/RetroShare06/stylesheets/Bubble/public/img/bubble-blue/bubble_TC.png
share/RetroShare06/stylesheets/Bubble/public/img/bubble-blue/bubble_TL.png
share/RetroShare06/stylesheets/Bubble/public/img/bubble-blue/bubble_TR.png
share/RetroShare06/stylesheets/Bubble/public/img/bubble-blue/bubble_tick-left.png
share/RetroShare06/stylesheets/Bubble/public/img/bubble-blue/bubble_tick-right.png
share/RetroShare06/stylesheets/Bubble/public/img/bubble-blue/bubble_tick.png
share/RetroShare06/stylesheets/Bubble/public/img/bubble-green/bubble_BC.png
share/RetroShare06/stylesheets/Bubble/public/img/bubble-green/bubble_BL.png
share/RetroShare06/stylesheets/Bubble/public/img/bubble-green/bubble_BR.png
share/RetroShare06/stylesheets/Bubble/public/img/bubble-green/bubble_CC.png
share/RetroShare06/stylesheets/Bubble/public/img/bubble-green/bubble_CL.png
share/RetroShare06/stylesheets/Bubble/public/img/bubble-green/bubble_CR.png
share/RetroShare06/stylesheets/Bubble/public/img/bubble-green/bubble_TC.png
share/RetroShare06/stylesheets/Bubble/public/img/bubble-green/bubble_TL.png
share/RetroShare06/stylesheets/Bubble/public/img/bubble-green/bubble_TR.png
share/RetroShare06/stylesheets/Bubble/public/img/bubble-green/bubble_tick-left.png
share/RetroShare06/stylesheets/Bubble/public/img/bubble-green/bubble_tick-right.png
share/RetroShare06/stylesheets/Bubble/public/img/bubble-green/bubble_tick.png
share/RetroShare06/stylesheets/Bubble/public/img/bubble-grey/bubble_BC.png
share/RetroShare06/stylesheets/Bubble/public/img/bubble-grey/bubble_BL.png
share/RetroShare06/stylesheets/Bubble/public/img/bubble-grey/bubble_BR.png
share/RetroShare06/stylesheets/Bubble/public/img/bubble-grey/bubble_CC.png
share/RetroShare06/stylesheets/Bubble/public/img/bubble-grey/bubble_CL.png
share/RetroShare06/stylesheets/Bubble/public/img/bubble-grey/bubble_CR.png
share/RetroShare06/stylesheets/Bubble/public/img/bubble-grey/bubble_TC.png
share/RetroShare06/stylesheets/Bubble/public/img/bubble-grey/bubble_TL.png
share/RetroShare06/stylesheets/Bubble/public/img/bubble-grey/bubble_TR.png
share/RetroShare06/stylesheets/Bubble/public/img/bubble-grey/bubble_tick-left.png
share/RetroShare06/stylesheets/Bubble/public/img/bubble-grey/bubble_tick-right.png
share/RetroShare06/stylesheets/Bubble/public/img/bubble-grey/bubble_tick.png
share/RetroShare06/stylesheets/Bubble/public/img/bubble-orange/bubble_BC.png
share/RetroShare06/stylesheets/Bubble/public/img/bubble-orange/bubble_BL.png
share/RetroShare06/stylesheets/Bubble/public/img/bubble-orange/bubble_BR.png
share/RetroShare06/stylesheets/Bubble/public/img/bubble-orange/bubble_CC.png
share/RetroShare06/stylesheets/Bubble/public/img/bubble-orange/bubble_CL.png
share/RetroShare06/stylesheets/Bubble/public/img/bubble-orange/bubble_CR.png
share/RetroShare06/stylesheets/Bubble/public/img/bubble-orange/bubble_TC.png
share/RetroShare06/stylesheets/Bubble/public/img/bubble-orange/bubble_TL.png
share/RetroShare06/stylesheets/Bubble/public/img/bubble-orange/bubble_TR.png
share/RetroShare06/stylesheets/Bubble/public/img/bubble-orange/bubble_tick-left.png
share/RetroShare06/stylesheets/Bubble/public/img/bubble-orange/bubble_tick-right.png
share/RetroShare06/stylesheets/Bubble/public/img/bubble-orange/bubble_tick.png
share/RetroShare06/stylesheets/Bubble/public/img/bubble-red/bubble_BC.png
share/RetroShare06/stylesheets/Bubble/public/img/bubble-red/bubble_BL.png
share/RetroShare06/stylesheets/Bubble/public/img/bubble-red/bubble_BR.png
share/RetroShare06/stylesheets/Bubble/public/img/bubble-red/bubble_CC.png
share/RetroShare06/stylesheets/Bubble/public/img/bubble-red/bubble_CL.png
share/RetroShare06/stylesheets/Bubble/public/img/bubble-red/bubble_CR.png
share/RetroShare06/stylesheets/Bubble/public/img/bubble-red/bubble_TC.png
share/RetroShare06/stylesheets/Bubble/public/img/bubble-red/bubble_TL.png
share/RetroShare06/stylesheets/Bubble/public/img/bubble-red/bubble_TR.png
share/RetroShare06/stylesheets/Bubble/public/img/bubble-red/bubble_tick-left.png
share/RetroShare06/stylesheets/Bubble/public/img/bubble-red/bubble_tick-right.png
share/RetroShare06/stylesheets/Bubble/public/img/bubble-red/bubble_tick.png
share/RetroShare06/stylesheets/Bubble/public/incoming.htm
share/RetroShare06/stylesheets/Bubble/public/info.xml
share/RetroShare06/stylesheets/Bubble/public/main.css
share/RetroShare06/stylesheets/Bubble/public/ooutgoing.htm
share/RetroShare06/stylesheets/Bubble/public/outgoing.htm
share/RetroShare06/stylesheets/Bubble/public/system.htm
share/RetroShare06/stylesheets/Bubble/public/variants/color.css
share/RetroShare06/stylesheets/Bubble/public/variants/standard.css
share/RetroShare06/stylesheets/Bubble/src/images.sh
share/RetroShare06/stylesheets/Bubble/src/img.svg
share/RetroShare06/stylesheets/Bubble/src/img/bubble-blue/bubble_BC.png
share/RetroShare06/stylesheets/Bubble/src/img/bubble-blue/bubble_BL.png
share/RetroShare06/stylesheets/Bubble/src/img/bubble-blue/bubble_BR.png
share/RetroShare06/stylesheets/Bubble/src/img/bubble-blue/bubble_CC.png
share/RetroShare06/stylesheets/Bubble/src/img/bubble-blue/bubble_CL.png
share/RetroShare06/stylesheets/Bubble/src/img/bubble-blue/bubble_CR.png
share/RetroShare06/stylesheets/Bubble/src/img/bubble-blue/bubble_TC.png
share/RetroShare06/stylesheets/Bubble/src/img/bubble-blue/bubble_TL.png
share/RetroShare06/stylesheets/Bubble/src/img/bubble-blue/bubble_TR.png
share/RetroShare06/stylesheets/Bubble/src/img/bubble-blue/bubble_tick-left.png
share/RetroShare06/stylesheets/Bubble/src/img/bubble-blue/bubble_tick-right.png
share/RetroShare06/stylesheets/Bubble/src/img/bubble-blue/bubble_tick.png
share/RetroShare06/stylesheets/Bubble/src/img/bubble-green/bubble_BC.png
share/RetroShare06/stylesheets/Bubble/src/img/bubble-green/bubble_BL.png
share/RetroShare06/stylesheets/Bubble/src/img/bubble-green/bubble_BR.png
share/RetroShare06/stylesheets/Bubble/src/img/bubble-green/bubble_CC.png
share/RetroShare06/stylesheets/Bubble/src/img/bubble-green/bubble_CL.png
share/RetroShare06/stylesheets/Bubble/src/img/bubble-green/bubble_CR.png
share/RetroShare06/stylesheets/Bubble/src/img/bubble-green/bubble_TC.png
share/RetroShare06/stylesheets/Bubble/src/img/bubble-green/bubble_TL.png
share/RetroShare06/stylesheets/Bubble/src/img/bubble-green/bubble_TR.png
share/RetroShare06/stylesheets/Bubble/src/img/bubble-green/bubble_tick-left.png
share/RetroShare06/stylesheets/Bubble/src/img/bubble-green/bubble_tick-right.png
share/RetroShare06/stylesheets/Bubble/src/img/bubble-green/bubble_tick.png
share/RetroShare06/stylesheets/Bubble/src/img/bubble-grey/bubble_BC.png
share/RetroShare06/stylesheets/Bubble/src/img/bubble-grey/bubble_BL.png
share/RetroShare06/stylesheets/Bubble/src/img/bubble-grey/bubble_BR.png
share/RetroShare06/stylesheets/Bubble/src/img/bubble-grey/bubble_CC.png
share/RetroShare06/stylesheets/Bubble/src/img/bubble-grey/bubble_CL.png
share/RetroShare06/stylesheets/Bubble/src/img/bubble-grey/bubble_CR.png
share/RetroShare06/stylesheets/Bubble/src/img/bubble-grey/bubble_TC.png
share/RetroShare06/stylesheets/Bubble/src/img/bubble-grey/bubble_TL.png
share/RetroShare06/stylesheets/Bubble/src/img/bubble-grey/bubble_TR.png
share/RetroShare06/stylesheets/Bubble/src/img/bubble-grey/bubble_tick-left.png
share/RetroShare06/stylesheets/Bubble/src/img/bubble-grey/bubble_tick-right.png
share/RetroShare06/stylesheets/Bubble/src/img/bubble-grey/bubble_tick.png
share/RetroShare06/stylesheets/Bubble/src/img/bubble-orange/bubble_BC.png
share/RetroShare06/stylesheets/Bubble/src/img/bubble-orange/bubble_BL.png
share/RetroShare06/stylesheets/Bubble/src/img/bubble-orange/bubble_BR.png
share/RetroShare06/stylesheets/Bubble/src/img/bubble-orange/bubble_CC.png
share/RetroShare06/stylesheets/Bubble/src/img/bubble-orange/bubble_CL.png
share/RetroShare06/stylesheets/Bubble/src/img/bubble-orange/bubble_CR.png
share/RetroShare06/stylesheets/Bubble/src/img/bubble-orange/bubble_TC.png
share/RetroShare06/stylesheets/Bubble/src/img/bubble-orange/bubble_TL.png
share/RetroShare06/stylesheets/Bubble/src/img/bubble-orange/bubble_TR.png
share/RetroShare06/stylesheets/Bubble/src/img/bubble-orange/bubble_tick-left.png
share/RetroShare06/stylesheets/Bubble/src/img/bubble-orange/bubble_tick-right.png
share/RetroShare06/stylesheets/Bubble/src/img/bubble-orange/bubble_tick.png
share/RetroShare06/stylesheets/Bubble/src/img/bubble-red/bubble_BC.png
share/RetroShare06/stylesheets/Bubble/src/img/bubble-red/bubble_BL.png
share/RetroShare06/stylesheets/Bubble/src/img/bubble-red/bubble_BR.png
share/RetroShare06/stylesheets/Bubble/src/img/bubble-red/bubble_CC.png
share/RetroShare06/stylesheets/Bubble/src/img/bubble-red/bubble_CL.png
share/RetroShare06/stylesheets/Bubble/src/img/bubble-red/bubble_CR.png
share/RetroShare06/stylesheets/Bubble/src/img/bubble-red/bubble_TC.png
share/RetroShare06/stylesheets/Bubble/src/img/bubble-red/bubble_TL.png
share/RetroShare06/stylesheets/Bubble/src/img/bubble-red/bubble_TR.png
share/RetroShare06/stylesheets/Bubble/src/img/bubble-red/bubble_tick-left.png
share/RetroShare06/stylesheets/Bubble/src/img/bubble-red/bubble_tick-right.png
share/RetroShare06/stylesheets/Bubble/src/img/bubble-red/bubble_tick.png
share/RetroShare06/stylesheets/Bubble_Compact/private/Kopie von incoming.htm
share/RetroShare06/stylesheets/Bubble_Compact/private/hincoming.htm
share/RetroShare06/stylesheets/Bubble_Compact/private/houtgoing.htm
share/RetroShare06/stylesheets/Bubble_Compact/private/images.sh
share/RetroShare06/stylesheets/Bubble_Compact/private/img/bubble-blue/bubble_BC.png
share/RetroShare06/stylesheets/Bubble_Compact/private/img/bubble-blue/bubble_BL.png
share/RetroShare06/stylesheets/Bubble_Compact/private/img/bubble-blue/bubble_BR.png
share/RetroShare06/stylesheets/Bubble_Compact/private/img/bubble-blue/bubble_CC.png
share/RetroShare06/stylesheets/Bubble_Compact/private/img/bubble-blue/bubble_CL.png
share/RetroShare06/stylesheets/Bubble_Compact/private/img/bubble-blue/bubble_CR.png
share/RetroShare06/stylesheets/Bubble_Compact/private/img/bubble-blue/bubble_TC.png
share/RetroShare06/stylesheets/Bubble_Compact/private/img/bubble-blue/bubble_TL.png
share/RetroShare06/stylesheets/Bubble_Compact/private/img/bubble-blue/bubble_TR.png
share/RetroShare06/stylesheets/Bubble_Compact/private/img/bubble-blue/bubble_tick-left.png
share/RetroShare06/stylesheets/Bubble_Compact/private/img/bubble-blue/bubble_tick-right.png
share/RetroShare06/stylesheets/Bubble_Compact/private/img/bubble-blue/bubble_tick.png
share/RetroShare06/stylesheets/Bubble_Compact/private/img/bubble-green/bubble_BC.png
share/RetroShare06/stylesheets/Bubble_Compact/private/img/bubble-green/bubble_BL.png
share/RetroShare06/stylesheets/Bubble_Compact/private/img/bubble-green/bubble_BR.png
share/RetroShare06/stylesheets/Bubble_Compact/private/img/bubble-green/bubble_CC.png
share/RetroShare06/stylesheets/Bubble_Compact/private/img/bubble-green/bubble_CL.png
share/RetroShare06/stylesheets/Bubble_Compact/private/img/bubble-green/bubble_CR.png
share/RetroShare06/stylesheets/Bubble_Compact/private/img/bubble-green/bubble_TC.png
share/RetroShare06/stylesheets/Bubble_Compact/private/img/bubble-green/bubble_TL.png
share/RetroShare06/stylesheets/Bubble_Compact/private/img/bubble-green/bubble_TR.png
share/RetroShare06/stylesheets/Bubble_Compact/private/img/bubble-green/bubble_tick-left.png
share/RetroShare06/stylesheets/Bubble_Compact/private/img/bubble-green/bubble_tick-right.png
share/RetroShare06/stylesheets/Bubble_Compact/private/img/bubble-green/bubble_tick.png
share/RetroShare06/stylesheets/Bubble_Compact/private/img/bubble-grey/bubble_BC.png
share/RetroShare06/stylesheets/Bubble_Compact/private/img/bubble-grey/bubble_BL.png
share/RetroShare06/stylesheets/Bubble_Compact/private/img/bubble-grey/bubble_BR.png
share/RetroShare06/stylesheets/Bubble_Compact/private/img/bubble-grey/bubble_CC.png
share/RetroShare06/stylesheets/Bubble_Compact/private/img/bubble-grey/bubble_CL.png
share/RetroShare06/stylesheets/Bubble_Compact/private/img/bubble-grey/bubble_CR.png
share/RetroShare06/stylesheets/Bubble_Compact/private/img/bubble-grey/bubble_TC.png
share/RetroShare06/stylesheets/Bubble_Compact/private/img/bubble-grey/bubble_TL.png
share/RetroShare06/stylesheets/Bubble_Compact/private/img/bubble-grey/bubble_TR.png
share/RetroShare06/stylesheets/Bubble_Compact/private/img/bubble-grey/bubble_tick-left.png
share/RetroShare06/stylesheets/Bubble_Compact/private/img/bubble-grey/bubble_tick-right.png
share/RetroShare06/stylesheets/Bubble_Compact/private/img/bubble-grey/bubble_tick.png
share/RetroShare06/stylesheets/Bubble_Compact/private/img/bubble-orange/bubble_BC.png
share/RetroShare06/stylesheets/Bubble_Compact/private/img/bubble-orange/bubble_BL.png
share/RetroShare06/stylesheets/Bubble_Compact/private/img/bubble-orange/bubble_BR.png
share/RetroShare06/stylesheets/Bubble_Compact/private/img/bubble-orange/bubble_CC.png
share/RetroShare06/stylesheets/Bubble_Compact/private/img/bubble-orange/bubble_CL.png
share/RetroShare06/stylesheets/Bubble_Compact/private/img/bubble-orange/bubble_CR.png
share/RetroShare06/stylesheets/Bubble_Compact/private/img/bubble-orange/bubble_TC.png
share/RetroShare06/stylesheets/Bubble_Compact/private/img/bubble-orange/bubble_TL.png
share/RetroShare06/stylesheets/Bubble_Compact/private/img/bubble-orange/bubble_TR.png
share/RetroShare06/stylesheets/Bubble_Compact/private/img/bubble-orange/bubble_tick-left.png
share/RetroShare06/stylesheets/Bubble_Compact/private/img/bubble-orange/bubble_tick-right.png
share/RetroShare06/stylesheets/Bubble_Compact/private/img/bubble-orange/bubble_tick.png
share/RetroShare06/stylesheets/Bubble_Compact/private/img/bubble-red/bubble_BC.png
share/RetroShare06/stylesheets/Bubble_Compact/private/img/bubble-red/bubble_BL.png
share/RetroShare06/stylesheets/Bubble_Compact/private/img/bubble-red/bubble_BR.png
share/RetroShare06/stylesheets/Bubble_Compact/private/img/bubble-red/bubble_CC.png
share/RetroShare06/stylesheets/Bubble_Compact/private/img/bubble-red/bubble_CL.png
share/RetroShare06/stylesheets/Bubble_Compact/private/img/bubble-red/bubble_CR.png
share/RetroShare06/stylesheets/Bubble_Compact/private/img/bubble-red/bubble_TC.png
share/RetroShare06/stylesheets/Bubble_Compact/private/img/bubble-red/bubble_TL.png
share/RetroShare06/stylesheets/Bubble_Compact/private/img/bubble-red/bubble_TR.png
share/RetroShare06/stylesheets/Bubble_Compact/private/img/bubble-red/bubble_tick-left.png
share/RetroShare06/stylesheets/Bubble_Compact/private/img/bubble-red/bubble_tick-right.png
share/RetroShare06/stylesheets/Bubble_Compact/private/img/bubble-red/bubble_tick.png
share/RetroShare06/stylesheets/Bubble_Compact/private/incoming.htm
share/RetroShare06/stylesheets/Bubble_Compact/private/info.xml
share/RetroShare06/stylesheets/Bubble_Compact/private/main.css
share/RetroShare06/stylesheets/Bubble_Compact/private/ooutgoing.htm
share/RetroShare06/stylesheets/Bubble_Compact/private/outgoing.htm
share/RetroShare06/stylesheets/Bubble_Compact/private/system.htm
share/RetroShare06/stylesheets/Bubble_Compact/private/variants/color.css
share/RetroShare06/stylesheets/Bubble_Compact/private/variants/standard.css
share/RetroShare06/webui/JSXTransformer.js
share/RetroShare06/webui/RsApi.js
share/RetroShare06/webui/RsXHRConnection.js
share/RetroShare06/webui/green-black.css
share/RetroShare06/webui/gui.jsx
share/RetroShare06/webui/img/logo_splash.png
share/RetroShare06/webui/index.html
share/RetroShare06/webui/react.js
share/applications/retroshare06.desktop
share/icons/hicolor/128x128/apps/retroshare06.png
share/icons/hicolor/24x24/apps/retroshare06.png
share/icons/hicolor/48x48/apps/retroshare06.png
share/icons/hicolor/64x64/apps/retroshare06.png
share/pixmaps/retroshare06.xpm

Return to bug 207550

Lines 2-48 Link Here

(-)retroshare-0.6/Makefile (-61 / +21 lines)
2	# $FreeBSD: head/net-p2p/retroshare/Makefile 386312 2015-05-14 10:15:04Z mat $	2	# $FreeBSD: head/net-p2p/retroshare/Makefile 386312 2015-05-14 10:15:04Z mat $
3		3
4	PORTNAME= retroshare	4	PORTNAME= retroshare
5	PORTVERSION= 0.5.5c	5	PORTVERSION= 0.6.0
6	PORTREVISION= 3	6	DISTVERSIONPREFIX= v
7	CATEGORIES= net-p2p	7	CATEGORIES= net-p2p
8	MASTER_SITES= SF/${PORTNAME}/${BINARY}/${PORTVERSION}
9	DISTNAME= ${PORTNAME}_${SRC_VERSION}-${SRC_REVISION}
10		8
11	MAINTAINER= peter@netkey.at	9	MAINTAINER= peter@netkey.at
12	COMMENT= Private and secure decentralised communication platform	10	COMMENT= Private and secure decentralised communication platform
13		11
14	LICENSE= GPLv2	12	LICENSE= GPLv2
15		13
16	BUILD_DEPENDS= protoc:${PORTSDIR}/devel/protobuf	14	LIB_DEPENDS= libsqlcipher.so:${PORTSDIR}/databases/sqlcipher \
17	LIB_DEPENDS= libcurl.so:${PORTSDIR}/ftp/curl \
18	libupnp.so:${PORTSDIR}/devel/upnp \
19	libgnome-keyring.so:${PORTSDIR}/security/libgnome-keyring \	15	libgnome-keyring.so:${PORTSDIR}/security/libgnome-keyring \
20	libspeex.so:${PORTSDIR}/audio/speex \	16	libspeex.so:${PORTSDIR}/audio/speex \
21	libxslt.so:${PORTSDIR}/textproc/libxslt \	17	libupnp.so:${PORTSDIR}/devel/upnp \
22	libssh_threads.so:${PORTSDIR}/security/libssh	18	libgpgme.so:${PORTSDIR}/security/gpgme \
		19	libopencv_highgui.so:${PORTSDIR}/graphics/opencv \
		20	libavcodec.so:${PORTSDIR}/multimedia/ffmpeg \
		21	libmicrohttpd.so:${PORTSDIR}/www/libmicrohttpd
23		22
24	USES= compiler:features dos2unix pkgconfig qmake	23	USES= qmake compiler:features dos2unix execinfo
25	USE_GNOME= glib20 libxml2 libxslt	24	USE_GNOME= glib20 libxml2 libxslt
26	USE_XORG= x11 xscrnsaver	25	USE_QT5= buildtools_build uitools_build core gui network xml \
27	USE_QT4= corelib gui network xml script designer_build uic_build \	26	widgets multimedia printsupport
28	qmake_build moc_build rcc_build multimedia	27	DOS2UNIX_FILES= retroshare-nogui/src/retroshare-nogui.pro
29	HAS_CONFIGURE= yes	28	USE_GITHUB= yes
30		29	GH_ACCOUNT= RetroShare
31	BINARY= RetroShare	30	GH_PROJECT= RetroShare
32	SRC_REVISION= 0.7068	31
33	SRC_VERSION= 0.5.5	32	INSTALLS_ICONS= yes
34	WRKSRC= ${WRKDIR}/${PORTNAME}-${SRC_VERSION}/src
35
36	MAKE_JOBS_UNSAFE=yes
37	USE_LDCONFIG= yes
38
39	DESKTOP_ENTRIES="${BINARY}" "${COMMENT}" "${DATADIR}/retrosharelogo1.png" \
40	"${BINARY}" "Network;FileTransfer;" true
41
42	DOS2UNIX_FILES= retroshare-gui/src/retroshare-gui.pro \
43	retroshare-nogui/src/retroshare-nogui.pro \
44	retroshare-gui/src/gui/RetroShareLink.h \
45	retroshare-gui/src/gui/common/GroupTreeWidget.cpp
46		33
47	.include <bsd.port.pre.mk>	34	.include <bsd.port.pre.mk>
48		35
Lines 57-92 Link Here
57	${WRKSRC}/retroshare-gui/src/retroshare-gui.pro	44	${WRKSRC}/retroshare-gui/src/retroshare-gui.pro
58	@${REINPLACE_CMD} -e 's\|/usr/local\|${LOCALBASE}\|' \	45	@${REINPLACE_CMD} -e 's\|/usr/local\|${LOCALBASE}\|' \
59	${WRKSRC}/retroshare-nogui/src/retroshare-nogui.pro	46	${WRKSRC}/retroshare-nogui/src/retroshare-nogui.pro
60	@${REINPLACE_CMD} -e 's\|/usr/local/share/retroshare\|${DATADIR}\|' \	47	@${REINPLACE_CMD} -e 's\|/usr/bin\|${PREFIX}/bin\|' \
61	${WRKSRC}/libretroshare/src/rsserver/rsinit.cc	48	${WRKSRC}/data/retroshare06.desktop
62	@${REINPLACE_CMD} -e 's\|/usr/local\|${LOCALBASE}\|' \	49	@${REINPLACE_CMD} -e 's\|/usr/share\|${PREFIX}/share\|' \
63	${WRKSRC}/plugins/FeedReader/FeedReader.pro	50	${WRKSRC}/data/retroshare06.desktop
64	@${REINPLACE_CMD} -e 's\|/usr/local/share/retroshare\|${DATADIR}\|' \
65	${WRKSRC}/libretroshare/src/rsserver/rsinit.cc
66	@${REINPLACE_CMD} -e 's\|/usr/lib\|${LOCALBASE}/lib\|' \
67	${WRKSRC}/libretroshare/src/rsserver/rsinit.cc
68
69	post-install:
70	${INSTALL_PROGRAM} ${WRKSRC}/retroshare-gui/src/${BINARY} \
71	${STAGEDIR}${PREFIX}/bin
72	${INSTALL_PROGRAM} ${WRKSRC}/retroshare-nogui/src/retroshare-nogui \
73	${STAGEDIR}${PREFIX}/bin
74	${MKDIR} ${STAGEDIR}${DATADIR}
75	${INSTALL_MAN} ${WRKSRC}/libbitdht/src/example/bdboot.txt \
76	${STAGEDIR}${DATADIR}
77	${INSTALL_DATA} ${WRKSRC}/retroshare-gui/src/gui/images/retrosharelogo1.png \
78	${STAGEDIR}${DATADIR}
79	${MKDIR} ${STAGEDIR}${PREFIX}/lib/retroshare
80	${MKDIR} ${STAGEDIR}${PREFIX}/lib/retroshare/extensions
81	${INSTALL_LIB} ${WRKSRC}/plugins/LinksCloud/libLinksCloud.so.1.0.0 \
82	${STAGEDIR}${PREFIX}/lib/retroshare/extensions/libLinksCloud.so.1
83	${INSTALL_LIB} ${WRKSRC}/plugins/VOIP/libVOIP.so.1.0.0 \
84	${STAGEDIR}${PREFIX}/lib/retroshare/extensions/libVOIP.so.1
85	${INSTALL_LIB} ${WRKSRC}/plugins/FeedReader/libFeedReader.so.1.0.0 \
86	${STAGEDIR}${PREFIX}/lib/retroshare/extensions/libFeedReader.so.1
87	@cd ${STAGEDIR}${PREFIX}/lib/retroshare/extensions && \
88	${LN} -s libLinksCloud.so.1 libLinksCloud.so && \
89	${LN} -s libVOIP.so.1 libVOIP.so && \
90	${LN} -s libFeedReader.so.1 libFeedReader.so
91		51
92	.include <bsd.port.post.mk>	52	.include <bsd.port.post.mk>

Lines 1-145 Link Here

(-)retroshare-0.6/files/patch-clang (-145 lines)
1	--- libretroshare/src/retroshare/rsconfig.h.orig
2	+++ libretroshare/src/retroshare/rsconfig.h
3	@@ -31,6 +31,8 @@
4	#include <list>
5	#include <map>
6
7	+#include <time.h>
8	+
9	/* The New Config Interface Class */
10	class RsServerConfig;
11	extern RsServerConfig *rsConfig;
12	--- libretroshare/src/retroshare/rsflags.h.orig
13	+++ libretroshare/src/retroshare/rsflags.h
14	@@ -1,6 +1,7 @@
15	#pragma once
16
17	#include <stdint.h>
18	+#include <ostream>
19
20	// This class provides a representation for flags that can be combined with bitwise
21	// operations. However, because the class is templated with an id, it's not possible to
22	--- libretroshare/src/retroshare/rsgxsifacetypes.h.orig
23	+++ libretroshare/src/retroshare/rsgxsifacetypes.h
24	@@ -12,6 +12,8 @@
25	#include <vector>
26	#include <string>
27	#include <inttypes.h>
28	+
29	+#include <time.h>
30
31
32	typedef std::string RsGxsGroupId;
33	--- plugins/FeedReader/interface/rsFeedReader.h.orig
34	+++ plugins/FeedReader/interface/rsFeedReader.h
35	@@ -26,6 +26,8 @@
36	#include <string>
37	#include <list>
38
39	+#include <time.h>
40	+
41	class RsFeedReader;
42	extern RsFeedReader *rsFeedReader;
43
44	--- plugins/LinksCloud/rsrank.h.orig
45	+++ plugins/LinksCloud/rsrank.h
46	@@ -30,6 +30,8 @@
47	#include <string>
48	#include <list>
49
50	+#include <time.h>
51	+
52	/* The Main Interface Class - for information about your Peers */
53	class RsRanks;
54	extern RsRanks *rsRanks;
55	--- retroshare-gui/src/gui/CreateMsgLinkDialog.h.orig
56	+++ retroshare-gui/src/gui/CreateMsgLinkDialog.h
57	@@ -23,6 +23,8 @@
58
59	#include "ui_CreateMsgLinkDialog.h"
60
61	+#include <time.h>
62	+
63	class FriendSelectionWidget ;
64
65	class CreateMsgLinkDialog : public QDialog, public Ui::CreateMsgLinkDialog
66	--- retroshare-gui/src/gui/RetroShareLink.h.orig
67	+++ retroshare-gui/src/gui/RetroShareLink.h
68	@@ -33,6 +33,7 @@
69	// -------------+----------------+--------------------------+------------------+-------------+-------------
70	//
71	#include <stdint.h>
72	+#include <time.h>
73	#include <QString>
74	#include <QVector>
75	#include <QUrl>
76	--- retroshare-gui/src/gui/common/GroupTreeWidget.cpp.orig
77	+++ retroshare-gui/src/gui/common/GroupTreeWidget.cpp
78	@@ -502,7 +502,7 @@ void GroupTreeWidget::calculateScore(QTr
79
80	/* Find out which has given word in it */
81	QTreeWidgetItemIterator itemIterator(ui->treeWidget);
82	- QTreeWidgetItem *item;
83	+ // QTreeWidgetItem *item;
84	while ((item = *itemIterator) != NULL) {
85	itemIterator++;
86
87	--- retroshare-gui/src/gui/connect/ConnectProgressDialog.h.orig
88	+++ retroshare-gui/src/gui/connect/ConnectProgressDialog.h
89	@@ -29,6 +29,7 @@
90	#include "ui_ConnectProgressDialog.h"
91
92	#include <stdint.h>
93	+#include <time.h>
94
95	class ConnectProgressDialog : public QDialog
96	{
97	--- retroshare-gui/src/./util/DateTime.h.orig
98	+++ retroshare-gui/src/./util/DateTime.h
99	@@ -24,6 +24,8 @@
100
101	#include <QString>
102
103	+#include <time.h>
104	+
105	class QDateTime;
106	class QDate;
107	class QTime;
108	--- libretroshare/src/util/argstream.h.orig
109	+++ libretroshare/src/util/argstream.h
110	@@ -141,9 +141,9 @@ namespace
111	inline OptionHolder(char s,
112	const char* l,
113	const char* desc);
114	- friend OptionHolder help(char s='h',
115	- const char* l="help",
116	- const char* desc="Display this help");
117	+ friend OptionHolder help(char s,
118	+ const char* l,
119	+ const char* desc);
120	private:
121	std::string shortName_;
122	std::string longName_;
123	@@ -173,9 +173,9 @@ namespace
124	return OptionHolder(l,b,desc);
125	}
126	inline OptionHolder
127	- help(char s,
128	- const char* l,
129	- const char* desc)
130	+ help(char s='h',
131	+ const char* l="help",
132	+ const char* desc="Display this help")
133	{
134	return OptionHolder(s,l,desc);
135	}
136	--- retroshare-nogui/src/menu/menu.h.orig 2014-01-28 22:57:11.000000000 +0100
137	+++ retroshare-nogui/src/menu/menu.h 2014-04-10 13:51:23.670843012 +0200
138	@@ -27,6 +27,7 @@
139	#define RSNOGUI_MENU_H
140
141	#include <inttypes.h>
142	+#include <time.h>
143
144	#include <string>
145	#include <map>

Line 0 Link Here

(-)retroshare-0.6/files/patch-libbitdht_src_bitdht_bencode.c (+46 lines)
	1	--- libbitdht/src/bitdht/bencode.c.orig 2016-02-05 19:04:46 UTC
	2	+++ libbitdht/src/bitdht/bencode.c
	3	@@ -20,7 +20,6 @@
	4	*/
	5
	6	#include <stdio.h>
	7	-#include <iostream>
	8	#include <stdlib.h> /* malloc() realloc() free() strtoll() */
	9	#include <string.h> /* memset() */
	10	#include "util/bdstring.h"
	11	@@ -115,7 +114,7 @@ static char _be_decode_str(const char
	12
	13	if(_ret == NULL)
	14	{
	15	- std::cerr << "(EE) " << __PRETTY_FUNCTION__ << ": ERROR. cannot allocate memory for " << len+1+sizeof(sllen) << " bytes." << std::endl;
	16	+ //std::cerr << "(EE) " << __PRETTY_FUNCTION__ << ": ERROR. cannot allocate memory for " << len+1+sizeof(sllen) << " bytes." << std::endl;
	17	return NULL;
	18	}
	19
	20	@@ -511,7 +510,7 @@ be_node be_create_str(const char str)
	21
	22	if(_ret == NULL)
	23	{
	24	- std::cerr << "(EE) " << __PRETTY_FUNCTION__ << ": ERROR. cannot allocate memory for " << len+1+sizeof(sllen) << " bytes." << std::endl;
	25	+ //std::cerr << "(EE) " << __PRETTY_FUNCTION__ << ": ERROR. cannot allocate memory for " << len+1+sizeof(sllen) << " bytes." << std::endl;
	26	return NULL;
	27	}
	28	char *ret = NULL;
	29	@@ -536,7 +535,7 @@ be_node be_create_str_wlen(const char
	30
	31	if(_ret == NULL)
	32	{
	33	- std::cerr << "(EE) " << __PRETTY_FUNCTION__ << ": ERROR. cannot allocate memory for " << len+1+sizeof(sllen) << " bytes." << std::endl;
	34	+ //std::cerr << "(EE) " << __PRETTY_FUNCTION__ << ": ERROR. cannot allocate memory for " << len+1+sizeof(sllen) << " bytes." << std::endl;
	35	return NULL;
	36	}
	37	char *ret = NULL;
	38	@@ -584,7 +583,7 @@ int be_add_keypair(be_node *dict, const
	39
	40	if(_ret == NULL)
	41	{
	42	- std::cerr << "(EE) " << __PRETTY_FUNCTION__ << ": ERROR. cannot allocate memory for " << len+1+sizeof(sllen) << " bytes." << std::endl;
	43	+ //std::cerr << "(EE) " << __PRETTY_FUNCTION__ << ": ERROR. cannot allocate memory for " << len+1+sizeof(sllen) << " bytes." << std::endl;
	44	return 0;
	45	}
	46	char *ret = NULL;

Line 0 Link Here

(-)retroshare-0.6/files/patch-libretroshare_src_grouter_p3grouter.h (+20 lines)
	1	--- libretroshare/src/grouter/p3grouter.h.orig 2016-02-05 19:04:46 UTC
	2	+++ libretroshare/src/grouter/p3grouter.h
	3	@@ -225,7 +225,7 @@ private:
	4	void handleLowLevelTransactionAckItem(RsGRouterTransactionAcknItem*) ;
	5
	6	static Sha1CheckSum computeDataItemHash(RsGRouterGenericDataItem *data_item);
	7	-#ifdef __APPLE__
	8	+#if defined(__APPLE__) \|\| defined(__FreeBSD__)
	9	public:
	10	#endif
	11	class nullstream: public std::ostream {};
	12	@@ -236,7 +236,7 @@ public:
	13
	14	return _debug_enabled?(std::cerr):null;
	15	}
	16	-#ifdef __APPLE__
	17	+#if defined(__APPLE__) \|\| defined(__FreeBSD__)
	18	private:
	19	#endif
	20	void routePendingObjects() ;

Lines 1-12 Link Here

(-)retroshare-0.6/files/patch-plugins-FeedReader-FeedReader.pro (-12 lines)
1	--- plugins/FeedReader/FeedReader.pro.orig 2013-10-22 11:53:29.000000000 +0200
2	+++ plugins/FeedReader/FeedReader.pro 2013-10-22 11:54:10.000000000 +0200
3	@@ -101,3 +101,9 @@
4	LIBS += -lcurl -lxml2 -lxslt
5	}
6
7	+freebsd-* {
8	+
9	+ INCLUDEPATH += /usr/local/include/libxml2
10	+
11	+ LIBS += -lcurl -lxml2 -lxslt
12	+}

Line 0 Link Here

(-)retroshare-0.6/files/patch-plugins_VOIP_gui_VideoProcessor.cpp (+21 lines)
	1	--- plugins/VOIP/gui/VideoProcessor.cpp.orig 2016-02-05 19:04:46 UTC
	2	+++ plugins/VOIP/gui/VideoProcessor.cpp
	3	@@ -3,7 +3,7 @@
	4	#ifdef __MACH__
	5	#include <malloc/malloc.h>
	6	#else
	7	-#include <malloc.h>
	8	+#include <stdlib.h>
	9	#endif
	10
	11	#include <QByteArray>
	12	@@ -737,7 +737,8 @@ bool FFmpegVideo::decodeData(const RsVOI
	13	//Mac OS X appears to be 16-byte mem aligned.
	14	unsigned char tmp = (unsigned char)malloc(s + AV_INPUT_BUFFER_PADDING_SIZE) ;
	15	#else //MAC
	16	- unsigned char tmp = (unsigned char)memalign(16, s + AV_INPUT_BUFFER_PADDING_SIZE) ;
	17	+ unsigned char *tmp ;
	18	+ int unused_error = posix_memalign((void **)tmp, 16, s + AV_INPUT_BUFFER_PADDING_SIZE) ;
	19	#endif //MAC
	20	#endif //MINGW
	21	if (tmp == NULL) {

Lines 1-29 Link Here

(-)retroshare-0.6/files/patch-retroshare-gui__src__retroshare-gui.pro (-29 lines)
1	--- retroshare-gui/src/retroshare-gui.pro.orig 2014-04-10 13:28:51.661832058 +0200
2	+++ retroshare-gui/src/retroshare-gui.pro 2014-04-10 13:29:31.092831413 +0200
3	@@ -215,17 +215,22 @@ macx {
4	freebsd-* {
5	INCLUDEPATH *= /usr/local/include/gpgme
6	LIBS *= ../../libretroshare/src/lib/libretroshare.a
7	+ LIBS *= ../../openpgpsdk/src/lib/libops.a -lbz2
8	LIBS *= -lssl
9	- LIBS *= -lgpgme
10	- LIBS *= -lupnp
11	+ LIBS *= -lcrypto
12	+ LIBS *= -lz
13	+ LIBS *= -lupnp -lixml
14	+ LIBS *= -lXss -lX11
15	LIBS *= -lgnome-keyring
16	PRE_TARGETDEPS *= ../../libretroshare/src/lib/libretroshare.a
17	+ PRE_TARGETDEPS *= ../../openpgpsdk/src/lib/libops.a
18
19	gxs {
20	LIBS += ../../supportlibs/pegmarkdown/lib/libpegmarkdown.a
21	- LIBS += -lsqlite3
22	+ LIBS += ../../../lib/sqlcipher/.libs/libsqlcipher.a
23	}
24	-
25	+ LIBS *= -rdynamic
26	+ DEFINES *= HAVE_XSS # for idle time, libx screensaver extensions
27	}
28
29	##################################### OpenBSD ######################################

Lines 1-26 Link Here

(-)retroshare-0.6/files/patch-retroshare-nogui__src__retroshare-nogui.pro (-26 lines)
1	--- retroshare-nogui/src/retroshare-nogui.pro.orig 2014-04-10 14:14:22.622840778 +0200
2	+++ retroshare-nogui/src/retroshare-nogui.pro 2014-04-10 14:14:55.384836372 +0200
3	@@ -114,12 +114,20 @@ macx {
4
5	freebsd-* {
6	INCLUDEPATH *= /usr/local/include/gpgme
7	+ QMAKE_CXXFLAGS *= -Dfseeko64=fseeko -Dftello64=ftello -Dstat64=stat -Dstatvfs64=statvfs -Dfopen64=fopen
8	LIBS *= ../../libretroshare/src/lib/libretroshare.a
9	- LIBS *= -lssl
10	- LIBS *= -lgpgme
11	- LIBS *= -lupnp
12	+ LIBS *= ../../openpgpsdk/src/lib/libops.a -lbz2
13	+ LIBS *= -lssl -lcrypto
14	+ LIBS *= -lz
15	+ LIBS *= -lupnp -lixml
16	LIBS *= -lgnome-keyring
17	PRE_TARGETDEPS *= ../../libretroshare/src/lib/libretroshare.a
18	+ PRE_TARGETDEPS *= ../../openpgpsdk/src/lib/libops.a
19	+ LIBS *= -rdynamic
20	+ gxs {
21	+ # We need a explicit path here, to force using the home version
22	+ LIBS += ../../../lib/sqlcipher/.libs/libsqlcipher.a
23	+ }
24	}
25
26	##################################### OpenBSD ######################################