diff options
| -rw-r--r-- | net-p2p/libbt/Makefile | 16 | ||||
| -rw-r--r-- | net-p2p/libbt/distinfo | 4 | ||||
| -rw-r--r-- | net-p2p/libbt/files/patch-include::util.h | 12 | ||||
| -rw-r--r-- | net-p2p/libbt/pkg-plist | 2 | ||||
| -rw-r--r-- | net/libbt/Makefile | 16 | ||||
| -rw-r--r-- | net/libbt/distinfo | 4 | ||||
| -rw-r--r-- | net/libbt/files/patch-include::util.h | 12 | ||||
| -rw-r--r-- | net/libbt/pkg-plist | 2 |
8 files changed, 42 insertions, 26 deletions
diff --git a/net-p2p/libbt/Makefile b/net-p2p/libbt/Makefile index cce0bb926054..07b82757c97a 100644 --- a/net-p2p/libbt/Makefile +++ b/net-p2p/libbt/Makefile @@ -6,7 +6,7 @@ # PORTNAME= libbt -PORTVERSION= 1.01 +PORTVERSION= 1.02 CATEGORIES= net devel MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -23,15 +23,11 @@ USE_REINPLACE= yes USE_GCC= 3.3 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib" -.include <bsd.port.pre.mk> - -.if ${ARCH} == "alpha" -BROKEN= "Does not compile on alpha" -.endif +PORTDOCS= protocol-ext.txt protocol.txt post-patch: @${REINPLACE_CMD} -e 's|depend||' ${WRKSRC}/Makefile.in - @${REINPLACE_CMD} -e 's|\(CFLAGS:=\)|\1\@CFLAGS\@ |' ${WRKSRC}/src/Makefile.in + @${REINPLACE_CMD} -e 's|\(CFLAGS:=\)|\1\@CFLAGS\@ \@CPPFLAGS\@ |' ${WRKSRC}/src/Makefile.in do-install: ${INSTALL_DATA} ${WRKSRC}/src/libbt.a ${PREFIX}/lib @@ -46,7 +42,9 @@ do-install: post-install: .if !defined(NOPORTDOCS) ${MKDIR} ${DOCSDIR} - ${INSTALL_MAN} ${WRKSRC}/docs/protocol.txt ${DOCSDIR} +.for i in ${PORTDOCS} + ${INSTALL_MAN} ${WRKSRC}/docs/${i} ${DOCSDIR} +.endfor .endif -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/net-p2p/libbt/distinfo b/net-p2p/libbt/distinfo index d8cc727794a0..696cad142d84 100644 --- a/net-p2p/libbt/distinfo +++ b/net-p2p/libbt/distinfo @@ -1,2 +1,2 @@ -MD5 (libbt-1.01.tar.gz) = 6a22db0d4db9036afbb5af94b8fdd526 -SIZE (libbt-1.01.tar.gz) = 307537 +MD5 (libbt-1.02.tar.gz) = 1db9d77dd51014d672e1c3e2fd60eb31 +SIZE (libbt-1.02.tar.gz) = 307050 diff --git a/net-p2p/libbt/files/patch-include::util.h b/net-p2p/libbt/files/patch-include::util.h new file mode 100644 index 000000000000..8ad3b431dd7b --- /dev/null +++ b/net-p2p/libbt/files/patch-include::util.h @@ -0,0 +1,12 @@ +--- 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 @@ + 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 diff --git a/net-p2p/libbt/pkg-plist b/net-p2p/libbt/pkg-plist index 581eac7b8cbd..2ed1ce96441e 100644 --- a/net-p2p/libbt/pkg-plist +++ b/net-p2p/libbt/pkg-plist @@ -15,6 +15,4 @@ include/libbt/stream.h include/libbt/types.h include/libbt/util.h lib/libbt.a -%%PORTDOCS%%%%DOCSDIR%%/protocol.txt -%%PORTDOCS%%@dirrm %%DOCSDIR%% @dirrm include/libbt diff --git a/net/libbt/Makefile b/net/libbt/Makefile index cce0bb926054..07b82757c97a 100644 --- a/net/libbt/Makefile +++ b/net/libbt/Makefile @@ -6,7 +6,7 @@ # PORTNAME= libbt -PORTVERSION= 1.01 +PORTVERSION= 1.02 CATEGORIES= net devel MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -23,15 +23,11 @@ USE_REINPLACE= yes USE_GCC= 3.3 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib" -.include <bsd.port.pre.mk> - -.if ${ARCH} == "alpha" -BROKEN= "Does not compile on alpha" -.endif +PORTDOCS= protocol-ext.txt protocol.txt post-patch: @${REINPLACE_CMD} -e 's|depend||' ${WRKSRC}/Makefile.in - @${REINPLACE_CMD} -e 's|\(CFLAGS:=\)|\1\@CFLAGS\@ |' ${WRKSRC}/src/Makefile.in + @${REINPLACE_CMD} -e 's|\(CFLAGS:=\)|\1\@CFLAGS\@ \@CPPFLAGS\@ |' ${WRKSRC}/src/Makefile.in do-install: ${INSTALL_DATA} ${WRKSRC}/src/libbt.a ${PREFIX}/lib @@ -46,7 +42,9 @@ do-install: post-install: .if !defined(NOPORTDOCS) ${MKDIR} ${DOCSDIR} - ${INSTALL_MAN} ${WRKSRC}/docs/protocol.txt ${DOCSDIR} +.for i in ${PORTDOCS} + ${INSTALL_MAN} ${WRKSRC}/docs/${i} ${DOCSDIR} +.endfor .endif -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/net/libbt/distinfo b/net/libbt/distinfo index d8cc727794a0..696cad142d84 100644 --- a/net/libbt/distinfo +++ b/net/libbt/distinfo @@ -1,2 +1,2 @@ -MD5 (libbt-1.01.tar.gz) = 6a22db0d4db9036afbb5af94b8fdd526 -SIZE (libbt-1.01.tar.gz) = 307537 +MD5 (libbt-1.02.tar.gz) = 1db9d77dd51014d672e1c3e2fd60eb31 +SIZE (libbt-1.02.tar.gz) = 307050 diff --git a/net/libbt/files/patch-include::util.h b/net/libbt/files/patch-include::util.h new file mode 100644 index 000000000000..8ad3b431dd7b --- /dev/null +++ b/net/libbt/files/patch-include::util.h @@ -0,0 +1,12 @@ +--- 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 @@ + 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 diff --git a/net/libbt/pkg-plist b/net/libbt/pkg-plist index 581eac7b8cbd..2ed1ce96441e 100644 --- a/net/libbt/pkg-plist +++ b/net/libbt/pkg-plist @@ -15,6 +15,4 @@ include/libbt/stream.h include/libbt/types.h include/libbt/util.h lib/libbt.a -%%PORTDOCS%%%%DOCSDIR%%/protocol.txt -%%PORTDOCS%%@dirrm %%DOCSDIR%% @dirrm include/libbt |