From 12c05f36a2218bd8340c412dbe3d03a7ea091cb8 Mon Sep 17 00:00:00 2001 From: Yen-Ming Lee Date: Mon, 19 Apr 2004 16:57:19 +0000 Subject: [PATCH] - add patch based on OS versions. - add USE_GCC=3.3 and unbreak this port on 4.x - backout arch-related settings in previous commit. Noticed by: kris Reviewed by: Florent Thoumie Approved by: Florent Thoumie --- net-p2p/libbt/Makefile | 6 ++++-- net-p2p/libbt/files/patch-src::peer.c | 6 +++++- net/libbt/Makefile | 6 ++++-- net/libbt/files/patch-src::peer.c | 6 +++++- 4 files changed, 18 insertions(+), 6 deletions(-) diff --git a/net-p2p/libbt/Makefile b/net-p2p/libbt/Makefile index bd2b5850ab02..cce0bb926054 100644 --- a/net-p2p/libbt/Makefile +++ b/net-p2p/libbt/Makefile @@ -20,12 +20,14 @@ LIB_DEPENDS= uuid.1:${PORTSDIR}/sysutils/e2fsprogs \ GNU_CONFIGURE= yes USE_GMAKE= yes USE_REINPLACE= yes - +USE_GCC= 3.3 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib" .include -ONLY_FOR_ARCHS= i386 +.if ${ARCH} == "alpha" +BROKEN= "Does not compile on alpha" +.endif post-patch: @${REINPLACE_CMD} -e 's|depend||' ${WRKSRC}/Makefile.in diff --git a/net-p2p/libbt/files/patch-src::peer.c b/net-p2p/libbt/files/patch-src::peer.c index 15ad4cc51605..6c2104deda6c 100644 --- a/net-p2p/libbt/files/patch-src::peer.c +++ b/net-p2p/libbt/files/patch-src::peer.c @@ -1,10 +1,14 @@ --- src/peer.c Wed Apr 7 06:14:44 2004 +++ src/peer.c.new Tue Apr 13 19:29:01 2004 -@@ -20,6 +20,7 @@ +@@ -20,6 +20,11 @@ # endif #endif #include ++#if __FreeBSD__ >= 5 +#include ++#else ++#include ++#endif #include #ifdef HAVE_STRINGS_H # include diff --git a/net/libbt/Makefile b/net/libbt/Makefile index bd2b5850ab02..cce0bb926054 100644 --- a/net/libbt/Makefile +++ b/net/libbt/Makefile @@ -20,12 +20,14 @@ LIB_DEPENDS= uuid.1:${PORTSDIR}/sysutils/e2fsprogs \ GNU_CONFIGURE= yes USE_GMAKE= yes USE_REINPLACE= yes - +USE_GCC= 3.3 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib" .include -ONLY_FOR_ARCHS= i386 +.if ${ARCH} == "alpha" +BROKEN= "Does not compile on alpha" +.endif post-patch: @${REINPLACE_CMD} -e 's|depend||' ${WRKSRC}/Makefile.in diff --git a/net/libbt/files/patch-src::peer.c b/net/libbt/files/patch-src::peer.c index 15ad4cc51605..6c2104deda6c 100644 --- a/net/libbt/files/patch-src::peer.c +++ b/net/libbt/files/patch-src::peer.c @@ -1,10 +1,14 @@ --- src/peer.c Wed Apr 7 06:14:44 2004 +++ src/peer.c.new Tue Apr 13 19:29:01 2004 -@@ -20,6 +20,7 @@ +@@ -20,6 +20,11 @@ # endif #endif #include ++#if __FreeBSD__ >= 5 +#include ++#else ++#include ++#endif #include #ifdef HAVE_STRINGS_H # include