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

(-)Makefile (-21 / +49 lines)
Lines 2-11 Link Here
2
# $FreeBSD$
2
# $FreeBSD$
3
3
4
PORTNAME=	retroshare
4
PORTNAME=	retroshare
5
PORTVERSION=	0.5.4d
5
PORTVERSION=	0.5.5a
6
PORTREVISION=	2
7
CATEGORIES=	net-p2p
6
CATEGORIES=	net-p2p
8
MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
7
MASTER_SITES=	SF
9
MASTER_SITE_SUBDIR=${PORTNAME}/${BINARY}/${PORTVERSION}
8
MASTER_SITE_SUBDIR=${PORTNAME}/${BINARY}/${PORTVERSION}
10
DISTNAME=	${BINARY}-v${PORTVERSION}
9
DISTNAME=	${BINARY}-v${PORTVERSION}
11
10
Lines 29-36 Link Here
29
		fontconfig:${PORTSDIR}/x11-fonts/fontconfig
28
		fontconfig:${PORTSDIR}/x11-fonts/fontconfig
30
RUN_DEPENDS+=	pinentry-qt4:${PORTSDIR}/security/pinentry-qt4
29
RUN_DEPENDS+=	pinentry-qt4:${PORTSDIR}/security/pinentry-qt4
31
30
32
WRKSRC=		${WRKDIR}/trunk
31
USE_ZIP=	yes
33
USES=		gettext iconv
34
USE_GNOME=	glib20
32
USE_GNOME=	glib20
35
USE_XORG=	ice sm x11 xau xcb xdmcp xext xrender
33
USE_XORG=	ice sm x11 xau xcb xdmcp xext xrender
36
USE_QT4=	corelib gui network xml script designer_build uic_build \
34
USE_QT4=	corelib gui network xml script designer_build uic_build \
Lines 40-47 Link Here
40
BINARY_NOGUI=	retroshare-nogui
38
BINARY_NOGUI=	retroshare-nogui
41
MAKE_JOBS_UNSAFE=yes
39
MAKE_JOBS_UNSAFE=yes
42
40
43
DESKTOP_ENTRIES="${BINARY}" "${COMMENT}" "" "${BINARY}" \
41
DESKTOP_ENTRIES="${BINARY}" "${COMMENT}" "${DATADIR}/retrosharelogo1.png" \
44
		"Network;FileTransfer;" true
42
		"${BINARY}" "Network;FileTransfer;" true
45
43
46
OPTIONS_DEFINE=	NOGUI PLUGINS
44
OPTIONS_DEFINE=	NOGUI PLUGINS
47
OPTIONS_DEFAULT=	PLUGINS
45
OPTIONS_DEFAULT=	PLUGINS
Lines 48-58 Link Here
48
NOGUI_DESC=		Install retroshare-nogui (CLI binary)
46
NOGUI_DESC=		Install retroshare-nogui (CLI binary)
49
PLUGINS_DESC=	Install plugins (LinksCloud, VoIP)
47
PLUGINS_DESC=	Install plugins (LinksCloud, VoIP)
50
48
51
NO_STAGE=	yes
52
.include <bsd.port.options.mk>
49
.include <bsd.port.options.mk>
53
50
54
.if ${PORT_OPTIONS:MPLUGINS}
51
.if ${PORT_OPTIONS:MPLUGINS}
55
LIB_DEPENDS+=	speex:${PORTSDIR}/audio/speex
52
LIB_DEPENDS+=	speex:${PORTSDIR}/audio/speex \
53
		libxslt.so:${PORTSDIR}/textproc/libxslt
56
USE_QT4+=	multimedia
54
USE_QT4+=	multimedia
57
USE_LDCONFIG=	yes
55
USE_LDCONFIG=	yes
58
.endif
56
.endif
Lines 62-69 Link Here
62
		${QMAKE} PREFIX=${PREFIX} ${BINARY}.pro
60
		${QMAKE} PREFIX=${PREFIX} ${BINARY}.pro
63
61
64
USE_DOS2UNIX=	retroshare-gui/src/retroshare-gui.pro \
62
USE_DOS2UNIX=	retroshare-gui/src/retroshare-gui.pro \
65
		retroshare-nogui/src/retroshare-nogui.pro \
63
		retroshare-nogui/src/retroshare-nogui.pro
66
		retroshare-gui/src/gui/common/GroupTreeWidget.cpp
67
64
68
post-patch:
65
post-patch:
69
	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|' \
66
	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|' \
Lines 74-79 Link Here
74
		${WRKSRC}/retroshare-nogui/src/retroshare-nogui.pro
