Attachment #196768 for bug #231033




# Created by: Florent Thoumie <flz@xbsd.org>
# $FreeBSD$

PORTNAME=	libbt
PORTVERSION=	1.06
PORTREVISION=	5
CATEGORIES=	net-p2p devel
MASTER_SITES=	SF

LICENSE=	GPLv2 LGPL21
LICENSE_COMB=	multi

MAINTAINER=	egypcio@googlemail.com
COMMENT=	C library implementing the core BitTorrent protocol

LIB_DEPENDS=	libcurl.so:ftp/curl \
		libuuid.so:misc/e2fsprogs-libuuid

GNU_CONFIGURE=	yes
USES=		gmake localbase ssl
CPPFLAGS+=	-I${LOCALBASE}/include
LDFLAGS+=	-L${LOCALBASE}/lib

PORTDOCS=	protocol.txt protocol-ext.txt \
		CHANGELOG CREDITS README

OPTIONS_DEFINE=	DOCS
OPTIONS_SUB=	yes

post-patch:
	@${REINPLACE_CMD} -e 's|depend||' ${WRKSRC}/Makefile.in
	@${REINPLACE_CMD} -e 's|-lssl|-lcrypto|' ${WRKSRC}/configure
	@${REINPLACE_CMD} -e 's|\(CFLAGS:=\)|\1\@CFLAGS\@ \@CPPFLAGS\@ |' ${WRKSRC}/src/Makefile.in

do-install:
	${INSTALL_DATA} ${WRKSRC}/src/libbt.a ${STAGEDIR}${PREFIX}/lib
	${MKDIR} ${STAGEDIR}${PREFIX}/include/libbt
	${INSTALL_DATA} ${WRKSRC}/src/libbt.a ${STAGEDIR}${PREFIX}/lib
	(cd ${WRKSRC}/src && ${INSTALL_PROGRAM} btcheck btget btlist ${STAGEDIR}${PREFIX}/bin)
	(cd ${WRKSRC}/include && ${INSTALL_DATA} *.h ${STAGEDIR}${PREFIX}/include/libbt)

