Index: net-p2p/retroshare/Makefile =================================================================== --- net-p2p/retroshare/Makefile (revision 417756) +++ net-p2p/retroshare/Makefile (working copy) @@ -2,7 +2,8 @@ # $FreeBSD$ PORTNAME= retroshare -PORTVERSION= 0.6.0 +PORTVERSION= 0.6.0e +PORTREVISION= 1 DISTVERSIONPREFIX= v CATEGORIES= net-p2p @@ -29,11 +30,13 @@ USE_QT5= buildtools_build uitools_build core gui network xml \ widgets multimedia printsupport INSTALLS_ICONS= yes +USES+= desktop-file-utils DOS2UNIX_FILES= retroshare-nogui/src/retroshare-nogui.pro USE_GITHUB= yes GH_ACCOUNT= RetroShare GH_PROJECT= RetroShare +GH_TAGNAME= 9f7ef8b .include @@ -52,5 +55,9 @@ ${WRKSRC}/data/retroshare06.desktop @${REINPLACE_CMD} -e 's|/usr/share|${PREFIX}/share|' \ ${WRKSRC}/data/retroshare06.desktop +.if defined(GH_TAGNAME) + @${REINPLACE_CMD} -e 's|01234567|0${GH_TAGNAME}|' \ + ${WRKSRC}/libretroshare/src/retroshare/rsversion.h +.endif .include Index: net-p2p/retroshare/distinfo =================================================================== --- net-p2p/retroshare/distinfo (revision 417756) +++ net-p2p/retroshare/distinfo (working copy) @@ -1,2 +1,3 @@ -SHA256 (RetroShare-RetroShare-v0.6.0_GH0.tar.gz) = 50b9157bbe407aaefcbf9af1f29392e63148dc060bf78a3b200c9bc09998cf7c -SIZE (RetroShare-RetroShare-v0.6.0_GH0.tar.gz) = 17436205 +TIMESTAMP = 1467176910 +SHA256 (RetroShare-RetroShare-v0.6.0e-9f7ef8b_GH0.tar.gz) = 0bcffff8814e4ff67458fbaca8e15b11c5a3fdc85ad4c080583c0f9cf32734e7 +SIZE (RetroShare-RetroShare-v0.6.0e-9f7ef8b_GH0.tar.gz) = 17400160 Index: net-p2p/retroshare/files/patch-libbitdht_src_bitdht_bencode.c =================================================================== --- net-p2p/retroshare/files/patch-libbitdht_src_bitdht_bencode.c (revision 417756) +++ net-p2p/retroshare/files/patch-libbitdht_src_bitdht_bencode.c (nonexistent) @@ -1,46 +0,0 @@ ---- libbitdht/src/bitdht/bencode.c.orig 2016-02-05 19:04:46 UTC -+++ libbitdht/src/bitdht/bencode.c -@@ -20,7 +20,6 @@ - */ - - #include --#include - #include /* malloc() realloc() free() strtoll() */ - #include /* 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; Property changes on: net-p2p/retroshare/files/patch-libbitdht_src_bitdht_bencode.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: net-p2p/retroshare/files/patch-libretroshare_src_grouter_p3grouter.h =================================================================== --- net-p2p/retroshare/files/patch-libretroshare_src_grouter_p3grouter.h (revision 417756) +++ net-p2p/retroshare/files/patch-libretroshare_src_grouter_p3grouter.h (nonexistent) @@ -1,20 +0,0 @@ ---- 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() ; Property changes on: net-p2p/retroshare/files/patch-libretroshare_src_grouter_p3grouter.h ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: net-p2p/retroshare/files/patch-libretroshare_src_rsserver_rsinit.cc =================================================================== --- net-p2p/retroshare/files/patch-libretroshare_src_rsserver_rsinit.cc (revision 417756) +++ net-p2p/retroshare/files/patch-libretroshare_src_rsserver_rsinit.cc (nonexistent) @@ -1,11 +0,0 @@ ---- libretroshare/src/rsserver/rsinit.cc.orig 2016-02-05 19:04:46 UTC -+++ libretroshare/src/rsserver/rsinit.cc -@@ -367,7 +367,7 @@ int RsInit::InitRetroShare(int argcIgnor - #ifdef LOCALNET_TESTING - >> parameter('R',"restrict-port" ,portRestrictions ,"port1-port2","Apply port restriction" ,false) - #endif --#ifdef __APPLE__ -+#if defined(__APPLE__) || defined(__FreeBSD__) - >> help('h',"help","Display this Help") ; - #else - >> help() ; Property changes on: net-p2p/retroshare/files/patch-libretroshare_src_rsserver_rsinit.cc ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: net-p2p/retroshare/files/patch-libretroshare_src_util_argstream.h =================================================================== --- net-p2p/retroshare/files/patch-libretroshare_src_util_argstream.h (revision 417756) +++ net-p2p/retroshare/files/patch-libretroshare_src_util_argstream.h (nonexistent) @@ -1,11 +0,0 @@ ---- libretroshare/src/util/argstream.h.orig 2016-02-05 19:04:46 UTC -+++ libretroshare/src/util/argstream.h -@@ -141,7 +141,7 @@ namespace - inline OptionHolder(char s, - const char* l, - const char* desc); --#ifdef __APPLE__ -+#if defined(__APPLE__) || defined(__FreeBSD__) - friend OptionHolder help(char s, - const char* l, - const char* desc); Property changes on: net-p2p/retroshare/files/patch-libretroshare_src_util_argstream.h ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: net-p2p/retroshare/files/patch-retroshare-nogui_src_retroshare.cc =================================================================== --- net-p2p/retroshare/files/patch-retroshare-nogui_src_retroshare.cc (revision 417756) +++ net-p2p/retroshare/files/patch-retroshare-nogui_src_retroshare.cc (nonexistent) @@ -1,11 +0,0 @@ ---- retroshare-nogui/src/retroshare.cc.orig 2016-02-05 19:04:46 UTC -+++ retroshare-nogui/src/retroshare.cc -@@ -86,7 +86,7 @@ int main(int argc, char **argv) - // unfinished - //args >> parameter("http-listen", listenAddress, "ipv6 address", "Listen only on the specified address.", false); - args >> option("http-allow-all", allowAllIps, "allow connections from all IP adresses (default= localhost only)"); --#ifdef __APPLE__ -+#if defined(__APPLE__) || defined(__FreeBSD__) - args >> help('h',"help","Display this Help"); - #else - args >> help(); Property changes on: net-p2p/retroshare/files/patch-retroshare-nogui_src_retroshare.cc ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: net-p2p/retroshare/pkg-plist =================================================================== --- net-p2p/retroshare/pkg-plist (revision 417756) +++ net-p2p/retroshare/pkg-plist (working copy) @@ -434,14 +434,10 @@ 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/app.css +share/RetroShare06/webui/app.js 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