ports/164979: [maintainer update] net-p2p/retroshare: update to 0.5.3a

Peter Klett glocke at bsdstammtisch.at
Sat Feb 11 14:40:08 UTC 2012


>Number:         164979
>Category:       ports
>Synopsis:       [maintainer update] net-p2p/retroshare: update to
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Sat Feb 11 14:40:08 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator:     Peter Klett <glocke at bsdstammtisch.at>
>Release:        FreeBSD 9.0-PRERELEASE amd64
>Organization:
>Environment:
System: FreeBSD antec 9.0-PRERELEASE FreeBSD 9.0-PRERELEASE #0: Sat Nov 
26 00:14:30 CET 2011
>Description:
- Update to 0.5.3a

Removed file(s):
- files/patch-libbitdht-src-util-bdrandom.cc
- files/patch-libretroshare-src-dbase-findex.h
- files/patch-libretroshare-src-ft-ftfilecreator.h
- files/patch-libretroshare-src-ft-ftfileprovider.h
- files/patch-libretroshare-src-libretroshare.pro
- files/patch-libretroshare-src-rsserver-rsinit.cc
- files/patch-libretroshare-src-rsserver-rsloginhandler.cc
- files/patch-libretroshare-src-upnp-upnphandler.cc
- files/patch-libretroshare-src-upnp-upnphandler.h
- files/patch-libretroshare-src-util-rsdir.h
- files/patch-libretroshare-src-util-rsdiscspace.cc
- files/patch-libretroshare-src-util-rsrandom.cc
- files/patch-retroshare-gui-src-RetroShare.pro
- files/rsinit.h


Generated with FreeBSD Port Tools 0.99
>How-To-Repeat:
>Fix:

--- retroshare-0.5.3a.patch begins here ---
diff -ruN --exclude=CVS 
/home/retep/src/redports/port/retroshare.bak/Makefile 
/home/retep/src/redports/port/retroshare/Makefile
--- /home/retep/src/redports/port/retroshare.bak/Makefile       
2012-01-27 15:41:16.000000000 +0100
+++ /home/retep/src/redports/port/retroshare/Makefile   2012-02-11 
13:45:00.000000000 +0100
@@ -2,11 +2,11 @@
  # Date created:        15 January 2012
  # Whom:                glocke
  #
-# $FreeBSD: ports/net-p2p/retroshare/Makefile,v 1.1 2012/01/27 
14:41:16 pawel Exp $
+# $FreeBSD$
  #

  PORTNAME=      retroshare
-PORTVERSION=   0.5.2a
+PORTVERSION=   0.5.3a
  CATEGORIES=    net-p2p
  MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE}
  MASTER_SITE_SUBDIR=${PORTNAME}/${BINARY}/${PORTVERSION}
@@ -29,23 +29,49 @@
                 qmake_build moc_build rcc_build
  HAS_CONFIGURE= yes
  BINARY=                RetroShare
+BINARY_NOGUI=  retroshare-nogui

  DESKTOP_ENTRIES="${BINARY}" "${COMMENT}" "" "${BINARY}" \
                 "Network;FileTransfer;" true

-CFLAGS+=       -I${LOCALBASE}/include/gpgme
+OPTIONS=       NOGUI "Also build nogui binary" On

-USE_DOS2UNIX=  retroshare-gui/src/${BINARY}.pro
+.include <bsd.port.options.mk>

  do-configure:
         @cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} \
                 ${QMAKE} PREFIX=${PREFIX} ${BINARY}.pro

  post-patch:
