View | Details | Raw Unified | Return to bug 210682 | Differences between
and this patch

Collapse All | Expand All

(-)net-p2p/retroshare/Makefile (-2 / +8 lines)
Lines 2-8 Link Here
2
# $FreeBSD$
2
# $FreeBSD$
3
3
4
PORTNAME=	retroshare
4
PORTNAME=	retroshare
5
PORTVERSION=	0.6.0
5
PORTVERSION=	0.6.0e
6
PORTREVISION=	1
6
DISTVERSIONPREFIX=	v
7
DISTVERSIONPREFIX=	v
7
CATEGORIES=	net-p2p
8
CATEGORIES=	net-p2p
8
9
Lines 23-29 Link Here
23
		libcurl.so:ftp/curl \
24
		libcurl.so:ftp/curl \
24
		libmicrohttpd.so:www/libmicrohttpd
25
		libmicrohttpd.so:www/libmicrohttpd
25
26
26
USES=		qmake compiler:features dos2unix execinfo pkgconfig
27
USES=		compiler:features desktop-file-utils dos2unix execinfo pkgconfig qmake
27
USE_GNOME=	glib20 libxml2 libxslt
28
USE_GNOME=	glib20 libxml2 libxslt
28
USE_GL=		gl
29
USE_GL=		gl
29
USE_QT5=	buildtools_build uitools_build core gui network xml \
30
USE_QT5=	buildtools_build uitools_build core gui network xml \
Lines 34-39 Link Here
34
USE_GITHUB=	yes
35
USE_GITHUB=	yes
35
GH_ACCOUNT=	RetroShare
36
GH_ACCOUNT=	RetroShare
36
GH_PROJECT=	RetroShare
37
GH_PROJECT=	RetroShare
38
GH_TAGNAME=	9f7ef8b
37
39
38
.include <bsd.port.pre.mk>
40
.include <bsd.port.pre.mk>
39
41
Lines 52-56 Link Here
52
		${WRKSRC}/data/retroshare06.desktop
54
		${WRKSRC}/data/retroshare06.desktop
53
	@${REINPLACE_CMD} -e 's|/usr/share|${PREFIX}/share|' \
55
	@${REINPLACE_CMD} -e 's|/usr/share|${PREFIX}/share|' \
54
		${WRKSRC}/data/retroshare06.desktop
56
		${WRKSRC}/data/retroshare06.desktop
57
.if defined(GH_TAGNAME)
58
	@${REINPLACE_CMD} -e 's|01234567|0${GH_TAGNAME}|' \
59
		${WRKSRC}/libretroshare/src/retroshare/rsversion.h
60
.endif
55
61
56
.include <bsd.port.post.mk>
62
.include <bsd.port.post.mk>
(-)net-p2p/retroshare/distinfo (-2 / +3 lines)
Lines 1-2 Link Here
1
SHA256 (RetroShare-RetroShare-v0.6.0_GH0.tar.gz) = 50b9157bbe407aaefcbf9af1f29392e63148dc060bf78a3b200c9bc09998cf7c
1
TIMESTAMP = 1467176910
2
SIZE (RetroShare-RetroShare-v0.6.0_GH0.tar.gz) = 17436205
2
SHA256 (RetroShare-RetroShare-v0.6.0e-9f7ef8b_GH0.tar.gz) = 0bcffff8814e4ff67458fbaca8e15b11c5a3fdc85ad4c080583c0f9cf32734e7
3
SIZE (RetroShare-RetroShare-v0.6.0e-9f7ef8b_GH0.tar.gz) = 17400160
(-)net-p2p/retroshare/files/patch-libbitdht_src_bitdht_bencode.c (-46 lines)
Lines 1-46 Link Here
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;
(-)net-p2p/retroshare/files/patch-libretroshare_src_grouter_p3grouter.h (-20 lines)
Lines 1-20 Link Here
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() ;
(-)net-p2p/retroshare/files/patch-libretroshare_src_rsserver_rsinit.cc (-11 lines)
Lines 1-11 Link Here
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() ;
(-)net-p2p/retroshare/files/patch-libretroshare_src_util_argstream.h (-11 lines)
Lines 1-11 Link Here
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);
(-)net-p2p/retroshare/files/patch-retroshare-nogui_src_retroshare.cc (-11 lines)
Lines 1-11 Link Here
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();
(-)net-p2p/retroshare/pkg-plist (-6 / +2 lines)
Lines 434-447 Link Here
434
share/RetroShare06/stylesheets/Bubble_Compact/private/system.htm
434
share/RetroShare06/stylesheets/Bubble_Compact/private/system.htm
435
share/RetroShare06/stylesheets/Bubble_Compact/private/variants/color.css
435
share/RetroShare06/stylesheets/Bubble_Compact/private/variants/color.css
436
share/RetroShare06/stylesheets/Bubble_Compact/private/variants/standard.css
436
share/RetroShare06/stylesheets/Bubble_Compact/private/variants/standard.css
437
share/RetroShare06/webui/JSXTransformer.js
437
share/RetroShare06/webui/app.css
438
share/RetroShare06/webui/RsApi.js
438
share/RetroShare06/webui/app.js
439
share/RetroShare06/webui/RsXHRConnection.js
440
share/RetroShare06/webui/green-black.css
441
share/RetroShare06/webui/gui.jsx
442
share/RetroShare06/webui/img/logo_splash.png
439
share/RetroShare06/webui/img/logo_splash.png
443
share/RetroShare06/webui/index.html
440
share/RetroShare06/webui/index.html
444
share/RetroShare06/webui/react.js
445
share/applications/retroshare06.desktop
441
share/applications/retroshare06.desktop
446
share/icons/hicolor/128x128/apps/retroshare06.png
442
share/icons/hicolor/128x128/apps/retroshare06.png
447
share/icons/hicolor/24x24/apps/retroshare06.png
443
share/icons/hicolor/24x24/apps/retroshare06.png

Return to bug 210682