diff options
author | Kris Kennaway <kris@FreeBSD.org> | 2003-06-04 22:43:38 +0000 |
---|---|---|
committer | Kris Kennaway <kris@FreeBSD.org> | 2003-06-04 22:43:38 +0000 |
commit | 93872f18cc0a948ab9c010bbe5694579bd59f8c4 (patch) | |
tree | 918c0e1660ed837a4087b57670a1b1c181c285e0 /net-mgmt | |
parent | Remove some local changes that crept in with the previous commit. (diff) |
Move inclusion of bsd.port.pre.mk later in the file for conditional BROKEN
tag. Early inclusion caused problems for some ports, so to be safe I'm
updating all of them.
Pointy hat to: kris
Notes
Notes:
svn path=/head/; revision=82300
Diffstat (limited to 'net-mgmt')
-rw-r--r-- | net-mgmt/cflowd/Makefile | 12 | ||||
-rw-r--r-- | net-mgmt/irrtoolset/Makefile | 12 | ||||
-rw-r--r-- | net-mgmt/oproute/Makefile | 4 | ||||
-rw-r--r-- | net-mgmt/sting/Makefile | 4 |
4 files changed, 16 insertions, 16 deletions
diff --git a/net-mgmt/cflowd/Makefile b/net-mgmt/cflowd/Makefile index ec73c10bbc0f..c61b5a189359 100644 --- a/net-mgmt/cflowd/Makefile +++ b/net-mgmt/cflowd/Makefile @@ -22,12 +22,6 @@ COMMENT= Flow analysis tool used for analyzing Cisco's NetFlow switching BUILD_DEPENDS= ${LOCALBASE}/lib/libArts.a:${PORTSDIR}/net/arts++ -.include <bsd.port.pre.mk> - -.if ${OSVERSION} >= 500113 -BROKEN= "Does not compile (bad C++ code)" -.endif - GNU_CONFIGURE= yes USE_GMAKE= yes USE_BISON= yes @@ -37,6 +31,12 @@ CONFIGURE_ARGS+=--enable-shared --with-artspp=${PREFIX} MANL= cfdases.l cfdifmatrix.l cfdnets.l cfdnexthops.l \ cfdportmatrix.l cfdprotos.l cfdtos.l flowdump.l flowwatch.l +.include <bsd.port.pre.mk> + +.if ${OSVERSION} >= 500113 +BROKEN= "Does not compile (bad C++ code)" +.endif + .if !defined(CFLOWD_FLOWSCAN_PATCH) pre-everything:: @${ECHO} "you can compile cflowd with patches for FlowScan by typing:" diff --git a/net-mgmt/irrtoolset/Makefile b/net-mgmt/irrtoolset/Makefile index 7cfd192945d8..c98f7554f76d 100644 --- a/net-mgmt/irrtoolset/Makefile +++ b/net-mgmt/irrtoolset/Makefile @@ -16,12 +16,6 @@ COMMENT= A suite of routing policy tools to interact with the IRR LIB_DEPENDS= tk83.1:${PORTSDIR}/x11-toolkits/tk83 -.include <bsd.port.pre.mk> - -.if ${OSVERSION} >= 500113 -BROKEN= "Does not compile (bad C++ code)" -.endif - USE_BISON= yes USE_GMAKE= yes USE_GCC= 2.95 @@ -36,6 +30,12 @@ MAN1= CIDRAdvisor.1 aoe.1 prpath.1 RtConfig.1 peval.1 \ roe.1 rpslcheck.1 prtraceroute.1 MAN3= librpsl.3 +.include <bsd.port.pre.mk> + +.if ${OSVERSION} >= 500113 +BROKEN= "Does not compile (bad C++ code)" +.endif + post-patch: @${SED} -i.orig -e 's|#include <malloc.h>|/* #include <malloc.h> */|' \ ${WRKSRC}/src/irr/birdwhoisc.cc diff --git a/net-mgmt/oproute/Makefile b/net-mgmt/oproute/Makefile index f30ad28ff1e0..59e03db1d3bd 100644 --- a/net-mgmt/oproute/Makefile +++ b/net-mgmt/oproute/Makefile @@ -15,14 +15,14 @@ EXTRACT_SUFX= .tgz MAINTAINER= ports@FreeBSD.org COMMENT= A tool for measuring general performance of the Internet +USE_REINPLACE= yes + .include <bsd.port.pre.mk> .if ${OSVERSION} >= 500113 BROKEN= "Does not compile (bad C++ code)" .endif -USE_REINPLACE= yes - post-patch: @${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/Makefile diff --git a/net-mgmt/sting/Makefile b/net-mgmt/sting/Makefile index ac53a487d007..1a656033832c 100644 --- a/net-mgmt/sting/Makefile +++ b/net-mgmt/sting/Makefile @@ -14,14 +14,14 @@ DISTNAME= sting MAINTAINER= ports@FreeBSD.org COMMENT= A tool that measures end-to-end TCP connection characteristics +WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} + .include <bsd.port.pre.mk> .if ${OSVERSION} >= 500113 || defined(IPFW2) BROKEN= "Does not work with ipfw2" .endif -WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} - do-install: ${INSTALL_PROGRAM} ${WRKSRC}/sting ${PREFIX}/bin .if !defined(NOPORTDOCS) |