From owner-svn-ports-head@freebsd.org Thu Jun 28 20:48:34 2018 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 997C11026D95; Thu, 28 Jun 2018 20:48:34 +0000 (UTC) (envelope-from swills@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4CB3A8D47F; Thu, 28 Jun 2018 20:48:34 +0000 (UTC) (envelope-from swills@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 289FB174C1; Thu, 28 Jun 2018 20:48:34 +0000 (UTC) (envelope-from swills@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w5SKmYGt045563; Thu, 28 Jun 2018 20:48:34 GMT (envelope-from swills@FreeBSD.org) Received: (from swills@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w5SKmXN9045559; Thu, 28 Jun 2018 20:48:33 GMT (envelope-from swills@FreeBSD.org) Message-Id: <201806282048.w5SKmXN9045559@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: swills set sender to swills@FreeBSD.org using -f From: Steve Wills Date: Thu, 28 Jun 2018 20:48:33 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r473509 - in head/net-p2p/retroshare: . files X-SVN-Group: ports-head X-SVN-Commit-Author: swills X-SVN-Commit-Paths: in head/net-p2p/retroshare: . files X-SVN-Commit-Revision: 473509 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 28 Jun 2018 20:48:34 -0000 Author: swills Date: Thu Jun 28 20:48:32 2018 New Revision: 473509 URL: https://svnweb.freebsd.org/changeset/ports/473509 Log: net-p2p/retroshare: Update to 0.6.4 PR: 229367 Submitted by: peter@netkey.at (maintainer) Added: head/net-p2p/retroshare/files/patch-libretroshare_src_rsserver_rsaccounts.cc (contents, props changed) head/net-p2p/retroshare/files/patch-retroshare.pri (contents, props changed) Modified: head/net-p2p/retroshare/Makefile (contents, props changed) head/net-p2p/retroshare/distinfo (contents, props changed) head/net-p2p/retroshare/files/patch-libretroshare_src_libretroshare.pro (contents, props changed) Modified: head/net-p2p/retroshare/Makefile ============================================================================== --- head/net-p2p/retroshare/Makefile Thu Jun 28 20:25:34 2018 (r473508) +++ head/net-p2p/retroshare/Makefile Thu Jun 28 20:48:32 2018 (r473509) @@ -3,8 +3,7 @@ PORTNAME= retroshare DISTVERSIONPREFIX= v -DISTVERSION= 0.6.3 -PORTREVISION= 2 +DISTVERSION= 0.6.4 CATEGORIES= net-p2p MAINTAINER= peter@netkey.at @@ -29,6 +28,7 @@ USES= compiler:features desktop-file-utils dos2unix p USE_GITHUB= yes GH_ACCOUNT= RetroShare GH_PROJECT= RetroShare +RS_REVISION= 0e6d27a USE_GNOME= libxml2 libxslt USE_GL= gl USE_QT= core gui multimedia printsupport network widgets xml \ @@ -39,8 +39,12 @@ DOS2UNIX_FILES= retroshare-nogui/src/retroshare-nogui. post-patch: @${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|' \ + ${WRKSRC}/retroshare.pri + @${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|' \ ${WRKSRC}/libretroshare/src/libretroshare.pro @${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|' \ + ${WRKSRC}/libretroshare/src/rsserver/rsaccounts.cc + @${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|' \ ${WRKSRC}/retroshare-gui/src/retroshare-gui.pro @${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|' \ ${WRKSRC}/retroshare-nogui/src/retroshare-nogui.pro @@ -48,9 +52,7 @@ post-patch: ${WRKSRC}/data/retroshare.desktop @${REINPLACE_CMD} -e 's|/usr/share|${PREFIX}/share|' \ ${WRKSRC}/data/retroshare.desktop -.if defined(GH_TAGNAME) - @${REINPLACE_CMD} -e 's|RS_REVISION_NUMBER.*|RS_REVISION_NUMBER 0x${GH_TAGNAME}|' \ + @${REINPLACE_CMD} -e 's|RS_REVISION_NUMBER.*|RS_REVISION_NUMBER 0x${RS_REVISION}|' \ ${WRKSRC}/libretroshare/src/retroshare/rsversion.h -.endif .include Modified: head/net-p2p/retroshare/distinfo ============================================================================== --- head/net-p2p/retroshare/distinfo Thu Jun 28 20:25:34 2018 (r473508) +++ head/net-p2p/retroshare/distinfo Thu Jun 28 20:48:32 2018 (r473509) @@ -1,3 +1,3 @@ -TIMESTAMP = 1514378949 -SHA256 (RetroShare-RetroShare-v0.6.3_GH0.tar.gz) = ddb64aa5148fdc950d4426f52f1cbb11578619b1242614e3c4ca4792ee5ce30b -SIZE (RetroShare-RetroShare-v0.6.3_GH0.tar.gz) = 19699359 +TIMESTAMP = 1530050837 +SHA256 (RetroShare-RetroShare-v0.6.4_GH0.tar.gz) = 84355c0f3be5ec1dfa7253e327ea1254f76f47739c233cfb8d0983ebd1a61f4a +SIZE (RetroShare-RetroShare-v0.6.4_GH0.tar.gz) = 20018361 Modified: head/net-p2p/retroshare/files/patch-libretroshare_src_libretroshare.pro ============================================================================== --- head/net-p2p/retroshare/files/patch-libretroshare_src_libretroshare.pro Thu Jun 28 20:25:34 2018 (r473508) +++ head/net-p2p/retroshare/files/patch-libretroshare_src_libretroshare.pro Thu Jun 28 20:48:32 2018 (r473509) @@ -1,6 +1,6 @@ ---- libretroshare/src/libretroshare.pro.orig 2016-02-05 19:04:46 UTC +--- libretroshare/src/libretroshare.pro.orig 2018-03-13 19:25:38 UTC +++ libretroshare/src/libretroshare.pro -@@ -293,7 +293,7 @@ mac { +@@ -341,13 +341,15 @@ mac { freebsd-* { INCLUDEPATH *= /usr/local/include/gpgme @@ -9,3 +9,11 @@ QMAKE_CXXFLAGS *= -Dfseeko64=fseeko -Dftello64=ftello -Dstat64=stat -Dstatvfs64=statvfs -Dfopen64=fopen + # linux/bsd can use either - libupnp is more complete and packaged. + #CONFIG += upnp_miniupnpc + CONFIG += upnp_libupnp ++ DEFINES *= PLUGIN_DIR=\"\\\"$${PLUGIN_DIR}\\\"\" ++ DEFINES *= DATA_DIR=\"\\\"$${DATA_DIR}\\\"\" + } + + ################################# OpenBSD ########################################## Added: head/net-p2p/retroshare/files/patch-libretroshare_src_rsserver_rsaccounts.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net-p2p/retroshare/files/patch-libretroshare_src_rsserver_rsaccounts.cc Thu Jun 28 20:48:32 2018 (r473509) @@ -0,0 +1,10 @@ +--- libretroshare/src/rsserver/rsaccounts.cc.orig 2018-03-13 19:25:38 UTC ++++ libretroshare/src/rsserver/rsaccounts.cc +@@ -35,6 +35,7 @@ + #endif // WINDOWS_SYS + + #include ++#include + #include + + #include Added: head/net-p2p/retroshare/files/patch-retroshare.pri ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net-p2p/retroshare/files/patch-retroshare.pri Thu Jun 28 20:48:32 2018 (r473509) @@ -0,0 +1,22 @@ +--- retroshare.pri.orig 2018-03-13 19:25:38 UTC ++++ retroshare.pri +@@ -16,7 +16,7 @@ no_retroshare_nogui:CONFIG -= retroshare + + # To enable RetroShare plugins append the following + # assignation to qmake command line "CONFIG+=retroshare_plugins" +-CONFIG *= no_retroshare_plugins ++CONFIG *=retroshare_plugins + retroshare_plugins:CONFIG -= no_retroshare_plugins + + # To enable RetroShare-android-service append the following assignation to +@@ -101,8 +101,8 @@ rs_macos10.10:CONFIG -= rs_macos10.11 + rs_macos10.12:CONFIG -= rs_macos10.11 + + +-linux-* { +- isEmpty(PREFIX) { PREFIX = "/usr" } ++freebsd-* { ++ isEmpty(PREFIX) { PREFIX = "/usr/local" } + isEmpty(BIN_DIR) { BIN_DIR = "$${PREFIX}/bin" } + isEmpty(INC_DIR) { INC_DIR = "$${PREFIX}/include/retroshare" } + isEmpty(LIB_DIR) { LIB_DIR = "$${PREFIX}/lib" }