Date: Mon, 22 Apr 2019 08:26:59 +0000 (UTC) From: Tobias Kortkamp <tobik@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r499614 - in head/net-p2p/retroshare: . files Message-ID: <201904220826.x3M8QxhZ041860@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: tobik Date: Mon Apr 22 08:26:59 2019 New Revision: 499614 URL: https://svnweb.freebsd.org/changeset/ports/499614 Log: net-p2p/retroshare: Switch from devel/upnp to net/miniupnpc RetroShare does not build with upnp >= 1.8. Upstream does not have a solution for this yet other than suggesting to switch to using miniupnpc as a workaround. PR: 237406 Submitted by: tobik Approved by: peter@netkey.at (maintainer) Modified: head/net-p2p/retroshare/Makefile head/net-p2p/retroshare/files/patch-libretroshare_src_libretroshare.pro head/net-p2p/retroshare/files/patch-retroshare-gui_src_retroshare-gui.pro head/net-p2p/retroshare/files/patch-retroshare-nogui_src_retroshare-nogui.pro Modified: head/net-p2p/retroshare/Makefile ============================================================================== --- head/net-p2p/retroshare/Makefile Mon Apr 22 08:24:51 2019 (r499613) +++ head/net-p2p/retroshare/Makefile Mon Apr 22 08:26:59 2019 (r499614) @@ -4,7 +4,7 @@ PORTNAME= retroshare DISTVERSIONPREFIX= v DISTVERSION= 0.6.4 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= net-p2p PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ @@ -19,14 +19,14 @@ LICENSE_FILE= ${WRKSRC}/LICENSE.txt LIB_DEPENDS= libsqlcipher.so:databases/sqlcipher \ libspeex.so:audio/speex \ libspeexdsp.so:audio/speexdsp \ - libupnp.so:devel/upnp \ libgnome-keyring.so:security/libgnome-keyring \ libgpgme.so:security/gpgme \ libopencv_highgui.so:graphics/opencv \ libopencv_imgproc.so:graphics/opencv-core \ libavcodec.so:multimedia/ffmpeg \ libcurl.so:ftp/curl \ - libmicrohttpd.so:www/libmicrohttpd + libmicrohttpd.so:www/libmicrohttpd \ + libminiupnpc.so:net/miniupnpc USES= compiler:features desktop-file-utils dos2unix \ gnome pkgconfig qmake qt:5 ssl Modified: head/net-p2p/retroshare/files/patch-libretroshare_src_libretroshare.pro ============================================================================== --- head/net-p2p/retroshare/files/patch-libretroshare_src_libretroshare.pro Mon Apr 22 08:24:51 2019 (r499613) +++ head/net-p2p/retroshare/files/patch-libretroshare_src_libretroshare.pro Mon Apr 22 08:26:59 2019 (r499614) @@ -1,6 +1,6 @@ --- libretroshare/src/libretroshare.pro.orig 2018-03-13 19:25:38 UTC +++ libretroshare/src/libretroshare.pro -@@ -341,13 +341,15 @@ mac { +@@ -341,13 +341,14 @@ mac { freebsd-* { INCLUDEPATH *= /usr/local/include/gpgme @@ -10,8 +10,9 @@ 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 +- #CONFIG += upnp_miniupnpc +- CONFIG += upnp_libupnp ++ CONFIG += upnp_miniupnpc + DEFINES *= PLUGIN_DIR=\"\\\"$${PLUGIN_DIR}\\\"\" + DEFINES *= DATA_DIR=\"\\\"$${DATA_DIR}\\\"\" } Modified: head/net-p2p/retroshare/files/patch-retroshare-gui_src_retroshare-gui.pro ============================================================================== --- head/net-p2p/retroshare/files/patch-retroshare-gui_src_retroshare-gui.pro Mon Apr 22 08:24:51 2019 (r499613) +++ head/net-p2p/retroshare/files/patch-retroshare-gui_src_retroshare-gui.pro Mon Apr 22 08:26:59 2019 (r499614) @@ -1,16 +1,16 @@ ---- retroshare-gui/src/retroshare-gui.pro.orig 2016-02-05 19:04:46 UTC +--- retroshare-gui/src/retroshare-gui.pro.orig 2018-03-13 19:25:38 UTC +++ retroshare-gui/src/retroshare-gui.pro -@@ -239,12 +239,16 @@ macx { +@@ -270,12 +270,15 @@ macx { freebsd-* { INCLUDEPATH *= /usr/local/include/gpgme - LIBS *= -lssl + LIBS *= -lssl -lcrypto LIBS *= -lgpgme - LIBS *= -lupnp +- LIBS *= -lupnp ++ LIBS *= -lminiupnpc LIBS *= -lgnome-keyring + LIBS *= -lz -+ LIBS *= -lixml + LIBS *= -lexecinfo - LIBS += -lsqlite3 Modified: head/net-p2p/retroshare/files/patch-retroshare-nogui_src_retroshare-nogui.pro ============================================================================== --- head/net-p2p/retroshare/files/patch-retroshare-nogui_src_retroshare-nogui.pro Mon Apr 22 08:24:51 2019 (r499613) +++ head/net-p2p/retroshare/files/patch-retroshare-nogui_src_retroshare-nogui.pro Mon Apr 22 08:26:59 2019 (r499614) @@ -1,16 +1,16 @@ ---- retroshare-nogui/src/retroshare-nogui.pro.orig 2016-03-05 21:29:14 UTC +--- retroshare-nogui/src/retroshare-nogui.pro.orig 2019-04-20 14:26:36 UTC +++ retroshare-nogui/src/retroshare-nogui.pro -@@ -126,10 +126,16 @@ macx { +@@ -115,10 +115,15 @@ macx { freebsd-* { INCLUDEPATH *= /usr/local/include/gpgme - LIBS *= -lssl + LIBS *= -lssl -lcrypto LIBS *= -lgpgme - LIBS *= -lupnp +- LIBS *= -lupnp ++ LIBS *= -lminiupnpc LIBS *= -lgnome-keyring + LIBS *= -lz -+ LIBS *= -lixml + LIBS *= -lthr + LIBS += -lsqlcipher + LIBS *= -lexecinfo
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201904220826.x3M8QxhZ041860>