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

4 files changed, 16 insertions, 16 deletions

diff --git a/net-mgmt/cflowd/Makefile b/net-mgmt/cflowd/Makefile
index ec73c10..c61b5a1 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 7cfd192..c98f755 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 f30ad28..59e03db 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 ac53a48..1a65603 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)