8 files changed, 80 insertions, 140 deletions

diff --git a/net-p2p/retroshare/Makefile b/net-p2p/retroshare/Makefile
index 8572f58da793..256fdd9b7f4c 100644
--- a/net-p2p/retroshare/Makefile
+++ b/net-p2p/retroshare/Makefile
@@ -2,10 +2,9 @@
 # $FreeBSD$
 
 PORTNAME=	retroshare
-PORTVERSION=	0.5.4d
-PORTREVISION=	2
+PORTVERSION=	0.5.5a
 CATEGORIES=	net-p2p
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITES=	SF
 MASTER_SITE_SUBDIR=${PORTNAME}/${BINARY}/${PORTVERSION}
 DISTNAME=	${BINARY}-v${PORTVERSION}
 
@@ -14,56 +13,41 @@ COMMENT=	Private and secure decentralised communication platform
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	dbus-1:${PORTSDIR}/devel/dbus \
-		pthread-stubs:${PORTSDIR}/devel/libpthread-stubs \
-		pcre:${PORTSDIR}/devel/pcre \
-		upnp:${PORTSDIR}/devel/upnp \
-		png15:${PORTSDIR}/graphics/png \
-		freetype:${PORTSDIR}/print/freetype2 \
-		assuan:${PORTSDIR}/security/libassuan \
-		gcrypt:${PORTSDIR}/security/libgcrypt \
-		gnome-keyring:${PORTSDIR}/security/libgnome-keyring \
-		gpg-error:${PORTSDIR}/security/libgpg-error \
-		gpgme:${PORTSDIR}/security/gpgme \
-		expat:${PORTSDIR}/textproc/expat2 \
-		fontconfig:${PORTSDIR}/x11-fonts/fontconfig
-RUN_DEPENDS+=	pinentry-qt4:${PORTSDIR}/security/pinentry-qt4
+LIB_DEPENDS=	libdbus-1.so:${PORTSDIR}/devel/dbus \
+		libpthread-stubs.so:${PORTSDIR}/devel/libpthread-stubs \
+		libpcre.so:${PORTSDIR}/devel/pcre \
+		libupnp.so:${PORTSDIR}/devel/upnp \
+		libpng15.so:${PORTSDIR}/graphics/png \
+		libfreetype.so:${PORTSDIR}/print/freetype2 \
+		libassuan.so:${PORTSDIR}/security/libassuan \
+		libgcrypt.so:${PORTSDIR}/security/libgcrypt \
+		libgnome-keyring.so:${PORTSDIR}/security/libgnome-keyring \
+		libgpg-error.so:${PORTSDIR}/security/libgpg-error \
+		libgpgme.so:${PORTSDIR}/security/gpgme \
+		libexpat.so:${PORTSDIR}/textproc/expat2 \
+		libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig \
+		libspeex.so:${PORTSDIR}/audio/speex \
+		libxslt.so:${PORTSDIR}/textproc/libxslt
+RUN_DEPENDS=	pinentry-qt4:${PORTSDIR}/security/pinentry-qt4
 
-WRKSRC=		${WRKDIR}/trunk
-USES=		gettext iconv
+USE_ZIP=	yes
 USE_GNOME=	glib20
 USE_XORG=	ice sm x11 xau xcb xdmcp xext xrender
 USE_QT4=	corelib gui network xml script designer_build uic_build \
-		qmake_build moc_build rcc_build
+		qmake_build moc_build rcc_build multimedia
 HAS_CONFIGURE=	yes
 BINARY=		RetroShare
-BINARY_NOGUI=	retroshare-nogui
 MAKE_JOBS_UNSAFE=yes
-
-DESKTOP_ENTRIES="${BINARY}" "${COMMENT}" "" "${BINARY}" \
-		"Network;FileTransfer;" true
-
-OPTIONS_DEFINE=	NOGUI PLUGINS
-OPTIONS_DEFAULT=	PLUGINS
-NOGUI_DESC=		Install retroshare-nogui (CLI binary)
-PLUGINS_DESC=	Install plugins (LinksCloud, VoIP)
-
-NO_STAGE=	yes
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MPLUGINS}
-LIB_DEPENDS+=	speex:${PORTSDIR}/audio/speex
-USE_QT4+=	multimedia
 USE_LDCONFIG=	yes
-.endif
+
+DESKTOP_ENTRIES="${BINARY}" "${COMMENT}" "${DATADIR}/retrosharelogo1.png" \
+		"${BINARY}" "Network;FileTransfer;" true
 
 do-configure:
 	@cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} \
 		${QMAKE} PREFIX=${PREFIX} ${BINARY}.pro
 
