Date: Thu, 31 Oct 2013 11:45:19 +0100 (CET) From: Peter Klett <peter@netkey.at> To: FreeBSD-gnats-submit@freebsd.org Subject: ports/183520: [maintainer update] Update RetroShare to 0.5.5.a; Support for Staging Message-ID: <201310311045.r9VAjJSv058642@petersbsd.netkey.at> Resent-Message-ID: <201310311050.r9VAo0Y6013872@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 183520
>Category: ports
>Synopsis: [maintainer update] Update RetroShare to 0.5.5.a; Support for Staging
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Thu Oct 31 10:50:00 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator: Peter Klett
>Release: FreeBSD 9.1-RELEASE amd64
>Organization:
>Environment:
System: FreeBSD petersbsd 9.1-RELEASE FreeBSD 9.1-RELEASE #0 r243825: Tue Dec 4 09:23:10 UTC 2012 root@farrell.cse.buffalo.edu:/usr/obj/usr/src/sys/GENERIC amd64
>Description:
* Update to RetroShare version 0.5.5a
* Support for Staging
* Added files:
+ files/patch-plugins-FeedReader-FeedReader.pro
* Deleted files:
+ files/patch-plugins-VOIP-VOIP.pro
+ files/patch-retroshare-gui-src-gui-common-GroupTreeWidget.cpp
>How-To-Repeat:
Update to 0.5.5.a
>Fix:
See attached diff
--- retroshare.diff begins here ---
Index: Makefile
===================================================================
--- Makefile (Revision 332215)
+++ Makefile (Arbeitskopie)
@@ -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}
@@ -29,8 +28,7 @@
fontconfig:${PORTSDIR}/x11-fonts/fontconfig
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 \
@@ -40,8 +38,8 @@
BINARY_NOGUI= retroshare-nogui
MAKE_JOBS_UNSAFE=yes
-DESKTOP_ENTRIES="${BINARY}" "${COMMENT}" "" "${BINARY}" \
- "Network;FileTransfer;" true
+DESKTOP_ENTRIES="${BINARY}" "${COMMENT}" "${DATADIR}/retrosharelogo1.png" \
+ "${BINARY}" "Network;FileTransfer;" true
OPTIONS_DEFINE= NOGUI PLUGINS
OPTIONS_DEFAULT= PLUGINS
@@ -48,11 +46,11 @@
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
+LIB_DEPENDS+= speex:${PORTSDIR}/audio/speex \
+ libxslt.so:${PORTSDIR}/textproc/libxslt
USE_QT4+= multimedia
USE_LDCONFIG= yes
.endif
@@ -62,8 +60,7 @@
${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
+ retroshare-nogui/src/retroshare-nogui.pro
post-patch:
@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|' \
@@ -74,6 +71,10 @@
${WRKSRC}/retroshare-nogui/src/retroshare-nogui.pro
@${REINPLACE_CMD} -e 's|/usr/local/share/retroshare|${DATADIR}|' \
${WRKSRC}/libretroshare/src/rsserver/rsinit.cc
+ @${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
.if empty(PORT_OPTIONS:MNOGUI)
@${REINPLACE_CMD} -e 's|retroshare-nogui|#retroshare-nogui|' \
${WRKSRC}/${BINARY}.pro
@@ -93,6 +94,25 @@
@${REINPLACE_CMD} -e 's|/usr/lib|${LOCALBASE}/lib|' \
${WRKSRC}/libretroshare/src/rsserver/rsinit.cc
.endif
+.if empty(PORT_OPTIONS:MNOGUI)
+ @${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)
@@ -107,22 +127,30 @@
.endif
post-install:
- ${INSTALL_PROGRAM} ${WRKSRC}/retroshare-gui/src/${BINARY} ${PREFIX}/bin
+ ${INSTALL_PROGRAM} ${WRKSRC}/retroshare-gui/src/${BINARY} \
+ ${STAGEDIR}${PREFIX}/bin
.if ${PORT_OPTIONS:MNOGUI}
- ${INSTALL_PROGRAM} ${WRKSRC}/retroshare-nogui/src/${BINARY_NOGUI} ${PREFIX}/bin
+ ${INSTALL_PROGRAM} ${WRKSRC}/retroshare-nogui/src/${BINARY_NOGUI} \
+ ${STAGEDIR}${PREFIX}/bin
.endif
- ${MKDIR} ${DATADIR}
- ${INSTALL_MAN} ${WRKSRC}/libbitdht/src/example/bdboot.txt ${DATADIR}
+ ${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}
.if ${PORT_OPTIONS:MPLUGINS}
- ${MKDIR} ${PREFIX}/lib/retroshare
- ${MKDIR} ${PREFIX}/lib/retroshare/extensions
+ ${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
+ ${LN} -s libVOIP.so.1 libVOIP.so && \
+ ${LN} -s libFeedReader.so.1 libFeedReader.so
.endif
.include <bsd.port.mk>
Index: distinfo
===================================================================
--- distinfo (Revision 332215)
+++ distinfo (Arbeitskopie)
@@ -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
Index: files/patch-plugins-FeedReader-FeedReader.pro
===================================================================
--- files/patch-plugins-FeedReader-FeedReader.pro (Revision 0)
+++ files/patch-plugins-FeedReader-FeedReader.pro (Arbeitskopie)
@@ -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
++}
Eigenschaftsänderungen: files/patch-plugins-FeedReader-FeedReader.pro
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: files/patch-plugins-VOIP-VOIP.pro
===================================================================
--- files/patch-plugins-VOIP-VOIP.pro (Revision 332215)
+++ files/patch-plugins-VOIP-VOIP.pro (Arbeitskopie)
@@ -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
- }
-
Index: files/patch-retroshare-gui-src-gui-common-GroupTreeWidget.cpp
===================================================================
--- files/patch-retroshare-gui-src-gui-common-GroupTreeWidget.cpp (Revision 332215)
+++ files/patch-retroshare-gui-src-gui-common-GroupTreeWidget.cpp (Arbeitskopie)
@@ -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);
- }
- }
-
Index: files/patch-retroshare-gui-src-retroshare-gui.pro
===================================================================
--- files/patch-retroshare-gui-src-retroshare-gui.pro (Revision 332215)
+++ files/patch-retroshare-gui-src-retroshare-gui.pro (Arbeitskopie)
@@ -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 ######################################
Index: pkg-plist
===================================================================
--- pkg-plist (Revision 332215)
+++ pkg-plist (Arbeitskopie)
@@ -4,7 +4,10 @@
%%PLUGINS%%lib/retroshare/extensions/libLinksCloud.so.1
%%PLUGINS%%lib/retroshare/extensions/libVOIP.so
%%PLUGINS%%lib/retroshare/extensions/libVOIP.so.1
+%%PLUGINS%%lib/retroshare/extensions/libFeedReader.so
+%%PLUGINS%%lib/retroshare/extensions/libFeedReader.so.1
%%DATADIR%%/bdboot.txt
+%%DATADIR%%/retrosharelogo1.png
@dirrm %%DATADIR%%
%%PLUGINS%%@dirrm lib/retroshare/extensions
%%PLUGINS%%@dirrm lib/retroshare
--- retroshare.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201310311045.r9VAjJSv058642>