-       ${CP} ${FILESDIR}/rsinit.h ${WRKSRC}/libretroshare/src/rsserver
+       @${REINPLACE_CMD} -e 's|plugins|#plugins|' 
${WRKSRC}/${BINARY}.pro
+       @${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|' \
+               ${WRKSRC}/libretroshare/src/libretroshare.pro
+       @${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|' \
+               ${WRKSRC}/retroshare-gui/src/RetroShare.pro
+       @${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|' \
+               ${WRKSRC}/retroshare-nogui/src/retroshare-nogui.pro
+.if defined(WITHOUT_NOGUI)
+       @${REINPLACE_CMD} -e 's|retroshare-nogui|#retroshare-nogui|' \
+               ${WRKSRC}/${BINARY}.pro
+       @${REINPLACE_CMD} -e 's|RetroShare.pro \\|RetroShare.pro|' \
+               ${WRKSRC}/${BINARY}.pro
+.else
+       @${REINPLACE_CMD} -e 's|retroshare-nogui.pro 
\\|retroshare-nogui.pro|' \
+               ${WRKSRC}/${BINARY}.pro
+.endif
+
+pre-install:
+.if defined(WITHOUT_NOGUI)
+PLIST_SUB+=    NOGUI="@comment "
+.else
+PLIST_SUB+=    NOGUI=""
+.endif

  post-install:
         ${INSTALL_PROGRAM} ${WRKSRC}/retroshare-gui/src/${BINARY} 
${PREFIX}/bin
+.if defined(WITH_NOGUI)
+       ${INSTALL_PROGRAM} 
${WRKSRC}/retroshare-nogui/src/${BINARY_NOGUI} ${PREFIX}/bin
+.endif
         ${MKDIR} ${DATADIR}
         ${INSTALL_MAN} ${WRKSRC}/libbitdht/src/example/bdboot.txt 
${DATADIR}
         @${ECHO_MSG} 
"**************************************************"
diff -ruN --exclude=CVS 
/home/retep/src/redports/port/retroshare.bak/distinfo 
/home/retep/src/redports/port/retroshare/distinfo
--- /home/retep/src/redports/port/retroshare.bak/distinfo       
2012-01-27 15:41:16.000000000 +0100
+++ /home/retep/src/redports/port/retroshare/distinfo   2012-02-09 
21:39:26.000000000 +0100
@@ -1,2 +1,2 @@
-SHA256 (RetroShare-v0.5.2a.tar.gz) = 
33838c0234e779e6b310bbd19bf6c5c0394e84cc5b418114b68f0cac8c1eec18
-SIZE (RetroShare-v0.5.2a.tar.gz) = 10334273
+SHA256 (RetroShare-v0.5.3a.tar.gz) = 
744f3d410c57e51455d07fe9e77dc9e645a58de454ce5248aa8704c41d2df3a4
+SIZE (RetroShare-v0.5.3a.tar.gz) = 6419672
diff -ruN --exclude=CVS 
/home/retep/src/redports/port/retroshare.bak/files/patch-libbitdht-src-util-bdrandom.cc 
/home/retep/src/redports/port/retroshare/files/patch-libbitdht-src-util-bdrandom.cc
--- 
/home/retep/src/redports/port/retroshare.bak/files/patch-libbitdht-src-util-bdrandom.cc 
     2012-01-27 15:41:16.000000000 +0100
+++ 
/home/retep/src/redports/port/retroshare/files/patch-libbitdht-src-util-bdrandom.cc 
1970-01-01 01:00:00.000000000 +0100
@@ -1,11 +0,0 @@
-+++ libbitdht/src/util/bdrandom.cc     2012-01-15 03:45:36.000000000 
+0100
---- libbitdht/src/util/bdrandom.cc.orig        2012-01-15 
03:45:07.000000000 +0100
-@@ -13,7 +13,7 @@
-   #ifdef __APPLE__
-       static bool auto_seed = bdRandom::seed( (time(NULL) + 
pthread_mach_thread_np(pthread_self())*0x1293fe + 
(getpid()^0x113ef76b))^0x18e34a12 ) ;
-   #else
-+//    static bool auto_seed = bdRandom::seed( (time(NULL) + 
pthread_self()*0x1293fe + (getpid()^0x113ef76b))^0x18e34a12 ) ;
--    static bool auto_seed = bdRandom::seed( (time(NULL) + 
pthread_self()*0x1293fe + (getpid()^0x113ef76b))^0x18e34a12 ) ;
-   #endif
- #endif
- bool bdRandom::seed(uint32_t s)
diff -ruN --exclude=CVS 
/home/retep/src/redports/port/retroshare.bak/files/patch-libretroshare-src-dbase-findex.h 
/home/retep/src/redports/port/retroshare/files/patch-libretroshare-src-dbase-findex.h
--- 
/home/retep/src/redports/port/retroshare.bak/files/patch-libretroshare-src-dbase-findex.h 
   2012-01-27 15:41:16.000000000 +0100
+++ 
/home/retep/src/redports/port/retroshare/files/patch-libretroshare-src-dbase-findex.h 
       1970-01-01 01:00:00.000000000 +0100
@@ -1,17 +0,0 @@
---- libretroshare/src/dbase/findex.h.orig      2011-04-15 
22:21:52.000000000 +0200
-+++ libretroshare/src/dbase/findex.h   2012-01-15 03:55:27.000000000 
+0100
-@@ -33,6 +33,14 @@
- #include <stdint.h>
- #include "retroshare/rstypes.h"
-
-+#include <dirent.h>
-+#include <fnmatch.h>
-+#include <unistd.h>
-+#define O_LARGEFILE      0100000
-+#define stat64 stat
-+#define _stat stat
-+#define _getcwd getcwd
-+
- class ostream;
-
- 
/******************************************************************************************
diff -ruN --exclude=CVS 
/home/retep/src/redports/port/retroshare.bak/files/patch-libretroshare-src-ft-ftfilecreator.h 
/home/retep/src/redports/port/retroshare/files/patch-libretroshare-src-ft-ftfilecreator.h
--- 
/home/retep/src/redports/port/retroshare.bak/files/patch-libretroshare-src-ft-ftfilecreator.h 
       2012-01-27 15:41:16.000000000 +0100
+++ 
/home/retep/src/redports/port/retroshare/files/patch-libretroshare-src-ft-ftfilecreator.h 
   1970-01-01 01:00:00.000000000 +0100
@@ -1,10 +0,0 @@
---- libretroshare/src/ft/ftfilecreator.h~      2011-04-25 
16:20:57.000000000 +0200
-+++ libretroshare/src/ft/ftfilecreator.h       2012-01-15 
20:30:41.000000000 +0100
-@@ -35,6 +35,7 @@
- #include "ftfileprovider.h"
- #include "ftchunkmap.h"
- #include <map>
-+#define fseeko64 fseeko
-
- class ZeroInitCounter
- {
diff -ruN --exclude=CVS 
/home/retep/src/redports/port/retroshare.bak/files/patch-libretroshare-src-ft-ftfileprovider.h 
/home/retep/src/redports/port/retroshare/files/patch-libretroshare-src-ft-ftfileprovider.h
--- 
/home/retep/src/redports/port/retroshare.bak/files/patch-libretroshare-src-ft-ftfileprovider.h 
      2012-01-27 15:41:16.000000000 +0100
+++ 
/home/retep/src/redports/port/retroshare/files/patch-libretroshare-src-ft-ftfileprovider.h 
  1970-01-01 01:00:00.000000000 +0100
@@ -1,10 +0,0 @@
---- libretroshare/src/ft/ftfileprovider.h~     2011-02-20 
01:59:47.000000000 +0100
-+++ libretroshare/src/ft/ftfileprovider.h      2012-01-15 
04:01:35.000000000 +0100
-@@ -34,6 +34,7 @@
- #include <stdint.h>
- #include "util/rsthreads.h"
- #include "retroshare/rsfiles.h"
-+#define fseeko64 fseeko
-
- class ftFileProvider
- {
diff -ruN --exclude=CVS 
/home/retep/src/redports/port/retroshare.bak/files/patch-libretroshare-src-libretroshare.pro 
/home/retep/src/redports/port/retroshare/files/patch-libretroshare-src-libretroshare.pro
--- 
/home/retep/src/redports/port/retroshare.bak/files/patch-libretroshare-src-libretroshare.pro 
        2012-01-27 15:41:16.000000000 +0100
+++ 
/home/retep/src/redports/port/retroshare/files/patch-libretroshare-src-libretroshare.pro 
    1970-01-01 01:00:00.000000000 +0100
@@ -1,10 +0,0 @@
---- libretroshare/src/libretroshare.pro~       2011-08-03 
19:43:26.000000000 +0200
-+++ libretroshare/src/libretroshare.pro        2012-01-15 
04:20:41.000000000 +0100
-@@ -104,6 +104,7 @@
-       INCLUDEPATH += . $${BITDHT_DIR}
-       # The next line if for compliance with debian packages. Keep 
it!
-       INCLUDEPATH += ../libbitdht
-+      INCLUDEPATH += $${PREFIX}/include/gpgme
-       DEFINES *= RS_USE_BITDHT
- }
-
diff -ruN --exclude=CVS 
/home/retep/src/redports/port/retroshare.bak/files/patch-libretroshare-src-rsserver-rsinit.cc 
/home/retep/src/redports/port/retroshare/files/patch-libretroshare-src-rsserver-rsinit.cc
--- 
/home/retep/src/redports/port/retroshare.bak/files/patch-libretroshare-src-rsserver-rsinit.cc 
       2012-01-27 15:41:16.000000000 +0100
+++ 
/home/retep/src/redports/port/retroshare/files/patch-libretroshare-src-rsserver-rsinit.cc 
   1970-01-01 01:00:00.000000000 +0100
@@ -1,88 +0,0 @@
---- libretroshare/src/rsserver/rsinit.cc.org   2012-01-15 
04:34:27.000000000 +0100
-+++ libretroshare/src/rsserver/rsinit.cc       2012-01-15 
04:35:45.000000000 +0100
-@@ -59,78 +59,14 @@
-
- #include "tcponudp/udpstunner.h"
-
--class accountId
--{
--      public:
--              std::string pgpId;
--              std::string pgpName;
--              std::string pgpEmail;
--
--              std::string sslId;
--                std::string location;
--};
--
--
--class RsInitConfig
--{
--      public:
--                /* Directories (SetupBaseDir) */
--                static std::string basedir;
--                static std::string homePath;
--#ifdef WINDOWS_SYS
--                static bool portable;
--                static bool isWindowsXP;
--#endif
--
--              static std::list<accountId> accountIds;
--              static std::string preferedId;
--
--              /* for certificate creation */
--                //static std::string gpgPasswd;
--
--#ifndef WINDOWS_SYS
--              static int lockHandle;
--#else
--              static HANDLE lockHandle;
--#endif
--
--              /* These fields are needed for login */
--                static std::string loginId;
--                static std::string configDir;
--                static std::string load_cert;
--                static std::string load_key;
--
--              static std::string passwd;
--
--                static bool autoLogin;                  /* autoLogin 
allowed */
--                static bool startMinimised;           /* Icon or Full 
Window */
--
--                /* Key Parameters that must be set before
--                 * RetroShare will start up:
--                 */
--
--                /* Listening Port */
--                static bool forceExtPort;
--                static bool forceLocalAddr;
--                static unsigned short port;
--                static char inet[256];
--
--                /* Logging */
--                static bool haveLogFile;
--                static bool outStderr;
--                static bool haveDebugLevel;
--                static int  debugLevel;
--                static std::string logfname;
--
--                static bool firsttime_run;
--                static bool load_trustedpeer;
--                static std::string load_trustedpeer_file;
--
--                static bool udpListenerOnly;
--
--                static std::string RetroShareLink;
--};
-+#include "rsinit.h"
-
-+#include <fnmatch.h>
-+#include <unistd.h>
-+#define O_LARGEFILE      0100000
-+#define stat64 stat
-+#define _stat stat
-+#define _getcwd getcwd
-
- const int p3facestartupzone = 47238;
-
diff -ruN --exclude=CVS 
/home/retep/src/redports/port/retroshare.bak/files/patch-libretroshare-src-rsserver-rsloginhandler.cc 
/home/retep/src/redports/port/retroshare/files/patch-libretroshare-src-rsserver-rsloginhandler.cc
--- 
/home/retep/src/redports/port/retroshare.bak/files/patch-libretroshare-src-rsserver-rsloginhandler.cc 
       2012-01-27 15:41:16.000000000 +0100
