diff options
author | Tijl Coosemans <tijl@FreeBSD.org> | 2014-02-11 18:33:17 +0000 |
---|---|---|
committer | Tijl Coosemans <tijl@FreeBSD.org> | 2014-02-11 18:33:17 +0000 |
commit | 805102b9941cffc65843683ad00b0fcd315cf552 (patch) | |
tree | 32533eafaabbad98ddaae52fab4ceb5ec3f45650 /net-mgmt | |
parent | a92a891ba139bbaa50c571745630a1d8d36ccc14 (diff) | |
download | ports-805102b9941cffc65843683ad00b0fcd315cf552.tar.gz ports-805102b9941cffc65843683ad00b0fcd315cf552.zip |
Notes
Diffstat (limited to 'net-mgmt')
-rw-r--r-- | net-mgmt/cflowd/Makefile | 28 | ||||
-rw-r--r-- | net-mgmt/cflowd/pkg-plist | 2 |
2 files changed, 12 insertions, 18 deletions
diff --git a/net-mgmt/cflowd/Makefile b/net-mgmt/cflowd/Makefile index 92f6693809d9..b3809d0918d5 100644 --- a/net-mgmt/cflowd/Makefile +++ b/net-mgmt/cflowd/Makefile @@ -3,7 +3,7 @@ PORTNAME= cflowd PORTVERSION= 2.1.b1 -PORTREVISION= 10 +PORTREVISION= 11 PORTEPOCH= 1 CATEGORIES= net-mgmt MASTER_SITES= http://www.caida.org/tools/measurement/cflowd/download/ @@ -14,9 +14,8 @@ COMMENT= Flow analysis tool used for analyzing Cisco's NetFlow switching LIB_DEPENDS= Arts:${PORTSDIR}/net-mgmt/arts++ -USE_AUTOTOOLS= libtool -USE_GMAKE= yes -USES= bison +GNU_CONFIGURE= yes +USES= bison gmake libtool USE_LDCONFIG= yes CONFIGURE_ARGS= --enable-shared --with-artspp=${LOCALBASE} @@ -30,6 +29,10 @@ FLOWSCAN_DESC= FlowScan patch NO_STAGE= yes .include <bsd.port.options.mk> +.if ${OPSYS} == FreeBSD && ${OSVERSION} > 1000000 +BROKEN= Fails with recent flex/clang/libc++, try net-mgmt/flow-tools +.endif + .if ${PORT_OPTIONS:MFLOWSCAN} PATCH_SITES+= http://net.doit.wisc.edu/~plonka/cflowd/ PATCHFILES+= cflowd-${PORTVERSION:S|.|-|g}-djp.patch @@ -39,20 +42,9 @@ post-extract: ${CHMOD} -R u+w ${WRKSRC} post-patch: - @${FIND} ${WRKSRC} -type f | ${XARGS} \ - ${REINPLACE_CMD} -e 's|iostream.h>|iostream>|;s|strstream.h|sstream|' - @${FIND} ${WRKSRC} -name Makefile.in | ${XARGS} \ - ${REINPLACE_CMD} -e '/^LIBTOOL =/s^\$$(top_builddir)/libtool^${LIBTOOL}^' \ - -e '/LIBTOOL/ { ;\ - N ;\ - / -o / s|$${LIBTOOL} $${CXX}|$${LIBTOOL} --mode=link $${CXX}| ;\ - P ;\ - D ;\ - }'; - @${FIND} ${WRKSRC} -name Makefile.in | ${XARGS} ${REINPLACE_CMD} \ - -e 's|$${LIBTOOL} $$(CXX)|$${LIBTOOL} --mode=compile $$(CXX)|' \ - -e 's|$${LIBTOOL} $${CXX}|$${LIBTOOL} --mode=compile $${CXX}|' \ - -e 's|$${LIBTOOL} \.\.|$${LIBTOOL} --mode=install ..|' + @${FIND} ${WRKSRC} -type f | ${XARGS} ${REINPLACE_CMD} \ + -e 's|fstream\.h|fstream|' -e 's|iomanip\.h|iomanip|' \ + -e 's|iostream\.h|iostream|' -e 's|strstream\.h|strstream|' post-install: ${INSTALL_SCRIPT} ${FILESDIR}/cflowd.sh \ diff --git a/net-mgmt/cflowd/pkg-plist b/net-mgmt/cflowd/pkg-plist index 4cbd606e6b8c..128b0768bfed 100644 --- a/net-mgmt/cflowd/pkg-plist +++ b/net-mgmt/cflowd/pkg-plist @@ -78,10 +78,12 @@ lib/cflowd/libCfd.a lib/cflowd/libCfd.la lib/cflowd/libCfd.so lib/cflowd/libCfd.so.0 +lib/cflowd/libCfd.so.0.0.0 lib/cflowd/libsnmp++.a lib/cflowd/libsnmp++.la lib/cflowd/libsnmp++.so lib/cflowd/libsnmp++.so.0 +lib/cflowd/libsnmp++.so.0.0.0 sbin/cfdcollect sbin/cflowd sbin/cflowdmux |