post-install-DOCS-on:
.endfor
	${MKDIR} ${STAGEDIR}${DOCSDIR}
	${RLN} ${WRKSRC}/docs/*.txt ${WRKSRC}
	(cd ${WRKSRC} && ${INSTALL_MAN} ${PORTDOCS} ${STAGEDIR}${DOCSDIR})
.endfor

.include <bsd.port.mk>

Lines 1-2 Link Here

(-)net-p2p/libbt/distinfo (-2 / +3 lines)
1	SHA256 (libbt-1.05.tar.gz) = d4d770120c7e5df6957b2b40e1edb6695106142360d5caac521b31a4c59fa1c7	1	TIMESTAMP = 1535654605
2	SIZE (libbt-1.05.tar.gz) = 322880	2	SHA256 (libbt-1.06.tar.gz) = 89f7887ef892158fec2691efaf26036dab2a239ab87881473ae405f2f2d13560
		3	SIZE (libbt-1.06.tar.gz) = 334835




--- 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 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);
 

Line 0 Link Here

(-)net-p2p/libbt/files/patch-src__udpproto.c (+11 lines)
	1	--- src/udpproto.c.orig 2018-08-30 18:56:26 UTC
	2	+++ src/udpproto.c
	3	@@ -4,7 +4,7 @@
	4	#include <string.h>
	5	#include <stdlib.h>
	6	#include <unistd.h>
	7	-
	8	+#include <limits.h>
	9	#include <arpa/inet.h>
	10
	11	#include "udpproto.h"




bin/btcheck
bin/btget
bin/btlist
include/libbt/benc.h
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
%%PORTDOCS%%%%DOCSDIR%%/CHANGELOG
%%PORTDOCS%%%%DOCSDIR%%/CREDITS
%%PORTDOCS%%%%DOCSDIR%%/README
%%PORTDOCS%%%%DOCSDIR%%/protocol-ext.txt
%%PORTDOCS%%%%DOCSDIR%%/protocol.txt

Return to bug 231033

Lines 1-43 Link Here

(-)net-p2p/libbt/Makefile (-19 / +19 lines)
1	# Created by: Florent Thoumie <flz@xbsd.org>	1	# Created by: Florent Thoumie <flz@xbsd.org>
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= libbt	4	PORTNAME= libbt
5	PORTVERSION= 1.05	5	PORTVERSION= 1.06
6	PORTREVISION= 5
7	CATEGORIES= net-p2p devel	6	CATEGORIES= net-p2p devel
8	MASTER_SITES= SF	7	MASTER_SITES= SF
9		8
10	MAINTAINER= ports@FreeBSD.org	9	LICENSE= GPLv2 LGPL21
		10	LICENSE_COMB= multi
		11
		12	MAINTAINER= egypcio@googlemail.com
11	COMMENT= C library implementing the core BitTorrent protocol	13	COMMENT= C library implementing the core BitTorrent protocol
12		14
13	LIB_DEPENDS= libcurl.so:ftp/curl	15	LIB_DEPENDS= libcurl.so:ftp/curl \
		16	libuuid.so:misc/e2fsprogs-libuuid
14		17
15	GNU_CONFIGURE= yes	18	GNU_CONFIGURE= yes
16	USES= gmake	19	USES= gmake localbase ssl
17	CPPFLAGS+= -I${LOCALBASE}/include
18	LDFLAGS+= -L${LOCALBASE}/lib
19		20
20	PORTDOCS= protocol-ext.txt protocol.txt	21	PORTDOCS= protocol.txt protocol-ext.txt \
		22	CHANGELOG CREDITS README
21		23
22	.include <bsd.port.options.mk>	24	OPTIONS_DEFINE= DOCS
		25	OPTIONS_SUB= yes
23		26
24	post-patch:	27	post-patch:
25	@${REINPLACE_CMD} -e 's\|depend\|\|' ${WRKSRC}/Makefile.in	28	@${REINPLACE_CMD} -e 's\|depend\|\|' ${WRKSRC}/Makefile.in
26	@${REINPLACE_CMD} -e 's\|-lssl\|-lcrypto\|' ${WRKSRC}/configure	29	@${REINPLACE_CMD} -e 's\|-lssl\|-lcrypto\|' ${WRKSRC}/configure
27	@${REINPLACE_CMD} -e 's\|\(CFLAGS:=\)\|\1\@CFLAGS\@ \@CPPFLAGS\@ \|' ${WRKSRC}/src/Makefile.in	30	@${REINPLACE_CMD} -e 's\|\(CFLAGS:=\)\|\1\@CFLAGS\@ \@CPPFLAGS\@ \|' ${WRKSRC}/src/Makefile.in
28		31
29	do-install:	32	do-install:
30	${INSTALL_DATA} ${WRKSRC}/src/libbt.a ${STAGEDIR}${PREFIX}/lib
31	${MKDIR} ${STAGEDIR}${PREFIX}/include/libbt	33	${MKDIR} ${STAGEDIR}${PREFIX}/include/libbt
32	.for i in btcheck btget btlist	34	${INSTALL_DATA} ${WRKSRC}/src/libbt.a ${STAGEDIR}${PREFIX}/lib
33	${INSTALL_PROGRAM} ${WRKSRC}/src/${i} ${STAGEDIR}${PREFIX}/bin	35	(cd ${WRKSRC}/src && ${INSTALL_PROGRAM} btcheck btget btlist ${STAGEDIR}${PREFIX}/bin)
34	.endfor	36	(cd ${WRKSRC}/include && ${INSTALL_DATA} *.h ${STAGEDIR}${PREFIX}/include/libbt)
35	.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	37
36	${INSTALL_DATA} ${WRKSRC}/include/${i} ${STAGEDIR}${PREFIX}/include/libbt	38	post-install-DOCS-on:
37	.endfor
38	${MKDIR} ${STAGEDIR}${DOCSDIR}	39	${MKDIR} ${STAGEDIR}${DOCSDIR}
39	.for i in ${PORTDOCS}	40	${RLN} ${WRKSRC}/docs/*.txt ${WRKSRC}
40	${INSTALL_DATA} ${WRKSRC}/docs/${i} ${STAGEDIR}${DOCSDIR}	41	(cd ${WRKSRC} && ${INSTALL_MAN} ${PORTDOCS} ${STAGEDIR}${DOCSDIR})
41	.endfor
42		42
43	.include <bsd.port.mk>	43	.include <bsd.port.mk>

Lines 1-12 Link Here

(-)net-p2p/libbt/files/patch-include__util.h (-6 / +15 lines)
1	--- include/util.h Fri Apr 16 08:41:48 2004	1	--- include/util.h.orig 2018-08-30 18:48:15 UTC
2	+++ include/util.h.new Sun May 30 14:17:54 2004	2	+++ include/util.h
3	@@ -28,9 +28,4 @@	3	@@ -53,11 +53,15 @@
4	typedef void (exitfn_ptr) (int,void);	4	typedef void (exitfn_ptr) (int,void);
5	int on_exit( exitfn_ptr exitfn, void* data) ;	5	int on_exit( exitfn_ptr exitfn, void* data) ;
6	#endif	6	#endif
7	-#define malloc(s) use_btmalloc_instead	7	-#define malloc(s) use_btmalloc_instead
8	-#define calloc(n,s) use_btcalloc_instead	8	-#define calloc(n,s) use_btcalloc_instead
9	-#define realloc(p,s) use_btrealloc_instead	9	-#define realloc(p,s) use_btrealloc_instead
10	-#define free(p) use_btfree_instead	10	+/*
11	-	11	+ #define malloc(s) use_btmalloc_instead
12	#endif	12	+ #define calloc(n,s) use_btcalloc_instead
		13	+ #define realloc(p,s) use_btrealloc_instead
		14	+/*
		15	#undef free
		16	+/*
		17	#define free(p) use_btfree_instead
		18	+*/
		19
		20	void hexdump( void *buf, int buflen);
		21