71
		${WRKSRC}/retroshare-nogui/src/retroshare-nogui.pro
75
	@${REINPLACE_CMD} -e 's|/usr/local/share/retroshare|${DATADIR}|' \
72
	@${REINPLACE_CMD} -e 's|/usr/local/share/retroshare|${DATADIR}|' \
76
		${WRKSRC}/libretroshare/src/rsserver/rsinit.cc
73
		${WRKSRC}/libretroshare/src/rsserver/rsinit.cc
74
	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|' \
75
		${WRKSRC}/plugins/FeedReader/FeedReader.pro
76
	@${REINPLACE_CMD} -e 's|/usr/local/share/retroshare|${DATADIR}|' \
77
		${WRKSRC}/libretroshare/src/rsserver/rsinit.cc
77
.if empty(PORT_OPTIONS:MNOGUI)
78
.if empty(PORT_OPTIONS:MNOGUI)
78
	@${REINPLACE_CMD} -e 's|retroshare-nogui|#retroshare-nogui|' \
79
	@${REINPLACE_CMD} -e 's|retroshare-nogui|#retroshare-nogui|' \
79
		${WRKSRC}/${BINARY}.pro
80
		${WRKSRC}/${BINARY}.pro
Lines 93-98 Link Here
93
	@${REINPLACE_CMD} -e 's|/usr/lib|${LOCALBASE}/lib|' \
94
	@${REINPLACE_CMD} -e 's|/usr/lib|${LOCALBASE}/lib|' \
94
		${WRKSRC}/libretroshare/src/rsserver/rsinit.cc
95
		${WRKSRC}/libretroshare/src/rsserver/rsinit.cc
95
.endif
96
.endif
97
.if empty(PORT_OPTIONS:MNOGUI)
98
	@${REINPLACE_CMD} -e 's|retroshare-nogui|#retroshare-nogui|' \
99
		${WRKSRC}/${BINARY}.pro
100
.if empty(PORT_OPTIONS:MPLUGINS)
101
	@${REINPLACE_CMD} -e 's|retroshare-gui.pro \\|retroshare-gui.pro|' \
102
		${WRKSRC}/${BINARY}.pro
103
.endif
104
.else
105
.if empty(PORT_OPTIONS:MPLUGINS)
106
	@${REINPLACE_CMD} -e 's|retroshare-nogui.pro \\|retroshare-nogui.pro|' \
107
		${WRKSRC}/${BINARY}.pro
108
.endif
109
.endif
110
.if empty(PORT_OPTIONS:MPLUGINS)
111
	@${REINPLACE_CMD} -e 's|plugins|#plugins|' ${WRKSRC}/${BINARY}.pro
112
.else
113
	@${REINPLACE_CMD} -e 's|/usr/lib|${LOCALBASE}/lib|' \
114
		${WRKSRC}/libretroshare/src/rsserver/rsinit.cc
115
.endif
96
116
97
pre-install:
117
pre-install:
98
.if empty(PORT_OPTIONS:MNOGUI)
118
.if empty(PORT_OPTIONS:MNOGUI)
Lines 107-128 Link Here
107
.endif
127
.endif
108
128
109
post-install:
129
post-install:
110
	${INSTALL_PROGRAM} ${WRKSRC}/retroshare-gui/src/${BINARY} ${PREFIX}/bin
130
	${INSTALL_PROGRAM} ${WRKSRC}/retroshare-gui/src/${BINARY} \
131
		${STAGEDIR}${PREFIX}/bin
111
.if ${PORT_OPTIONS:MNOGUI}
132
.if ${PORT_OPTIONS:MNOGUI}
112
	${INSTALL_PROGRAM} ${WRKSRC}/retroshare-nogui/src/${BINARY_NOGUI} ${PREFIX}/bin
133
	${INSTALL_PROGRAM} ${WRKSRC}/retroshare-nogui/src/${BINARY_NOGUI} \
134
		${STAGEDIR}${PREFIX}/bin
113
.endif
135
.endif
114
	${MKDIR} ${DATADIR}
136
	${MKDIR} ${STAGEDIR}${DATADIR}
115
	${INSTALL_MAN} ${WRKSRC}/libbitdht/src/example/bdboot.txt ${DATADIR}
137
	${INSTALL_MAN} ${WRKSRC}/libbitdht/src/example/bdboot.txt \
138
		${STAGEDIR}${DATADIR}
139
	${INSTALL_DATA} ${WRKSRC}/retroshare-gui/src/gui/images/retrosharelogo1.png \
140
		${STAGEDIR}${DATADIR}
