Date: Sun, 29 Feb 2004 17:09:42 +0100 (CET) From: Florent Thoumie <flz@xbsd.org> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/63531: Update port: net/libbt to 0.03 Message-ID: <20040229160942.1710BA92@gw.xbsd.org> Resent-Message-ID: <200402291610.i1TGAGNv036446@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 63531
>Category: ports
>Synopsis: Update port: net/libbt to 0.03
>Confidential: no
>Severity: non-critical
>Priority: medium
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Sun Feb 29 08:10:16 PST 2004
>Closed-Date:
>Last-Modified:
>Originator: Florent Thoumie
>Release: FreeBSD 4.9-RC i386
>Organization:
Xbsd.org
>Environment:
System: FreeBSD gw 4.9-RC FreeBSD 4.9-RC #4: Sun Oct 5 14:25:09 CEST 2003 rf@gw:/usr/src/sys/compile/GW i386
>Description:
Update to 0.03.
Patches are no longer needed.
>How-To-Repeat:
N/A
>Fix:
--- patch-libbt-0.03 begins here ---
diff -ruN libbt/Makefile libbt.new/Makefile
--- libbt/Makefile Sat Feb 28 12:56:51 2004
+++ libbt.new/Makefile Sun Feb 29 16:58:58 2004
@@ -6,11 +6,11 @@
#
PORTNAME= libbt
-PORTVERSION= 0.02
+PORTVERSION= 0.03
CATEGORIES= net devel
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
-EXTRACT_SUFX= .tgz
+DISTNAME= ${PORTNAME}.${PORTVERSION}
MAINTAINER= flz@xbsd.org
COMMENT= C library implementing the core BitTorrent protocol
@@ -21,13 +21,21 @@
WRKSRC= ${WRKDIR}/${PORTNAME}
GNU_CONFIGURE= yes
+USE_GMAKE= yes
+USE_REINPLACE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
+CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
+
+post-patch:
+ @${REINPLACE_CMD} -e 's|\(makedepend --\)|\1 \@CPPFLAGS\@|' ${WRKSRC}/src/Makefile.in
+ @${REINPLACE_CMD} -e 's|\(CFLAGS:=\)|\1\@CFLAGS\@|' ${WRKSRC}/src/Makefile.in
do-install:
${INSTALL_DATA} ${WRKSRC}/src/libbt.a ${PREFIX}/lib
${MKDIR} ${PREFIX}/include/libbt
+.for i in btcheck btget btlist
+ ${INSTALL_PROGRAM} ${WRKSRC}/src/${i} ${PREFIX}/bin
+.endfor
.for i in benc.h bitset.h bterror.h bts.h context.h peer.h random.h segmenter.h strbuf.h stream.h types.h util.h
${INSTALL_DATA} ${WRKSRC}/include/${i} ${PREFIX}/include/libbt
.endfor
diff -ruN libbt/distinfo libbt.new/distinfo
--- libbt/distinfo Sat Feb 28 12:56:51 2004
+++ libbt.new/distinfo Sun Feb 29 16:09:40 2004
@@ -1,2 +1,2 @@
-MD5 (libbt-0.02.tgz) = a954666cb53b7a35f1793b531a6430bd
-SIZE (libbt-0.02.tgz) = 333463
+MD5 (libbt.0.03.tar.gz) = 8c2ff3afcef27441fc398105ef241a6e
+SIZE (libbt.0.03.tar.gz) = 395161
diff -ruN libbt/files/patch-include::bterror.h libbt.new/files/patch-include::bterror.h
--- libbt/files/patch-include::bterror.h Sat Feb 28 12:56:51 2004
+++ libbt.new/files/patch-include::bterror.h Thu Jan 1 00:00:00 1970
@@ -1,18 +0,0 @@
---- include/bterror.h.old Thu Feb 26 17:38:32 2004
-+++ include/bterror.h Thu Feb 26 17:38:53 2004
-@@ -15,15 +15,6 @@
- BTERR_LAST
- };
-
--#ifdef BTERROR_BODY
--char *bterror_string[] = {
-- "Bad protocol ID on peer connection",
-- "Unrecognized Flags in peer protocol handshake",
-- "Peer hash value doesn't match my hash value",
-- "Peer disconnected after repeated errors"
--};
--#else
- extern char *bterror_string[];
--#endif
-
- #endif
diff -ruN libbt/files/patch-src::Makefile.in libbt.new/files/patch-src::Makefile.in
--- libbt/files/patch-src::Makefile.in Sat Feb 28 12:56:51 2004
+++ libbt.new/files/patch-src::Makefile.in Thu Jan 1 00:00:00 1970
@@ -1,19 +0,0 @@
---- src/Makefile.in.old Thu Feb 26 18:27:14 2004
-+++ src/Makefile.in Thu Feb 26 18:28:04 2004
-@@ -1,8 +1,8 @@
--OBJS=benc.o bts.o types.o random.o strbuf.o stream.o peer.o segmenter.o util.o bitset.o context.o
--CFLAGS=-Wall -g -I../include
-+OBJS=bterror.o benc.o bts.o types.o random.o strbuf.o stream.o peer.o segmenter.o util.o bitset.o context.o
-+CFLAGS=@CFLAGS@ -Wall -I../include -I${PREFIX}/include
- LIBS=@LIBS@ `curl-config --libs`
-
--all: btlist btget btcheck
-+all: libbt.a
- btcheck: btcheck.c libbt.a
- gcc ${CFLAGS} btcheck.c ${LIBS} -lbt -L. -o btcheck
-
-@@ -20,3 +20,4 @@
-
- libbt.a: ${OBJS}
- ar rc $@ ${OBJS}
-+ ranlib libbt.a
diff -ruN libbt/files/patch-src::bitset.c libbt.new/files/patch-src::bitset.c
--- libbt/files/patch-src::bitset.c Sat Feb 28 12:56:51 2004
+++ libbt.new/files/patch-src::bitset.c Thu Jan 1 00:00:00 1970
@@ -1,12 +0,0 @@
---- src/bitset.c.old Thu Feb 26 15:21:52 2004
-+++ src/bitset.c Thu Feb 26 15:22:14 2004
-@@ -1,8 +1,6 @@
- #include "config.h"
-
--#if HAVE_MALLOC_H
--#include <malloc.h>
--#endif
-+#include <stdlib.h>
- #include <assert.h>
- #include <stdio.h>
- #include "bitset.h"
diff -ruN libbt/files/patch-src::bterror.c libbt.new/files/patch-src::bterror.c
--- libbt/files/patch-src::bterror.c Sat Feb 28 12:56:51 2004
+++ libbt.new/files/patch-src::bterror.c Thu Jan 1 00:00:00 1970
@@ -1,13 +0,0 @@
---- src/bterror.c.old Thu Feb 26 17:39:15 2004
-+++ src/bterror.c Thu Feb 26 17:39:54 2004
-@@ -1,3 +1,9 @@
- /* bterror.c */
--#define BTERROR_BODY
- #include "bterror.h"
-+
-+char *bterror_string[] = {
-+ "Bad protocol ID on peer connection",
-+ "Unrecognized Flags in peer protocol handshake",
-+ "Peer hash value doesn't match my hash value",
-+ "Peer disconnected after repeated errors"
-+};
diff -ruN libbt/files/patch-src::peer.c libbt.new/files/patch-src::peer.c
--- libbt/files/patch-src::peer.c Sat Feb 28 12:56:51 2004
+++ libbt.new/files/patch-src::peer.c Thu Jan 1 00:00:00 1970
@@ -1,17 +0,0 @@
---- src/peer.c.old Thu Feb 26 17:34:55 2004
-+++ src/peer.c Thu Feb 26 17:35:21 2004
-@@ -1,5 +1,6 @@
- #include "config.h"
-
-+#include <sys/types.h>
- #if WIN32
- // #include <winsock2.h>
- #else
-@@ -13,7 +14,6 @@
- #include <fcntl.h>
- #endif
- #endif
--#include <sys/types.h>
- #include <string.h>
- #include <errno.h>
- #include <time.h>
diff -ruN libbt/files/patch-src::stream.c libbt.new/files/patch-src::stream.c
--- libbt/files/patch-src::stream.c Sat Feb 28 12:56:51 2004
+++ libbt.new/files/patch-src::stream.c Thu Jan 1 00:00:00 1970
@@ -1,16 +0,0 @@
---- src/stream.c.old Thu Feb 26 17:34:48 2004
-+++ src/stream.c Thu Feb 26 17:35:11 2004
-@@ -1,4 +1,5 @@
- #include "config.h"
-+#include <sys/types.h>
- #include <errno.h>
- #include <string.h>
- #include <stdarg.h>
-@@ -14,7 +15,6 @@
- #include <unistd.h>
- #endif
- #endif
--#include <sys/types.h>
- #include "bterror.h"
- #include "stream.h"
- #undef DEBUG_STREAM
diff -ruN libbt/pkg-plist libbt.new/pkg-plist
--- libbt/pkg-plist Sat Feb 28 12:56:51 2004
+++ libbt.new/pkg-plist Sun Feb 29 16:45:40 2004
@@ -1,3 +1,6 @@
+bin/btcheck
+bin/btget
+bin/btlist
include/libbt/benc.h
include/libbt/bitset.h
include/libbt/bterror.h
--- patch-libbt-0.03 ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20040229160942.1710BA92>