- add USE_GCC=2.95 and unbreak this port

- add OPTIONS for FlowScan patch
- minor fixes

2 files changed, 14 insertions, 19 deletions

diff --git a/net-mgmt/cflowd/Makefile b/net-mgmt/cflowd/Makefile
index ba42f0cd2bb7..0f83ea8cbf62 100644
--- a/net-mgmt/cflowd/Makefile
+++ b/net-mgmt/cflowd/Makefile
@@ -11,39 +11,38 @@ PORTREVISION=	8
 PORTEPOCH=	1
 CATEGORIES=	net-mgmt
 MASTER_SITES=	ftp://ftp.caida.org/pub/cflowd/
-DISTNAME=	${PORTNAME}-${PORTVERSION:S/./-/g}
-
-.if defined(CFLOWD_FLOWSCAN_PATCH)
-PATCH_SITES=	http://net.doit.wisc.edu/~plonka/cflowd/
-PATCHFILES=	cflowd-2-1-b1-djp.patch
-.endif
+DISTNAME=	${PORTNAME}-${PORTVERSION:S|.|-|g}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Flow analysis tool used for analyzing Cisco's NetFlow switching
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/libArts.a:${PORTSDIR}/net-mgmt/arts++
+LIB_DEPENDS=	Arts.0:${PORTSDIR}/net-mgmt/arts++
 
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_BISON=	yes
 USE_REINPLACE=	yes
+INSTALLS_SHLIB=	yes
+USE_LIBTOOL_VER=13
+USE_GCC=	2.95
 
-CONFIGURE_ARGS+=--enable-shared --with-artspp=${PREFIX}
+CONFIGURE_ARGS=	--enable-shared --with-artspp=${LOCALBASE}
 
 MANL=		cfdases.l cfdifmatrix.l cfdnets.l cfdnexthops.l \
 		cfdportmatrix.l cfdprotos.l cfdtos.l flowdump.l flowwatch.l
 
-.include <bsd.port.pre.mk>
+OPTIONS=	FLOWSCAN "FlowScan patch" off
 
-post-patch:
-	cd ${WRKSRC}; ${FIND} . -type f | ${XARGS} ${GREP} -l '<strstream.h>' | ${XARGS} ${REINPLACE_CMD} -e 's/<strstream.h>/<strstream>/'
+.include <bsd.port.pre.mk>
 
-.if !defined(CFLOWD_FLOWSCAN_PATCH)
-pre-everything::
-	@${ECHO} "you can compile cflowd with patches for FlowScan by typing:"
-	@${ECHO} "make CFLOWD_FLOWSCAN_PATCH=yes"
+.if defined(WITH_FLOWSCAN)
+PATCH_SITES+=	http://net.doit.wisc.edu/~plonka/cflowd/
+PATCHFILES+=	cflowd-${PORTVERSION:S|.|-|g}-djp.patch
 .endif
 
+post-configure:
+	${REINPLACE_CMD} -e 's/ gcc\* / gcc\* | g\+\+\* /g' ${WRKSRC}/libtool
+
 post-install:
 	${INSTALL_SCRIPT} ${FILESDIR}/cflowd.sh \
 		${PREFIX}/etc/rc.d/cflowd-base.sh.sample
diff --git a/net-mgmt/cflowd/pkg-plist b/net-mgmt/cflowd/pkg-plist
index 60e4ad377a61..75efc75a4ef7 100644
--- a/net-mgmt/cflowd/pkg-plist
+++ b/net-mgmt/cflowd/pkg-plist
@@ -75,11 +75,9 @@ include/cflowd/snmp++/userdefined.h
 include/cflowd/snmp++/usertimeout.h
 include/cflowd/snmp++/vb.h
 lib/cflowd/libCfd.a
-lib/cflowd/libCfd.la
 lib/cflowd/libCfd.so
 lib/cflowd/libCfd.so.0
 lib/cflowd/libsnmp++.a
-lib/cflowd/libsnmp++.la
 lib/cflowd/libsnmp++.so
 lib/cflowd/libsnmp++.so.0
 sbin/cfdcollect
@@ -88,5 +86,3 @@ sbin/cflowdmux
 @dirrm include/cflowd/snmp++
 @dirrm include/cflowd
 @dirrm lib/cflowd
-@unexec /usr/bin/env /sbin/ldconfig -R
-@exec /usr/bin/env /sbin/ldconfig -m %B