116
.if ${PORT_OPTIONS:MPLUGINS}
141
.if ${PORT_OPTIONS:MPLUGINS}
117
	${MKDIR} ${PREFIX}/lib/retroshare
142
	${MKDIR} ${STAGEDIR}${PREFIX}/lib/retroshare
118
	${MKDIR} ${PREFIX}/lib/retroshare/extensions
143
	${MKDIR} ${STAGEDIR}${PREFIX}/lib/retroshare/extensions
119
	${INSTALL_LIB} ${WRKSRC}/plugins/LinksCloud/libLinksCloud.so.1.0.0 \
144
	${INSTALL_LIB} ${WRKSRC}/plugins/LinksCloud/libLinksCloud.so.1.0.0 \
120
		${PREFIX}/lib/retroshare/extensions/libLinksCloud.so.1
145
		${STAGEDIR}${PREFIX}/lib/retroshare/extensions/libLinksCloud.so.1
121
	${INSTALL_LIB} ${WRKSRC}/plugins/VOIP/libVOIP.so.1.0.0 \
146
	${INSTALL_LIB} ${WRKSRC}/plugins/VOIP/libVOIP.so.1.0.0 \
122
		${PREFIX}/lib/retroshare/extensions/libVOIP.so.1
147
		${STAGEDIR}${PREFIX}/lib/retroshare/extensions/libVOIP.so.1
123
	@cd ${PREFIX}/lib/retroshare/extensions && \
148
	${INSTALL_LIB} ${WRKSRC}/plugins/FeedReader/libFeedReader.so.1.0.0 \
149
		${STAGEDIR}${PREFIX}/lib/retroshare/extensions/libFeedReader.so.1
150
	@cd ${STAGEDIR}${PREFIX}/lib/retroshare/extensions && \
124
		${LN} -s libLinksCloud.so.1 libLinksCloud.so && \
151
		${LN} -s libLinksCloud.so.1 libLinksCloud.so && \
125
		${LN} -s libVOIP.so.1 libVOIP.so
152
		${LN} -s libVOIP.so.1 libVOIP.so && \
153
		${LN} -s libFeedReader.so.1 libFeedReader.so
126
.endif
154
.endif
127
155
128
.include <bsd.port.mk>
156
.include <bsd.port.mk>
(-)distinfo (-2 / +2 lines)
Lines 1-2 Link Here
1
SHA256 (RetroShare-v0.5.4d.tar.gz) = 2c5bcd1764829abc260d5c9328088a09307c00f0e15c3cc12a08ba3584d549c7
1
SHA256 (RetroShare-v0.5.5a.zip) = c0d33c6e2055b68184940098599c105c6b6c2909a166331a0c710f9fd86a2253
2
SIZE (RetroShare-v0.5.4d.tar.gz) = 15914197
2
SIZE (RetroShare-v0.5.5a.zip) = 12527884
(-)files/patch-plugins-FeedReader-FeedReader.pro (+15 lines)
Line 0 Link Here
1
--- plugins/FeedReader/FeedReader.pro.orig	2013-10-22 11:53:29.000000000 +0200
2
+++ plugins/FeedReader/FeedReader.pro	2013-10-22 11:54:10.000000000 +0200
3
@@ -101,3 +101,9 @@
4
 	LIBS += -lcurl -lxml2 -lxslt
5
 }
6
 
7
+freebsd-* {
8
+
9
+	INCLUDEPATH += /usr/local/include/libxml2
10
+
11
+	LIBS += -lcurl -lxml2 -lxslt
12
+}
13
text/plain
14
yes
15
native
(-)files/patch-plugins-VOIP-VOIP.pro (-11 lines)
Lines 1-11 Link Here
1
--- plugins/VOIP/VOIP.pro.orig	2012-10-29 11:31:20.931921695 +0100
2
+++ plugins/VOIP/VOIP.pro	2012-10-29 12:17:47.694925531 +0100
3
@@ -9,7 +9,7 @@
4
 QT_VER_MAJ = $$member(QT_VERSION, 0)
5
 QT_VER_MIN = $$member(QT_VERSION, 1)
6
  
