Attachment #131271 for bug #175310

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

Lines 1-2 Link Here

(-)distinfo (-2 / +2 lines)
1	SHA256 (RetroShare-v0.5.4b.tar.gz) = 6570f9e3eab077e4f5637cf98c7b72c30afea5b2b811df6398d4919a1c2c0134	1	SHA256 (RetroShare-v0.5.4d.tar.gz) = 2c5bcd1764829abc260d5c9328088a09307c00f0e15c3cc12a08ba3584d549c7
2	SIZE (RetroShare-v0.5.4b.tar.gz) = 7322037	2	SIZE (RetroShare-v0.5.4d.tar.gz) = 15914197




--- retroshare-gui/src/retroshare-gui.pro.orig	2012-10-29 21:09:06.932916323 +0100
+++ retroshare-gui/src/retroshare-gui.pro	2012-10-29 21:10:17.747920258 +0100
@@ -175,11 +175,14 @@
 freebsd-* {
 	INCLUDEPATH *= /usr/local/include/gpgme
 	LIBS *= ../../libretroshare/src/lib/libretroshare.a

 	LIBS *= -lssl
 	LIBS *= -lgpgme
 	LIBS *= -lupnp
 	LIBS *= -lgnome-keyring
 	PRE_TARGETDEPS *= ../../libretroshare/src/lib/libretroshare.a
+	# plugins need this
+	QMAKE_LFLAGS *= -rdynamic
 }
 
 ############################## Common stuff ######################################

Line 0 Link Here

(-)files/patch-plugins-VOIP-VOIP.pro (+11 lines)
	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

Lines 1-4 Link Here

(-)pkg-plist (+6 lines)
1	bin/RetroShare	1	bin/RetroShare
2	%%NOGUI%%bin/retroshare-nogui	2	%%NOGUI%%bin/retroshare-nogui
		3	%%PLUGINS%%lib/retroshare/extensions/libLinksCloud.so.1
		4	%%PLUGINS%%lib/retroshare/extensions/libVOIP.so.1
3	%%DATADIR%%/bdboot.txt	5	%%DATADIR%%/bdboot.txt
4	@dirrm %%DATADIR%%	6	@dirrm %%DATADIR%%
		7	%%PLUGINS%%@unexec /bin/rm %D/lib/retroshare/extensions/libLinksCloud.so \|\| /usr/bin/true
		8	%%PLUGINS%%@unexec /bin/rm %D/lib/retroshare/extensions/libVOIP.so \|\| /usr/bin/true
		9	%%PLUGINS%%@dirrm lib/retroshare/extensions
		10	%%PLUGINS%%@dirrm lib/retroshare

Lines 2-8 Link Here

(-)Makefile (-3 / +35 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= retroshare	4	PORTNAME= retroshare
5	PORTVERSION= 0.5.4b	5	PORTVERSION= 0.5.4d
6	PORTREVISION= 1	6	PORTREVISION= 1
7	CATEGORIES= net-p2p	7	CATEGORIES= net-p2p
8	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}	8	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
Lines 45-55 Link Here
45	DESKTOP_ENTRIES="${BINARY}" "${COMMENT}" "" "${BINARY}" \	45	DESKTOP_ENTRIES="${BINARY}" "${COMMENT}" "" "${BINARY}" \
46	"Network;FileTransfer;" true	46	"Network;FileTransfer;" true
47		47
48	OPTIONS_DEFINE= NOGUI	48	OPTIONS_DEFINE= NOGUI PLUGINS
49	NOGUI_DESC= "Install retroshare-nogui binary"	49	OPTIONS_DEFAULT= PLUGINS
		50	NOGUI_DESC= Install retroshare-nogui (CLI binary)
		51	PLUGINS_DESC= Install plugins (LinksCloud, VoIP)
50		52
51	.include <bsd.port.options.mk>	53	.include <bsd.port.options.mk>
52		54
		55	.if ${PORT_OPTIONS:MPLUGINS}
		56	USE_QT4+= multimedia
		57	USE_LDCONFIG= yes
		58	.endif
		59
53	do-configure:	60	do-configure:
54	@cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} \	61	@cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} \
55	${QMAKE} PREFIX=${PREFIX} ${BINARY}.pro	62	${QMAKE} PREFIX=${PREFIX} ${BINARY}.pro
Lines 69-81 Link Here
69	.if empty(PORT_OPTIONS:MNOGUI)	76	.if empty(PORT_OPTIONS:MNOGUI)
70	@${REINPLACE_CMD} -e 's\|retroshare-nogui\|#retroshare-nogui\|' \	77	@${REINPLACE_CMD} -e 's\|retroshare-nogui\|#retroshare-nogui\|' \
71	${WRKSRC}/${BINARY}.pro	78	${WRKSRC}/${BINARY}.pro
		79	.if empty(PORT_OPTIONS:MPLUGINS)
