From owner-svn-ports-all@freebsd.org Sat Sep 1 19:33:32 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 9F2E6FF88DC; Sat, 1 Sep 2018 19:33:32 +0000 (UTC) (envelope-from yuri@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 3E894784DC; Sat, 1 Sep 2018 19:33:32 +0000 (UTC) (envelope-from yuri@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 1993D6CEE; Sat, 1 Sep 2018 19:33:32 +0000 (UTC) (envelope-from yuri@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w81JXVix039881; Sat, 1 Sep 2018 19:33:31 GMT (envelope-from yuri@FreeBSD.org) Received: (from yuri@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w81JXVem039876; Sat, 1 Sep 2018 19:33:31 GMT (envelope-from yuri@FreeBSD.org) Message-Id: <201809011933.w81JXVem039876@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: yuri set sender to yuri@FreeBSD.org using -f From: Yuri Victorovich Date: Sat, 1 Sep 2018 19:33:31 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r478718 - in head/net-p2p/libbt: . files X-SVN-Group: ports-head X-SVN-Commit-Author: yuri X-SVN-Commit-Paths: in head/net-p2p/libbt: . files X-SVN-Commit-Revision: 478718 X-SVN-Commit-Repository: ports 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.27 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, 01 Sep 2018 19:33:33 -0000 Author: yuri Date: Sat Sep 1 19:33:30 2018 New Revision: 478718 URL: https://svnweb.freebsd.org/changeset/ports/478718 Log: net-p2p/libbt: Update 1.05 -> 1.06 egypcio@googlemail.com takes maintainership Port changes: * Add DOCS option * Add to dependencies * Port cleanup PR: 231033 Submitted by: Vinícius Zavam (original version) Submitted by: Nathan (final version) Added: head/net-p2p/libbt/files/patch-src__udpproto.c (contents, props changed) Modified: head/net-p2p/libbt/Makefile head/net-p2p/libbt/distinfo head/net-p2p/libbt/files/patch-include__util.h head/net-p2p/libbt/pkg-plist Modified: head/net-p2p/libbt/Makefile ============================================================================== --- head/net-p2p/libbt/Makefile Sat Sep 1 19:21:35 2018 (r478717) +++ head/net-p2p/libbt/Makefile Sat Sep 1 19:33:30 2018 (r478718) @@ -2,25 +2,29 @@ # $FreeBSD$ PORTNAME= libbt -PORTVERSION= 1.05 -PORTREVISION= 5 +DISTVERSION= 1.06 CATEGORIES= net-p2p devel MASTER_SITES= SF -MAINTAINER= ports@FreeBSD.org +MAINTAINER= egypcio@googlemail.com COMMENT= C library implementing the core BitTorrent protocol -LIB_DEPENDS= libcurl.so:ftp/curl +LICENSE= GPLv2 LGPL21 +LICENSE_COMB= multi +LIB_DEPENDS= libcurl.so:ftp/curl \ + libuuid.so:misc/e2fsprogs-libuuid + +USES= gmake localbase ssl GNU_CONFIGURE= yes -USES= gmake -CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib -PORTDOCS= protocol-ext.txt protocol.txt +DOCS= docs/protocol.txt docs/protocol-ext.txt \ + CHANGELOG CREDITS README -.include +OPTIONS_DEFINE= DOCS +PORTDOCS= * + post-patch: @${REINPLACE_CMD} -e 's|depend||' ${WRKSRC}/Makefile.in @${REINPLACE_CMD} -e 's|-lssl|-lcrypto|' ${WRKSRC}/configure @@ -28,16 +32,12 @@ post-patch: do-install: ${INSTALL_DATA} ${WRKSRC}/src/libbt.a ${STAGEDIR}${PREFIX}/lib - ${MKDIR} ${STAGEDIR}${PREFIX}/include/libbt -.for i in btcheck btget btlist - ${INSTALL_PROGRAM} ${WRKSRC}/src/${i} ${STAGEDIR}${PREFIX}/bin -.endfor -.for i in benc.h bitset.h bterror.h btmessage.h bts.h context.h peer.h random.h segmenter.h strbuf.h stream.h types.h util.h - ${INSTALL_DATA} ${WRKSRC}/include/${i} ${STAGEDIR}${PREFIX}/include/libbt -.endfor - ${MKDIR} ${STAGEDIR}${DOCSDIR} -.for i in ${PORTDOCS} - ${INSTALL_DATA} ${WRKSRC}/docs/${i} ${STAGEDIR}${DOCSDIR} -.endfor + @${MKDIR} ${STAGEDIR}${PREFIX}/include/libbt + cd ${WRKSRC}/src && ${INSTALL_PROGRAM} btcheck btget btlist ${STAGEDIR}${PREFIX}/bin + cd ${WRKSRC}/include && ${INSTALL_DATA} *.h ${STAGEDIR}${PREFIX}/include/libbt + +do-install-DOCS-on: + @${MKDIR} ${STAGEDIR}${DOCSDIR} + cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${STAGEDIR}${DOCSDIR} .include Modified: head/net-p2p/libbt/distinfo ============================================================================== --- head/net-p2p/libbt/distinfo Sat Sep 1 19:21:35 2018 (r478717) +++ head/net-p2p/libbt/distinfo Sat Sep 1 19:33:30 2018 (r478718) @@ -1,2 +1,3 @@ -SHA256 (libbt-1.05.tar.gz) = d4d770120c7e5df6957b2b40e1edb6695106142360d5caac521b31a4c59fa1c7 -SIZE (libbt-1.05.tar.gz) = 322880 +TIMESTAMP = 1535654605 +SHA256 (libbt-1.06.tar.gz) = 89f7887ef892158fec2691efaf26036dab2a239ab87881473ae405f2f2d13560 +SIZE (libbt-1.06.tar.gz) = 334835 Modified: head/net-p2p/libbt/files/patch-include__util.h ============================================================================== --- head/net-p2p/libbt/files/patch-include__util.h Sat Sep 1 19:21:35 2018 (r478717) +++ head/net-p2p/libbt/files/patch-include__util.h Sat Sep 1 19:33:30 2018 (r478718) @@ -1,12 +1,21 @@ ---- include/util.h Fri Apr 16 08:41:48 2004 -+++ include/util.h.new Sun May 30 14:17:54 2004 -@@ -28,9 +28,4 @@ +--- include/util.h.orig 2018-08-30 18:48:15 UTC ++++ include/util.h +@@ -53,11 +53,15 @@ typedef void (*exitfn_ptr) (int,void*); int on_exit( exitfn_ptr exitfn, void* data) ; #endif -#define malloc(s) use_btmalloc_instead -#define calloc(n,s) use_btcalloc_instead -#define realloc(p,s) use_btrealloc_instead --#define free(p) use_btfree_instead -- - #endif ++/* ++ #define malloc(s) use_btmalloc_instead ++ #define calloc(n,s) use_btcalloc_instead ++ #define realloc(p,s) use_btrealloc_instead ++/* + #undef free ++/* + #define free(p) use_btfree_instead ++*/ + + void hexdump( void *buf, int buflen); + Added: head/net-p2p/libbt/files/patch-src__udpproto.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net-p2p/libbt/files/patch-src__udpproto.c Sat Sep 1 19:33:30 2018 (r478718) @@ -0,0 +1,11 @@ +--- src/udpproto.c.orig 2018-08-30 18:56:26 UTC ++++ src/udpproto.c +@@ -4,7 +4,7 @@ + #include + #include + #include +- ++#include + #include + + #include "udpproto.h" Modified: head/net-p2p/libbt/pkg-plist ============================================================================== --- head/net-p2p/libbt/pkg-plist Sat Sep 1 19:21:35 2018 (r478717) +++ head/net-p2p/libbt/pkg-plist Sat Sep 1 19:33:30 2018 (r478718) @@ -6,12 +6,15 @@ include/libbt/bitset.h include/libbt/bterror.h include/libbt/btmessage.h include/libbt/bts.h +include/libbt/config.h include/libbt/context.h include/libbt/peer.h +include/libbt/peerexchange.h include/libbt/random.h include/libbt/segmenter.h include/libbt/strbuf.h include/libbt/stream.h include/libbt/types.h +include/libbt/udpproto.h include/libbt/util.h lib/libbt.a