7
-lessThan(QT_VER_MAJ, 4) | lessThan(QT_VER_MIN, 7) | win32 {
8
+lessThan(QT_VER_MAJ, 4) | lessThan(QT_VER_MIN, 7) | win32 | freebsd-* {
9
    QT += multimedia
10
 }
11
 
(-)files/patch-retroshare-gui-src-gui-common-GroupTreeWidget.cpp (-22 lines)
Lines 1-22 Link Here
1
--- ./retroshare-gui/src/gui/common/GroupTreeWidget.cpp.orig	2013-02-28 16:46:27.000000000 +0100
2
+++ retroshare-gui/src/gui/common/GroupTreeWidget.cpp	2013-02-28 16:47:15.000000000 +0100
3
@@ -449,15 +449,15 @@
4
 
5
 	/* Find out which has given word in it */
6
 	QTreeWidgetItemIterator itemIterator(ui->treeWidget);
7
-	QTreeWidgetItem *item;
8
-	while ((item = *itemIterator) != NULL) {
9
+	QTreeWidgetItem *item2;
10
+	while ((item2 = *itemIterator) != NULL) {
11
 		itemIterator++;
12
 
13
-		if (item->data(COLUMN_DATA, ROLE_ID).toString().isEmpty()) {
14
+		if (item2->data(COLUMN_DATA, ROLE_ID).toString().isEmpty()) {
15
 			continue;
16
 		}
17
 
18
-		calculateScore(item, filterText);
19
+		calculateScore(item2, filterText);
20
 	}
21
 }
22
 
(-)files/patch-retroshare-gui-src-retroshare-gui.pro (-7 / +13 lines)
Lines 1-17 Link Here
1
--- retroshare-gui/src/retroshare-gui.pro.orig	2012-10-29 21:09:06.932916323 +0100
1
--- retroshare-gui/src/retroshare-gui.pro.orig	2013-10-21 21:31:11.012605427 +0200
2
+++ retroshare-gui/src/retroshare-gui.pro	2012-10-29 21:10:17.747920258 +0100
2
+++ retroshare-gui/src/retroshare-gui.pro	2013-10-21 21:31:53.770609780 +0200
3
@@ -175,11 +175,14 @@
3
@@ -209,17 +209,19 @@
4
 freebsd-* {
4
 freebsd-* {
5
 	INCLUDEPATH *= /usr/local/include/gpgme
5
 	INCLUDEPATH *= /usr/local/include/gpgme
6
 	LIBS *= ../../libretroshare/src/lib/libretroshare.a
6
 	LIBS *= ../../libretroshare/src/lib/libretroshare.a
7
+	LIBS += ../../openpgpsdk/src/lib/libops.a -lbz2
7
+	LIBS *= ../../openpgpsdk/src/lib/libops.a -lbz2
8
 	LIBS *= -lssl
8
 	LIBS *= -lssl
9
 	LIBS *= -lgpgme
9
 	LIBS *= -lgpgme
10
 	LIBS *= -lupnp
10
 	LIBS *= -lupnp
11
 	LIBS *= -lgnome-keyring
11
 	LIBS *= -lgnome-keyring
12
 	PRE_TARGETDEPS *= ../../libretroshare/src/lib/libretroshare.a
12
 	PRE_TARGETDEPS *= ../../libretroshare/src/lib/libretroshare.a
13
+	# plugins need this
13
+	PRE_TARGETDEPS *= ../../openpgpsdk/src/lib/libops.a
14
+	QMAKE_LFLAGS *= -rdynamic
14
 
15
         gxs {
16
                 LIBS += ../../supportlibs/pegmarkdown/lib/libpegmarkdown.a
17
                 LIBS += -lsqlite3
18
         }
19
-
20
+	LIBS *= -rdynamic
15
 }
21
 }
16
 
22
 
17
 ############################## Common stuff ######################################
23
 ##################################### OpenBSD ######################################
(-)pkg-plist (+3 lines)
Lines 4-10 Link Here
4
%%PLUGINS%%lib/retroshare/extensions/libLinksCloud.so.1
4
%%PLUGINS%%lib/retroshare/extensions/libLinksCloud.so.1
5
%%PLUGINS%%lib/retroshare/extensions/libVOIP.so
5
%%PLUGINS%%lib/retroshare/extensions/libVOIP.so
6
%%PLUGINS%%lib/retroshare/extensions/libVOIP.so.1
6
%%PLUGINS%%lib/retroshare/extensions/libVOIP.so.1
7
%%PLUGINS%%lib/retroshare/extensions/libFeedReader.so
8
%%PLUGINS%%lib/retroshare/extensions/libFeedReader.so.1
7
%%DATADIR%%/bdboot.txt
9
%%DATADIR%%/bdboot.txt
10
%%DATADIR%%/retrosharelogo1.png
8
@dirrm %%DATADIR%%
11
@dirrm %%DATADIR%%
9
%%PLUGINS%%@dirrm lib/retroshare/extensions
12
%%PLUGINS%%@dirrm lib/retroshare/extensions
10
%%PLUGINS%%@dirrm lib/retroshare
13
%%PLUGINS%%@dirrm lib/retroshare

Return to bug 183520