Lines 1-17 Link Here

(-)net-p2p/libbt/pkg-plist (+8 lines)
1	bin/btcheck	1	bin/btcheck
2	bin/btget	2	bin/btget
3	bin/btlist	3	bin/btlist
4	include/libbt/benc.h	4	include/libbt/benc.h
5	include/libbt/bitset.h	5	include/libbt/bitset.h
6	include/libbt/bterror.h	6	include/libbt/bterror.h
7	include/libbt/btmessage.h	7	include/libbt/btmessage.h
8	include/libbt/bts.h	8	include/libbt/bts.h
		9	include/libbt/config.h
9	include/libbt/context.h	10	include/libbt/context.h
10	include/libbt/peer.h	11	include/libbt/peer.h
		12	include/libbt/peerexchange.h
11	include/libbt/random.h	13	include/libbt/random.h
12	include/libbt/segmenter.h	14	include/libbt/segmenter.h
13	include/libbt/strbuf.h	15	include/libbt/strbuf.h
14	include/libbt/stream.h	16	include/libbt/stream.h
15	include/libbt/types.h	17	include/libbt/types.h
		18	include/libbt/udpproto.h
16	include/libbt/util.h	19	include/libbt/util.h
17	lib/libbt.a	20	lib/libbt.a
		21	%%PORTDOCS%%%%DOCSDIR%%/CHANGELOG
		22	%%PORTDOCS%%%%DOCSDIR%%/CREDITS
		23	%%PORTDOCS%%%%DOCSDIR%%/README
		24	%%PORTDOCS%%%%DOCSDIR%%/protocol-ext.txt
		25	%%PORTDOCS%%%%DOCSDIR%%/protocol.txt