Date: Tue, 11 Feb 2014 18:33:17 +0000 (UTC) From: Tijl Coosemans <tijl@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r343794 - head/net-mgmt/cflowd Message-ID: <201402111833.s1BIXHWw025774@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: tijl Date: Tue Feb 11 18:33:17 2014 New Revision: 343794 URL: http://svnweb.freebsd.org/changeset/ports/343794 QAT: https://qat.redports.org/buildarchive/r343794/ Log: - USES=gmake libtool. - Mark broken on FreeBSD 10+. Fixing one problem leads to another and another in perpetuum... Modified: head/net-mgmt/cflowd/Makefile head/net-mgmt/cflowd/pkg-plist Modified: head/net-mgmt/cflowd/Makefile ============================================================================== --- head/net-mgmt/cflowd/Makefile Tue Feb 11 18:29:30 2014 (r343793) +++ head/net-mgmt/cflowd/Makefile Tue Feb 11 18:33:17 2014 (r343794) @@ -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 ana 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 \ Modified: head/net-mgmt/cflowd/pkg-plist ============================================================================== --- head/net-mgmt/cflowd/pkg-plist Tue Feb 11 18:29:30 2014 (r343793) +++ head/net-mgmt/cflowd/pkg-plist Tue Feb 11 18:33:17 2014 (r343794) @@ -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201402111833.s1BIXHWw025774>