-USE_DOS2UNIX=	retroshare-gui/src/retroshare-gui.pro \
-		retroshare-nogui/src/retroshare-nogui.pro \
-		retroshare-gui/src/gui/common/GroupTreeWidget.cpp
+USE_DOS2UNIX=	retroshare-gui/src/retroshare-gui.pro
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|' \
@@ -74,55 +58,34 @@ post-patch:
 		${WRKSRC}/retroshare-nogui/src/retroshare-nogui.pro
 	@${REINPLACE_CMD} -e 's|/usr/local/share/retroshare|${DATADIR}|' \
 		${WRKSRC}/libretroshare/src/rsserver/rsinit.cc
-.if empty(PORT_OPTIONS:MNOGUI)
+	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|' \
+		${WRKSRC}/plugins/FeedReader/FeedReader.pro
+	@${REINPLACE_CMD} -e 's|/usr/local/share/retroshare|${DATADIR}|' \
+		${WRKSRC}/libretroshare/src/rsserver/rsinit.cc
 	@${REINPLACE_CMD} -e 's|retroshare-nogui|#retroshare-nogui|' \
 		${WRKSRC}/${BINARY}.pro
-.if empty(PORT_OPTIONS:MPLUGINS)
-	@${REINPLACE_CMD} -e 's|retroshare-gui.pro \\|retroshare-gui.pro|' \
-		${WRKSRC}/${BINARY}.pro
-.endif
-.else
-.if empty(PORT_OPTIONS:MPLUGINS)
-	@${REINPLACE_CMD} -e 's|retroshare-nogui.pro \\|retroshare-nogui.pro|' \
-		${WRKSRC}/${BINARY}.pro
-.endif
-.endif
-.if empty(PORT_OPTIONS:MPLUGINS)
-	@${REINPLACE_CMD} -e 's|plugins|#plugins|' ${WRKSRC}/${BINARY}.pro
-.else
 	@${REINPLACE_CMD} -e 's|/usr/lib|${LOCALBASE}/lib|' \
 		${WRKSRC}/libretroshare/src/rsserver/rsinit.cc
-.endif
-
-pre-install:
-.if empty(PORT_OPTIONS:MNOGUI)
-PLIST_SUB+=	NOGUI="@comment "
-.else
-PLIST_SUB+=	NOGUI=""
-.endif
-.if empty(PORT_OPTIONS:MPLUGINS)
-PLIST_SUB+=	PLUGINS="@comment "
-.else
-PLIST_SUB+=	PLUGINS=""
-.endif
 
 post-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/retroshare-gui/src/${BINARY} ${PREFIX}/bin
-.if ${PORT_OPTIONS:MNOGUI}
-	${INSTALL_PROGRAM} ${WRKSRC}/retroshare-nogui/src/${BINARY_NOGUI} ${PREFIX}/bin
-.endif
-	${MKDIR} ${DATADIR}
-	${INSTALL_MAN} ${WRKSRC}/libbitdht/src/example/bdboot.txt ${DATADIR}
-.if ${PORT_OPTIONS:MPLUGINS}
-	${MKDIR} ${PREFIX}/lib/retroshare
-	${MKDIR} ${PREFIX}/lib/retroshare/extensions
+	${INSTALL_PROGRAM} ${WRKSRC}/retroshare-gui/src/${BINARY} \
+		${STAGEDIR}${PREFIX}/bin
+	${MKDIR} ${STAGEDIR}${DATADIR}
+	${INSTALL_MAN} ${WRKSRC}/libbitdht/src/example/bdboot.txt \
+		${STAGEDIR}${DATADIR}
+	${INSTALL_DATA} ${WRKSRC}/retroshare-gui/src/gui/images/retrosharelogo1.png \
+		${STAGEDIR}${DATADIR}
+	${MKDIR} ${STAGEDIR}${PREFIX}/lib/retroshare
+	${MKDIR} ${STAGEDIR}${PREFIX}/lib/retroshare/extensions
 	${INSTALL_LIB} ${WRKSRC}/plugins/LinksCloud/libLinksCloud.so.1.0.0 \
-		${PREFIX}/lib/retroshare/extensions/libLinksCloud.so.1
+		${STAGEDIR}${PREFIX}/lib/retroshare/extensions/libLinksCloud.so.1
 	${INSTALL_LIB} ${WRKSRC}/plugins/VOIP/libVOIP.so.1.0.0 \
