Date: Mon, 15 Oct 2012 21:51:39 +0200 (CEST) From: Peter Klett <peter@netkey.at> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/172731: [Maintainer Update] net-p2p/retroshare: update to 0.5.4b Message-ID: <201210151951.q9FJpdeE026282@antec.home> Resent-Message-ID: <201210152000.q9FK01fp051231@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 172731
>Category: ports
>Synopsis: [Maintainer Update] net-p2p/retroshare: update to 0.5.4b
>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 Oct 15 20:00:01 UTC 2012
>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 retroshare to version 0.5.4b
* new OPTIONS syntax
* maintainer email address update
* Added files:
- files/patch-libbitdht-src-libbitdht.pro
- files/patch-libretroshare-src-libretroshare.pro
- files/patch-retroshare-gui-src-retroshare-gui.pro
- files/patch-retroshare-nogui-src-retroshare-nogui.pro
>How-To-Repeat:
Update to 0.5.4b
>Fix:
Hope this diff works..
--- retroshare.diff begins here ---
Index: distinfo
===================================================================
--- distinfo (Revision 305927)
+++ distinfo (Arbeitskopie)
@@ -1,2 +1,2 @@
-SHA256 (RetroShare-v0.5.3a.tar.gz) = 744f3d410c57e51455d07fe9e77dc9e645a58de454ce5248aa8704c41d2df3a4
-SIZE (RetroShare-v0.5.3a.tar.gz) = 6419672
+SHA256 (RetroShare-v0.5.4b.tar.gz) = 6570f9e3eab077e4f5637cf98c7b72c30afea5b2b811df6398d4919a1c2c0134
+SIZE (RetroShare-v0.5.4b.tar.gz) = 7322037
Index: files/patch-retroshare-gui-src-retroshare-gui.pro
===================================================================
--- files/patch-retroshare-gui-src-retroshare-gui.pro (Revision 0)
+++ files/patch-retroshare-gui-src-retroshare-gui.pro (Arbeitskopie)
@@ -0,0 +1,10 @@
+--- 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 @@
+ 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
Index: files/patch-retroshare-nogui-src-retroshare-nogui.pro
===================================================================
--- files/patch-retroshare-nogui-src-retroshare-nogui.pro (Revision 0)
+++ files/patch-retroshare-nogui-src-retroshare-nogui.pro (Arbeitskopie)
@@ -0,0 +1,10 @@
+--- 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
Index: files/patch-libbitdht-src-libbitdht.pro
===================================================================
--- files/patch-libbitdht-src-libbitdht.pro (Revision 0)
+++ files/patch-libbitdht-src-libbitdht.pro (Arbeitskopie)
@@ -0,0 +1,10 @@
+--- libbitdht/src/libbitdht.pro.orig 2012-08-16 18:59:51.000000000 +0200
++++ libbitdht/src/libbitdht.pro 2012-10-08 18:41:49.000000000 +0200
+@@ -91,6 +91,7 @@
+
+ freebsd-* {
+ DESTDIR = lib
++ INCLUDEPATH += ../../openpgpsdk/src \
+ }
+
+ ################################### COMMON stuff ##################################
Index: files/patch-libretroshare-src-libretroshare.pro
===================================================================
--- files/patch-libretroshare-src-libretroshare.pro (Revision 0)
+++ files/patch-libretroshare-src-libretroshare.pro (Arbeitskopie)
@@ -0,0 +1,10 @@
+--- libretroshare/src/libretroshare.pro.orig 2012-10-08 18:45:10.000000000 +0200
++++ libretroshare/src/libretroshare.pro 2012-10-08 19:26:26.000000000 +0200
+@@ -341,6 +341,7 @@
+ freebsd-* {
+ INCLUDEPATH *= /usr/local/include/gpgme
+ INCLUDEPATH *= /usr/local/include/glib-2.0
++ INCLUDEPATH += ../../openpgpsdk/src
+
+ QMAKE_CXXFLAGS *= -Dfseeko64=fseeko -Dftello64=ftello -Dstat64=stat -Dstatvfs64=statvfs -Dfopen64=fopen
+
Index: Makefile
===================================================================
--- Makefile (Revision 305927)
+++ Makefile (Arbeitskopie)
@@ -6,22 +6,22 @@
#
PORTNAME= retroshare
-PORTVERSION= 0.5.3a
-PORTREVISION= 2
+PORTVERSION= 0.5.4b
+PORTREVISION=
CATEGORIES= net-p2p
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR=${PORTNAME}/${BINARY}/${PORTVERSION}
DISTNAME= ${BINARY}-v${PORTVERSION}
-MAINTAINER= glocke@bsdstammtisch.at
+MAINTAINER= peter@netkey.at
COMMENT= A private and secure decentralised communication platform
LICENSE= GPLv2
LICENSE_FILE= ${WRKDIR}/trunk/retroshare-gui/src/license/license.txt
-LIB_DEPENDS= gpgme.19:${PORTSDIR}/security/gpgme \
- upnp.9:${PORTSDIR}/devel/upnp \
- gnome-keyring.0:${PORTSDIR}/security/libgnome-keyring
+LIB_DEPENDS= gpgme:${PORTSDIR}/security/gpgme \
+ upnp:${PORTSDIR}/devel/upnp \
+ gnome-keyring:${PORTSDIR}/security/libgnome-keyring
RUN_DEPENDS+= pinentry-qt4:${PORTSDIR}/security/pinentry-qt4
WRKSRC= ${WRKDIR}/trunk
@@ -35,7 +35,8 @@
DESKTOP_ENTRIES="${BINARY}" "${COMMENT}" "" "${BINARY}" \
"Network;FileTransfer;" true
-OPTIONS= NOGUI "Also build nogui binary" Off
+OPTIONS_DEFINE= NOGUI
+NOGUI_DESC= "Also build retroshare-nogui binary"
.include <bsd.port.options.mk>
@@ -43,28 +44,31 @@
@cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} \
${QMAKE} PREFIX=${PREFIX} ${BINARY}.pro
+USE_DOS2UNIX= retroshare-gui/src/retroshare-gui.pro \
+ retroshare-nogui/src/retroshare-nogui.pro
+
post-patch:
- @${REINPLACE_CMD} -e 's|plugins|#plugins|' ${WRKSRC}/${BINARY}.pro
@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|' \
${WRKSRC}/libretroshare/src/libretroshare.pro
@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|' \
- ${WRKSRC}/retroshare-gui/src/RetroShare.pro
+ ${WRKSRC}/retroshare-gui/src/retroshare-gui.pro
@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|' \
${WRKSRC}/retroshare-nogui/src/retroshare-nogui.pro
@${REINPLACE_CMD} -e 's|/usr/local/share/retroshare|${DATADIR}|' \
${WRKSRC}/libretroshare/src/rsserver/rsinit.cc
-.if defined(WITHOUT_NOGUI)
+.if empty(PORT_OPTIONS:MNOGUI)
@${REINPLACE_CMD} -e 's|retroshare-nogui|#retroshare-nogui|' \
${WRKSRC}/${BINARY}.pro
- @${REINPLACE_CMD} -e 's|RetroShare.pro \\|RetroShare.pro|' \
+ @${REINPLACE_CMD} -e 's|retroshare-gui.pro \\|retroshare-gui.pro|' \
${WRKSRC}/${BINARY}.pro
.else
@${REINPLACE_CMD} -e 's|retroshare-nogui.pro \\|retroshare-nogui.pro|' \
${WRKSRC}/${BINARY}.pro
.endif
+ @${REINPLACE_CMD} -e 's|plugins|#plugins|' ${WRKSRC}/${BINARY}.pro
pre-install:
-.if defined(WITHOUT_NOGUI)
+.if empty(PORT_OPTIONS:MNOGUI)
PLIST_SUB+= NOGUI="@comment "
.else
PLIST_SUB+= NOGUI=""
@@ -72,7 +76,7 @@
post-install:
${INSTALL_PROGRAM} ${WRKSRC}/retroshare-gui/src/${BINARY} ${PREFIX}/bin
-.if defined(WITH_NOGUI)
+.if ${PORT_OPTIONS:MNOGUI}
${INSTALL_PROGRAM} ${WRKSRC}/retroshare-nogui/src/${BINARY_NOGUI} ${PREFIX}/bin
.endif
${MKDIR} ${DATADIR}
--- 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?201210151951.q9FJpdeE026282>