Attachment #194676 for bug #229367

View | Details | Raw Unified | Return to bug 229367
Collapse All | Expand All

Lines 1-3 Link Here

(-)retroshare/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1514378949	1	TIMESTAMP = 1530050837
2	SHA256 (RetroShare-RetroShare-v0.6.3_GH0.tar.gz) = ddb64aa5148fdc950d4426f52f1cbb11578619b1242614e3c4ca4792ee5ce30b	2	SHA256 (RetroShare-RetroShare-v0.6.4_GH0.tar.gz) = 84355c0f3be5ec1dfa7253e327ea1254f76f47739c233cfb8d0983ebd1a61f4a
3	SIZE (RetroShare-RetroShare-v0.6.3_GH0.tar.gz) = 19699359	3	SIZE (RetroShare-RetroShare-v0.6.4_GH0.tar.gz) = 20018361




--- libretroshare/src/libretroshare.pro.orig	2018-03-13 19:25:38 UTC
+++ libretroshare/src/libretroshare.pro
@@ -341,13 +341,15 @@ mac {
 
 freebsd-* {
 	INCLUDEPATH *= /usr/local/include/gpgme

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

Line 0 Link Here

(-)retroshare/files/patch-libretroshare_src_rsserver_rsaccounts.cc (+10 lines)
	1	--- libretroshare/src/rsserver/rsaccounts.cc.orig 2018-03-13 19:25:38 UTC
	2	+++ libretroshare/src/rsserver/rsaccounts.cc
	3	@@ -35,6 +35,7 @@
	4	#endif // WINDOWS_SYS
	5
	6	#include <sys/types.h>
	7	+#include <sys/param.h>
	8	#include <sys/stat.h>
	9
	10	#include <iostream>




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

Lines 3-10 Link Here

(-)retroshare/Makefile (-5 / +7 lines)
3		3
4	PORTNAME= retroshare	4	PORTNAME= retroshare
5	DISTVERSIONPREFIX= v	5	DISTVERSIONPREFIX= v
6	DISTVERSION= 0.6.3	6	DISTVERSION= 0.6.4
7	PORTREVISION= 2
8	CATEGORIES= net-p2p	7	CATEGORIES= net-p2p
9		8
10	MAINTAINER= peter@netkey.at	9	MAINTAINER= peter@netkey.at
Lines 29-34 Link Here
29	USE_GITHUB= yes	28	USE_GITHUB= yes
30	GH_ACCOUNT= RetroShare	29	GH_ACCOUNT= RetroShare
31	GH_PROJECT= RetroShare	30	GH_PROJECT= RetroShare
		31	RS_REVISION= 0e6d27a
32	USE_GNOME= libxml2 libxslt	32	USE_GNOME= libxml2 libxslt
33	USE_GL= gl	33	USE_GL= gl
34	USE_QT5= core gui multimedia printsupport network widgets xml \	34	USE_QT5= core gui multimedia printsupport network widgets xml \
Lines 39-46 Link Here
39		39
40	post-patch:	40	post-patch:
41	@${REINPLACE_CMD} -e 's\|/usr/local\|${LOCALBASE}\|' \	41	@${REINPLACE_CMD} -e 's\|/usr/local\|${LOCALBASE}\|' \
		42	${WRKSRC}/retroshare.pri
		43	@${REINPLACE_CMD} -e 's\|/usr/local\|${LOCALBASE}\|' \
42	${WRKSRC}/libretroshare/src/libretroshare.pro	44	${WRKSRC}/libretroshare/src/libretroshare.pro
43	@${REINPLACE_CMD} -e 's\|/usr/local\|${LOCALBASE}\|' \	45	@${REINPLACE_CMD} -e 's\|/usr/local\|${LOCALBASE}\|' \
		46	${WRKSRC}/libretroshare/src/rsserver/rsaccounts.cc
		47	@${REINPLACE_CMD} -e 's\|/usr/local\|${LOCALBASE}\|' \
44	${WRKSRC}/retroshare-gui/src/retroshare-gui.pro	48	${WRKSRC}/retroshare-gui/src/retroshare-gui.pro
45	@${REINPLACE_CMD} -e 's\|/usr/local\|${LOCALBASE}\|' \	49	@${REINPLACE_CMD} -e 's\|/usr/local\|${LOCALBASE}\|' \
46	${WRKSRC}/retroshare-nogui/src/retroshare-nogui.pro	50	${WRKSRC}/retroshare-nogui/src/retroshare-nogui.pro
Lines 48-56 Link Here
48	${WRKSRC}/data/retroshare.desktop	52	${WRKSRC}/data/retroshare.desktop
49	@${REINPLACE_CMD} -e 's\|/usr/share\|${PREFIX}/share\|' \	53	@${REINPLACE_CMD} -e 's\|/usr/share\|${PREFIX}/share\|' \
50	${WRKSRC}/data/retroshare.desktop	54	${WRKSRC}/data/retroshare.desktop
51	.if defined(GH_TAGNAME)	55	@${REINPLACE_CMD} -e 's\|RS_REVISION_NUMBER.*\|RS_REVISION_NUMBER 0x${RS_REVISION}\|' \
52	@${REINPLACE_CMD} -e 's\|RS_REVISION_NUMBER.*\|RS_REVISION_NUMBER 0x${GH_TAGNAME}\|' \
53	${WRKSRC}/libretroshare/src/retroshare/rsversion.h	56	${WRKSRC}/libretroshare/src/retroshare/rsversion.h
54	.endif
55		57
56	.include <bsd.port.post.mk>	58	.include <bsd.port.post.mk>

Return to bug 229367

Lines 1-6 Link Here

(-)retroshare/files/patch-libretroshare_src_libretroshare.pro (-2 / +10 lines)
1	--- libretroshare/src/libretroshare.pro.orig 2016-02-05 19:04:46 UTC	1	--- libretroshare/src/libretroshare.pro.orig 2018-03-13 19:25:38 UTC
2	+++ libretroshare/src/libretroshare.pro	2	+++ libretroshare/src/libretroshare.pro
3	@@ -293,7 +293,7 @@ mac {	3	@@ -341,13 +341,15 @@ mac {
4		4
5	freebsd-* {	5	freebsd-* {
6	INCLUDEPATH *= /usr/local/include/gpgme	6	INCLUDEPATH *= /usr/local/include/gpgme
Lines 9-11 Link Here
9		9
10	QMAKE_CXXFLAGS *= -Dfseeko64=fseeko -Dftello64=ftello -Dstat64=stat -Dstatvfs64=statvfs -Dfopen64=fopen	10	QMAKE_CXXFLAGS *= -Dfseeko64=fseeko -Dftello64=ftello -Dstat64=stat -Dstatvfs64=statvfs -Dfopen64=fopen
11		11
		12	# linux/bsd can use either - libupnp is more complete and packaged.
		13	#CONFIG += upnp_miniupnpc
		14	CONFIG += upnp_libupnp
		15	+ DEFINES *= PLUGIN_DIR=\"\\\"$${PLUGIN_DIR}\\\"\"
		16	+ DEFINES *= DATA_DIR=\"\\\"$${DATA_DIR}\\\"\"
		17	}
		18
		19	################################# OpenBSD ##########################################

Line 0 Link Here

(-)retroshare/files/patch-retroshare.pri (+22 lines)
	1	--- retroshare.pri.orig 2018-03-13 19:25:38 UTC
	2	+++ retroshare.pri
	3	@@ -16,7 +16,7 @@ no_retroshare_nogui:CONFIG -= retroshare
	4
	5	# To enable RetroShare plugins append the following
	6	# assignation to qmake command line "CONFIG+=retroshare_plugins"
	7	-CONFIG *= no_retroshare_plugins
	8	+CONFIG *=retroshare_plugins
	9	retroshare_plugins:CONFIG -= no_retroshare_plugins
	10
	11	# To enable RetroShare-android-service append the following assignation to
	12	@@ -101,8 +101,8 @@ rs_macos10.10:CONFIG -= rs_macos10.11
	13	rs_macos10.12:CONFIG -= rs_macos10.11
	14
	15
	16	-linux-* {
	17	- isEmpty(PREFIX) { PREFIX = "/usr" }
	18	+freebsd-* {
	19	+ isEmpty(PREFIX) { PREFIX = "/usr/local" }
	20	isEmpty(BIN_DIR) { BIN_DIR = "$${PREFIX}/bin" }
	21	isEmpty(INC_DIR) { INC_DIR = "$${PREFIX}/include/retroshare" }
	22	isEmpty(LIB_DIR) { LIB_DIR = "$${PREFIX}/lib" }