-		${PREFIX}/lib/retroshare/extensions/libVOIP.so.1
-	@cd ${PREFIX}/lib/retroshare/extensions && \
+		${STAGEDIR}${PREFIX}/lib/retroshare/extensions/libVOIP.so.1
+	${INSTALL_LIB} ${WRKSRC}/plugins/FeedReader/libFeedReader.so.1.0.0 \
+		${STAGEDIR}${PREFIX}/lib/retroshare/extensions/libFeedReader.so.1
+	@cd ${STAGEDIR}${PREFIX}/lib/retroshare/extensions && \
 		${LN} -s libLinksCloud.so.1 libLinksCloud.so && \
-		${LN} -s libVOIP.so.1 libVOIP.so
-.endif
+		${LN} -s libVOIP.so.1 libVOIP.so && \
+		${LN} -s libFeedReader.so.1 libFeedReader.so
 
 .include <bsd.port.mk>
diff --git a/net-p2p/retroshare/distinfo b/net-p2p/retroshare/distinfo
index c051516e5f37..db7f5cd2bbea 100644
--- a/net-p2p/retroshare/distinfo
+++ b/net-p2p/retroshare/distinfo
@@ -1,2 +1,2 @@
-SHA256 (RetroShare-v0.5.4d.tar.gz) = 2c5bcd1764829abc260d5c9328088a09307c00f0e15c3cc12a08ba3584d549c7
-SIZE (RetroShare-v0.5.4d.tar.gz) = 15914197
+SHA256 (RetroShare-v0.5.5a.zip) = c0d33c6e2055b68184940098599c105c6b6c2909a166331a0c710f9fd86a2253
+SIZE (RetroShare-v0.5.5a.zip) = 12527884
diff --git a/net-p2p/retroshare/files/patch-plugins-FeedReader-FeedReader.pro b/net-p2p/retroshare/files/patch-plugins-FeedReader-FeedReader.pro
new file mode 100644
index 000000000000..b006d69bfce6
--- /dev/null
+++ b/net-p2p/retroshare/files/patch-plugins-FeedReader-FeedReader.pro
@@ -0,0 +1,12 @@
+--- plugins/FeedReader/FeedReader.pro.orig	2013-10-22 11:53:29.000000000 +0200
++++ plugins/FeedReader/FeedReader.pro	2013-10-22 11:54:10.000000000 +0200
+@@ -101,3 +101,9 @@
+ 	LIBS += -lcurl -lxml2 -lxslt
+ }
+ 
++freebsd-* {
++
++	INCLUDEPATH += /usr/local/include/libxml2
++
++	LIBS += -lcurl -lxml2 -lxslt
++}
diff --git a/net-p2p/retroshare/files/patch-plugins-VOIP-VOIP.pro b/net-p2p/retroshare/files/patch-plugins-VOIP-VOIP.pro
deleted file mode 100644
index 1cc0a9dd9723..000000000000
--- a/net-p2p/retroshare/files/patch-plugins-VOIP-VOIP.pro
+++ /dev/null
@@ -1,11 +0,0 @@
---- plugins/VOIP/VOIP.pro.orig	2012-10-29 11:31:20.931921695 +0100
-+++ plugins/VOIP/VOIP.pro	2012-10-29 12:17:47.694925531 +0100
-@@ -9,7 +9,7 @@
- QT_VER_MAJ = $$member(QT_VERSION, 0)
- QT_VER_MIN = $$member(QT_VERSION, 1)
-  
--lessThan(QT_VER_MAJ, 4) | lessThan(QT_VER_MIN, 7) | win32 {
-+lessThan(QT_VER_MAJ, 4) | lessThan(QT_VER_MIN, 7) | win32 | freebsd-* {
-    QT += multimedia
- }
- 
diff --git a/net-p2p/retroshare/files/patch-retroshare-gui-src-gui-common-GroupTreeWidget.cpp b/net-p2p/retroshare/files/patch-retroshare-gui-src-gui-common-GroupTreeWidget.cpp
deleted file mode 100644
index 144574a95c2c..000000000000
--- a/net-p2p/retroshare/files/patch-retroshare-gui-src-gui-common-GroupTreeWidget.cpp
+++ /dev/null
@@ -1,22 +0,0 @@
---- ./retroshare-gui/src/gui/common/GroupTreeWidget.cpp.orig	2013-02-28 16:46:27.000000000 +0100
-+++ retroshare-gui/src/gui/common/GroupTreeWidget.cpp	2013-02-28 16:47:15.000000000 +0100
-@@ -449,15 +449,15 @@
- 
- 	/* Find out which has given word in it */
- 	QTreeWidgetItemIterator itemIterator(ui->treeWidget);
--	QTreeWidgetItem *item;
--	while ((item = *itemIterator) != NULL) {
-+	QTreeWidgetItem *item2;
-+	while ((item2 = *itemIterator) != NULL) {
- 		itemIterator++;
- 
--		if (item->data(COLUMN_DATA, ROLE_ID).toString().isEmpty()) {
-+		if (item2->data(COLUMN_DATA, ROLE_ID).toString().isEmpty()) {
- 			continue;
- 		}
- 
--		calculateScore(item, filterText);
-+		calculateScore(item2, filterText);
- 	}
- }
- 
diff --git a/net-p2p/retroshare/files/patch-retroshare-gui-src-retroshare-gui.pro b/net-p2p/retroshare/files/patch-retroshare-gui-src-retroshare-gui.pro
index f4a0a952f1ca..9c016372ba5f 100644
--- a/net-p2p/retroshare/files/patch-retroshare-gui-src-retroshare-gui.pro
+++ b/net-p2p/retroshare/files/patch-retroshare-gui-src-retroshare-gui.pro
@@ -1,17 +1,23 @@
---- 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 @@
+--- retroshare-gui/src/retroshare-gui.pro.orig	2013-10-21 21:31:11.012605427 +0200
++++ retroshare-gui/src/retroshare-gui.pro	2013-10-21 21:31:53.770609780 +0200
+@@ -209,17 +209,19 @@
  freebsd-* {
  	INCLUDEPATH *= /usr/local/include/gpgme
  	LIBS *= ../../libretroshare/src/lib/libretroshare.a
-+	LIBS += ../../openpgpsdk/src/lib/libops.a -lbz2
++	LIBS *= ../../openpgpsdk/src/lib/libops.a -lbz2
  	LIBS *= -lssl
  	LIBS *= -lgpgme
  	LIBS *= -lupnp
  	LIBS *= -lgnome-keyring
  	PRE_TARGETDEPS *= ../../libretroshare/src/lib/libretroshare.a
-+	# plugins need this
-+	QMAKE_LFLAGS *= -rdynamic
++	PRE_TARGETDEPS *= ../../openpgpsdk/src/lib/libops.a
+ 
+         gxs {
+                 LIBS += ../../supportlibs/pegmarkdown/lib/libpegmarkdown.a
+                 LIBS += -lsqlite3
+         }
+-
++	LIBS *= -rdynamic
  }
  
- ############################## Common stuff ######################################
+ ##################################### OpenBSD ######################################
diff --git a/net-p2p/retroshare/files/patch-retroshare-nogui-src-retroshare-nogui.pro b/net-p2p/retroshare/files/patch-retroshare-nogui-src-retroshare-nogui.pro
deleted file mode 100644
index 9541312f6d43..000000000000
--- a/net-p2p/retroshare/files/patch-retroshare-nogui-src-retroshare-nogui.pro
+++ /dev/null
@@ -1,10 +0,0 @@
---- retroshare-nogui/src/retroshare-nogui.pro.orig	2012-10-08 22:44:45.000000000 +0200
-+++ retroshare-nogui/src/retroshare-nogui.pro	2012-10-08 22:46:13.000000000 +0200
-@@ -78,6 +78,7 @@
- freebsd-* {
- 	INCLUDEPATH *= /usr/local/include/gpgme
- 	LIBS *= ../../libretroshare/src/lib/libretroshare.a
-+	LIBS += ../../openpgpsdk/src/lib/libops.a -lbz2
- 	LIBS *= -lssl
- 	LIBS *= -lgpgme
- 	LIBS *= -lupnp
diff --git a/net-p2p/retroshare/pkg-plist b/net-p2p/retroshare/pkg-plist
index 75577e6c64c0..bf4d41039a80 100644
--- a/net-p2p/retroshare/pkg-plist
+++ b/net-p2p/retroshare/pkg-plist
@@ -1,10 +1,12 @@
 bin/RetroShare
-%%NOGUI%%bin/retroshare-nogui
-%%PLUGINS%%lib/retroshare/extensions/libLinksCloud.so
-%%PLUGINS%%lib/retroshare/extensions/libLinksCloud.so.1
-%%PLUGINS%%lib/retroshare/extensions/libVOIP.so
-%%PLUGINS%%lib/retroshare/extensions/libVOIP.so.1
+lib/retroshare/extensions/libLinksCloud.so
+lib/retroshare/extensions/libLinksCloud.so.1
+lib/retroshare/extensions/libVOIP.so
+lib/retroshare/extensions/libVOIP.so.1
+lib/retroshare/extensions/libFeedReader.so
+lib/retroshare/extensions/libFeedReader.so.1
 %%DATADIR%%/bdboot.txt
+%%DATADIR%%/retrosharelogo1.png
 @dirrm %%DATADIR%%
-%%PLUGINS%%@dirrm lib/retroshare/extensions
-%%PLUGINS%%@dirrm lib/retroshare
+@dirrm lib/retroshare/extensions
+@dirrm lib/retroshare