svn commit: r421336 - in head/net-p2p/retroshare: . files

[Kurt Jaeger]

Author: pi
Date: Sun Sep  4 13:27:04 2016
New Revision: 421336
URL: https://svnweb.freebsd.org/changeset/ports/421336

Log:
  net-p2p/retroshare: Update fixing connectivity problems in 0.6.0
  
  - Updates to the current revision to 9f7ef8b
  - Deletes no longer relevant patches
  - Makes RS show the code revision when GH_TAGNAME is explicitly defined
  - Changes PORTVERSION to 0.6.0e to reflect the fact that extra commits are added
  - Bumps PORTREVISION
  - also fixes the build in C++11 mode (See PR#212365)
  
  PR:		210682
  Submitted by:	Yuri Victorovich <yuri at rawbw.com> (maintainer)
  Approved by:	peter at netkey.at (maintainer)

Deleted:
  head/net-p2p/retroshare/files/patch-libbitdht_src_bitdht_bencode.c
  head/net-p2p/retroshare/files/patch-libretroshare_src_grouter_p3grouter.h
  head/net-p2p/retroshare/files/patch-libretroshare_src_rsserver_rsinit.cc
  head/net-p2p/retroshare/files/patch-libretroshare_src_util_argstream.h
  head/net-p2p/retroshare/files/patch-retroshare-nogui_src_retroshare.cc
Modified:
  head/net-p2p/retroshare/Makefile
  head/net-p2p/retroshare/distinfo
  head/net-p2p/retroshare/pkg-plist

Modified: head/net-p2p/retroshare/Makefile
==============================================================================
--- head/net-p2p/retroshare/Makefile	Sun Sep  4 13:23:18 2016	(r421335)
+++ head/net-p2p/retroshare/Makefile	Sun Sep  4 13:27:04 2016	(r421336)
@@ -2,8 +2,9 @@
 # $FreeBSD$
 
 PORTNAME=	retroshare
-PORTVERSION=	0.6.0
+PORTVERSION=	0.6.0e
 DISTVERSIONPREFIX=	v
+PORTREVISION=	1
 CATEGORIES=	net-p2p
 
 MAINTAINER=	peter at netkey.at
@@ -23,7 +24,7 @@ LIB_DEPENDS=	libsqlcipher.so:databases/s
 		libcurl.so:ftp/curl \
 		libmicrohttpd.so:www/libmicrohttpd
 
-USES=		qmake compiler:features dos2unix execinfo pkgconfig
+USES=		compiler:features desktop-file-utils dos2unix execinfo pkgconfig qmake ssl
 USE_GNOME=	glib20 libxml2 libxslt
 USE_GL=		gl
 USE_QT5=	buildtools_build uitools_build core gui network xml \
@@ -34,6 +35,7 @@ DOS2UNIX_FILES=	retroshare-nogui/src/ret
 USE_GITHUB=	yes
 GH_ACCOUNT=	RetroShare
 GH_PROJECT=	RetroShare
+GH_TAGNAME=	9f7ef8b
 
 .include <bsd.port.pre.mk>
 
@@ -52,5 +54,9 @@ post-patch:
 		${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 <bsd.port.post.mk>

Modified: head/net-p2p/retroshare/distinfo
==============================================================================
--- head/net-p2p/retroshare/distinfo	Sun Sep  4 13:23:18 2016	(r421335)
+++ head/net-p2p/retroshare/distinfo	Sun Sep  4 13:27:04 2016	(r421336)
@@ -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

Modified: head/net-p2p/retroshare/pkg-plist
==============================================================================
--- head/net-p2p/retroshare/pkg-plist	Sun Sep  4 13:23:18 2016	(r421335)
+++ head/net-p2p/retroshare/pkg-plist	Sun Sep  4 13:27:04 2016	(r421336)
@@ -434,14 +434,10 @@ share/RetroShare06/stylesheets/Bubble_Co
 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