From owner-svn-ports-all@FreeBSD.ORG Sat Oct 20 10:54:11 2012 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 9F3C66CE; Sat, 20 Oct 2012 10:54:11 +0000 (UTC) (envelope-from pawel@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 85B4E8FC08; Sat, 20 Oct 2012 10:54:11 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q9KAsBQr012472; Sat, 20 Oct 2012 10:54:11 GMT (envelope-from pawel@svn.freebsd.org) Received: (from pawel@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q9KAsBJ1012465; Sat, 20 Oct 2012 10:54:11 GMT (envelope-from pawel@svn.freebsd.org) Message-Id: <201210201054.q9KAsBJ1012465@svn.freebsd.org> From: Pawel Pekala Date: Sat, 20 Oct 2012 10:54:11 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r306177 - in head/net-p2p/retroshare: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 20 Oct 2012 10:54:11 -0000 Author: pawel Date: Sat Oct 20 10:54:10 2012 New Revision: 306177 URL: http://svn.freebsd.org/changeset/ports/306177 Log: - Update to version 0.5.4b - Change maintainer's email - Convert to OptionsNG While here: - Add missing lib deps - Don't install GPLv2 license file - Correct COMMENT PR: ports/172731 Submitted by: Peter Klett (maintainer) Feature safe: yes Added: head/net-p2p/retroshare/files/ head/net-p2p/retroshare/files/patch-libbitdht-src-libbitdht.pro (contents, props changed) head/net-p2p/retroshare/files/patch-libretroshare-src-libretroshare.pro (contents, props changed) head/net-p2p/retroshare/files/patch-retroshare-gui-src-retroshare-gui.pro (contents, props changed) head/net-p2p/retroshare/files/patch-retroshare-nogui-src-retroshare-nogui.pro (contents, props changed) Modified: head/net-p2p/retroshare/Makefile head/net-p2p/retroshare/distinfo Modified: head/net-p2p/retroshare/Makefile ============================================================================== --- head/net-p2p/retroshare/Makefile Sat Oct 20 10:36:27 2012 (r306176) +++ head/net-p2p/retroshare/Makefile Sat Oct 20 10:54:10 2012 (r306177) @@ -1,30 +1,39 @@ -# New ports collection makefile for: retroshare -# Date created: 15 January 2012 -# Whom: glocke -# +# Created by: glocke@bsdstammtisch.at # $FreeBSD$ -# PORTNAME= retroshare -PORTVERSION= 0.5.3a -PORTREVISION= 2 +PORTVERSION= 0.5.4b CATEGORIES= net-p2p MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR=${PORTNAME}/${BINARY}/${PORTVERSION} DISTNAME= ${BINARY}-v${PORTVERSION} -MAINTAINER= glocke@bsdstammtisch.at -COMMENT= A private and secure decentralised communication platform +MAINTAINER= peter@netkey.at +COMMENT= 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= 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 \ + xcb:${PORTSDIR}/x11/libxcb RUN_DEPENDS+= pinentry-qt4:${PORTSDIR}/security/pinentry-qt4 WRKSRC= ${WRKDIR}/trunk +USE_ICONV= yes +USE_GETTEXT= yes +USE_GNOME= glib20 +USE_XORG= ice sm x11 xau xdmcp xext xrender USE_QT4= corelib gui network xml script designer_build uic_build \ qmake_build moc_build rcc_build HAS_CONFIGURE= yes @@ -35,7 +44,8 @@ MAKE_JOBS_UNSAFE=yes DESKTOP_ENTRIES="${BINARY}" "${COMMENT}" "" "${BINARY}" \ "Network;FileTransfer;" true -OPTIONS= NOGUI "Also build nogui binary" Off +OPTIONS_DEFINE= NOGUI +NOGUI_DESC= "Install retroshare-nogui binary" .include @@ -43,28 +53,31 @@ 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 + 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 +85,7 @@ PLIST_SUB+= NOGUI="" 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} Modified: head/net-p2p/retroshare/distinfo ============================================================================== --- head/net-p2p/retroshare/distinfo Sat Oct 20 10:36:27 2012 (r306176) +++ head/net-p2p/retroshare/distinfo Sat Oct 20 10:54:10 2012 (r306177) @@ -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 Added: head/net-p2p/retroshare/files/patch-libbitdht-src-libbitdht.pro ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net-p2p/retroshare/files/patch-libbitdht-src-libbitdht.pro Sat Oct 20 10:54:10 2012 (r306177) @@ -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 ################################## Added: head/net-p2p/retroshare/files/patch-libretroshare-src-libretroshare.pro ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net-p2p/retroshare/files/patch-libretroshare-src-libretroshare.pro Sat Oct 20 10:54:10 2012 (r306177) @@ -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 + Added: head/net-p2p/retroshare/files/patch-retroshare-gui-src-retroshare-gui.pro ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net-p2p/retroshare/files/patch-retroshare-gui-src-retroshare-gui.pro Sat Oct 20 10:54:10 2012 (r306177) @@ -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 Added: head/net-p2p/retroshare/files/patch-retroshare-nogui-src-retroshare-nogui.pro ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net-p2p/retroshare/files/patch-retroshare-nogui-src-retroshare-nogui.pro Sat Oct 20 10:54:10 2012 (r306177) @@ -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