cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

net-p2p/retroshare: Switch from devel/upnp to net/miniupnpc

Browse Source 
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)
This commit is contained in:
Tobias Kortkamp 2019-04-22 08:26:59 +00:00
parent 5cd6c2ce21
commit 56900eadb9
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=499614
4 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
net-p2p/retroshare/Makefile
View File

@ -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

7
net-p2p/retroshare/files/patch-libretroshare_src_libretroshare.pro
View File

@ -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}\\\"\"
}

8
net-p2p/retroshare/files/patch-retroshare-gui_src_retroshare-gui.pro
View File

@ -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

8
net-p2p/retroshare/files/patch-retroshare-nogui_src_retroshare-nogui.pro
View File

@ -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