72	@${REINPLACE_CMD} -e 's\|retroshare-gui.pro \\\|retroshare-gui.pro\|' \	80	@${REINPLACE_CMD} -e 's\|retroshare-gui.pro \\\|retroshare-gui.pro\|' \
73	${WRKSRC}/${BINARY}.pro	81	${WRKSRC}/${BINARY}.pro
		82	.endif
74	.else	83	.else
		84	.if empty(PORT_OPTIONS:MPLUGINS)
75	@${REINPLACE_CMD} -e 's\|retroshare-nogui.pro \\\|retroshare-nogui.pro\|' \	85	@${REINPLACE_CMD} -e 's\|retroshare-nogui.pro \\\|retroshare-nogui.pro\|' \
76	${WRKSRC}/${BINARY}.pro	86	${WRKSRC}/${BINARY}.pro
77	.endif	87	.endif
		88	.endif
		89	.if empty(PORT_OPTIONS:MPLUGINS)
78	@${REINPLACE_CMD} -e 's\|plugins\|#plugins\|' ${WRKSRC}/${BINARY}.pro	90	@${REINPLACE_CMD} -e 's\|plugins\|#plugins\|' ${WRKSRC}/${BINARY}.pro
		91	.else
		92	@${REINPLACE_CMD} -e 's\|/usr/lib\|${LOCALBASE}/lib\|' \
		93	${WRKSRC}/libretroshare/src/rsserver/rsinit.cc
		94	.endif
79		95
80	pre-install:	96	pre-install:
81	.if empty(PORT_OPTIONS:MNOGUI)	97	.if empty(PORT_OPTIONS:MNOGUI)
Lines 83-88 Link Here
83	.else	99	.else
84	PLIST_SUB+= NOGUI=""	100	PLIST_SUB+= NOGUI=""
85	.endif	101	.endif
		102	.if empty(PORT_OPTIONS:MPLUGINS)
		103	PLIST_SUB+= PLUGINS="@comment "
		104	.else
		105	PLIST_SUB+= PLUGINS=""
		106	.endif
86		107
87	post-install:	108	post-install:
88	${INSTALL_PROGRAM} ${WRKSRC}/retroshare-gui/src/${BINARY} ${PREFIX}/bin	109	${INSTALL_PROGRAM} ${WRKSRC}/retroshare-gui/src/${BINARY} ${PREFIX}/bin
Lines 91-95 Link Here
91	.endif	112	.endif
92	${MKDIR} ${DATADIR}	113	${MKDIR} ${DATADIR}
93	${INSTALL_MAN} ${WRKSRC}/libbitdht/src/example/bdboot.txt ${DATADIR}	114	${INSTALL_MAN} ${WRKSRC}/libbitdht/src/example/bdboot.txt ${DATADIR}
		115	.if ${PORT_OPTIONS:MPLUGINS}
		116	${MKDIR} ${PREFIX}/lib/retroshare
		117	${MKDIR} ${PREFIX}/lib/retroshare/extensions
		118	${INSTALL_LIB} ${WRKSRC}/plugins/LinksCloud/libLinksCloud.so.1.0.0 \
		119	${PREFIX}/lib/retroshare/extensions/libLinksCloud.so.1
		120	${INSTALL_LIB} ${WRKSRC}/plugins/VOIP/libVOIP.so.1.0.0 \
		121	${PREFIX}/lib/retroshare/extensions/libVOIP.so.1
		122	@cd ${PREFIX}/lib/retroshare/extensions && \
		123	${LN} -s libLinksCloud.so.1 libLinksCloud.so && \
		124	${LN} -s libVOIP.so.1 libVOIP.so
		125	.endif
94		126
95	.include <bsd.port.mk>	127	.include <bsd.port.mk>

Return to bug 175310

Lines 1-6 Link Here

(-)files/patch-retroshare-gui-src-retroshare-gui.pro (-3 / +10 lines)
1	--- retroshare-gui/src/retroshare-gui.pro.orig 2012-10-08 19:37:47.000000000 +0200	1	--- retroshare-gui/src/retroshare-gui.pro.orig 2012-10-29 21:09:06.932916323 +0100
2	+++ retroshare-gui/src/retroshare-gui.pro 2012-10-08 20:10:51.000000000 +0200	2	+++ retroshare-gui/src/retroshare-gui.pro 2012-10-29 21:10:17.747920258 +0100
3	@@ -175,6 +175,7 @@	3	@@ -175,11 +175,14 @@
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
Lines 8-10 Link Here
8	LIBS *= -lssl	8	LIBS *= -lssl
9	LIBS *= -lgpgme	9	LIBS *= -lgpgme
10	LIBS *= -lupnp	10	LIBS *= -lupnp
		11	LIBS *= -lgnome-keyring
		12	PRE_TARGETDEPS *= ../../libretroshare/src/lib/libretroshare.a
		13	+ # plugins need this
		14	+ QMAKE_LFLAGS *= -rdynamic
		15	}
		16
		17	############################## Common stuff ######################################