+++ 
/home/retep/src/redports/port/retroshare/files/patch-libretroshare-src-rsserver-rsloginhandler.cc 
   1970-01-01 01:00:00.000000000 +0100
@@ -1,28 +0,0 @@
---- libretroshare/src/rsserver/rsloginhandler.cc.orig  2012-01-15 
04:44:59.000000000 +0100
-+++ libretroshare/src/rsserver/rsloginhandler.cc       2012-01-15 
04:43:08.000000000 +0100
-@@ -4,6 +4,7 @@
- #include <pqi/authgpg.h>
- #include "rsloginhandler.h"
- #include "util/rsdir.h"
-+#include "rsinit.h"
-
- #ifdef UBUNTU
- #include <gnome-keyring-1/gnome-keyring.h>
-@@ -196,7 +197,7 @@
-       /******************** OSX KeyChain stuff 
*****************************/
- #else /* UNIX, but not UBUNTU or APPLE */
-
--      FILE* helpFile = 
RsDirUtil::rs_fopen(getAutologinFileName.c_str(), "r");
-+      FILE* helpFile = 
RsDirUtil::rs_fopen(getAutologinFileName(ssl_id).c_str(), "r");
-
-       if(helpFile == NULL){
-               std::cerr << "\nFailed to open help file\n" << 
std::endl;
-@@ -408,7 +409,7 @@
- #else
-
-       /* WARNING: Autologin is inherently unsafe */
--      FILE* helpFile = 
RsDirUtil::rs_fopen(getAutologinFileName.c_str(), "w");
-+      FILE* helpFile = 
RsDirUtil::rs_fopen(getAutologinFileName(ssl_id).c_str(), "w");
-
-       if(helpFile == NULL){
-               std::cerr << "\nRsStoreAutoLogin(): Failed to open help 
file\n" << std::endl;
diff -ruN --exclude=CVS 
/home/retep/src/redports/port/retroshare.bak/files/patch-libretroshare-src-upnp-upnphandler.cc 
/home/retep/src/redports/port/retroshare/files/patch-libretroshare-src-upnp-upnphandler.cc
--- 
/home/retep/src/redports/port/retroshare.bak/files/patch-libretroshare-src-upnp-upnphandler.cc 
      2012-01-27 15:41:16.000000000 +0100
+++ 
/home/retep/src/redports/port/retroshare/files/patch-libretroshare-src-upnp-upnphandler.cc 
  1970-01-01 01:00:00.000000000 +0100
@@ -1,10 +0,0 @@
---- libretroshare/src/upnp/upnphandler.cc~     2011-07-08 
11:54:27.000000000 +0200
-+++ libretroshare/src/upnp/upnphandler.cc      2012-01-15 
05:27:12.000000000 +0100
-@@ -12,6 +12,7 @@
- #endif
- /* This stuff is actually C */
-
-+#define do_not_use_this
- #include "upnp/upnphandler.h"
-
- #include "util/rsnet.h"
diff -ruN --exclude=CVS 
/home/retep/src/redports/port/retroshare.bak/files/patch-libretroshare-src-upnp-upnphandler.h 
/home/retep/src/redports/port/retroshare/files/patch-libretroshare-src-upnp-upnphandler.h
--- 
/home/retep/src/redports/port/retroshare.bak/files/patch-libretroshare-src-upnp-upnphandler.h 
       2012-01-27 15:41:16.000000000 +0100
+++ 
/home/retep/src/redports/port/retroshare/files/patch-libretroshare-src-upnp-upnphandler.h 
   1970-01-01 01:00:00.000000000 +0100
@@ -1,14 +0,0 @@
---- libretroshare/src/upnp/upnphandler.h~      2010-07-04 
12:42:17.000000000 +0200
-+++ libretroshare/src/upnp/upnphandler.h       2012-01-15 
05:26:45.000000000 +0100
-@@ -13,7 +13,11 @@
- #include "util/rsthreads.h"
-
- #include <upnp/upnp.h>
-+#ifdef do_not_use_this
-+#include "upnp/UPnPBase.cpp"
-+#else
- #include "upnp/UPnPBase.h"
-+#endif
-
- #define RS_UPNP_S_UNINITIALISED  0
- #define RS_UPNP_S_UNAVAILABLE    1
diff -ruN --exclude=CVS 
/home/retep/src/redports/port/retroshare.bak/files/patch-libretroshare-src-util-rsdir.h 
/home/retep/src/redports/port/retroshare/files/patch-libretroshare-src-util-rsdir.h
--- 
/home/retep/src/redports/port/retroshare.bak/files/patch-libretroshare-src-util-rsdir.h 
     2012-01-27 15:41:16.000000000 +0100
+++ 
/home/retep/src/redports/port/retroshare/files/patch-libretroshare-src-util-rsdir.h 
1970-01-01 01:00:00.000000000 +0100
@@ -1,20 +0,0 @@
---- libretroshare/src/util/rsdir.h.orig        2011-05-15 
14:42:55.000000000 +0200
-+++ libretroshare/src/util/rsdir.h     2012-01-15 20:10:19.000000000 
+0100
-@@ -31,6 +31,17 @@
- #include <string>
- #include <list>
- #include <stdint.h>
-+#include <fnmatch.h>
-+
-+#include <dirent.h>
-+#include <unistd.h>
-+#define O_LARGEFILE      0100000
-+#define stat64 stat
-+#define _stat stat
-+#define _getcwd getcwd
-+#define fseeko64 fseeko
-+#define fopen64 fopen
-+#define ftello64 ftello
-
- class CRC32Map ;
- class RsThread;
diff -ruN --exclude=CVS 
/home/retep/src/redports/port/retroshare.bak/files/patch-libretroshare-src-util-rsdiscspace.cc 
/home/retep/src/redports/port/retroshare/files/patch-libretroshare-src-util-rsdiscspace.cc
--- 
/home/retep/src/redports/port/retroshare.bak/files/patch-libretroshare-src-util-rsdiscspace.cc 
      2012-01-27 15:41:16.000000000 +0100
+++ 
/home/retep/src/redports/port/retroshare/files/patch-libretroshare-src-util-rsdiscspace.cc 
  1970-01-01 01:00:00.000000000 +0100
@@ -1,10 +0,0 @@
---- libretroshare/src/util/rsdiscspace.cc.orig 2011-07-05 
00:59:39.000000000 +0200
-+++ libretroshare/src/util/rsdiscspace.cc      2012-01-15 
04:55:17.000000000 +0100
-@@ -31,6 +31,7 @@
- #include <util/rsthreads.h>
- #ifndef WIN32
- #include <sys/statvfs.h>
-+#define statvfs64 statvfs
- #endif
-
- #define DELAY_BETWEEN_CHECKS 2
diff -ruN --exclude=CVS 
/home/retep/src/redports/port/retroshare.bak/files/patch-libretroshare-src-util-rsrandom.cc 
/home/retep/src/redports/port/retroshare/files/patch-libretroshare-src-util-rsrandom.cc
--- 
/home/retep/src/redports/port/retroshare.bak/files/patch-libretroshare-src-util-rsrandom.cc 
2012-01-27 15:41:16.000000000 +0100
+++ 
/home/retep/src/redports/port/retroshare/files/patch-libretroshare-src-util-rsrandom.cc 
     1970-01-01 01:00:00.000000000 +0100
@@ -1,11 +0,0 @@
---- libretroshare/src/util/rsrandom.cc~        2011-07-05 
00:59:39.000000000 +0200
-+++ libretroshare/src/util/rsrandom.cc 2012-01-15 04:56:47.000000000 
+0100
-@@ -13,7 +13,7 @@
-   #ifdef __APPLE__
-       static bool auto_seed = RSRandom::seed( (time(NULL) + 
pthread_mach_thread_np(pthread_self())*0x1293fe + 
(getpid()^0x113ef76b))^0x18e34a12 ) ;
-   #else
--    static bool auto_seed = RSRandom::seed( (time(NULL) + 
pthread_self()*0x1293fe + (getpid()^0x113ef76b))^0x18e34a12 ) ;
-+//    static bool auto_seed = RSRandom::seed( (time(NULL) + 
pthread_self()*0x1293fe + (getpid()^0x113ef76b))^0x18e34a12 ) ;
-   #endif
- #endif
- bool RSRandom::seed(uint32_t s)
diff -ruN --exclude=CVS 
/home/retep/src/redports/port/retroshare.bak/files/patch-retroshare-gui-src-RetroShare.pro 
/home/retep/src/redports/port/retroshare/files/patch-retroshare-gui-src-RetroShare.pro
--- 
/home/retep/src/redports/port/retroshare.bak/files/patch-retroshare-gui-src-RetroShare.pro 
  2012-01-27 15:41:16.000000000 +0100
