From 4167880e59fb18a5f1182d64387f33f6ff39d743 Mon Sep 17 00:00:00 2001 From: msf Date: Tue, 12 Apr 2005 19:29:22 +0000 Subject: [PATCH] - install libft and include files along with everything else - bump PKGNAME ok jakob@ --- net/flow-tools/Makefile | 13 ++++++++++++- net/flow-tools/patches/patch-lib_ftlib_h | 12 ++++++++++++ net/flow-tools/pkg/PLIST | 8 +++++++- 3 files changed, 31 insertions(+), 2 deletions(-) create mode 100644 net/flow-tools/patches/patch-lib_ftlib_h diff --git a/net/flow-tools/Makefile b/net/flow-tools/Makefile index b7aa51550a0..c04b516dbca 100644 --- a/net/flow-tools/Makefile +++ b/net/flow-tools/Makefile @@ -1,8 +1,9 @@ -# $OpenBSD: Makefile,v 1.11 2005/03/03 07:24:37 jakob Exp $ +# $OpenBSD: Makefile,v 1.12 2005/04/12 19:29:22 msf Exp $ COMMENT= "cisco NetFlow utilities" DISTNAME= flow-tools-0.67 +PKGNAME= ${DISTNAME}p0 CATEGORIES= net MAINTAINER= Jakob Schlyter @@ -19,6 +20,9 @@ WANTLIB= c z CONFIGURE_STYLE= gnu +post-patch: + @cp ${WRKSRC}/lib/radix.h ${WRKSRC}/lib/ftradix.h + do-install: (cd ${WRKSRC}/src; env ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} install) ${INSTALL_MAN} ${WRKSRC}/docs/*.1 ${PREFIX}/man/man1 @@ -28,5 +32,12 @@ do-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/flow-tools/sym ${INSTALL_DATA} ${WRKSRC}/configs/*.sym \ ${PREFIX}/share/examples/flow-tools/sym + ${INSTALL_DATA} ${WRKBUILD}/lib/libft.a ${PREFIX}/lib + ${INSTALL_DATA} ${WRKBUILD}/lib/ftconfig.h ${PREFIX}/include + ${INSTALL_DATA} ${WRKBUILD}/lib/ftlib.h ${PREFIX}/include + ${INSTALL_DATA} ${WRKBUILD}/lib/ftpaths.h ${PREFIX}/include + ${INSTALL_DATA} ${WRKBUILD}/lib/ftqueue.h ${PREFIX}/include + ${INSTALL_DATA} ${WRKBUILD}/lib/ftradix.h ${PREFIX}/include + .include diff --git a/net/flow-tools/patches/patch-lib_ftlib_h b/net/flow-tools/patches/patch-lib_ftlib_h new file mode 100644 index 00000000000..fc8144cf726 --- /dev/null +++ b/net/flow-tools/patches/patch-lib_ftlib_h @@ -0,0 +1,12 @@ +$OpenBSD: patch-lib_ftlib_h,v 1.1 2005/04/12 19:29:22 msf Exp $ +--- lib/ftlib.h.orig Tue Apr 12 08:20:07 2005 ++++ lib/ftlib.h Tue Apr 12 08:20:22 2005 +@@ -82,7 +82,7 @@ + + #include "ftqueue.h" + #include "ftpaths.h" +-#include "radix.h" ++#include "ftradix.h" + + /* + * compatability diff --git a/net/flow-tools/pkg/PLIST b/net/flow-tools/pkg/PLIST index 0aedf91304c..776b2aa8d36 100644 --- a/net/flow-tools/pkg/PLIST +++ b/net/flow-tools/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.7 2005/03/03 07:24:37 jakob Exp $ +@comment $OpenBSD: PLIST,v 1.8 2005/04/12 19:29:22 msf Exp $ bin/flow-capture bin/flow-cat bin/flow-dscan @@ -20,6 +20,12 @@ bin/flow-split bin/flow-stat bin/flow-tag bin/flow-xlate +include/ftconfig.h +include/ftlib.h +include/ftpaths.h +include/ftqueue.h +include/ftradix.h +lib/libft.a @man man/man1/flow-capture.1 @man man/man1/flow-cat.1 @man man/man1/flow-dscan.1