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

6 files changed, 34 insertions, 34 deletions

diff --git a/mail/dkimap4/Makefile b/mail/dkimap4/Makefile
index b74b1e0..41e8ec0 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 8829747..c131918 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 9fd1e0e..f8ef2d8 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 6391e62..ba9a8ac 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 11e92fe..ce4c8f2 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 db36eb31..6574a66 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 )