From owner-freebsd-ports-bugs@FreeBSD.ORG Mon Jan 14 22:10:02 2013 Return-Path: Delivered-To: freebsd-ports-bugs@smarthost.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id DA6958E9 for ; Mon, 14 Jan 2013 22:10:02 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) by mx1.freebsd.org (Postfix) with ESMTP id B79C0E81 for ; Mon, 14 Jan 2013 22:10:02 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.6/8.14.6) with ESMTP id r0EMA2F0007855 for ; Mon, 14 Jan 2013 22:10:02 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.6/8.14.6/Submit) id r0EMA21v007854; Mon, 14 Jan 2013 22:10:02 GMT (envelope-from gnats) Resent-Date: Mon, 14 Jan 2013 22:10:02 GMT Resent-Message-Id: <201301142210.r0EMA21v007854@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Peter Klett Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id A3A04855 for ; Mon, 14 Jan 2013 22:03:59 +0000 (UTC) (envelope-from peter@netkey.at) Received: from xena.netkey.at (xena.netkey.at [83.64.50.179]) by mx1.freebsd.org (Postfix) with ESMTP id 03D8FE3F for ; Mon, 14 Jan 2013 22:03:58 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by xena.netkey.at (Postfix) with ESMTP id 044D2D18406 for ; Mon, 14 Jan 2013 22:58:35 +0100 (CET) Received: from xena.netkey.at ([127.0.0.1]) by localhost (xena.netkey.at [127.0.0.1]) (amavisd-maia, port 10024) with ESMTP id 03862-02 for ; Mon, 14 Jan 2013 22:58:34 +0100 (CET) Received: from antec.home (chello084112169112.22.11.vie.surfer.at [84.112.169.112]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) (Authenticated sender: peter@netkey.at) by xena.netkey.at (Postfix) with ESMTPSA id 90396D18404 for ; Mon, 14 Jan 2013 22:58:34 +0100 (CET) Received: from antec.home (localhost [127.0.0.1]) by antec.home (8.14.5/8.14.5) with ESMTP id r0ELwW81082014 for ; Mon, 14 Jan 2013 22:58:32 +0100 (CET) (envelope-from peter@netkey.at) Received: (from retep@localhost) by antec.home (8.14.5/8.14.5/Submit) id r0ELwWej082013; Mon, 14 Jan 2013 22:58:32 +0100 (CET) (envelope-from peter@netkey.at) Message-Id: <201301142158.r0ELwWej082013@antec.home> Date: Mon, 14 Jan 2013 22:58:32 +0100 (CET) From: Peter Klett To: FreeBSD-gnats-submit@freebsd.org X-Send-Pr-Version: 3.113 Subject: ports/175310: [maintainer update] net-p2p/retroshare to 0.5.4d X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: Peter Klett List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Jan 2013 22:10:02 -0000 >Number: 175310 >Category: ports >Synopsis: [maintainer update] net-p2p/retroshare to 0.5.4d >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: Mon Jan 14 22:10:01 UTC 2013 >Closed-Date: >Last-Modified: >Originator: Peter Klett >Release: FreeBSD 9.0-STABLE amd64 >Organization: >Environment: System: FreeBSD antec 9.0-STABLE FreeBSD 9.0-STABLE #1: Mon Jun 18 02:44:58 CEST 2012 root@antec:/usr/obj/usr/src/sys/GENERIC amd64 >Description: * Update to RetroShare 0.5.4d * VoIP plugin * Added file: files/patch-plugins-VOIP-VOIP.pro >How-To-Repeat: Update to 0.5.4d >Fix: --- retroshare.diff begins here --- Index: distinfo =================================================================== --- distinfo (Revision 310398) +++ distinfo (Arbeitskopie) @@ -1,2 +1,2 @@ -SHA256 (RetroShare-v0.5.4b.tar.gz) = 6570f9e3eab077e4f5637cf98c7b72c30afea5b2b811df6398d4919a1c2c0134 -SIZE (RetroShare-v0.5.4b.tar.gz) = 7322037 +SHA256 (RetroShare-v0.5.4d.tar.gz) = 2c5bcd1764829abc260d5c9328088a09307c00f0e15c3cc12a08ba3584d549c7 +SIZE (RetroShare-v0.5.4d.tar.gz) = 15914197 Index: files/patch-retroshare-gui-src-retroshare-gui.pro =================================================================== --- files/patch-retroshare-gui-src-retroshare-gui.pro (Revision 310398) +++ files/patch-retroshare-gui-src-retroshare-gui.pro (Arbeitskopie) @@ -1,6 +1,6 @@ ---- retroshare-gui/src/retroshare-gui.pro.orig 2012-10-08 19:37:47.000000000 +0200 -+++ retroshare-gui/src/retroshare-gui.pro 2012-10-08 20:10:51.000000000 +0200 -@@ -175,6 +175,7 @@ +--- 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 @@ -8,3 +8,10 @@ LIBS *= -lssl LIBS *= -lgpgme LIBS *= -lupnp + LIBS *= -lgnome-keyring + PRE_TARGETDEPS *= ../../libretroshare/src/lib/libretroshare.a ++ # plugins need this ++ QMAKE_LFLAGS *= -rdynamic + } + + ############################## Common stuff ###################################### Index: files/patch-plugins-VOIP-VOIP.pro =================================================================== --- files/patch-plugins-VOIP-VOIP.pro (Revision 0) +++ files/patch-plugins-VOIP-VOIP.pro (Arbeitskopie) @@ -0,0 +1,11 @@ +--- 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: pkg-plist =================================================================== --- pkg-plist (Revision 310398) +++ pkg-plist (Arbeitskopie) @@ -1,4 +1,10 @@ bin/RetroShare %%NOGUI%%bin/retroshare-nogui +%%PLUGINS%%lib/retroshare/extensions/libLinksCloud.so.1 +%%PLUGINS%%lib/retroshare/extensions/libVOIP.so.1 %%DATADIR%%/bdboot.txt @dirrm %%DATADIR%% +%%PLUGINS%%@unexec /bin/rm %D/lib/retroshare/extensions/libLinksCloud.so || /usr/bin/true +%%PLUGINS%%@unexec /bin/rm %D/lib/retroshare/extensions/libVOIP.so || /usr/bin/true +%%PLUGINS%%@dirrm lib/retroshare/extensions +%%PLUGINS%%@dirrm lib/retroshare Index: Makefile =================================================================== --- Makefile (Revision 310398) +++ Makefile (Arbeitskopie) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= retroshare -PORTVERSION= 0.5.4b +PORTVERSION= 0.5.4d PORTREVISION= 1 CATEGORIES= net-p2p MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} @@ -45,11 +45,18 @@ DESKTOP_ENTRIES="${BINARY}" "${COMMENT}" "" "${BINARY}" \ "Network;FileTransfer;" true -OPTIONS_DEFINE= NOGUI -NOGUI_DESC= "Install retroshare-nogui binary" +OPTIONS_DEFINE= NOGUI PLUGINS +OPTIONS_DEFAULT= PLUGINS +NOGUI_DESC= Install retroshare-nogui (CLI binary) +PLUGINS_DESC= Install plugins (LinksCloud, VoIP) .include +.if ${PORT_OPTIONS:MPLUGINS} +USE_QT4+= multimedia +USE_LDCONFIG= yes +.endif + do-configure: @cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} \ ${QMAKE} PREFIX=${PREFIX} ${BINARY}.pro @@ -69,13 +76,22 @@ .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) @@ -83,6 +99,11 @@ .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 @@ -91,5 +112,16 @@ .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_LIB} ${WRKSRC}/plugins/LinksCloud/libLinksCloud.so.1.0.0 \ + ${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 && \ + ${LN} -s libLinksCloud.so.1 libLinksCloud.so && \ + ${LN} -s libVOIP.so.1 libVOIP.so +.endif .include --- retroshare.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: