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

140 files changed, 736 insertions, 735 deletions

diff --git a/astro/celestia/Makefile b/astro/celestia/Makefile
index fa02090777c6..5bc2b62f78f3 100644
--- a/astro/celestia/Makefile
+++ b/astro/celestia/Makefile
@@ -19,12 +19,6 @@ LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
 		png.5:${PORTSDIR}/graphics/png \
 		gtkgl.5:${PORTSDIR}/x11-toolkits/gtkglarea
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 500113
-BROKEN=         "Does not compile (bad C++ code)"
-.endif
-
 GNU_CONFIGURE=	yes
 PLIST=		${WRKDIR}/pkg-plist
 USE_GMAKE=	yes
@@ -39,6 +33,12 @@ CONFIGURE_ENV=	\
 LDFLAGS="-L${X11BASE}/lib -L${LOCALBASE}/lib -lm ${PTHREAD_LIBS}"
 CPPFLAGS="-I${X11BASE}/include -I${X11BASE}/include/GL -I${LOCALBASE}/include ${PTHREAD_CFLAGS}"
 
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} >= 500113
+BROKEN=         "Does not compile (bad C++ code)"
+.endif
+
 pre-patch:
 	${PERL} -pi -e \
 "s:-O2::g; s:-Wall::g; s:-ffast-math::g; s:-fexpensive-optimizations::g; s:\!\ /bin/sh:\!\ ${LOCALBASE}/bin/bash:g" \
diff --git a/audio/denemo/Makefile b/audio/denemo/Makefile
index 1175c1ea37b1..93d0ed8a945c 100644
--- a/audio/denemo/Makefile
+++ b/audio/denemo/Makefile
@@ -18,12 +18,6 @@ LIB_DEPENDS=	gnugetopt.1:${PORTSDIR}/devel/libgnugetopt \
 		intl.4:${PORTSDIR}/devel/gettext \
 		xml.5:${PORTSDIR}/textproc/libxml
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 500113
-BROKEN=         "Does not compile"
-.endif
-
 GNU_CONFIGURE=	yes
 PLIST=		${WRKDIR}/pkg-plist
 SHARED=		denemo.conf denemo.keymaprc english.keymaprc french.keymaprc
@@ -32,6 +26,12 @@ DOCDIR=		share/doc/${PORTNAME}
 USE_GNOME=	gtk12
 USE_X_PREFIX=	yes
 
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} >= 500113
+BROKEN=         "Does not compile"
+.endif
+
 post-configure:
 	${PERL} -pi -e "s:module12:module12 -lgnugetopt:g" ${WRKSRC}/Makefile
 	${PERL} -pi -e "s:<wait.h:<sys/wait.h:g" ${WRKSRC}/*.c
diff --git a/audio/fcplay/Makefile b/audio/fcplay/Makefile
index 5cd127714117..fa6adad9f573 100644
--- a/audio/fcplay/Makefile
+++ b/audio/fcplay/Makefile
@@ -18,12 +18,6 @@ COMMENT=	Future Composer Reference Player
 
 BUILD_DEPENDS=	${LOCALBASE}/include/sidplay/compconf.h:${PORTSDIR}/audio/libsidplay
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 500113
-BROKEN=         "Does not compile (bad C++ code)"
-.endif
-
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 USE_REINPLACE=	yes
@@ -31,6 +25,12 @@ USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CXXFLAGS+=	-I${LOCALBASE}/include
 
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} >= 500113
+BROKEN=         "Does not compile (bad C++ code)"
+.endif
+
 post-patch:
 .for f in configure Config.h.in
 	@${REINPLACE_CMD} -e "s@machine/soundcard\.h@sys/soundcard\.h@g; \
diff --git a/audio/mq3/Makefile b/audio/mq3/Makefile
index ff72a6d58f59..f823b1470906 100644
--- a/audio/mq3/Makefile
+++ b/audio/mq3/Makefile
@@ -19,12 +19,6 @@ LIB_DEPENDS=	fftw.2:${PORTSDIR}/math/fftw \
 		qthreads.15:${PORTSDIR}/lang/guile
 BUILD_DEPENDS=	nasm:${PORTSDIR}/devel/nasm
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 500113
-BROKEN=         "Does not build"
-.endif
-
 USE_QT_VER=	2
 QT_NONSTANDARD=	yes
 HAS_CONFIGURE=	yes
@@ -34,4 +28,10 @@ MAKE_ENV=	CPPFLAGS="-L${X11BASE}/lib -L${LOCALBASE}/lib}" \
 		QTDIR="${X11BASE}"
 CONFIGURE_ARGS=	-prefix ${PREFIX} -platform FreeBSD
 
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} >= 500113
+BROKEN=         "Does not build"
+.endif
+
 .include <bsd.port.post.mk>
diff --git a/audio/rebler/Makefile b/audio/rebler/Makefile
index f8fb6cd2541c..b1b8645dd30b 100644
--- a/audio/rebler/Makefile
+++ b/audio/rebler/Makefile
@@ -19,12 +19,6 @@ LIB_DEPENDS=	mpeg2:${PORTSDIR}/multimedia/libmpeg2 \
 		aviplay.0:${PORTSDIR}/multimedia/avifile \
 		popt:${PORTSDIR}/devel/popt
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 500113
-BROKEN=         "Does not compile (bad C++ code)"
-.endif
-
 USE_BZIP2=	yes
 AVIFILE_CONFIG?=	${LOCALBASE}/bin/avifile-config
 CFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS} \
@@ -32,6 +26,12 @@ CFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS} \
 LIBS+=		-L${LOCALBASE}/lib -lm -lmpeg2 ${PTHREAD_LIBS} \
 		`${AVIFILE_CONFIG} --libs` -lpopt
 
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} >= 500113
+BROKEN=         "Does not compile (bad C++ code)"
+.endif
+
 do-build:
 	@(cd ${WRKSRC} ; \
 	  ${CXX} ${CXXFLAGS} rebler.cpp -o rebler ${LIBS})
diff --git a/audio/spiralloops/Makefile b/audio/spiralloops/Makefile
index 4281e4f02af5..7575ee103b36 100644
--- a/audio/spiralloops/Makefile
+++ b/audio/spiralloops/Makefile
@@ -16,12 +16,6 @@ COMMENT=	Loop-based sampler
 
 LIB_DEPENDS=	fltk.1:${PORTSDIR}/x11-toolkits/fltk
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 500113
-BROKEN=         "Does not compile (bad C++ code)"
-.endif
-
 DOCDIR=		share/doc/${PORTNAME}
 DOC_FILES=	CHANGES COPYING README
 GNU_CONFIGURE=	yes
@@ -31,6 +25,12 @@ PLIST=		${WRKDIR}/pkg-plist
 USE_X_PREFIX=	yes
 WRKSRC=		${WRKDIR}/${DISTNAME}
 
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} >= 500113
+BROKEN=         "Does not compile (bad C++ code)"
+.endif
+
 post-patch:
 	${PERL} -pi -e "s:-ldl::g; s:^CFLAGS:XCFLAGS:g; s:^CXXFLAGS:XCXXFLAGS:g; s:usr/X11R6:${PREFIX}:g" ${WRKSRC}/Makefile.in
 	${PERL} -pi -e 's|-O3|${PTHREAD_CFLAGS}|g ; \
diff --git a/audio/spiralsynth/Makefile b/audio/spiralsynth/Makefile
index 3a14db670757..3a8638e6e3c7 100644
--- a/audio/spiralsynth/Makefile
+++ b/audio/spiralsynth/Makefile
@@ -16,12 +16,6 @@ COMMENT=	MIDI-capable synthesizer for X
 
 LIB_DEPENDS=	fltk.1:${PORTSDIR}/x11-toolkits/fltk
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 500113
-BROKEN=         "Does not compile (bad C++ code)"
-.endif
-
 GNU_CONFIGURE=	yes
 MAKE_ENV=	PTHREAD_LIBS="${PTHREAD_LIBS}" \
 		PTHREAD_CFLAGS="${PTHREAD_CFLAGS}"
@@ -32,6 +26,12 @@ WRKSRC=		${WRKDIR}/${DISTNAME}
 
 DOC_FILES=	CHANGES COPYING README
 
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} >= 500113
+BROKEN=         "Does not compile (bad C++ code)"
+.endif
+
 post-patch:
 	${PERL} -pi -e 's|-O3|${PTHREAD_CFLAGS}|g ; \
 			s|CFLAGS =|CFLAGS +=|g ; \
diff --git a/biology/avida/Makefile b/biology/avida/Makefile
index 00228e6d8d4e..62783d6f96b3 100644
--- a/biology/avida/Makefile
+++ b/biology/avida/Makefile
@@ -13,17 +13,17 @@ MASTER_SITES=	http://dllab.caltech.edu/avida/versions/
 MAINTAINER=	karlj000@unbc.ca
 COMMENT=	Avida is an auto-adaptive genetic system designed for ALife research
 
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:C/\.[[:alnum:]]+$//}
+USE_GMAKE=	yes
+GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--enable-viewer --enable-standard-prefix --prefix=${PREFIX} --datadir=${PREFIX}/share/${PORTNAME}
+
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} >= 500113
 BROKEN=         "Does not compile (bad C++ code)"
 .endif
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:C/\.[[:alnum:]]+$//}
-USE_GMAKE=	yes
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--enable-viewer --enable-standard-prefix --prefix=${PREFIX} --datadir=${PREFIX}/share/${PORTNAME}
-
 post-patch:
 	# Change source/defs.hh prefix and port name.
 	@ ${MV} ${WRKSRC}/source/defs.hh ${WRKSRC}/source/defs.hh.presed
diff --git a/chinese/chinput2/Makefile b/chinese/chinput2/Makefile
index 3c971f4e44f4..3392525c7326 100644
--- a/chinese/chinput2/Makefile
+++ b/chinese/chinput2/Makefile
@@ -18,16 +18,16 @@ COMMENT=	Another Chinese GB2312 and Big5 X11 input server
 BUILD_DEPENDS=	mysql:${PORTSDIR}/databases/mysql323-client
 RUN_DEPENDS=	mysql:${PORTSDIR}/databases/mysql323-client
 
+USE_XLIB=	yes
+
+WRKSRC=		${WRKDIR}/${PORTNAME}
+
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} >= 500113
 BROKEN=         "Does not build"
 .endif
 
-USE_XLIB=	yes
-
-WRKSRC=		${WRKDIR}/${PORTNAME}
-
 post-extract:
 	find ${WRKSRC} -name CVS | xargs ${RM} -rf
 
diff --git a/chinese/chinput3/Makefile b/chinese/chinput3/Makefile
index e7ff47bedfd4..5f8881322f9a 100644
--- a/chinese/chinput3/Makefile
+++ b/chinese/chinput3/Makefile
@@ -13,16 +13,16 @@ MASTER_SITES=	ftp://freebsd.sinica.edu.tw/pub/statue/chinput3/
 MAINTAINER=	statue@freebsd.sinica.edu.tw
 COMMENT=	Chinese GB2312,BIG5 code input server
 
+USE_XLIB=	yes
+USE_IMLIB=	yes
+USE_GNOME=	gtk12
+
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} >= 500113
 BROKEN=         "Does not link"
 .endif
 
-USE_XLIB=	yes
-USE_IMLIB=	yes
-USE_GNOME=	gtk12
-
 port-install:
 	@${SED} -e 's,%%X11BASE%%,${X11BASE},g' < ${PKGMESSAGE}
 
diff --git a/chinese/dictd-database/Makefile b/chinese/dictd-database/Makefile
index d6cf7baf29a3..2c349951cf6f 100644
--- a/chinese/dictd-database/Makefile
+++ b/chinese/dictd-database/Makefile
@@ -16,16 +16,16 @@ COMMENT=	A Chinese <-> English dictd words database
 
 BUILD_DEPENDS=  ${LOCALBASE}/bin/dictzip:${PORTSDIR}/chinese/dictd
 
+HAS_CONFIGURE=	yes
+USE_GMAKE=	yes
+USE_PERL5_BUILD=yes
+
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} >= 500113
 BROKEN=         "Does not build"
 .endif
 
-HAS_CONFIGURE=	yes
-USE_GMAKE=	yes
-USE_PERL5_BUILD=yes
-
 post-install:
 	@${CAT} ${PKGMESSAGE}
 
diff --git a/comms/plp/Makefile b/comms/plp/Makefile
index 50d73bae12a3..b66405577212 100644
--- a/comms/plp/Makefile
+++ b/comms/plp/Makefile
@@ -16,15 +16,15 @@ DISTNAME=	${PORTNAME}_1_8
 MAINTAINER=	maurice@serc.rmit.edu.au
 COMMENT=	Transfer data between a Psion Series 5(mx) and Unix
 
+USE_GMAKE=	yes
+USE_REINPLACE=	yes
+
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} >= 500113
 BROKEN=         "Does not compile (bad C++ code)"
 .endif
 
-USE_GMAKE=	yes
-USE_REINPLACE=	yes
-
 pre-patch:
 .for files in packet.cc socketchan.cc
 	@${REINPLACE_CMD} -e 's|malloc.h|stdlib.h|' ${WRKSRC}/ncp/${files}
diff --git a/deskutils/offix-trash/Makefile b/deskutils/offix-trash/Makefile
index 50fb1127723b..c45ff09f961d 100644
--- a/deskutils/offix-trash/Makefile
+++ b/deskutils/offix-trash/Makefile
@@ -17,14 +17,14 @@ COMMENT=	Trash from OffiX
 
 LIB_DEPENDS=	Dnd++.1:${PORTSDIR}/x11/libdnd
 
+GNU_CONFIGURE=	YES
+USE_GMAKE=	YES
+USE_X_PREFIX=	YES
+
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} >= 500113
 BROKEN=         "Does not compile (bad C++ code)"
 .endif
 
-GNU_CONFIGURE=	YES
-USE_GMAKE=	YES
-USE_X_PREFIX=	YES
-
 .include <bsd.port.post.mk>
diff --git a/devel/arm-elf-gcc295/Makefile b/devel/arm-elf-gcc295/Makefile
index 8cbd63bbd777..9c56e44aff63 100644
--- a/devel/arm-elf-gcc295/Makefile
+++ b/devel/arm-elf-gcc295/Makefile
@@ -24,12 +24,6 @@ BUILD_DEPENDS=	${PKGNAMEPREFIX}as:${PORTSDIR}/devel/${PKGNAMEPREFIX}binutils \
 RUN_DEPENDS=	${PKGNAMEPREFIX}as:${PORTSDIR}/devel/${PKGNAMEPREFIX}binutils \
 		${PKGNAMEPREFIX}ld:${PORTSDIR}/devel/${PKGNAMEPREFIX}binutils
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 500113
-BROKEN=         "Does not compile"
-.endif
-
 GCC_REV=	${DISTNAME:S/gcc-//g}
 PLIST_SUB+=	GCC_REV=${GCC_REV}
 USE_PERL5=	yes
@@ -47,6 +41,12 @@ LIBTOOLFILES=	configure etc/configure gcc/configure libiberty/configure \
 		texinfo/testsuite/configure
 MAN1=		${PKGNAMEPREFIX}g++.1 ${PKGNAMEPREFIX}gcc.1 cccp.1
 
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} >= 500113
+BROKEN=         "Does not compile"
+.endif
+
 .if !defined(DEFAULT_CPU)
 pre-extract:
 	@${ECHO}
diff --git a/devel/asis-gpl/Makefile b/devel/asis-gpl/Makefile
index 71bfdd5a3649..2fd20a7dd96d 100644
--- a/devel/asis-gpl/Makefile
+++ b/devel/asis-gpl/Makefile
@@ -19,17 +19,17 @@ COMMENT=	GNAT implementation of the Ada Semantic Interface Specification
 
 BUILD_DEPENDS=	adagcc:${PORTSDIR}/lang/gnat
 
+USE_GMAKE=	yes
+MAKEFILE=	"${FILESDIR}/Makefile.bsd"
+MAKE_ARGS=	GMAKE=${GMAKE} PORTVERSION=${PORTVERSION} \
+		LN=${LN}
+
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} >= 500113
 BROKEN=         "Does not compile"
 .endif
 
-USE_GMAKE=	yes
-MAKEFILE=	"${FILESDIR}/Makefile.bsd"
-MAKE_ARGS=	GMAKE=${GMAKE} PORTVERSION=${PORTVERSION} \
-		LN=${LN}
-
 do-install:
 	@${MKDIR} ${PREFIX}/lib/asis
 	@${INSTALL_DATA} ${WRKSRC}/asis/*.ad? ${WRKSRC}/gnat/*.ad? ${WRKSRC}/obj/*.ali ${PREFIX}/lib/asis
diff --git a/devel/asis/Makefile b/devel/asis/Makefile
index 71bfdd5a3649..2fd20a7dd96d 100644
--- a/devel/asis/Makefile
+++ b/devel/asis/Makefile
@@ -19,17 +19,17 @@ COMMENT=	GNAT implementation of the Ada Semantic Interface Specification
 
 BUILD_DEPENDS=	adagcc:${PORTSDIR}/lang/gnat
 
+USE_GMAKE=	yes
+MAKEFILE=	"${FILESDIR}/Makefile.bsd"
+MAKE_ARGS=	GMAKE=${GMAKE} PORTVERSION=${PORTVERSION} \
+		LN=${LN}
+
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} >= 500113
 BROKEN=         "Does not compile"
 .endif
 
-USE_GMAKE=	yes
-MAKEFILE=	"${FILESDIR}/Makefile.bsd"
-MAKE_ARGS=	GMAKE=${GMAKE} PORTVERSION=${PORTVERSION} \
-		LN=${LN}
-
 do-install:
 	@${MKDIR} ${PREFIX}/lib/asis
 	@${INSTALL_DATA} ${WRKSRC}/asis/*.ad? ${WRKSRC}/gnat/*.ad? ${WRKSRC}/obj/*.ali ${PREFIX}/lib/asis
diff --git a/devel/asmutils/Makefile b/devel/asmutils/Makefile
index 6894d0245938..c279c95938cd 100644
--- a/devel/asmutils/Makefile
+++ b/devel/asmutils/Makefile
@@ -15,12 +15,6 @@ COMMENT=	A set of UNIX utilities written in assembly language
 
 BUILD_DEPENDS=	nasm:${PORTSDIR}/devel/nasm
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 500113
-BROKEN=         "Does not compile"
-.endif
-
 ONLY_FOR_ARCHS=	i386
 
 USE_GMAKE=	yes
@@ -38,6 +32,12 @@ BINARIES=	asmutils basename cat chmod chown chroot cp cpuinfo date \
 DOCFILES=	Asmutils-HOWTO acknowledgements endorsements history \
 		index s-contrib s-debug s-include s-layout s-optimize
 
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} >= 500113
+BROKEN=         "Does not compile"
+.endif
+
 post-patch:
 	@(${SED} -e 's,%%KERNEL%%,${OSREL:S/.//g},g' ${WRKSRC}/MCONFIG > ${WRKDIR}/foo \
 		&& ${MV} ${WRKDIR}/foo ${WRKSRC}/MCONFIG)
diff --git a/devel/clint/Makefile b/devel/clint/Makefile
index a7306ff0e1a7..f8ebc9e43514 100644
--- a/devel/clint/Makefile
+++ b/devel/clint/Makefile
@@ -16,18 +16,18 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A static source code checker for C++
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 500113
-BROKEN=         "Does not compile (bad C++ code)"
-.endif
-
 USE_PYTHON=	yes
 USE_LIBTOOL=	yes
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
 INSTALLS_SHLIB=	yes
 
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} >= 500113
+BROKEN=         "Does not compile (bad C++ code)"
+.endif
+
 post-patch:
 	@${REINPLACE_CMD} -e "s,-lpthread,${PTHREAD_LIBS},g" ${WRKSRC}/configure
 
diff --git a/devel/crossgo32/Makefile b/devel/crossgo32/Makefile
index dd9301c4c8e8..fa237a9cf1a8 100644
--- a/devel/crossgo32/Makefile
+++ b/devel/crossgo32/Makefile
@@ -19,12 +19,6 @@ DISTFILES=	${DISTNAME}${EXTRACT_SUFX} dosrel-1.0${EXTRACT_SUFX}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Cross Development Environment for 32-bit DOS
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 500113
-BROKEN=         "Does not compile"
-.endif
-
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--target=${TARGET}
 USE_GMAKE=	yes
@@ -39,6 +33,12 @@ MAN1=	i386-go32-ar.1 i386-go32-nm.1 i386-go32-objdump.1\
 DOCDIR=		${PREFIX}/share/doc/crossgo32
 GO32DIR=	${PREFIX}/share/crossgo32
 
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} >= 500113
+BROKEN=         "Does not compile"
+.endif
+
 post-extract:
 	${MV} ${WRKDIR}/dosrel-1.0/ ${WRKSRC}
 
diff --git a/devel/ddd/Makefile b/devel/ddd/Makefile
index 505134b56825..1bdc8417924d 100644
--- a/devel/ddd/Makefile
+++ b/devel/ddd/Makefile
@@ -15,12 +15,6 @@ MASTER_SITE_SUBDIR= ddd
 MAINTAINER=	lioux@FreeBSD.org
 COMMENT=	Data Display Debugger -- a common graphical front-end for GDB/DBX/XDB
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 500113
-BROKEN=         "Does not compile (bad C++ code)"
-.endif
-
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	${ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS=	--with-motif-libraries="${LIBXMDIR}" \
@@ -45,6 +39,12 @@ LIBXMDIR!=	${ECHO_CMD} ${MOTIFLIB} | ${SED} -e 's/-L//g' | ${AWK} '{print $$1}'
 LIBXMDIR=	${X11BASE}
 .endif
 
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} >= 500113
+BROKEN=         "Does not compile (bad C++ code)"
+.endif
+
 pre-patch:
 	${RM} -fv ${WRKSRC}/ddd/ddd.info*
 	${RM} -fv ${WRKSRC}/ddd/ddd-themes.info*
diff --git a/devel/doc++/Makefile b/devel/doc++/Makefile
index 8d1dc53dac55..6b2108941f73 100644
--- a/devel/doc++/Makefile
+++ b/devel/doc++/Makefile
@@ -18,12 +18,6 @@ RUN_DEPENDS=	tex:${PORTSDIR}/print/teTeX \
 		gs:${PORTSDIR}/print/ghostscript-gnu \
 		anytopnm:${PORTSDIR}/graphics/netpbm
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 500113
-BROKEN=         "Does not compile (bad C++ code)"
-.endif
-
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 
@@ -61,6 +55,12 @@ ADDITIONAL_DOCS=	ClassGraph.class \
 			supportedTeXmacros.html \
 			toc.html
 
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} >= 500113
+BROKEN=         "Does not compile (bad C++ code)"
+.endif
+
 post-install:
 .if !defined(NOPORTSDOCS)
 	${MKDIR} ${PREFIX}/share/doc/doc++
diff --git a/devel/freescope/Makefile b/devel/freescope/Makefile
index 633c86a271a7..793a145e451b 100644
--- a/devel/freescope/Makefile
+++ b/devel/freescope/Makefile
@@ -16,12 +16,6 @@ DISTNAME=	${PORTNAME}-${PORTVERSION:R}-${PORTVERSION:E}.src
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Source code browsing on UNIX-like operating systems
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 500113
-BROKEN=         "Does not compile (bad C++ code)"
-.endif
-
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:R}
 
 USE_REINPLACE=	yes
@@ -29,6 +23,12 @@ GNU_CONFIGURE=	yes
 
 MAN1=	freescope.1
 
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} >= 500113
+BROKEN=         "Does not compile (bad C++ code)"
+.endif
+
 pre-patch:
 	@${REINPLACE_CMD} -e 's|CFLAGS=.*$$|CFLAGS="\$$CFLAGS"|g ; \
 		 s|CXXFLAGS=.*$$|CXXFLAGS="\$$CXXFLAGS"|g ; \
diff --git a/devel/ixlib/Makefile b/devel/ixlib/Makefile
index 0eca1515f596..e5525b40a44b 100644
--- a/devel/ixlib/Makefile
+++ b/devel/ixlib/Makefile
@@ -18,16 +18,16 @@ COMMENT=	A small C++ tools library based on STL
 
 LIB_DEPENDS=	intl.4:${PORTSDIR}/devel/gettext
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 500113
-BROKEN=         "Does not compile (bad C++ code)"
-.endif
-
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 INSTALLS_SHLIB= yes
 
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} >= 500113
+BROKEN=         "Does not compile (bad C++ code)"
+.endif
+
 .include <bsd.port.post.mk>
diff --git a/devel/mico/Makefile b/devel/mico/Makefile
index 98325b09208e..a26df18608c4 100644
--- a/devel/mico/Makefile
+++ b/devel/mico/Makefile
@@ -13,12 +13,6 @@ MASTER_SITES=	http://www.mico.org/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A CORBA 2.0 implementation which goal is freely available
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 500113
-BROKEN=         "Does not compile (bad C++ code)"
-.endif
-
 WRKSRC=			${WRKDIR}/mico
 INSTALLS_SHLIB=		yes
 GNU_CONFIGURE=		yes
@@ -32,6 +26,12 @@ MAN1=		idl.1 imr.1 nsadmin.1
 MAN5=		micorc.5
 MAN8=		ird.8 micod.8 nsd.8
 
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} >= 500113
+BROKEN=         "Does not compile (bad C++ code)"
+.endif
+
 post-patch:
 	${REINPLACE_CMD} -e "s,so.1.0,so, ;s,-O2,${CFLAGS}," ${WRKSRC}/configure
 
diff --git a/devel/p5-File-Lock/Makefile b/devel/p5-File-Lock/Makefile
index b92ffdb882c5..aade9d867f6e 100644
--- a/devel/p5-File-Lock/Makefile
+++ b/devel/p5-File-Lock/Makefile
@@ -15,12 +15,12 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	demon@FreeBSD.org
 COMMENT=	Perl5 module for file locking (flock,fcntl)
 
+PERL_CONFIGURE=	yes
+
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} >= 500113
 BROKEN=         "Does not compile"
 .endif
 
-PERL_CONFIGURE=	yes
-
 .include <bsd.port.post.mk>
diff --git a/devel/sdts++/Makefile b/devel/sdts++/Makefile
index 74fd7030b8a9..091fb7680e3b 100644
--- a/devel/sdts++/Makefile
+++ b/devel/sdts++/Makefile
@@ -19,13 +19,13 @@ DISTFILES=	${DISTNAME}${EXTRACT_SUFX}:site1 \
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	C++ library for SDTS related development
 
+USE_LIBTOOL=	yes
+CONFIGURE_ARGS=	--with-boost=${WRKDIR}/boost_1_27_0
+
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} >= 500113
 BROKEN=         "Configure fails"
 .endif
 
-USE_LIBTOOL=	yes
-CONFIGURE_ARGS=	--with-boost=${WRKDIR}/boost_1_27_0
-
 .include <bsd.port.post.mk>
diff --git a/devel/titano/Makefile b/devel/titano/Makefile
index cc722e18569e..5d0ac45615f2 100644
--- a/devel/titano/Makefile
+++ b/devel/titano/Makefile
@@ -17,12 +17,6 @@ COMMENT=	An IDE for GNOME desktop
 
 LIB_DEPENDS=	gtkeditor.0:${PORTSDIR}/x11-toolkits/libgtkeditor
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 500113
-BROKEN=         "Does not compile (bad C++ code)"
-.endif
-
 WRKSRC=		${WRKDIR}/${DISTNAME:S/b//}
 
 USE_REINPLACE=	yes
@@ -31,6 +25,12 @@ USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_LIBTOOL=	yes
 
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} >= 500113
+BROKEN=         "Does not compile (bad C++ code)"
+.endif
+
 pre-patch:
 	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
 		s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
diff --git a/devel/yacl/Makefile b/devel/yacl/Makefile
index b3aa429f628e..1efbf931df41 100644
--- a/devel/yacl/Makefile
+++ b/devel/yacl/Makefile
@@ -14,12 +14,6 @@ DISTNAME=		yacl-0170-beta
 MAINTAINER=		ports@freebsd.org
 COMMENT=	Portable programming library for C++
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 500113
-BROKEN=         "Does not compile (bad C++ code)"
-.endif
-
 NO_WRKSUBDIR=		yes
 USE_ZIP=		yes
 MAKE_ENV=		YACLPATH=${WRKDIR}
@@ -29,6 +23,12 @@ ALL_TARGET=		yacl
 
 USE_MOTIF=		true
 
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} >= 500113
+BROKEN=         "Does not compile (bad C++ code)"
+.endif
+
 post-build:
 	@(cd ${WRKSRC}/apps/bmpview; ${MAKE} ${MAKE_ENV} -f gnuc.mak)
 	@(cd ${WRKSRC}/apps/dlged; ${MAKE} ${MAKE_ENV} -f gnuc.mak)
diff --git a/editors/e93/Makefile b/editors/e93/Makefile
index 1611b98c2623..4c0ac94d2022 100644
--- a/editors/e93/Makefile
+++ b/editors/e93/Makefile
@@ -19,15 +19,15 @@ COMMENT=	A nifty editor based on Tcl/Tk
 LIB_DEPENDS=	tcl82.1:${PORTSDIR}/lang/tcl82 \
 		tk82.1:${PORTSDIR}/x11-toolkits/tk82
 
+WRKSRC=		${WRKDIR}/${PORTNAME}
+USE_X_PREFIX=	yes
+
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} >= 500113
 BROKEN=         "Does not compile"
 .endif
 
-WRKSRC=		${WRKDIR}/${PORTNAME}
-USE_X_PREFIX=	yes
-
 do-install:
 	${MKDIR} ${PREFIX}/share/doc/e93 ${PREFIX}/lib/e93lib/images \
 		${PREFIX}/lib/e93lib/highlightschemes \
diff --git a/editors/ved/Makefile b/editors/ved/Makefile
index eb40293e83f4..f33a0073fb42 100644
--- a/editors/ved/Makefile
+++ b/editors/ved/Makefile
@@ -13,16 +13,16 @@ MASTER_SITES=	ftp://ftp.fokus.gmd.de/pub/unix/ved/
 MAINTAINER=	greid@ukug.uk.freebsd.org
 COMMENT=	A small and fast screen-oriented editor.
 
+USE_GMAKE=	yes
+
+MAN1=		ved.1
+
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} >= 500113
 BROKEN=         "Does not compile"
 .endif
 
-USE_GMAKE=	yes
-
-MAN1=		ved.1
-
 post-patch:
 .for F in ved.h ved.1
 	${SED} -e 's,%%PREFIX%%,${PREFIX},' ${WRKSRC}/ved/$F \
diff --git a/editors/vigor/Makefile b/editors/vigor/Makefile
index 3ec6d429369d..dbd3e48649e2 100644
--- a/editors/vigor/Makefile
+++ b/editors/vigor/Makefile
@@ -17,12 +17,6 @@ COMMENT=	A vi clone inspired by the userfriendly comic strip
 LIB_DEPENDS=	tk82.1:${PORTSDIR}/x11-toolkits/tk82 \
 		tcl82.1:${PORTSDIR}/lang/tcl82
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 500113
-BROKEN=         "Does not compile"
-.endif
-
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=--program-transform-name="s,0,1,"
 CONFIGURE_ENV+=	LDFLAGS="-L${LOCALBASE}/lib"
@@ -30,6 +24,12 @@ CONFIGURE_ENV+=	LDFLAGS="-L${LOCALBASE}/lib"
 WRKSRC=	${WRKDIR}/${DISTNAME}/build
 CFLAGS+= 	-I${LOCALBASE}/include/tcl8.2 -I${LOCALBASE}/include/tk8.2
 
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} >= 500113
+BROKEN=         "Does not compile"
+.endif
+
 # Uglyness. So is "-ltcl -ltk -ltcl", so I don't feel bad.
 post-patch:
 	@${CP} ${WRKSRC}/configure ${WRKSRC}/configure.orig
diff --git a/editors/xenon/Makefile b/editors/xenon/Makefile
index 63eca50a182d..3292a94651e4 100644
--- a/editors/xenon/Makefile
+++ b/editors/xenon/Makefile
@@ -14,12 +14,6 @@ MASTER_SITES=	http://sydney.proximity.com.au/~ben/xenon/dist/ \
 MAINTAINER=	jedgar@FreeBSD.org
 COMMENT=	Simple X-based text editor
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 500113
-BROKEN=         "Does not compile (bad C++ code)"
-.endif
-
 USE_GMAKE=	yes
 USE_REINPLACE=	yes
 USE_X_PREFIX=	yes
@@ -31,6 +25,12 @@ MAN1=		xe.1
 FIX_FILES=	Xe.h XeApp.h XeFontTable.C XeFontTable.h XeKeyTable.C \
 		XeKeyTable.h XeObjectTable.h
 
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} >= 500113
+BROKEN=         "Does not compile (bad C++ code)"
+.endif
+
 do-configure:
 .for file in ${FIX_FILES}
 	@${REINPLACE_CMD} -e 's|#include <ext/|#include <|' \
diff --git a/emulators/bsvc/Makefile b/emulators/bsvc/Makefile
index 187e78123e35..6dd30412cd24 100644
--- a/emulators/bsvc/Makefile
+++ b/emulators/bsvc/Makefile
@@ -18,18 +18,18 @@ COMMENT=	An extensible hardware simulation framework with MC68K support
 
 RUN_DEPENDS=	wish8.2:${PORTSDIR}/x11-toolkits/tk82
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 500113
-BROKEN=         "Does not compile (bad C++ code)"
-.endif
-
 WRKSRC=		${WRKDIR}/${DISTNAME}/src
 
 USE_REINPLACE=	yes
 
 MAKE_ENV=	PROJECT_BASE=${PREFIX} WRKSRC=${WRKSRC}
 
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} >= 500113
+BROKEN=         "Does not compile (bad C++ code)"
+.endif
+
 pre-patch:
 	${CP} ${WRKSRC}/Makefile.Linux ${WRKSRC}/Makefile
 post-patch:
diff --git a/emulators/libvm68k/Makefile b/emulators/libvm68k/Makefile
index 0d39389b4bec..69840b8ae2d6 100644
--- a/emulators/libvm68k/Makefile
+++ b/emulators/libvm68k/Makefile
@@ -15,14 +15,14 @@ MASTER_SITES=	ftp://ftp.hypercore.co.jp/vx68k/${PORTNAME}-${PORTVERSION:R}/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	M68000 virtual machine library
 
+USE_LIBTOOL=	yes
+LIBTOOLFLAGS=	--disable-ltlibs --release-ignore
+INSTALLS_SHLIB=	yes
+
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} >= 500113
 BROKEN=         "Does not compile (bad C++ code)"
 .endif
 
-USE_LIBTOOL=	yes
-LIBTOOLFLAGS=	--disable-ltlibs --release-ignore
-INSTALLS_SHLIB=	yes
-
 .include <bsd.port.post.mk>
diff --git a/emulators/qcl/Makefile b/emulators/qcl/Makefile
index b8b40edb2f35..235d9f8faf2f 100644
--- a/emulators/qcl/Makefile
+++ b/emulators/qcl/Makefile
@@ -14,14 +14,14 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	huntting@glarp.com
 COMMENT=	A quantum computer simulator
 
+LIB_DEPENDS=	gnugetopt.1:${PORTSDIR}/devel/libgnugetopt
+
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} >= 500113
 BROKEN=         "Does not compile (bad C++ code)"
 .endif
 
-LIB_DEPENDS=	gnugetopt.1:${PORTSDIR}/devel/libgnugetopt
-
 post-install:
 	strip ${PREFIX}/bin/qcl
 
diff --git a/finance/aqmoney/Makefile b/finance/aqmoney/Makefile
index 565551265b93..df681b7873a5 100644
--- a/finance/aqmoney/Makefile
+++ b/finance/aqmoney/Makefile
@@ -15,14 +15,14 @@ COMMENT=	AqMoney uses openhbci to manage your credit institute accounts
 
 LIB_DEPENDS=		openhbci.7:${PORTSDIR}/finance/openhbci
 
+GNU_CONFIGURE=		yes
+CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
+MAN1=			aqmoney.1
+
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} >= 500113
 BROKEN=         "Configure fails"
 .endif
 
-GNU_CONFIGURE=		yes
-CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
-MAN1=			aqmoney.1
-
 .include <bsd.port.post.mk>
diff --git a/ftp/kwebget/Makefile b/ftp/kwebget/Makefile
index d27e9fdcd4c5..495911466fa4 100644
--- a/ftp/kwebget/Makefile
+++ b/ftp/kwebget/Makefile
@@ -16,12 +16,6 @@ COMMENT=	A KDE frontend to wget
 
 RUN_DEPENDS=	${LOCALBASE}/bin/wget:${PORTSDIR}/ftp/wget
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 500113
-BROKEN=         "Does not compile (bad C++ code)"
-.endif
-
 USE_KDELIBS_VER=	3
 USE_BZIP2=	yes
 USE_GMAKE=	yes
@@ -30,6 +24,12 @@ WRKSRC=		${WRKDIR}/${PORTNAME}
 CONFIGURE_TARGET=	# empty
 CONFIGURE_ARGS+=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} >= 500113
+BROKEN=         "Does not compile (bad C++ code)"
+.endif
+
 post-patch:
 	@${PERL} -pi -e 's#lqt#lqt2#g' ${WRKSRC}/configure ${WRKSRC}/kwebget/Makefile.in
 
diff --git a/games/alephone/Makefile b/games/alephone/Makefile
index d25e4b4b24e5..7d0182652ece 100644
--- a/games/alephone/Makefile
+++ b/games/alephone/Makefile
@@ -18,18 +18,18 @@ COMMENT=	The open source version of Bungie's Marathon game
 LIB_DEPENDS=	SDL-1.1.5:${PORTSDIR}/devel/sdl12:install \
 		SDL_image.10:${PORTSDIR}/graphics/sdl_image:install
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 500113
-BROKEN=         "Does not compile (bad C++ code)"
-.endif
-
 SDL_CONFIG?=	${LOCALBASE}/bin/sdl11-config
 
 USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	SDL_CONFIG="${SDL_CONFIG}"
 
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} >= 500113
+BROKEN=         "Does not compile (bad C++ code)"
+.endif
+
 post-patch:
 	@${PERL} -pi -e 's,^#include \"network_modem.h\".*,,' \
 		${WRKSRC}/Source_Files/Network/network.cpp \
diff --git a/games/battleball/Makefile b/games/battleball/Makefile
index 1adae103a101..e53db21910ff 100644
--- a/games/battleball/Makefile
+++ b/games/battleball/Makefile
@@ -15,18 +15,18 @@ DISTNAME=	${PORTNAME}.${PORTVERSION:S/.//}.src
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	3D single/multiplayer military soccer game for X Window System
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 500113
-BROKEN=         "Does not compile (bad C++ code)"
-.endif
-
 USE_X_PREFIX=	yes
 USE_MESA=	yes
 WRKSRC=		${WRKDIR}/battleball-2.1-src
 MAKE_ENV=	PTHREAD_LIBS="${PTHREAD_LIBS}" \
 		PTHREAD_CFLAGS="${PTHREAD_CFLAGS}"
 
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} >= 500113
+BROKEN=         "Does not compile (bad C++ code)"
+.endif
+
 do-install:
 	@ ${INSTALL_PROGRAM} ${WRKSRC}/battleball ${PREFIX}/bin
 
diff --git a/games/clanbomber/Makefile b/games/clanbomber/Makefile
index 8d13e2c7bdb8..3362f06cc48e 100644
--- a/games/clanbomber/Makefile
+++ b/games/clanbomber/Makefile
@@ -16,16 +16,16 @@ COMMENT=	A bomberman-like multiplayer game
 
 LIB_DEPENDS=	clanCore.0:${PORTSDIR}/devel/clanlib
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 500113
-BROKEN=         "Does not compile (bad C++ code)"
-.endif
-
 USE_XLIB=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	LIBS="${PTHREAD_LIBS} -L${LOCALBASE}/lib" \
 		CPPFLAGS="-I${LOCALBASE}/include"
 CFLAGS+=	-fpermissive
 
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} >= 500113
+BROKEN=         "Does not compile (bad C++ code)"
+.endif
+
 .include <bsd.port.post.mk>
diff --git a/games/criticalmass/Makefile b/games/criticalmass/Makefile
index 64f7e74d2969..a672ae195158 100644
--- a/games/criticalmass/Makefile
+++ b/games/criticalmass/Makefile
@@ -19,12 +19,6 @@ LIB_DEPENDS=	SDL-1.1.5:${PORTSDIR}/devel/sdl12 \
 		SDL_image.10:${PORTSDIR}/graphics/sdl_image \
 		SDL_mixer.2:${PORTSDIR}/audio/sdl_mixer
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 500113
-BROKEN=         "Does not compile (bad C++ code)"
-.endif
-
 USE_BZIP2=	yes
 USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
@@ -34,6 +28,12 @@ CONFIGURE_ENV=	LDFLAGS="${LDFLAGS} -L${X11BASE}/lib" \
 SDLINCPFILES=	utilities/GLBitmapCollection.cpp utilities/GLExtension.hpp \
 		utilities/GLTexture.hpp utilities/PNG.hpp
 
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} >= 500113
+BROKEN=         "Does not compile (bad C++ code)"
+.endif
+
 post-patch:
 	${REINPLACE_CMD} -e 's#sdl-config#sdl11-config#; s#-lSDL # #;' ${WRKSRC}/configure
 	${REINPLACE_CMD} -e 's#SDL/#SDL11/#;' ${SDLINCPFILES:S#^#${WRKSRC}/#}
diff --git a/games/nethack33/Makefile b/games/nethack33/Makefile
index 363f74c3bbc0..2a4b2e21cf2d 100644
--- a/games/nethack33/Makefile
+++ b/games/nethack33/Makefile
@@ -27,8 +27,6 @@ MAKE_ENV=	CXX="${CXX}" GRAPHICS="${GRAPHICS}"
 
 MAN6=		dgn_comp.6 dlb.6 lev_comp.6 nethack.6 recover.6
 
-.include <bsd.port.pre.mk>
-
 .if defined(WITH_GNOME_GRAPHICS)
 CATEGORIES=	games gnome
 PKGNAMESUFFIX=	-gnome
@@ -36,9 +34,6 @@ LIB_DEPENDS+=	gnugetopt:${PORTSDIR}/devel/libgnugetopt
 USE_GNOME=	yes
 GRAPHICS=	GNOME_GRAPHICS
 .elif defined(WITH_QT_GRAPHICS)
-.if ${OSVERSION} >= 500113
-BROKEN=         "Does not build"
-.endif
 PKGNAMESUFFIX=	-qt
 USE_QT_VER=	2
 MAKE_ENV+=	QTCPPFLAGS="${QTCPPFLAGS}" QTCFGLIBS="${QTCFGLIBS}" \
@@ -51,6 +46,12 @@ USE_XPM=	yes
 GRAPHICS=	X11_GRAPHICS
 .endif
 
+.include <bsd.port.pre.mk>
+
+.if defined(WITH_QT_GRAPHICS) && ${OSVERSION} >= 500113
+BROKEN=         "Does not build"
+.endif
+
 pre-everything::
 .if defined(WITH_GNOME_GRAPHICS) || defined(WITH_QT_GRAPHICS) \
 		|| defined(WITH_TTY_GRAPHICS) || defined(WITHOUT_X11)
diff --git a/games/nethack34/Makefile b/games/nethack34/Makefile
index b1e4bc6f70bb..8d19ede9e6ca 100644
--- a/games/nethack34/Makefile
+++ b/games/nethack34/Makefile
@@ -33,8 +33,6 @@ HACKNAME?=	nethack
 HACKDIR?=	lib/${HACKNAME}
 HACKDOCSDIR?=	share/doc/${HACKNAME}
 
-.include <bsd.port.pre.mk>
-
 .if defined(WITH_GNOME_GRAPHICS)
 CATEGORIES=	games gnome
 PKGNAMESUFFIX=	-gnome
@@ -43,9 +41,6 @@ USE_GNOME=	gnomelibs
 MAKE_ENV+=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 GRAPHICS=	GNOME_GRAPHICS
 .elif defined(WITH_QT_GRAPHICS)
-.if ${OSVERSION} >= 500113
-BROKEN=         "Does not compile (bad C++ code)"
-.endif
 PKGNAMESUFFIX=	-qt
 USE_QT_VER=	3
 MAKE_ENV+=	QTCPPFLAGS="${QTCPPFLAGS} ${PTHREAD_CFLAGS}" \
@@ -59,6 +54,12 @@ USE_XPM=	yes
 GRAPHICS=	X11_GRAPHICS
 .endif
 
+.include <bsd.port.pre.mk>
+
+.if defined(WITH_QT_GRAPHICS) && ${OSVERSION} >= 500113
+BROKEN=         "Does not compile (bad C++ code)"
+.endif
+
 pre-everything::
 .if defined(WITH_GNOME_GRAPHICS) || defined(WITH_QT_GRAPHICS) \
 		|| defined(WITH_TTY_GRAPHICS) || defined(WITHOUT_X11)
diff --git a/games/nil/Makefile b/games/nil/Makefile
index 849a5f171d00..c61655d6e146 100644
--- a/games/nil/Makefile
+++ b/games/nil/Makefile
@@ -17,12 +17,6 @@ COMMENT=	A multiplayer game that can be described as Quake in 2D or Worms done r
 
 LIB_DEPENDS=	SDL_mixer.2:${PORTSDIR}/audio/sdl_mixer
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 500113
-BROKEN=         "Does not compile (bad C++ code)"
-.endif
-
 WRKSRC=		${WRKDIR}/${PORTNAME}/${PORTNAME}
 
 SDL_CONFIG?=	${LOCALBASE}/bin/sdl11-config
@@ -31,6 +25,12 @@ USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 MAKE_ENV=	SDL_CONFIG="${SDL_CONFIG}"
 
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} >= 500113
+BROKEN=         "Does not compile (bad C++ code)"
+.endif
+
 pre-patch:
 	@find ${WRKSRC} \( -name "*.[ch]" -or -name "*.cpp" \) | \
 		xargs ${PERL} -pi -e 's|"SDL/|"|g ; s|<SDL/|<|g'
diff --git a/games/pipenightdreams/Makefile b/games/pipenightdreams/Makefile
index e63c29405cc8..08d30978502b 100644
--- a/games/pipenightdreams/Makefile
+++ b/games/pipenightdreams/Makefile
@@ -15,12 +15,6 @@ COMMENT=	A puzzle game similar to PipeMania
 
 LIB_DEPENDS=	SDL_image.10:${PORTSDIR}/graphics/sdl_image
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 500113
-BROKEN=         "Does not compile (bad C++ code)"
-.endif
-
 SDL_CONFIG?=	${LOCALBASE}/bin/sdl11-config
 GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
@@ -30,6 +24,12 @@ USE_REINPLACE=	yes
 
 MAN6=		pipenightdreams.6
 
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} >= 500113
+BROKEN=         "Does not compile (bad C++ code)"
+.endif
+
 post-patch:
 	${REINPLACE_CMD} 's|"SDL/SDL|"SDL|g ; s|<SDL/SDL|<SDL|g; \
 		s|SDL_LIBSS|SDL_LIBS|g; s|datadir/games|datadir|;' \
diff --git a/games/rtb/Makefile b/games/rtb/Makefile
index 47bb4c0dde88..413d5c0e50e7 100644
--- a/games/rtb/Makefile
+++ b/games/rtb/Makefile
@@ -14,15 +14,15 @@ MASTER_SITES=	http://www.lysator.liu.se/realtimebattle/Download/
 MAINTAINER=	draj@oceanfree.net
 COMMENT=	Robot programming game for UNIX
 
+USE_X_PREFIX=	yes
+USE_GNOME=	gtk12
+USE_LIBTOOL=	yes
+CONFIGURE_ARGS=	--enable-debug
+
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} >= 500113
 BROKEN=         "Does not compile (bad C++ code)"
 .endif
 
-USE_X_PREFIX=	yes
-USE_GNOME=	gtk12
-USE_LIBTOOL=	yes
-CONFIGURE_ARGS=	--enable-debug
-
 .include <bsd.port.post.mk>
diff --git a/games/xdeblock/Makefile b/games/xdeblock/Makefile
index d354cb0fd143..67c278153094 100644
--- a/games/xdeblock/Makefile
+++ b/games/xdeblock/Makefile
@@ -14,17 +14,17 @@ DISTFILES=	${PORTNAME}.tgz
 MAINTAINER=	nakai@FreeBSD.org
 COMMENT=	Block action game
 
+WRKSRC=		${WRKDIR}/xdeblo_v1.0
+USE_IMAKE=	yes
+USE_XPM=	yes
+NO_INSTALL_MANPAGES=	yes
+
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} >= 500113
 BROKEN=         "Does not compile"
 .endif
 
-WRKSRC=		${WRKDIR}/xdeblo_v1.0
-USE_IMAKE=	yes
-USE_XPM=	yes
-NO_INSTALL_MANPAGES=	yes
-
 post-patch:
 	@${PERL} -pi -e 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/main.c
 
diff --git a/graphics/cqcam/Makefile b/graphics/cqcam/Makefile
index ea121b53e80a..6cf16d595304 100644
--- a/graphics/cqcam/Makefile
+++ b/graphics/cqcam/Makefile
@@ -16,12 +16,6 @@ COMMENT=	Color Quickcam control program
 
 LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 500113
-BROKEN=         "Does not compile"
-.endif
-
 ONLY_FOR_ARCHS=	i386
 
 USE_XLIB=	yes
@@ -38,6 +32,12 @@ MLINKS=		cqcam.1 webcam.1 \
 PORTDOCS=	README docs/APINOTES docs/CHANGES docs/README.webcam \
 		docs/refresh.html docs/webcam.html docs/README.movies
 
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} >= 500113
+BROKEN=         "Does not compile"
+.endif
+
 post-install:
 .for file in cqcam gtkcam webcam xcqcam
 	@strip ${PREFIX}/bin/${file}
diff --git a/graphics/dynamechs/Makefile b/graphics/dynamechs/Makefile
index b9201d9cf10a..59ec63345c72 100644
--- a/graphics/dynamechs/Makefile
+++ b/graphics/dynamechs/Makefile
@@ -17,12 +17,6 @@ DISTNAME=	${PORTNAME}_${PORTVERSION:S/.p/pre/}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A Multibody Dynamic Simulation Library
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 500113
-BROKEN=         "Does not compile (bad C++ code)"
-.endif
-
 USE_MESA=	yes
 USE_GMAKE=	yes
 MAKE_ENV=	OPENGLINCDIR="${X11BASE}/include" \
@@ -31,6 +25,12 @@ MAKE_ENV=	OPENGLINCDIR="${X11BASE}/include" \
 		LDFLAGS="${PTHREAD_LIBS}"
 ALL_TARGET=	freebsd
 
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} >= 500113
+BROKEN=         "Does not compile (bad C++ code)"
+.endif
+
 do-configure:
 	@${CP} -f ${FILESDIR}/make.platform.freebsd ${WRKSRC}/make
 
diff --git a/graphics/gsculpt/Makefile b/graphics/gsculpt/Makefile
index e18adde21a54..a92f386ade83 100644
--- a/graphics/gsculpt/Makefile
+++ b/graphics/gsculpt/Makefile
@@ -16,17 +16,17 @@ DISTNAME=	gSculpt-${PORTVERSION}-src
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	An Opensource 3D modelling application
 
+WRKSRC=		${WRKDIR}/gSculpt-${PORTVERSION}
+USE_REINPLACE=	yes
+USE_GNOME=	gtk12
+USE_GMAKE=	yes
+
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} >= 500113
 BROKEN=         "Does not compile (bad C++ code)"
 .endif
 
-WRKSRC=		${WRKDIR}/gSculpt-${PORTVERSION}
-USE_REINPLACE=	yes
-USE_GNOME=	gtk12
-USE_GMAKE=	yes
-
 post-patch:
 	@${REINPLACE_CMD} -e "s,-O3 -Wall -Werror,${CXXFLAGS},g ; \
 		s,gtk-config,${GTK_CONFIG},g ; \
diff --git a/graphics/panorama/Makefile b/graphics/panorama/Makefile
index 30a7ff705ff3..df825a2dc663 100644
--- a/graphics/panorama/Makefile
+++ b/graphics/panorama/Makefile
@@ -21,12 +21,6 @@ PATCH_DIST_STRIP=	-p1
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	GNU framework for 3D graphics production
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 500113
-BROKEN=         "Does not compile (bad C++ code)"
-.endif
-
 LIB_DEPENDS=	jpeg:${PORTSDIR}/graphics/jpeg \
 		png:${PORTSDIR}/graphics/png \
 		ungif:${PORTSDIR}/graphics/libungif
@@ -47,4 +41,10 @@ CPPFLAGS=	-I${LOCALBASE}/include/freetype1/freetype \
 		-I${LOCALBASE}/include
 LDFLAGS=	-L${LOCALBASE}/lib
 
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} >= 500113
+BROKEN=         "Does not compile (bad C++ code)"
+.endif
+
 .include <bsd.port.post.mk>
diff --git a/graphics/rayshade/Makefile b/graphics/rayshade/Makefile
index c70520398a14..21f1ed54194b 100644
--- a/graphics/rayshade/Makefile
+++ b/graphics/rayshade/Makefile
@@ -18,17 +18,17 @@ COMMENT=	An extensible system for creating ray-traced images
 
 BUILD_DEPENDS=	$(LOCALBASE)/lib/librle.a:${PORTSDIR}/graphics/urt
 
+HAS_CONFIGURE=	yes
+CONFIGURE_SCRIPT=	Configure
+CONFIGURE_ARGS+=	< ${WRKDIR}/config.ans
+ALL_TARGET=
+
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} >= 500113
 BROKEN=         "Does not compile"
 .endif
 
-HAS_CONFIGURE=	yes
-CONFIGURE_SCRIPT=	Configure
-CONFIGURE_ARGS+=	< ${WRKDIR}/config.ans
-ALL_TARGET=
-
 pre-configure:
 	$(SED) -e "s,@CFLAGS@,${CFLAGS}," < ${FILESDIR}/config.ans > \
 		${WRKDIR}/config.ans
diff --git a/graphics/xmms-gforce/Makefile b/graphics/xmms-gforce/Makefile
index d66bd2d4ef0c..c63ada8cafae 100644
--- a/graphics/xmms-gforce/Makefile
+++ b/graphics/xmms-gforce/Makefile
@@ -17,18 +17,18 @@ COMMENT=	A visual plugin for XMMS
 BUILD_DEPENDS=	xmms-config:${PORTSDIR}/multimedia/xmms
 RUN_DEPENDS=	xmms:${PORTSDIR}/multimedia/xmms
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 500113
-BROKEN=         "Does not compile"
-.endif
-
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_X_PREFIX=	yes
 
 RESTRICTED=	"Non-commercial use only"
 
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} >= 500113
+BROKEN=         "Does not compile"
+.endif
+
 .if defined(WANT_DGA)
 PATCH_SITES=	${MASTER_SITES}
 PATCHFILES=	gforce-1.1.6xp3.dga.patch.gz
diff --git a/irc/lostirc/Makefile b/irc/lostirc/Makefile
index d1f3ff461c27..4590f8ae2f35 100644
--- a/irc/lostirc/Makefile
+++ b/irc/lostirc/Makefile
@@ -18,12 +18,6 @@ COMMENT=	LostIRC is a simple and minimal IRC client for X
 LIB_DEPENDS=	gtkmm-2.0.6:${PORTSDIR}/x11-toolkits/gtk--2 \
 		intl.4:${PORTSDIR}/devel/gettext
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 500113
-BROKEN=         "Does not compile (bad C++ code)"
-.endif
-
 USE_X_PREFIX=	yes
 USE_GNOME=	gnomehack
 GNU_CONFIGURE=	yes
@@ -33,6 +27,12 @@ MAN1=	lostirc.1
 
 DOCS=	AUTHORS COPYING ChangeLog TODO README INSTALL
 
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} >= 500113
+BROKEN=         "Does not compile (bad C++ code)"
+.endif
+
 post-patch:
 	${REINPLACE_CMD} -E "s@^(Gnomedir = ).*@\1${PREFIX}/share/gnome/apps/Internet@" ${WRKSRC}/Makefile.am
 	${REINPLACE_CMD} -E "s@(Gnomedir = ).*@\1${PREFIX}/share/gnome/apps/Internet@" ${WRKSRC}/Makefile.in
diff --git a/japanese/dserver/Makefile b/japanese/dserver/Makefile
index 4046d72bdd7a..39ff856aae4e 100644
--- a/japanese/dserver/Makefile
+++ b/japanese/dserver/Makefile
@@ -24,15 +24,15 @@ COMMENT=	CDROM dictionary server & clients
 
 RUN_DEPENDS=	jless:${PORTSDIR}/japanese/less
 
+WRKSRC=		${WRKDIR}/${PORTNAME}
+USE_GMAKE=	yes
+
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} >= 500113
 BROKEN=         "Does not compile"
 .endif
 
-WRKSRC=		${WRKDIR}/${PORTNAME}
-USE_GMAKE=	yes
-
 pre-patch:
 	${PATCH} -d ${WRKSRC}/clients -E  < ${DISTDIR}/kenjiro-ndtpd.diff
 	${PATCH} -d ${WRKSRC}/clients -E  <  ${DISTDIR}/kenjiro-dictlist.diff
diff --git a/japanese/oleo/Makefile b/japanese/oleo/Makefile
index 054c1f7b4e26..3e1c15035f22 100644
--- a/japanese/oleo/Makefile
+++ b/japanese/oleo/Makefile
@@ -24,17 +24,17 @@ COMMENT=	A Spreadsheet Program + Japanese patches
 # xmkmf is for configure script, not for USE_IMAKE.
 BUILD_DEPENDS=	xmkmf:${PORTSDIR}/devel/imake-4
 
+CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
+		LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
+GNU_CONFIGURE=yes
+USE_XLIB=      yes
+
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} >= 500113
 BROKEN=         "Does not compile"
 .endif
 
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
-		LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
-GNU_CONFIGURE=yes
-USE_XLIB=      yes
-
 post-install:
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${PREFIX}/share/doc/oleo/ja_JP.EUC
diff --git a/japanese/vfxdvi300/Makefile b/japanese/vfxdvi300/Makefile
index 23361b266300..399e5d28cc71 100644
--- a/japanese/vfxdvi300/Makefile
+++ b/japanese/vfxdvi300/Makefile
@@ -30,12 +30,6 @@ COMMENT=	DVI Previewer for X. + Japanese patch + vector font support
 LIB_DEPENDS=	VFlib2.24:${PORTSDIR}/japanese/vflib
 RUN_DEPENDS=	${LOCALBASE}/lib/fonts/pk${RESOLUTION}:${PORTSDIR}/print/pkfonts${RESOLUTION}
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 500113
-BROKEN=         "Does not compile"
-.endif
-
 NO_WRKSUBDIR=	yes
 USE_IMAKE=      yes
 XMKMF=	xmkmf
@@ -55,6 +49,12 @@ RESOLUTION=	300
 .endif
 .endif
 
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} >= 500113
+BROKEN=         "Does not compile"
+.endif
+
 pre-patch:
 	@(cd ${WRKDIR} ; \
 	  ${GZCAT} ${DISTDIR}/${DIST_SUBDIR}/950923.02.Z | uudecode ; \
diff --git a/japanese/xjtext/Makefile b/japanese/xjtext/Makefile
index 1564de79c181..4882108088bf 100644
--- a/japanese/xjtext/Makefile
+++ b/japanese/xjtext/Makefile
@@ -15,17 +15,17 @@ DISTNAME=	XJTEXT-${PORTVERSION}
 MAINTAINER=	sada@FreeBSD.org
 COMMENT=	A text viewer for Japanese virtical writings
 
+USE_BISON=	yes
+USE_GNOME=	imlib
+EXAMPLEDIR=	${PREFIX}/share/examples/xjtext
+DOCDIR=		${PREFIX}/share/doc/xjtext
+
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} >= 500113
 BROKEN=         "Does not compile (bad C++ code)"
 .endif
 
-USE_BISON=	yes
-USE_GNOME=	imlib
-EXAMPLEDIR=	${PREFIX}/share/examples/xjtext
-DOCDIR=		${PREFIX}/share/doc/xjtext
-
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/xjtext ${PREFIX}/bin
 
diff --git a/java/guavac/Makefile b/java/guavac/Makefile
index a2b09ff12fda..fbdfd7c8b23b 100644
--- a/java/guavac/Makefile
+++ b/java/guavac/Makefile
@@ -13,17 +13,17 @@ MASTER_SITES=	ftp://ftp.yggdrasil.com/pub/dist/devel/compilers/guavac/
 MAINTAINER=	nakai@FreeBSD.org
 COMMENT=	Java compiler and decompiler developed under GPL
 
+USE_GMAKE=	yes
+GNU_CONFIGURE=	yes
+MAN1=		guavac.1
+STRIP=
+
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} >= 500113
 BROKEN=         "Does not compile (bad C++ code)"
 .endif
 
-USE_GMAKE=	yes
-GNU_CONFIGURE=	yes
-MAN1=		guavac.1
-STRIP=
-
 pre-install:
 	@${CHMOD} +x ${WRKSRC}/mkinstalldirs
 
diff --git a/java/janosvm/Makefile b/java/janosvm/Makefile
index ee772637e68c..e8efe3871160 100644
--- a/java/janosvm/Makefile
+++ b/java/janosvm/Makefile
@@ -15,12 +15,6 @@ MASTER_SITES=	http://www.cs.utah.edu/flux/janos/${DISTNAME}/
 MAINTAINER=	znerd@FreeBSD.org
 COMMENT=	A virtual machine for executing Java bytecodes
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 500113
-BROKEN=         "Fails to link"
-.endif
-
 USE_XLIB=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-x
@@ -29,6 +23,12 @@ INSTALLS_SHLIB=	yes
 
 MAN1=	janosvm.1 jsihey.1 jsiregister.1 jsiunregister.1
 
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} >= 500113
+BROKEN=         "Fails to link"
+.endif
+
 .if !defined(NOPORTDOCS)
 post-install:
 	@${MKDIR} ${DOCSDIR}
diff --git a/java/shujit/Makefile b/java/shujit/Makefile
index d3de2f7e3e27..015b0162fe85 100644
--- a/java/shujit/Makefile
+++ b/java/shujit/Makefile
@@ -15,12 +15,6 @@ COMMENT=	A Just In Time java bytecode compiler
 
 LIB_DEPENDS=	gdbm:${PORTSDIR}/databases/gdbm
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 500113
-BROKEN=         "Does not compile"
-.endif
-
 WRKSRC=		${WRKDIR}/${PORTNAME}
 ONLY_FOR_ARCHS=	i386
 
@@ -36,6 +30,12 @@ USE_JAVA=	1.1+
 CONFIGURE_ARGS=	--with-jdk="${JAVA_HOME}"
 MAKE_ENV=	JAVADIR="${JAVA_HOME}"
 
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} >= 500113
+BROKEN=         "Does not compile"
+.endif
+
 post-configure:
 	@${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/README
 
diff --git a/lang/caml-light/Makefile b/lang/caml-light/Makefile
index a4405cc1b74e..7a9a137bc2a7 100644
--- a/lang/caml-light/Makefile
+++ b/lang/caml-light/Makefile
@@ -18,17 +18,17 @@ DISTNAME=	cl74unix
 MAINTAINER=	jkoshy@freebsd.org
 COMMENT=	A strongly typed functional language belonging to the ML family
 
+USE_XLIB=	yes
+WRKSRC=		${WRKDIR}/cl74
+ALL_TARGET=	configure world bootstrap
+MAN1=	camlc.1 camllex.1 camllibr.1 camllight.1 camlmktop.1 camlrun.1 camlyacc.1 mletags.1 camllorder.1 camlsearch.1
+
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} >= 500113
 BROKEN=         "Does not compile"
 .endif
 
-USE_XLIB=	yes
-WRKSRC=		${WRKDIR}/cl74
-ALL_TARGET=	configure world bootstrap
-MAN1=	camlc.1 camllex.1 camllibr.1 camllight.1 camlmktop.1 camlrun.1 camlyacc.1 mletags.1 camllorder.1 camlsearch.1
-
 do-build:
 	cd ${WRKSRC}/src; ${MAKE} ${ALL_TARGET} PREFIX=${PREFIX} \
 	X11BASE=${X11BASE}
diff --git a/lang/hope/Makefile b/lang/hope/Makefile
index 732a34c46f06..6d578a8382b3 100644
--- a/lang/hope/Makefile
+++ b/lang/hope/Makefile
@@ -14,12 +14,6 @@ DISTNAME=	${PORTNAME}
 MAINTAINER=	lev@serebryakov.spb.ru
 COMMENT=	Hope is lazy interpriter for HOPE applicative language
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 500113
-BROKEN=         "Does not install"
-.endif
-
 .if defined(WITH_DOCS)
 BUILD_DEPENDS+=	latex:${PORTSDIR}/print/teTeX \
 		latex2html:${PORTSDIR}/textproc/latex2html
@@ -33,6 +27,12 @@ USE_GMAKE=	yes
 
 MAN1=		hope.1
 
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} >= 500113
+BROKEN=         "Does not install"
+.endif
+
 pre-fetch:
 .if !defined(WITH_DOCS)
 	@${ECHO} ""
diff --git a/lang/ici/Makefile b/lang/ici/Makefile
index a675284f72a3..8cadcb0c714b 100644
--- a/lang/ici/Makefile
+++ b/lang/ici/Makefile
@@ -13,12 +13,6 @@ MASTER_SITES=	http://www.zeta.org.au/~atrn/ici/distfiles/
 MAINTAINER=	atrn@zeta.org.au
 COMMENT=	An interpretive language with C's overall feel combined with high level data types
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 500113
-BROKEN=         "Does not compile"
-.endif
-
 MAKEFILE=	Makefile.bsd
 MAN1=		ici3.1
 MANCOMPRESSED=	yes
@@ -34,6 +28,12 @@ ICIPCREHDRS=	pcre/internal.h pcre/pcre.h
 
 ICIDOCS=	doc/ici-a4.ps doc/ici-ltr.ps doc/ici.txt doc/ici.pdf
 
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} >= 500113
+BROKEN=         "Does not compile"
+.endif
+
 do-install:
 	cd ${WRKSRC} && ${MAKE} -f ${MAKEFILE} libici3.a
 	${INSTALL_PROGRAM} ${WRKSRC}/ici3 ${PREFIX}/bin
diff --git a/lang/moscow_ml/Makefile b/lang/moscow_ml/Makefile
index e65cd73882a2..7124d3f2d1f3 100644
--- a/lang/moscow_ml/Makefile
+++ b/lang/moscow_ml/Makefile
@@ -18,12 +18,6 @@ COMMENT=	Moscow ML, a lightweight implementation of Standard ML
 
 LIB_DEPENDS=	gmp.6:${PORTSDIR}/math/libgmp4
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 500113
-BROKEN=         "Does not compile"
-.endif
-
 MOSMLHOME=	$(PREFIX)/moscow_ml
 
 ALL_TARGET=	world MOSMLHOME=$(MOSMLHOME)
@@ -31,6 +25,12 @@ INSTALL_TARGET=	install MOSMLHOME=$(MOSMLHOME)
 WRKSRC=		${WRKDIR}/mosml/src
 USE_PERL5=	yes
 
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} >= 500113
+BROKEN=         "Does not compile"
+.endif
+
 post-install:
 	${SED} -e 's|^MOSMLHOME=.*|MOSMLHOME=${MOSMLHOME}|' \
 	${WRKDIR}/mosml/tools/Makefile.stub > ${MOSMLHOME}/tools/Makefile.stub
diff --git a/lang/nickle/Makefile b/lang/nickle/Makefile
index ecaec8fb0e90..eae97eff0548 100644
--- a/lang/nickle/Makefile
+++ b/lang/nickle/Makefile
@@ -13,16 +13,16 @@ MASTER_SITES=	http://www.nickle.org/release/
 MAINTAINER=	chrise@scardini.com
 COMMENT=	A desk calculator language
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 500113
-BROKEN=         "Does not compile"
-.endif
-
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 
 MAN1=	nickle.1
 
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} >= 500113
+BROKEN=         "Does not compile"
+.endif
+
 .include <bsd.port.post.mk>
diff --git a/mail/dkimap4/Makefile b/mail/dkimap4/Makefile
index b74b1e0e69ba..41e8ec0fc60c 100644
--- a/mail/dkimap4/Makefile
+++ b/mail/dkimap4/Makefile
@@ -16,12 +16,6 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	d.marks@student.umist.ac.uk
 COMMENT=	IMAP4rev1 and POP3 server from the DBOX BBS package
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 500113
-BROKEN=         "Does not compile (bad C++ code)"
-.endif
-
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 
@@ -39,6 +33,12 @@ MAKE_ARGS+=	SPOOLDIR="${SPOOLDIR}"
 
 DOCS=	README
 
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} >= 500113
+BROKEN=         "Does not compile (bad C++ code)"
+.endif
+
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/movemail/movemail ${PREFIX}/bin
 	${INSTALL_PROGRAM} ${WRKSRC}/dkimap4/dkimap4 ${PREFIX}/libexec
diff --git a/mail/filtermail/Makefile b/mail/filtermail/Makefile
index 88297476b272..c131918a7c3e 100644
--- a/mail/filtermail/Makefile
+++ b/mail/filtermail/Makefile
@@ -23,12 +23,6 @@ LIB_DEPENDS=	intl:${PORTSDIR}/devel/gettext \
 		iconv:${PORTSDIR}/converters/libiconv \
 		gnugetopt:${PORTSDIR}/devel/libgnugetopt
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 500113
-BROKEN=         "Does not compile (bad C++ code)"
-.endif
-
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib -lgnugetopt"
@@ -45,4 +39,10 @@ MAN5=		filtermailrc.5 filtermailex.5
 EXTRACT_AFTER_ARGS=	| ${SED} 's/[mM][aA][iI][lL][fF][iI][lL][tT][eE][rR]/filtermail/g' | ${TAR} -xf -
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} >= 500113
+BROKEN=         "Does not compile (bad C++ code)"
+.endif
+
 .include <bsd.port.post.mk>
diff --git a/mail/ftrack/Makefile b/mail/ftrack/Makefile
index 9fd1e0ec3550..f8ef2d87b0fd 100644
--- a/mail/ftrack/Makefile
+++ b/mail/ftrack/Makefile
@@ -16,12 +16,6 @@ COMMENT=	FTN Messages tracker
 
 BUILD_DEPENDS=	${LOCALBASE}/lib/libsmapi.a:${PORTSDIR}/mail/smapi
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 500113
-BROKEN=         "Does not compile (bad C++ code)"
-.endif
-
 USE_ZIP=	yes
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
@@ -29,6 +23,12 @@ ALL_TARGET=	ftrack
 MAKEFILE=	${WRKSRC}/MakeFiles/FreeBSD/Makefile
 EXTRACT_AFTER_ARGS=	-d ${WRKSRC}
 
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} >= 500113
+BROKEN=         "Does not compile (bad C++ code)"
+.endif
+
 pre-patch:
 	${REINPLACE_CMD} -e "s@-I../../hpp -I../../.. -O3@-Ihpp -I${LOCALBASE}/include ${CFLAGS}@g; \
 			s@../../src/@src/@g; s@g\+\+@${CC}@g; \
diff --git a/mail/liamail/Makefile b/mail/liamail/Makefile
index 6391e6218e29..ba9a8acac069 100644
--- a/mail/liamail/Makefile
+++ b/mail/liamail/Makefile
@@ -15,12 +15,6 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	kde@freebsd.org
 COMMENT=	A graphical mail client
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 500113
-BROKEN=         "Does not compile"
-.endif
-
 LIB_DEPENDS=	gnugetopt:${PORTSDIR}/devel/libgnugetopt
 
 USE_REINPLACE=	yes
@@ -31,6 +25,12 @@ CONFIGURE_ENV=	CPPFLAGS="${CXXFLAGS} -I${LOCALBASE}/include" \
 		QTDIR="${X11BASE}"
 USE_GMAKE=	yes
 
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} >= 500113
+BROKEN=         "Does not compile"
+.endif
+
 post-patch:
 	@${REINPLACE_CMD} -e "s/qt.so/qt2.so/g" ${WRKSRC}/configure
 	@${REINPLACE_CMD} -e "s/-lqt/-lqt2/g" ${WRKSRC}/src/Makefile.in
diff --git a/mail/mailsync/Makefile b/mail/mailsync/Makefile
index 11e92fe6fecc..ce4c8f24715e 100644
--- a/mail/mailsync/Makefile
+++ b/mail/mailsync/Makefile
@@ -17,12 +17,6 @@ COMMENT=	Mailsync is a way of keeping a collection of mailboxes synchronized
 
 LIB_DEPENDS=	c-client4.8:${PORTSDIR}/mail/cclient
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 500113
-BROKEN=         "Does not compile (bad C++ code)"
-.endif
-
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
 USE_GMAKE=	yes
@@ -33,6 +27,12 @@ ALL_TARGET=	default
 
 MAN1=		mailsync.1
 
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} >= 500113
+BROKEN=         "Does not compile (bad C++ code)"
+.endif
+
 post-patch:
 	@${REINPLACE_CMD} -e 's|/usr|${PREFIX}|g' \
 		${WRKSRC}/examples/mailsync \
diff --git a/mail/ml/Makefile b/mail/ml/Makefile
index db36eb31f3ef..6574a66d2558 100644
--- a/mail/ml/Makefile
+++ b/mail/ml/Makefile
@@ -14,16 +14,16 @@ MASTER_SITES=	http://ftp.rge.com/pub/mail/ml/ \
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	An X11 IMAP client
 
+WRKSRC=		${WRKDIR}/${DISTNAME}/src
+USE_IMAKE=	yes
+USE_MOTIF=	yes
+
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} >= 500113
 BROKEN=         "Does not compile"
 .endif
 
-WRKSRC=		${WRKDIR}/${DISTNAME}/src
-USE_IMAKE=	yes
-USE_MOTIF=	yes
-
 pre-configure:
 	@${ECHO_MSG} "===>  Building c-client"
 	@( cd ${WRKSRC}/../imap-4; make bsi )
diff --git a/math/R-letter/Makefile b/math/R-letter/Makefile
index c550cf5e469c..2828071f6544 100644
--- a/math/R-letter/Makefile
+++ b/math/R-letter/Makefile
@@ -28,12 +28,6 @@ COMMENT=	A language for statistical computing and graphics
 LIB_DEPENDS=	tcl84:${PORTSDIR}/lang/tcl84 \
 		tk84:${PORTSDIR}/x11-toolkits/tk84
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 500113
-BROKEN=         "Does not compile"
-.endif
-
 GNU_CONFIGURE=	yes
 USE_XLIB=	yes
 USE_PERL5=	yes
@@ -49,6 +43,12 @@ PAPERSIZE?=	letter
 
 MAN1=	R.1
 
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} >= 500113
+BROKEN=         "Does not compile"
+.endif
+
 test check: build
 	@(cd ${WRKSRC}; make check)
 fullcheck: build
diff --git a/math/R-project/Makefile b/math/R-project/Makefile
index c550cf5e469c..2828071f6544 100644
--- a/math/R-project/Makefile
+++ b/math/R-project/Makefile
@@ -28,12 +28,6 @@ COMMENT=	A language for statistical computing and graphics
 LIB_DEPENDS=	tcl84:${PORTSDIR}/lang/tcl84 \
 		tk84:${PORTSDIR}/x11-toolkits/tk84
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 500113
-BROKEN=         "Does not compile"
-.endif
-
 GNU_CONFIGURE=	yes
 USE_XLIB=	yes
 USE_PERL5=	yes
@@ -49,6 +43,12 @@ PAPERSIZE?=	letter
 
 MAN1=	R.1
 
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} >= 500113
+BROKEN=         "Does not compile"
+.endif
+
 test check: build
 	@(cd ${WRKSRC}; make check)
 fullcheck: build
diff --git a/math/R/Makefile b/math/R/Makefile
index c550cf5e469c..2828071f6544 100644
--- a/math/R/Makefile
+++ b/math/R/Makefile
@@ -28,12 +28,6 @@ COMMENT=	A language for statistical computing and graphics
 LIB_DEPENDS=	tcl84:${PORTSDIR}/lang/tcl84 \
 		tk84:${PORTSDIR}/x11-toolkits/tk84
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 500113
-BROKEN=         "Does not compile"
-.endif
-
 GNU_CONFIGURE=	yes
 USE_XLIB=	yes
 USE_PERL5=	yes
@@ -49,6 +43,12 @@ PAPERSIZE?=	letter
 
 MAN1=	R.1
 
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} >= 500113
+BROKEN=         "Does not compile"
+.endif
+
 test check: build
 	@(cd ${WRKSRC}; make check)
 fullcheck: build
diff --git a/math/freefem/Makefile b/math/freefem/Makefile
index b5a3cabca675..9e04a64e3661 100644
--- a/math/freefem/Makefile
+++ b/math/freefem/Makefile
@@ -14,12 +14,6 @@ MASTER_SITE_SUBDIR=	kfem
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A language for the Finite Element Method
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 500113
-BROKEN=         "Does not compile (bad C++ code)"
-.endif
-
 USE_REINPLACE=	yes
 USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
@@ -29,6 +23,12 @@ INSTALLS_SHLIB=	yes
 
 MAN1=		freefem.1
 
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} >= 500113
+BROKEN=         "Does not compile (bad C++ code)"
+.endif
+
 post-patch:
 	@${REINPLACE_CMD} -e 's|-O3 |\$$CXXFLAGS |g' ${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's|debian doc freefem|debian freefem|g ; \
diff --git a/math/oleo/Makefile b/math/oleo/Makefile
index 8496c57df252..bc23a643aba3 100644
--- a/math/oleo/Makefile
+++ b/math/oleo/Makefile
@@ -19,12 +19,6 @@ BROKEN=		"Does not compile"
 
 LIB_DEPENDS=	intl.4:${PORTSDIR}/devel/gettext
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 500113
-BROKEN=         "Does not compile"
-.endif
-
 USE_REINPLACE=	yes
 USE_AUTOCONF_VER=213
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
@@ -42,6 +36,12 @@ USE_XLIB=	yes
 CONFIGURE_ARGS+=	--without-motif
 .endif
 
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} >= 500113
+BROKEN=         "Does not compile"
+.endif
+
 pre-everything::
 .if !defined(WITH_MOTIF)
 	@${ECHO_MSG}
diff --git a/math/qscanplot/Makefile b/math/qscanplot/Makefile
index 32467c7f6a3c..b4c8095f63e0 100644
--- a/math/qscanplot/Makefile
+++ b/math/qscanplot/Makefile
@@ -15,12 +15,6 @@ COMMENT=	A program to extract data from scanned plots, graphs and figures
 
 BUILD_DEPENDS=	tmake:${PORTSDIR}/devel/tmake
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 500113
-BROKEN=         "Does not compile (bad C++ code)"
-.endif
-
 USE_X_PREFIX=	yes
 USE_QT_VER=	2
 USE_GMAKE=	yes
@@ -30,6 +24,12 @@ CONFIGURE_ENV=	LDFLAGS="-lm ${PTHREAD_LIBS}" \
 		LIBQT=-lqt2
 MAKE_ENV=	QTDIR=${X11BASE}
 
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} >= 500113
+BROKEN=         "Does not compile (bad C++ code)"
+.endif
+
 post-patch:
 	@${PERL} -pi -e 's|%%PREFIX%%|${PREFIX}|g' \
 		${WRKSRC}/qscanplot/templates/sample.qscanplotrc
diff --git a/math/surf/Makefile b/math/surf/Makefile
index 94e623af9383..ced07f21f031 100644
--- a/math/surf/Makefile
+++ b/math/surf/Makefile
@@ -19,12 +19,6 @@ LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
 		tiff.4:${PORTSDIR}/graphics/tiff \
 		gmp.6:${PORTSDIR}/math/libgmp4
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 500113
-BROKEN=         "Does not compile (bad C++ code)"
-.endif
-
 USE_GNOME=	gtk12
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
@@ -32,4 +26,10 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 
 MAN1=	surf.1
 
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} >= 500113
+BROKEN=         "Does not compile (bad C++ code)"
+.endif
+
 .include <bsd.port.post.mk>
diff --git a/misc/afbackup/Makefile b/misc/afbackup/Makefile
index 6e1605c92aa1..f7d438ad788a 100644
--- a/misc/afbackup/Makefile
+++ b/misc/afbackup/Makefile
@@ -22,12 +22,6 @@ WRKSRC=		${WRKDIR}/afbackup-3.3.5
 PLIST=		${WRKSRC}/pkg-plist
 BUILD_DEPENDS=	msgfmt:${PORTSDIR}/devel/gettext
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 500113
-BROKEN=         "Does not compile"
-.endif
-
 .if ! defined(NO_DES)
 USE_OPENSSL=	yes
 CONFIG_WITH_DES=	--with-des --with-des-header=openssl/des.h \
@@ -139,6 +133,12 @@ PKGINSTALL_ENV=		"NONINTERACTIVE=YES"
 PKGINSTALL_ENV=
 .endif
 
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} >= 500113
+BROKEN=         "Does not compile"
+.endif
+
 .if !defined(WITHOUT_SERVER) && !defined(WITHOUT_CLIENT) \
     && !defined(WITHOUT_REXECLINKS) && !defined(NO_GUI) \
     && !defined(NO_DES) && !defined(NO_AUTOKEY)
diff --git a/misc/estic/Makefile b/misc/estic/Makefile
index 03f601d9d3d6..bb5ca87a27fc 100644
--- a/misc/estic/Makefile
+++ b/misc/estic/Makefile
@@ -14,12 +14,6 @@ DISTNAME=		estic-${PORTVERSION}-sources
 MAINTAINER=		jhs@FreeBSD.org
 COMMENT=	Controller for ISDN TK-Anlage (PBX) made by Istec
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 500113
-BROKEN=         "Does not compile (bad C++ code)"
-.endif
-
 USE_XLIB=		yes
 USE_ZIP=		yes
 NO_WRKSUBDIR=		yes
@@ -38,6 +32,12 @@ PBX_DOC=${PREFIX}/share/doc/estic
 ESTIC=${WRKSRC}/estic
 MAKE_E= make X11BASE=${X11BASE} -f make/freebsd${X_OR_NOT}.mak
 
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} >= 500113
+BROKEN=         "Does not compile (bad C++ code)"
+.endif
+
 do-configure:
 	@cd ${WRKSRC}/spunk ; ${MAKE_E} dep
 	@cd ${ESTIC} ; ${MAKE_E} dep
diff --git a/misc/menushki/Makefile b/misc/menushki/Makefile
index d25138659393..7f864bcfb858 100644
--- a/misc/menushki/Makefile
+++ b/misc/menushki/Makefile
@@ -14,18 +14,18 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	pat@FreeBSD.org
 COMMENT=	Menu converter between varieties of Window Managers
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 500113
-BROKEN=         "Does not compile (bad C++ code)"
-.endif
-
 USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 
 DOCS=	AUTHORS ChangeLog README TODO
 
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} >= 500113
+BROKEN=         "Does not compile (bad C++ code)"
+.endif
+
 post-install:
 .ifndef(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
diff --git a/misc/vbidecode/Makefile b/misc/vbidecode/Makefile
index fc3b7411a94b..e6ad695cc19b 100644
--- a/misc/vbidecode/Makefile
+++ b/misc/vbidecode/Makefile
@@ -17,14 +17,14 @@ DISTNAME=		bttv-0.6.4
 MAINTAINER=		roger@freebsd.org
 COMMENT=	Get Videotext/Teletext (.vtx) and other VBI data from TV channels
 
+WRKSRC=			${WRKDIR}/bttv/apps/vbidecode
+
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} >= 500113
 BROKEN=         "Does not compile (bad C++ code)"
 .endif
 
-WRKSRC=			${WRKDIR}/bttv/apps/vbidecode
-
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/vbidecode ${PREFIX}/bin
 	@strip ${PREFIX}/bin/vbidecode
diff --git a/multimedia/mpegedit/Makefile b/multimedia/mpegedit/Makefile
index f982f0159da5..011b95d592a8 100644
--- a/multimedia/mpegedit/Makefile
+++ b/multimedia/mpegedit/Makefile
@@ -16,14 +16,14 @@ COMMENT=	A program to edit encoded mpeg streams
 
 LIB_DEPENDS=	netpbm.1:${PORTSDIR}/graphics/netpbm
 
+USE_X_PREFIX=	yes
+
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} >= 500113
 BROKEN=         "Does not compile (bad C++ code)"
 .endif
 
-USE_X_PREFIX=	yes
-
 post-extract:
 	@${FIND} ${WRKSRC} -name '.depend' | ${XARGS} ${RM} -f
 
diff --git a/multimedia/xmms-avi/Makefile b/multimedia/xmms-avi/Makefile
index 56ee89329b45..12659831e68f 100644
--- a/multimedia/xmms-avi/Makefile
+++ b/multimedia/xmms-avi/Makefile
@@ -20,12 +20,6 @@ BUILD_DEPENDS=	xmms-config:${PORTSDIR}/multimedia/xmms
 LIB_DEPENDS=	aviplay.0:${PORTSDIR}/multimedia/avifile
 RUN_DEPENDS=	xmms:${PORTSDIR}/multimedia/xmms
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 500113
-BROKEN=         "Does not compile (bad C++ code)"
-.endif
-
 SDL_CONFIG?=	${LOCALBASE}/bin/sdl11-config
 
 ONLY_FOR_ARCHS=	i386
@@ -36,6 +30,12 @@ USE_LIBTOOL=	yes
 CONFIGURE_ARGS=	--with-win32-path=${LOCALBASE}/lib/win32
 CONFIGURE_ENV=	SDL_CONFIG="${SDL_CONFIG}"
 
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} >= 500113
+BROKEN=         "Does not compile (bad C++ code)"
+.endif
+
 pre-patch:
 	@${REINPLACE_CMD} -e "s|SDL/SDL.h|SDL11/SDL.h|g" ${WRKSRC}/src/ctrackbar.cpp
 	@${REINPLACE_CMD} -e "s|lc_r|pthread|g" ${WRKSRC}/configure
diff --git a/multimedia/xmps/Makefile b/multimedia/xmps/Makefile
index aecf4dd34a6a..bc7149602748 100644
--- a/multimedia/xmps/Makefile
+++ b/multimedia/xmps/Makefile
@@ -15,12 +15,6 @@ COMMENT=	X MPEG Player System - a media player with a very nice GUI
 
 LIB_DEPENDS=	SDL-1.1.5:${PORTSDIR}/devel/sdl12
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 500113
-BROKEN=         "Does not compile"
-.endif
-
 SDL_CONFIG?=	${LOCALBASE}/bin/sdl11-config
 
 USE_X_PREFIX=	yes
@@ -32,6 +26,12 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		SDL_CONFIG="${SDL_CONFIG}" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} >= 500113
+BROKEN=         "Does not compile"
+.endif
+
 post-patch:
 	@${REINPLACE_CMD} -e "s|-lpthread|${PTHREAD_LIBS}|g" ${WRKSRC}/configure
 	@${FIND} ${WRKSRC} -name "Makefile.in" | xargs ${REINPLACE_CMD} -e \
diff --git a/net-im/xicq/Makefile b/net-im/xicq/Makefile
index dbe8e7f38ffb..aa884f07f0a6 100644
--- a/net-im/xicq/Makefile
+++ b/net-im/xicq/Makefile
@@ -14,17 +14,17 @@ DISTNAME=	xicq-071298-snapshot.src
 MAINTAINER=	scrappy@FreeBSD.org
 COMMENT=	Xtropy's ICQ Client
 
+WRKSRC=		${WRKDIR}/xicq-071298
+
+USE_GMAKE=	yes
+MAKE_ENV=	OPT="${CFLAGS}"
+
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} >= 500113
 BROKEN=         "Does not compile (bad C++ code)"
 .endif
 
-WRKSRC=		${WRKDIR}/xicq-071298
-
-USE_GMAKE=	yes
-MAKE_ENV=	OPT="${CFLAGS}"
-
 do-install:
 		${INSTALL_PROGRAM} ${WRKSRC}/src/xicq/main ${PREFIX}/bin/xicq
 		${MKDIR} ${PREFIX}/share/examples/xicq
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)
diff --git a/net-p2p/dctc/Makefile b/net-p2p/dctc/Makefile
index 1138010f8bb8..80384b5411a0 100644
--- a/net-p2p/dctc/Makefile
+++ b/net-p2p/dctc/Makefile
@@ -18,12 +18,6 @@ COMMENT=	A DirectConnect (www.neo-modus.com) text client for file sharing
 BUILD_DEPENDS=	makedepend:${PORTSDIR}/devel/makedepend
 LIB_DEPENDS=	db4.0:${PORTSDIR}/databases/db4
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 500113
-BROKEN=         "Configure fails"
-.endif
-
 USE_GETOPT_LONG=	yes
 USE_GNOME=	glib12
 USE_PERL5_RUN=	yes
@@ -62,6 +56,12 @@ DOC_FILES=      COPYING ChangeLog INSTALL README \
 		Documentation/output.nl \
 		Documentation/output Documentation/programs
 
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} >= 500113
+BROKEN=         "Configure fails"
+.endif
+
 post-extract:
 	@${CP} ${FILESDIR}/lp_mutex.c ${WRKSRC}/src
 
diff --git a/net/cflowd/Makefile b/net/cflowd/Makefile
index ec73c10bbc0f..c61b5a189359 100644
--- a/net/cflowd/Makefile
+++ b/net/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/click/Makefile b/net/click/Makefile
index 07f2574782f4..b5b38aaeac9e 100644
--- a/net/click/Makefile
+++ b/net/click/Makefile
@@ -13,12 +13,6 @@ MASTER_SITES=	http://www.pdos.lcs.mit.edu/click/
 MAINTAINER=	gnn@neville-neil.com
 COMMENT=	The Click Modular Router
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 500113
-BROKEN=         "Does not compile (bad C++ code)"
-.endif
-
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 
@@ -67,6 +61,12 @@ MANN=	FTPPortMapper.n ARPFaker.n ARPQuerier.n ARPResponder.n \
 
 CONFDIR=	${PREFIX}/etc/click/conf
 
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} >= 500113
+BROKEN=         "Does not compile (bad C++ code)"
+.endif
+
 post-install:
 	@strip ${PREFIX}/bin/click
 	@strip ${PREFIX}/bin/click-align
diff --git a/net/dctc/Makefile b/net/dctc/Makefile
index 1138010f8bb8..80384b5411a0 100644
--- a/net/dctc/Makefile
+++ b/net/dctc/Makefile
@@ -18,12 +18,6 @@ COMMENT=	A DirectConnect (www.neo-modus.com) text client for file sharing
 BUILD_DEPENDS=	makedepend:${PORTSDIR}/devel/makedepend
 LIB_DEPENDS=	db4.0:${PORTSDIR}/databases/db4
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 500113
-BROKEN=         "Configure fails"
-.endif
-
 USE_GETOPT_LONG=	yes
 USE_GNOME=	glib12
 USE_PERL5_RUN=	yes
@@ -62,6 +56,12 @@ DOC_FILES=      COPYING ChangeLog INSTALL README \
 		Documentation/output.nl \
 		Documentation/output Documentation/programs
 
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} >= 500113
+BROKEN=         "Configure fails"
+.endif
+
 post-extract:
 	@${CP} ${FILESDIR}/lp_mutex.c ${WRKSRC}/src
 
diff --git a/net/irrtoolset/Makefile b/net/irrtoolset/Makefile
index 7cfd192945d8..c98f7554f76d 100644
--- a/net/irrtoolset/Makefile
+++ b/net/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/ns/Makefile b/net/ns/Makefile
index 1b489bdd1339..048394a7da2a 100644
--- a/net/ns/Makefile
+++ b/net/ns/Makefile
@@ -17,12 +17,6 @@ COMMENT=	The UCB/LBNL Network Simulator Version 2
 BUILD_DEPENDS=	${LOCALBASE}/lib/libtclcl.a:${PORTSDIR}/devel/tclcl
 RUN_DEPENDS=	${LOCALBASE}/bin/tclsh8.3:${PORTSDIR}/lang/tcl83
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 500113
-BROKEN=         "Does not compile (bad C++ code)"
-.endif
-
 MAN1=		ns.1
 MANCOMPRESSED=	no
 
@@ -33,6 +27,12 @@ CONFIGURE_ARGS=	--with-tcl-ver=8.3 --with-tk-ver=8.3
 
 ALL_TARGET=
 
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} >= 500113
+BROKEN=         "Does not compile (bad C++ code)"
+.endif
+
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/ns ${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/ns.1 ${PREFIX}/man/man1
diff --git a/net/ns2/Makefile b/net/ns2/Makefile
index 1b489bdd1339..048394a7da2a 100644
--- a/net/ns2/Makefile
+++ b/net/ns2/Makefile
@@ -17,12 +17,6 @@ COMMENT=	The UCB/LBNL Network Simulator Version 2
 BUILD_DEPENDS=	${LOCALBASE}/lib/libtclcl.a:${PORTSDIR}/devel/tclcl
 RUN_DEPENDS=	${LOCALBASE}/bin/tclsh8.3:${PORTSDIR}/lang/tcl83
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 500113
-BROKEN=         "Does not compile (bad C++ code)"
-.endif
-
 MAN1=		ns.1
 MANCOMPRESSED=	no
 
@@ -33,6 +27,12 @@ CONFIGURE_ARGS=	--with-tcl-ver=8.3 --with-tk-ver=8.3
 
 ALL_TARGET=
 
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} >= 500113
+BROKEN=         "Does not compile (bad C++ code)"
+.endif
+
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/ns ${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/ns.1 ${PREFIX}/man/man1
diff --git a/net/ntop/Makefile b/net/ntop/Makefile
index 2db96ba3903d..844d9aa5a426 100644
--- a/net/ntop/Makefile
+++ b/net/ntop/Makefile
@@ -24,12 +24,6 @@ BUILD_DEPENDS=	${LOCALBASE}/lib/libgdc.a:${PORTSDIR}/graphics/gdchart
 RUN_DEPENDS=	${LOCALBASE}/lib/libgdc.a:${PORTSDIR}/graphics/gdchart
 LIB_DEPENDS=	gdbm.3:${PORTSDIR}/databases/gdbm
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 500113
-BROKEN=         "Does not compile"
-.endif
-
 # ntop will store its runtime database files in ${DBDIR}/ntop/
 DBDIR?=		/var/db
 
@@ -52,6 +46,7 @@ CONFIGURE_ARGS=	--localstatedir=${DBDIR} \
 CONFIGURE_ARGS+=	--enable-tcpwrap
 .endif
 
+.include <bsd.port.pre.mk>
 .if ${OSVERSION} < 400014
 LIB_DEPENDS+=	ssl.3:${PORTSDIR}/security/openssl
 CONFIGURE_ARGS+=	--with-ossl-root=${LOCALBASE}
@@ -60,6 +55,10 @@ CONFIGURE_ARGS+=	--with-ossl-root=${LOCALBASE}
 MAN1=		intop.1
 MAN8=		ntop.8
 
+.if ${OSVERSION} >= 500113
+BROKEN=         "Does not compile"
+.endif
+
 # Remove included dependencies as a precaution against polluting the
 # configuration.  Not strictly necessary.
 pre-configure:
diff --git a/net/oproute/Makefile b/net/oproute/Makefile
index f30ad28ff1e0..59e03db1d3bd 100644
--- a/net/oproute/Makefile
+++ b/net/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/sting/Makefile b/net/sting/Makefile
index ac53a487d007..1a656033832c 100644
--- a/net/sting/Makefile
+++ b/net/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)
diff --git a/net/tcpview/Makefile b/net/tcpview/Makefile
index 632af7d9e037..804bb8985872 100644
--- a/net/tcpview/Makefile
+++ b/net/tcpview/Makefile
@@ -14,18 +14,18 @@ EXTRACT_SUFX=	.tar.Z
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A Motif-based TCP/IP protocol analyzer
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 500113
-BROKEN=         "Does not compile"
-.endif
-
 USE_BISON=	yes
 USE_MOTIF=	yes
 USE_REINPLACE=	yes
 
 MAN1=		tcpview.1
 
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} >= 500113
+BROKEN=         "Does not compile"
+.endif
+
 post-patch:
 .for f in nametoaddr.c addrtoname.c print-nfs.c detail-tcp.c tv_addrtoname.c
 	@${REINPLACE_CMD} -e 's/NTOHL/ntohl/ ; s/NTOHS/ntohs/' ${WRKSRC}/${f}
diff --git a/net/tintin++/Makefile b/net/tintin++/Makefile
index 4199ae80f92b..1ccb2a49efc6 100644
--- a/net/tintin++/Makefile
+++ b/net/tintin++/Makefile
@@ -15,13 +15,13 @@ DISTNAME=	tintin++v1.5pl9
 MAINTAINER=	jhp@cocoja.holywar.net
 COMMENT=	A client program to help playing muds
 
+WRKSRC=		${WRKDIR}/tintin++/v1.5/src
+GNU_CONFIGURE=	yes
+
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} >= 500113
 BROKEN=         "Does not compile"
 .endif
 
-WRKSRC=		${WRKDIR}/tintin++/v1.5/src
-GNU_CONFIGURE=	yes
-
 .include <bsd.port.post.mk>
diff --git a/net/xicq/Makefile b/net/xicq/Makefile
index dbe8e7f38ffb..aa884f07f0a6 100644
--- a/net/xicq/Makefile
+++ b/net/xicq/Makefile
@@ -14,17 +14,17 @@ DISTNAME=	xicq-071298-snapshot.src
 MAINTAINER=	scrappy@FreeBSD.org
 COMMENT=	Xtropy's ICQ Client
 
+WRKSRC=		${WRKDIR}/xicq-071298
+
+USE_GMAKE=	yes
+MAKE_ENV=	OPT="${CFLAGS}"
+
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} >= 500113
 BROKEN=         "Does not compile (bad C++ code)"
 .endif
 
-WRKSRC=		${WRKDIR}/xicq-071298
-
-USE_GMAKE=	yes
-MAKE_ENV=	OPT="${CFLAGS}"
-
 do-install:
 		${INSTALL_PROGRAM} ${WRKSRC}/src/xicq/main ${PREFIX}/bin/xicq
 		${MKDIR} ${PREFIX}/share/examples/xicq
diff --git a/news/PicMonger/Makefile b/news/PicMonger/Makefile
index 9e9a0ad59539..8964381903c5 100644
--- a/news/PicMonger/Makefile
+++ b/news/PicMonger/Makefile
@@ -16,15 +16,15 @@ COMMENT=	An automated USENET (NNT) picture decoding client
 LIB_DEPENDS=	gtkmm.2:${PORTSDIR}/x11-toolkits/gtk--
 RUN_DEPENDS=	mpack:${PORTSDIR}/converters/mpack
 
+USE_X_PREFIX=	yes
+USE_GMAKE=	yes
+USE_GNOME=	imlib
+GNU_CONFIGURE=	yes
+
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} >= 500113
 BROKEN=         "Does not compile (bad C++ code)"
 .endif
 
-USE_X_PREFIX=	yes
-USE_GMAKE=	yes
-USE_GNOME=	imlib
-GNU_CONFIGURE=	yes
-
 .include <bsd.port.post.mk>
diff --git a/news/nget/Makefile b/news/nget/Makefile
index 33b9574205bb..4fa4e0ceba7a 100644
--- a/news/nget/Makefile
+++ b/news/nget/Makefile
@@ -15,17 +15,17 @@ DISTNAME=	nget-${PORTVERSION}+uulib
 MAINTAINER=	george@crackpipe.net
 COMMENT=	Auto-resuming command line nntp file grabber
 
+MAN1=		nget.1 ngetlite.1
+MANCOMPRESSED=	no
+GNU_CONFIGURE=	yes
+USE_GMAKE=	yes
+
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} >= 500113
 BROKEN=         "Fails to link"
 .endif
 
-MAN1=		nget.1 ngetlite.1
-MANCOMPRESSED=	no
-GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
-
 post-extract:
 	${LN} -s nget-${PORTVERSION} ${WRKDIR}/${DISTNAME}
 
diff --git a/print/lilypond/Makefile b/print/lilypond/Makefile
index 64511f271244..db8ce0505dce 100644
--- a/print/lilypond/Makefile
+++ b/print/lilypond/Makefile
@@ -19,12 +19,6 @@ COMMENT=	The GNU music typesetter
 BUILD_DEPENDS=	${LOCALBASE}/bin/latex:${PORTSDIR}/print/teTeX
 LIB_DEPENDS=	guile.15:${PORTSDIR}/lang/guile
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 500113
-BROKEN=         "Configure fails"
-.endif
-
 MAN1=	abc2ly.1 as2text.1 convert-ly.1 etf2ly.1 lilypond.1 \
 	lilypond-book.1 ly2dvi.1 midi2ly.1 mup2ly.1 musedata2ly.1 pmx2ly.1
 
@@ -40,6 +34,12 @@ INFO_FILES=		lilypond.info lilypond-internals.info
 CONFIGURE_ARGS+=	--with-kpathsea-include=${PREFIX}/include \
 			--with-kpathsea-lib=${PREFIX}/lib
 
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} >= 500113
+BROKEN=         "Configure fails"
+.endif
+
 post-configure:
 	${REINPLACE_CMD} -e "s:^INFO_FILES:xxxINFO_FILES:g" \
 		${WRKSRC}/Documentation/user/GNUmakefile
diff --git a/print/xmbibtex/Makefile b/print/xmbibtex/Makefile
index ceca01ab3936..9d0cb09a1c08 100644
--- a/print/xmbibtex/Makefile
+++ b/print/xmbibtex/Makefile
@@ -14,16 +14,16 @@ MASTER_SITE_SUBDIR=	apps/tex
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A reference manager based on the BibTeX file format
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 500113
-BROKEN=         "Does not compile (bad C++ code)"
-.endif
-
 WRKSRC=		${WRKDIR}/${DISTNAME}/src
 
 USE_MOTIF=	yes
 USE_IMAKE=	yes
 NO_INSTALL_MANPAGES=	yes
 
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} >= 500113
+BROKEN=         "Does not compile (bad C++ code)"
+.endif
+
 .include <bsd.port.post.mk>
diff --git a/science/qcl/Makefile b/science/qcl/Makefile
index b8b40edb2f35..235d9f8faf2f 100644
--- a/science/qcl/Makefile
+++ b/science/qcl/Makefile
@@ -14,14 +14,14 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	huntting@glarp.com
 COMMENT=	A quantum computer simulator
 
+LIB_DEPENDS=	gnugetopt.1:${PORTSDIR}/devel/libgnugetopt
+
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} >= 500113
 BROKEN=         "Does not compile (bad C++ code)"
 .endif
 
-LIB_DEPENDS=	gnugetopt.1:${PORTSDIR}/devel/libgnugetopt
-
 post-install:
 	strip ${PREFIX}/bin/qcl
 
diff --git a/science/vis5d+/Makefile b/science/vis5d+/Makefile
index 0a6aabe68f71..0823c19e9bcf 100644
--- a/science/vis5d+/Makefile
+++ b/science/vis5d+/Makefile
@@ -16,12 +16,6 @@ MASTER_SITE_SUBDIR=	vis5d
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	An OpenGL-based volumetric visualization program for scientific datasets
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 500113
-BROKEN=         "Does not compile (bad C++ code)"
-.endif
-
 BUILD_DEPENDS=	${LOCALBASE}/lib/libmix.a:${PORTSDIR}/graphics/qslim \
 		convert:${PORTSDIR}/graphics/ImageMagick
 LIB_DEPENDS=	iconv.3:${PORTSDIR}/converters/libiconv \
@@ -41,4 +35,10 @@ INSTALLS_SHLIB=	yes
 CPPFLAGS=	-I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_FLAGS}
 LDFLAGS=	-L${LOCALBASE}/lib -L${X11BASE}/lib ${PTHREAD_LIBS} 
 
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} >= 500113
+BROKEN=         "Does not compile (bad C++ code)"
+.endif
+
 .include <bsd.port.post.mk>
diff --git a/security/hashish/Makefile b/security/hashish/Makefile
index f135156ebff8..de2c9731e443 100644
--- a/security/hashish/Makefile
+++ b/security/hashish/Makefile
@@ -20,17 +20,17 @@ COMMENT=	A file and string hashing utility
 BUILD_DEPENDS=	${LOCALBASE}/lib/libcryptopp.a:${PORTSDIR}/security/cryptopp
 LIB_DEPENDS=	wx_gtk:${PORTSDIR}/x11-toolkits/wxgtk-devel
 
+USE_REINPLACE=	yes
+WRKSRC=		${WRKDIR}/Hashish
+CFLAGS+=	-I${LOCALBASE}/include
+USE_GMAKE=	yes
+
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} >= 500113
 BROKEN=         "Does not compile (bad C++ code)"
 .endif
 
-USE_REINPLACE=	yes
-WRKSRC=		${WRKDIR}/Hashish
-CFLAGS+=	-I${LOCALBASE}/include
-USE_GMAKE=	yes
-
 post-patch:
 	@${REINPLACE_CMD} -e "s,^CXXFLAGS =,CXXFLAGS+=${PTHREAD_CFLAGS},g ; \
 		s,^LBLIBS =,LBLIBS = ${PTHREAD_LIBS} -L${LOCALBASE}/lib,g" \
diff --git a/security/pgp6/Makefile b/security/pgp6/Makefile
index ed2f5ebf2118..c8beba1aabe6 100644
--- a/security/pgp6/Makefile
+++ b/security/pgp6/Makefile
@@ -22,12 +22,6 @@ DISTNAME=	pgpsrc658unix
 MAINTAINER=	mike@fate.com
 COMMENT=	Public-Key encryption for the masses
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 500113
-BROKEN=         "Does not compile"
-.endif
-
 WRKSRC=		${WRKDIR}/pgpsrc
 USE_GMAKE=	yes
 
@@ -35,6 +29,12 @@ MAN1=		pgp.1
 
 LATEST_LINK=	pgp6
 
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} >= 500113
+BROKEN=         "Does not compile"
+.endif
+
 # the distfile is actually a tar of three compressed tars and their
 # signatures
 post-extract:
diff --git a/sysutils/bubblemon/Makefile b/sysutils/bubblemon/Makefile
index 76fdf0397237..11c034d11884 100644
--- a/sysutils/bubblemon/Makefile
+++ b/sysutils/bubblemon/Makefile
@@ -17,12 +17,6 @@ COMMENT=	Bubblemon is a system CPU and memory load monitor for the GNOME panel
 
 LIB_DEPENDS=	gtop.1:${PORTSDIR}/devel/libgtop
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 500113
-BROKEN=         "Does not compile"
-.endif
-
 USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
 USE_GNOME=	gnomeprefix gnomehack libpanel
@@ -34,6 +28,12 @@ MANLANG=	"" hu sv
 
 DOCS=	AUTHORS COPYING ChangeLog FAQ PROFILING TRANSLATIONS NEWS README TODO
 
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} >= 500113
+BROKEN=         "Does not compile"
+.endif
+
 post-patch:
 	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ;' ${WRKSRC}/configure
 
diff --git a/sysutils/di/Makefile b/sysutils/di/Makefile
index 61a5b282ca69..8a500d810768 100644
--- a/sysutils/di/Makefile
+++ b/sysutils/di/Makefile
@@ -13,15 +13,15 @@ MASTER_SITES=	http://www.gentoo.com/di/
 MAINTAINER=	bll@gentoo.com
 COMMENT=	A disk information utility
 
+HAS_CONFIGURE=	yes
+MAN1=		di.1
+
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} >= 500113
 BROKEN=         "Does not compile"
 .endif
 
-HAS_CONFIGURE=	yes
-MAN1=		di.1
-
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/di ${PREFIX}/bin
 	${INSTALL_PROGRAM} ${WRKSRC}/mi ${PREFIX}/bin
diff --git a/sysutils/ndir/Makefile b/sysutils/ndir/Makefile
index b9ea70ccab99..f6f9fa74c102 100644
--- a/sysutils/ndir/Makefile
+++ b/sysutils/ndir/Makefile
@@ -15,12 +15,6 @@ EXTRACT_SUFX=	-1.tar.gz
 MAINTAINER=	markp@FreeBSD.org
 COMMENT=	A featureful directory lister
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 500113
-BROKEN=         "Does not compile (bad C++ code)"
-.endif
-
 USE_GMAKE=	yes
 USE_REINPLACE=	yes
 ALL_TARGET=	compile
@@ -28,6 +22,12 @@ CFLAGS+=	-DNO_THOUSANDS_GROUPING
 MAN1=		ndir.1
 MLINKS=		ndir.1 lv.1 ndir.1 lw.1
 
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} >= 500113
+BROKEN=         "Does not compile (bad C++ code)"
+.endif
+
 post-patch:
 	${REINPLACE_CMD} -E "s/^export GLOBAL.+//g" ${WRKSRC}/Makefile
 
diff --git a/sysutils/xlogmaster/Makefile b/sysutils/xlogmaster/Makefile
index 39a7edc4789a..6750d7257161 100644
--- a/sysutils/xlogmaster/Makefile
+++ b/sysutils/xlogmaster/Makefile
@@ -14,12 +14,6 @@ MASTER_SITE_SUBDIR=	xlogmaster
 MAINTAINER=	aw1@stade.co.uk
 COMMENT=	Quick & easy monitoring of logfiles and devices
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 500113
-BROKEN=         "Does not compile (bad C++ code)"
-.endif
-
 USE_XLIB=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gtk12
@@ -27,6 +21,12 @@ GNU_CONFIGURE=	yes
 
 MAN1=		xlogmaster.1
 
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} >= 500113
+BROKEN=         "Does not compile (bad C++ code)"
+.endif
+
 post-install:
 	@install-info ${PREFIX}/info/xlogmaster.info ${PREFIX}/info/dir
 	${INSTALL_DATA} ${FILESDIR}/xlogmasterrc ${PREFIX}/etc/xlogmaster
diff --git a/sysutils/xosview/Makefile b/sysutils/xosview/Makefile
index 96eee878e444..0c627a319c23 100644
--- a/sysutils/xosview/Makefile
+++ b/sysutils/xosview/Makefile
@@ -15,14 +15,14 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A graphical performance meter
 
+USE_X_PREFIX=	yes
+GNU_CONFIGURE=	yes
+MAN1=		xosview.1
+
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} >= 500113
 BROKEN=         "Does not compile (bad C++ code)"
 .endif
 
-USE_X_PREFIX=	yes
-GNU_CONFIGURE=	yes
-MAN1=		xosview.1
-
 .include <bsd.port.post.mk>
diff --git a/sysutils/xperfmon3/Makefile b/sysutils/xperfmon3/Makefile
index 4c5982f74e1e..58bd8f7caa6f 100644
--- a/sysutils/xperfmon3/Makefile
+++ b/sysutils/xperfmon3/Makefile
@@ -17,15 +17,15 @@ EXTRACT_SUFX=	v1.1.tar.Z
 MAINTAINER=	Lars.Koeller@Uni-Bielefeld.DE
 COMMENT=	Xperfmon++ : A graphical X11 system performance monitor
 
+LATEST_LINK=	xperfmon3
+
+USE_IMAKE=	yes
+MAN1=		xperfmon++.1
+
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} >= 500113
 BROKEN=         "Does not compile"
 .endif
 
-LATEST_LINK=	xperfmon3
-
-USE_IMAKE=	yes
-MAN1=		xperfmon++.1
-
 .include <bsd.port.post.mk>
diff --git a/sysutils/xsysinfo/Makefile b/sysutils/xsysinfo/Makefile
index bc314c278c21..42a278796cf7 100644
--- a/sysutils/xsysinfo/Makefile
+++ b/sysutils/xsysinfo/Makefile
@@ -13,16 +13,16 @@ MASTER_SITES=	ftp://freebsd.csie.nctu.edu.tw/pub/jdli/source/
 MAINTAINER=	jdli@csie.nctu.edu.tw
 COMMENT=	A system information display tool
 
+USE_IMAKE=	yes
+MANCOMPRESSED=	yes
+MAN1=		xsysinfo.1
+
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} >= 500113
 BROKEN=         "Does not compile"
 .endif
 
-USE_IMAKE=	yes
-MANCOMPRESSED=	yes
-MAN1=		xsysinfo.1
-
 pre-configure:
 	if [ -e /usr/lib/libdevstat.a -o -e /usr/lib/aout/libdevstat.a ]; then \
 		cd ${WRKSRC} ; \
diff --git a/sysutils/xw/Makefile b/sysutils/xw/Makefile
index 71d500bde5cb..f1968f4d0920 100644
--- a/sysutils/xw/Makefile
+++ b/sysutils/xw/Makefile
@@ -13,15 +13,15 @@ MASTER_SITES=	http://www.mavetju.org/download/adopted/
 MAINTAINER=	ports@FreeBSD.Org
 COMMENT=	X app to list current users logged into the system
 
+GTK_CONFIG=${X11BASE}/bin/gtk12-config
+
+USE_GNOME=	imlib
+USE_X_PREFIX=	yes
+
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} >= 500113
 BROKEN=         "Does not compile"
 .endif
 
-GTK_CONFIG=${X11BASE}/bin/gtk12-config
-
-USE_GNOME=	imlib
-USE_X_PREFIX=	yes
-
 .include <bsd.port.post.mk>
diff --git a/textproc/kbedic/Makefile b/textproc/kbedic/Makefile
index 0a542c257bed..de35b2183f95 100644
--- a/textproc/kbedic/Makefile
+++ b/textproc/kbedic/Makefile
@@ -16,12 +16,6 @@ DISTNAME=	${PORTNAME}-src-${PORTVERSION}
 MAINTAINER=	todorov@freebsd-bg.org
 COMMENT=	An English-to-Bulgarian and Bulgarian-to-English dictionary
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 500113
-BROKEN=         "Does not compile"
-.endif
-
 RUN_DEPENDS=	${DICT_DIR}/${DICT_CHECK}:${PORTSDIR}/textproc/bedic-data
 
 DICT_CHECK?=	buleng.dat
@@ -39,6 +33,12 @@ CONFIGURE_ARGS+=	--with-x
 PLIST=		${PKGDIR}/pkg-plist.console
 .endif
 
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} >= 500113
+BROKEN=         "Does not compile"
+.endif
+
 pre-fetch:
 		@${ECHO_MSG} "	--- Dictionaries setup information ---"
 		@${ECHO_MSG} "This port uses dictionaries provided by the textproc/bedic-data port."
diff --git a/textproc/nicetext/Makefile b/textproc/nicetext/Makefile
index 69252ff8ff27..e07cde7fba89 100644
--- a/textproc/nicetext/Makefile
+++ b/textproc/nicetext/Makefile
@@ -13,12 +13,6 @@ MASTER_SITES=	ftp://ctgi.net/pub/ctgi/nicetext/src/ \
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Convert files to pseudo-natural-language text and back again
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 500113
-BROKEN=         "Does not compile (bad C++ code)"
-.endif
-
 USE_GMAKE=	YES
 MAKE_FLAGS=	CXXFLAGS="${CXXFLAGS} -pedantic" CFLAGS="${CFLAGS} -pedantic"
 
@@ -29,6 +23,12 @@ PROGRAMS=	bitcp dct2mstr expgram genmodel gramtest impkimmo impmsc \
 		impwbstr listword nicetext nttpd printint rinfo scramble \
 		sortdct txt2dct
 
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} >= 500113
+BROKEN=         "Does not compile (bad C++ code)"
+.endif
+
 post-install:
 	@${ECHO_CMD} "#!/bin/sh" > ${WRKSRC}/bin/qstart-nttpd
 	@${ECHO_CMD} ${PREFIX}/bin/"nttpd -b " ${PREFIX}/share/examples/nicetext/database >> ${WRKSRC}/bin/qstart-nttpd
diff --git a/textproc/word2x/Makefile b/textproc/word2x/Makefile
index da2cca048860..7c6e09b446b9 100644
--- a/textproc/word2x/Makefile
+++ b/textproc/word2x/Makefile
@@ -14,15 +14,15 @@ MASTER_SITE_SUBDIR=	word2x
 MAINTAINER=	billf@FreeBSD.org
 COMMENT=	Converter from MS Word to text, HTML or LaTeX
 
+USE_GMAKE=	yes
+GNU_CONFIGURE=	yes
+
+MAN1=	word2x.1
+
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} >= 500113
 BROKEN=         "Does not compile (bad C++ code)"
 .endif
 
-USE_GMAKE=	yes
-GNU_CONFIGURE=	yes
-
-MAN1=	word2x.1
-
 .include <bsd.port.post.mk>
diff --git a/textproc/xmlpp/Makefile b/textproc/xmlpp/Makefile
index ae244172a009..88749dfe382b 100644
--- a/textproc/xmlpp/Makefile
+++ b/textproc/xmlpp/Makefile
@@ -14,17 +14,17 @@ MASTER_SITES=	http://www.root.at/download/gpl/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	XML Parser and Validator
 
+USE_REINPLACE=	yes
+FETCH_CMD=	/usr/bin/fetch
+USE_GMAKE=	yes
+USE_LIBTOOL=	yes
+
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} >= 500113
 BROKEN=         "Does not compile (bad C++ code)"
 .endif
 
-USE_REINPLACE=	yes
-FETCH_CMD=	/usr/bin/fetch
-USE_GMAKE=	yes
-USE_LIBTOOL=	yes
-
 pre-patch:
 	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
 		's|/usr/local/share|$$(datadir)|g'
diff --git a/textproc/xxdiff/Makefile b/textproc/xxdiff/Makefile
index 02a01f8b37d5..5d6ea2e99949 100644
--- a/textproc/xxdiff/Makefile
+++ b/textproc/xxdiff/Makefile
@@ -22,12 +22,6 @@ COMMENT=	QT interface to view/merge differences between 2 or 3 files
 
 BUILD_DEPENDS=	tmake:${PORTSDIR}/devel/tmake
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 500113
-BROKEN=         "Does not compile (bad C++ code)"
-.endif
-
 USE_BISON=	yes
 USE_GMAKE=	yes
 USE_QT_VER=	2
@@ -35,6 +29,12 @@ TMAKEENV=	TMAKEPATH=${LOCALBASE}/share/tmake/freebsd-g++ QTDIR=${X11BASE}
 MAKE_ENV+=	QTDIR=${X11BASE} PTHREAD_LIBS=${PTHREAD_LIBS}
 WRKSRC=	${WRKDIR}/xxdiff-${PORTVERSION}/src
 
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} >= 500113
+BROKEN=         "Does not compile (bad C++ code)"
+.endif
+
 do-build:
 	(cd ${WRKSRC}; ${SETENV} ${TMAKEENV} tmake -o Makefile xxdiff.pro)
 	(cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} \
diff --git a/www/aria/Makefile b/www/aria/Makefile
index d25de8169349..514611233893 100644
--- a/www/aria/Makefile
+++ b/www/aria/Makefile
@@ -16,12 +16,6 @@ DISTNAME=	${PORTNAME}-${PORTVERSION:S/.t/test/}
 MAINTAINER=	nakai@FreeBSD.org
 COMMENT=	Yet another download tool
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 500113
-BROKEN=         "Does not build"
-.endif
-
 USE_BZIP2=	yes
 USE_GNOME=	gtk12
 USE_OPENSSL=	yes
@@ -31,6 +25,12 @@ USE_LIBTOOL=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
 
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} >= 500113
+BROKEN=         "Does not build"
+.endif
+
 pre-patch:
 	@${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g; \
 		s|-lssl|-lcrypto -lssl|g; \
diff --git a/www/logtools/Makefile b/www/logtools/Makefile
index 3d8e0ceb6e35..e88f61debd3f 100644
--- a/www/logtools/Makefile
+++ b/www/logtools/Makefile
@@ -14,13 +14,13 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	xaa+ports@timewasters.nl
 COMMENT=	Useful tools to deal with CLF files (Common Log File format)
 
+GNU_CONFIGURE=	yes
+MAN1=		clfmerge.1 logprn.1 funnel.1 clfsplit.1 clfdomainsplit.1
+
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} >= 500113
 BROKEN=         "Does not compile (bad C++ code)"
 .endif
 
-GNU_CONFIGURE=	yes
-MAN1=		clfmerge.1 logprn.1 funnel.1 clfsplit.1 clfdomainsplit.1
-
 .include <bsd.port.post.mk>
diff --git a/www/p5-Apache-Peek/Makefile b/www/p5-Apache-Peek/Makefile
index e1f4cf392198..4fadea16b6d3 100644
--- a/www/p5-Apache-Peek/Makefile
+++ b/www/p5-Apache-Peek/Makefile
@@ -18,15 +18,15 @@ COMMENT=	A perl5 data debugging tool for the XS programmer
 BUILD_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Apache/src.pm:${PORTSDIR}/www/mod_perl \
 		${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/B/Graph.pm:${PORTSDIR}/devel/p5-B-Graph
 
+PERL_CONFIGURE=	YES
+
+MAN3=		Apache::Peek.3
+MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
+
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} >= 500113
 BROKEN=         "Does not compile"
 .endif
 
-PERL_CONFIGURE=	YES
-
-MAN3=		Apache::Peek.3
-MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
-
 .include <bsd.port.post.mk>
diff --git a/www/wsmake/Makefile b/www/wsmake/Makefile
index 9426d08d40a7..bff0f5051394 100644
--- a/www/wsmake/Makefile
+++ b/www/wsmake/Makefile
@@ -20,12 +20,6 @@ EXTRACT_ONLY=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}
 MAINTAINER=	jkoshy@freebsd.org
 COMMENT=	Software for production and maintenance of web sites
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 500113
-BROKEN=         "Does not compile (bad C++ code)"
-.endif
-
 USE_BZIP2=	YES
 GNU_CONFIGURE=	YES
 
@@ -33,6 +27,12 @@ WSMAKE_MASTER_SITE=	http://www.wsmake.org
 WSMAKE_DOCDIR=	${PREFIX}/share/doc/wsmake
 WSMAKE_EXDIR=	${PREFIX}/share/examples/wsmake
 
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} >= 500113
+BROKEN=         "Does not compile (bad C++ code)"
+.endif
+
 # Install examples and optional documentation.
 post-install:
 	${MKDIR} ${WSMAKE_EXDIR}
diff --git a/x11-toolkits/v/Makefile b/x11-toolkits/v/Makefile
index 4a60d597bbc4..a236c7b575be 100644
--- a/x11-toolkits/v/Makefile
+++ b/x11-toolkits/v/Makefile
@@ -18,18 +18,18 @@ COMMENT=	A C++ GUI development framework for X11 and Microsoft Windows
 BROKEN=		compiler error in function fixup_memory_subreg
 .endif
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 500113
-BROKEN=         "Does not compile (bad C++ code)"
-.endif
-
 WRKSRC=		${WRKDIR}/v
 
 USE_X_PREFIX=	YES
 USE_GMAKE=	YES
 MAKE_ENV=	INSTALLDIR=${PREFIX} HOMEV=${WRKSRC}
 
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} >= 500113
+BROKEN=         "Does not compile (bad C++ code)"
+.endif
+
 do-configure:
 	${CP} ${WRKSRC}/ConfigX.mk ${WRKSRC}/Config.mk
 
diff --git a/x11-toolkits/viewkit/Makefile b/x11-toolkits/viewkit/Makefile
index bd8a2307b27e..27c5957e4d3c 100644
--- a/x11-toolkits/viewkit/Makefile
+++ b/x11-toolkits/viewkit/Makefile
@@ -21,12 +21,6 @@ COMMENT=	ViewKit workalike from Hungry Programmers
 
 BUILD_DEPENDS=   ${AUTOCONFIG}:${PORTSDIR}/devel/${AUTOCONFIG}
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 500113
-BROKEN=         "Does not compile (bad C++ code)"
-.endif
-
 AUTOCONFIG=      autoconf
 
 MOTIFPACKAGE?=   open-motif
@@ -35,6 +29,12 @@ USE_MOTIF = yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-${MOTIFPACKAGE}
 
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} >= 500113
+BROKEN=         "Does not compile (bad C++ code)"
+.endif
+
 pre-configure:
 	@cd ${WRKSRC}; ${CHMOD} +w configure; ${AUTOCONFIG}
 
diff --git a/x11-toolkits/viewklass/Makefile b/x11-toolkits/viewklass/Makefile
index 651b3e844743..c5242a278f97 100644
--- a/x11-toolkits/viewklass/Makefile
+++ b/x11-toolkits/viewklass/Makefile
@@ -18,17 +18,17 @@ COMMENT=	C++ Framework for Motif
 
 BUILD_DEPENDS=	xmkmf:${PORTSDIR}/devel/imake
 
+USE_X_PREFIX=	yes
+USE_MOTIF=	yes
+USE_REINPLACE=	yes
+GNU_CONFIGURE=	yes
+
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} >= 500113
 BROKEN=         "Does not compile (bad C++ code)"
 .endif
 
-USE_X_PREFIX=	yes
-USE_MOTIF=	yes
-USE_REINPLACE=	yes
-GNU_CONFIGURE=	yes
-
 post-patch:
 	@${REINPLACE_CMD} -e 's/^CFLAGS=/CFLAGS+=/g ; \
 		 s/^CXXFLAGS=/CXXFLAGS+=/g ; \
diff --git a/x11-toolkits/xview/Makefile b/x11-toolkits/xview/Makefile
index 979d971704f1..76d3b6e5febd 100644
--- a/x11-toolkits/xview/Makefile
+++ b/x11-toolkits/xview/Makefile
@@ -18,12 +18,6 @@ DISTNAME=	xview3.2p1-X11R6
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	X Window-System-based Visual/Integrated Environment for Workstations
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 500113
-BROKEN=         "Does not compile"
-.endif
-
 USE_IMAKE=	yes
 INSTALLS_SHLIB=	yes
 IMAKEINCLUDE=	"-I${X11BASE}/lib/X11/config -I${WRKSRC}/config"
@@ -33,6 +27,12 @@ ALL_TARGET=	World
 
 MAN1=		msgfmt.1 xgettext.1 xview.1
 
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} >= 500113
+BROKEN=         "Does not compile"
+.endif
+
 post-install:
 .if !defined(NOPORTDOCS)
 	@(cd $(WRKSRC); $(MAKE) -k 'SUBDIRS=doc' install)
diff --git a/x11-wm/qlwm/Makefile b/x11-wm/qlwm/Makefile
index 13897f7269a8..35e6c2201007 100644
--- a/x11-wm/qlwm/Makefile
+++ b/x11-wm/qlwm/Makefile
@@ -15,12 +15,6 @@ MASTER_SITES=	http://www.netcologne.de/~nc-lindenal/qlwm/
 MAINTAINER=	trevor@FreeBSD.org
 COMMENT=	Qt-based window manager
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 500113
-BROKEN=         "Fails to link"
-.endif
-
 DOCDIR=		share/doc/${PORTNAME}
 DOCS=		CHANGES README
 LIBDIR=		lib/${PORTNAME}
@@ -34,6 +28,12 @@ REINPLACE_ARGS=	-i'' -E
 MAKE_ENV=	DEST="${PREFIX}/${LIBDIR}" INCPATH="${QTCPPFLAGS}" \
 		LIBS="${QTCFGLIBS} -lqt-mt -pthread" LINK="${CXX}" MOC="${MOC}"
 
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} >= 500113
+BROKEN=         "Fails to link"
+.endif
+
 post-patch:
 	find ${WRKSRC} -name "Makefile" | xargs ${REINPLACE_CMD} \
 		's|/usr/local/qlwm|${PREFIX}/${LIBDIR}|g ; \
diff --git a/x11-wm/toolbox/Makefile b/x11-wm/toolbox/Makefile
index b1a1d30a38a0..d1eb3dde457c 100644
--- a/x11-wm/toolbox/Makefile
+++ b/x11-wm/toolbox/Makefile
@@ -13,17 +13,17 @@ MASTER_SITES=	http://www2.bc.edu/~kelleyry/toolbox/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A blackbox style configuration utility
 
+USE_QT_VER=	2
+USE_X_PREFIX=	yes
+
+MAKE_ENV=	CXX="${CXX}" CC="${CC}"
+
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} >= 500113
 BROKEN=         "Fails to link"
 .endif
 
-USE_QT_VER=	2
-USE_X_PREFIX=	yes
-
-MAKE_ENV=	CXX="${CXX}" CC="${CC}"
-
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/toolbox ${PREFIX}/bin/toolbox
 
diff --git a/x11-wm/wmanager/Makefile b/x11-wm/wmanager/Makefile
index 0678e41479c3..ac19542e3df5 100644
--- a/x11-wm/wmanager/Makefile
+++ b/x11-wm/wmanager/Makefile
@@ -16,12 +16,6 @@ COMMENT=	X11 window manager selector
 
 LIB_DEPENDS=	fltk.1:${PORTSDIR}/x11-toolkits/fltk
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 500113
-BROKEN=         "Does not compile (bad C++ code)"
-.endif
-
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
@@ -29,6 +23,12 @@ MAKE_ENV=	CXX="${CXX}" \
 		PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
 		PTHREAD_LIBS="${PTHREAD_LIBS}"
 
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} >= 500113
+BROKEN=         "Does not compile (bad C++ code)"
+.endif
+
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/wmanager ${PREFIX}/bin
 .if !defined(NOPORTDOCS)
diff --git a/x11-wm/xwmm/Makefile b/x11-wm/xwmm/Makefile
index 89ed06bdf524..198246328572 100644
--- a/x11-wm/xwmm/Makefile
+++ b/x11-wm/xwmm/Makefile
@@ -14,18 +14,18 @@ MASTER_SITE_SUBDIR=	asami
 MAINTAINER=	kde@freebsd.org
 COMMENT=	A simple utility managing multiple Window Managers with Qt
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 500113
-BROKEN=         "Does not compile (bad C++ code)"
-.endif
-
 USE_X_PREFIX=	yes
 USE_QT_VER=	2
 USE_GMAKE=	yes
 MAKE_ENV=	QTDIR=$(X11BASE)
 ALL_TARGET=	# empty
 
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} >= 500113
+BROKEN=         "Does not compile (bad C++ code)"
+.endif
+
 do-install:
 	$(INSTALL_PROGRAM) $(WRKSRC)/xwmm $(PREFIX)/bin
 	$(INSTALL_SCRIPT) $(WRKSRC)/startkde.fixed $(PREFIX)/bin/startkde.xwmm
diff --git a/x11/decurs/Makefile b/x11/decurs/Makefile
index 5e2cbf96bb63..6b324ad093ac 100644
--- a/x11/decurs/Makefile
+++ b/x11/decurs/Makefile
@@ -16,16 +16,16 @@ COMMENT=	A GTK+ based program that lets you edit you XFree86 mouse cursors
 
 LIB_DEPENDS=	gtkmm.2:${PORTSDIR}/x11-toolkits/gtk--
 
+USE_X_PREFIX=	yes
+USE_GNOME=	gtk12
+GNU_CONFIGURE=	yes
+
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} >= 500113
 BROKEN=         "Does not compile (bad C++ code)"
 .endif
 
-USE_X_PREFIX=	yes
-USE_GNOME=	gtk12
-GNU_CONFIGURE=	yes
-
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/src/decurs ${X11BASE}/bin/decurs-real
 	@${MKDIR} ${DATADIR}
diff --git a/x11/gmrun/Makefile b/x11/gmrun/Makefile
index 2aff5bc2658a..44219253161b 100644
--- a/x11/gmrun/Makefile
+++ b/x11/gmrun/Makefile
@@ -16,17 +16,17 @@ COMMENT=	A customizable program to run programs, with tab-completion
 
 BUILD_DEPENDS+=	${LOCALBASE}/lib/libstlport_gcc.so:${PORTSDIR}/devel/stlport
 
+USE_X_PREFIX=	yes
+GNU_CONFIGURE=	yes
+USE_GMAKE=	yes
+USE_GNOME=	gnomeprefix gnomehack gtk12 glib12
+
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} >= 500113
 BROKEN=         "Does not compile (bad C++ code)"
 .endif
 
-USE_X_PREFIX=	yes
-GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
-USE_GNOME=	gnomeprefix gnomehack gtk12 glib12
-
 post-patch:
 	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's|PACKAGE_DATA_DIR\"|\"${PREFIX}/etc|' ${WRKSRC}/src/prefs.cc
diff --git a/x11/rxvt-devel/Makefile b/x11/rxvt-devel/Makefile
index 773b224d67b6..c2315a8570a8 100644
--- a/x11/rxvt-devel/Makefile
+++ b/x11/rxvt-devel/Makefile
@@ -24,12 +24,6 @@ COMMENT=	A low memory usage xterm replacement that supports color
 
 BUILD_DEPENDS=	libtool:${PORTSDIR}/devel/libtool
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 500113
-BROKEN=         "Does not compile"
-.endif
-
 USE_X_PREFIX=	yes
 USE_XPM=	yes
 GNU_CONFIGURE=	yes
@@ -101,6 +95,12 @@ CONFIGURE_ARGS+=	--enable-xim
 CONFIGURE_ARGS+=	--enable-xterm-scroll
 .endif # WITH_XTERM_SCROLLBAR
 
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} >= 500113
+BROKEN=         "Does not compile"
+.endif
+
 pre-everything::
 	@${ECHO_MSG}
 	@${ECHO_MSG} "You may use the following build options:"