mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2025-02-05 11:35:01 +00:00
Code Issues Releases Activity

net-mgmt/nfdump: Upgrade version to 1.6.9 => 1.6.12 and stage

Browse Source 
Also assign maintainership to submitter

PR:		192554
Submitted by:	Carlos JPM
This commit is contained in:
John Marino 2014-08-10 18:59:54 +00:00
parent 600af559c2
commit c7687c0688
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=364558
3 changed files with 58 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
net-mgmt/nfdump/Makefile
View File

@ -2,22 +2,25 @@
# $FreeBSD$
PORTNAME= nfdump
PORTVERSION= 1.6.9
PORTVERSION= 1.6.12
CATEGORIES= net-mgmt
MASTER_SITES= SF/${PORTNAME}/stable/${PORTNAME}-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
MAINTAINER= cpm@fbsd.es
COMMENT= Command-line tools to collect and process NetFlow data
LICENSE= BSD
LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/BSD-license.txt
GNU_CONFIGURE= yes
MAKE_JOBS_UNSAFE= yes
USES= libtool
USE_AUTOTOOLS= autoconf:env autoheader:env
USE_CSTD= gnu89
USE_LDCONFIG= yes
MAKE_JOBS_UNSAFE= yes
#flow-tools support
OPTIONS_DEFINE= FT2NFDUMP NFPROFILE FIXTIMEBUG READPCAP NFTRACK \
OPTIONS_DEFINE= DOCS FT2NFDUMP NFPROFILE FIXTIMEBUG READPCAP NFTRACK \
SFLOW NFDUMP15
OPTIONS_DEFAULT= NFPROFILE
@ -27,9 +30,8 @@ FIXTIMEBUG_DESC= With fixing swap time bug of some v5
READPCAP_DESC= With pcap support
NFTRACK_DESC= With PortTracker support
SFLOW_DESC= Build sflow collector daemon also
NFDUMP15_DESC= Enable compatbility with version 1.5
NFDUMP15_DESC= Enable compatibility with version 1.5
NO_STAGE= yes
post-patch:
@${REINPLACE_CMD} 's|-ggdb||' ${WRKSRC}/bin/Makefile.in
@ -43,10 +45,10 @@ CONFIGURE_ARGS+= --enable-compat15
CONFIGURE_ARGS+= --disable-compat15
.endif
PLIST_FILES= bin/nfanon bin/nfcapd bin/nfdump bin/nfexpire bin/nfreplay
MAN1= nfanon.1 nfcapd.1 nfdump.1 nfexpire.1 nfreplay.1
MAN1+= ft2nfdump.1 nfprofile.1 sfcapd.1
PORTDOCS= AUTHORS ChangeLog INSTALL README
PLIST_FILES= bin/nfanon bin/nfcapd bin/nfdump bin/nfexpire bin/nfreplay \
man/man1/nfanon.1.gz man/man1/nfcapd.1.gz man/man1/nfdump.1.gz \
man/man1/nfexpire.1.gz man/man1/nfreplay.1.gz
PORTDOCS= AUTHORS ChangeLog INSTALL NEWS README ToDo
.if ${PORT_OPTIONS:MFIXTIMEBUG}
CONFIGURE_ARGS+= --enable-fixtimebug
@ -56,7 +58,7 @@ CONFIGURE_ARGS+= --disable-fixtimebug
.if ${PORT_OPTIONS:MNFPROFILE}
CONFIGURE_ARGS+= --enable-nfprofile
PLIST_FILES+= bin/nfprofile
PLIST_FILES+= bin/nfprofile man/man1/nfprofile.1.gz
.else
CONFIGURE_ARGS+= --disable-nfprofile
.endif
@ -78,7 +80,7 @@ RUN_DEPENDS+= rrdtool:${PORTSDIR}/databases/rrdtool
.if ${PORT_OPTIONS:MFT2NFDUMP}
BUILD_DEPENDS+= flow-cat:${PORTSDIR}/net-mgmt/flow-tools
CONFIGURE_ARGS+= --enable-ftconv --with-ftpath=${LOCALBASE}
PLIST_FILES+= bin/ft2nfdump
PLIST_FILES+= bin/ft2nfdump man/man1/ft2nfdump.1.gz
.endif
.if ${PORT_OPTIONS:MREADPCAP}
@ -90,16 +92,48 @@ CONFIGURE_ARGS+= --disable-readpcap
#sflow capture support
.if ${PORT_OPTIONS:MSFLOW}
CONFIGURE_ARGS+= --enable-sflow
PLIST_FILES+= bin/sfcapd
#MAN1+= sfcapd.1
PLIST_FILES+= bin/sfcapd man/man1/sfcapd.1.gz
.else
CONFIGURE_ARGS+= --disable-sflow
.endif
.if ${PORT_OPTIONS:MDOCS}
do-install:
.for binary in nfanon nfcapd nfdump nfexpire nfreplay
${INSTALL_DATA} ${WRKSRC}/bin/${binary} ${STAGEDIR}${PREFIX}/bin
${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${binary}
.endfor
.if ${PORT_OPTIONS:MNFPROFILE}
${INSTALL_DATA} ${WRKSRC}/bin/nfprofile ${STAGEDIR}${PREFIX}/bin
${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/nfprofile
${INSTALL_MAN} ${WRKSRC}/man/nfprofile.1 ${STAGEDIR}${PREFIX}/man/man1
.endif
.if ${PORT_OPTIONS:MNFTRACK}
${INSTALL_DATA} ${WRKSRC}/bin/nftrack ${STAGEDIR}${PREFIX}/bin
${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/nftrack
.endif
.if ${PORT_OPTIONS:MFT2NFDUMP}
${INSTALL_DATA} ${WRKSRC}/bin/ft2nfdump ${STAGEDIR}${PREFIX}/bin
${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/ft2nfdump
${INSTALL_MAN} ${WRKSRC}/man/ft2nfdump.1 ${STAGEDIR}${PREFIX}/man/man1
.endif
.if ${PORT_OPTIONS:MSFLOW}
${INSTALL_DATA} ${WRKSRC}/bin/sfcapd ${STAGEDIR}${PREFIX}/bin
${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/sfcapd
${INSTALL_MAN} ${WRKSRC}/man/sfcapd.1 ${STAGEDIR}${PREFIX}/man/man1
.endif
.for filename in nfanon nfdump nfcapd nfexpire nfreplay
${INSTALL_MAN} ${WRKSRC}/man/${filename}.1 ${STAGEDIR}${PREFIX}/man/man1
.endfor
post-install:
${MKDIR} ${DOCSDIR}
cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}
.if ${PORT_OPTIONS:MDOCS}
${MKDIR} ${STAGEDIR}${DOCSDIR}
cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
.endif
.include <bsd.port.mk>

4
net-mgmt/nfdump/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (nfdump-1.6.9.tar.gz) = 734943ab872d3642575add5db64ef5755f85a0a9600b120d5ee09bea4ef98dbc
SIZE (nfdump-1.6.9.tar.gz) = 686587
SHA256 (nfdump-1.6.12.tar.gz) = 4b597c3c948b2ac1a4b0b11ffbdc5c8bab8835f14718ad0f7896daeaf7b89204
SIZE (nfdump-1.6.12.tar.gz) = 733604

8
net-mgmt/nfdump/files/patch-configure
View File

@ -1,6 +1,6 @@
--- ./configure.orig 2013-03-02 18:24:29.000000000 +0100
+++ ./configure 2013-03-27 20:43:21.000000000 +0100
@@ -4945,7 +4945,7 @@
--- configure.orig 2014-08-10 13:37:42.000000000 +0200
+++ configure 2014-08-10 13:39:21.000000000 +0200
@@ -4975,7 +4975,7 @@
# Check whether --enable-nfprofile was given.
@ -9,7 +9,7 @@
enableval=$enable_nfprofile;
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for rrd_update in -lrrd" >&5
$as_echo_n "checking for rrd_update in -lrrd... " >&6; }
@@ -5069,7 +5069,7 @@
@@ -5099,7 +5099,7 @@
# Check whether --enable-nftrack was given.