+++ 
/home/retep/src/redports/port/retroshare/files/patch-retroshare-gui-src-RetroShare.pro 
      1970-01-01 01:00:00.000000000 +0100
@@ -1,17 +0,0 @@
---- retroshare-gui/src/RetroShare.pro.orig     2011-08-03 
19:45:03.000000000 +0200
-+++ retroshare-gui/src/RetroShare.pro  2012-01-15 12:55:12.000000000 
+0100
-@@ -153,9 +153,12 @@
-
- # ###########################################
-
-+INCLUDEPATH += $${PREFIX}/include/gpgme
-+LIBS += ../../libretroshare/src/libretroshare.a -lssl -lgpgme -lupnp
-+
- bitdht {
--      LIBS += ../../libbitdht/src/lib/libbitdht.a
--      PRE_TARGETDEPS *= ../../libbitdht/src/lib/libbitdht.a
-+      LIBS += ../../libbitdht/src/libbitdht.a
-+      PRE_TARGETDEPS *= ../../libbitdht/src/libbitdht.a
- }
-
- win32 {
diff -ruN --exclude=CVS 
/home/retep/src/redports/port/retroshare.bak/files/rsinit.h 
/home/retep/src/redports/port/retroshare/files/rsinit.h
--- /home/retep/src/redports/port/retroshare.bak/files/rsinit.h 
2012-01-27 15:41:16.000000000 +0100
+++ /home/retep/src/redports/port/retroshare/files/rsinit.h     
1970-01-01 01:00:00.000000000 +0100
@@ -1,78 +0,0 @@
-
-#ifndef RETROSHARE_RSINIT_H
-#define RETROSHARE_RSINIT_H
-
-class accountId
-{
-       public:
-               std::string pgpId;
-               std::string pgpName;
-               std::string pgpEmail;
-
-               std::string sslId;
-                std::string location;
-};
-
-
-class RsInitConfig
-{
-       public:
-                /* Directories (SetupBaseDir) */
-                static std::string basedir;
-                static std::string homePath;
-#ifdef WINDOWS_SYS
-                static bool portable;
-                static bool isWindowsXP;
-#endif
-
-               static std::list<accountId> accountIds;
-               static std::string preferedId;
-
-               /* for certificate creation */
-                //static std::string gpgPasswd;
-
-#ifndef WINDOWS_SYS
-               static int lockHandle;
-#else
-               static HANDLE lockHandle;
-#endif
-
-               /* These fields are needed for login */
-                static std::string loginId;
-                static std::string configDir;
-                static std::string load_cert;
-                static std::string load_key;
-
-               static std::string passwd;
-
-                static bool autoLogin;                  /* autoLogin 
allowed */
-                static bool startMinimised;            /* Icon or Full 
Window */
-
-                /* Key Parameters that must be set before
-                 * RetroShare will start up:
-                 */
-
-                /* Listening Port */
-                static bool forceExtPort;
-                static bool forceLocalAddr;
-                static unsigned short port;
-                static char inet[256];
-
-                /* Logging */
-                static bool haveLogFile;
-                static bool outStderr;
-                static bool haveDebugLevel;
-                static int  debugLevel;
-                static std::string logfname;
-
-                static bool firsttime_run;
-                static bool load_trustedpeer;
-                static std::string load_trustedpeer_file;
-
-                static bool udpListenerOnly;
-
-                static std::string RetroShareLink;
-};
-
-#endif
-
diff -ruN --exclude=CVS 
/home/retep/src/redports/port/retroshare.bak/pkg-plist 
/home/retep/src/redports/port/retroshare/pkg-plist
--- /home/retep/src/redports/port/retroshare.bak/pkg-plist      
2012-01-27 15:41:16.000000000 +0100
+++ /home/retep/src/redports/port/retroshare/pkg-plist  2012-02-10 
01:17:46.000000000 +0100
@@ -1,3 +1,4 @@
  bin/RetroShare
+%%NOGUI%%bin/retroshare-nogui
  %%DATADIR%%/bdboot.txt
  @dirrm %%DATADIR%%
--- retroshare-0.5.3a.patch ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted:
 > 0.5.3a



More information about the freebsd-ports-bugs mailing list