23 files changed, 130 insertions, 15 deletions

diff --git a/ftp/smbftpd/Makefile b/ftp/smbftpd/Makefile
index c6c2508db93a..ff3ebac39c21 100644
--- a/ftp/smbftpd/Makefile
+++ b/ftp/smbftpd/Makefile
@@ -11,7 +11,6 @@ CATEGORIES=	ftp
 MASTER_SITES=	SF/${PORTNAME}/SmbFTPD/${PORTVERSION}	\
 		http://www.twbsd.org/download/download.php?file=smbftpd/
 
-
 MAINTAINER=	jnlin@csie.nctu.edu.tw
 COMMENT=	FTP daemon using Samba-like share management mechanism
 
@@ -48,4 +47,8 @@ CONFIGURE_ARGS+=	"--with-iconv"
 CONFIGURE_ARGS+=	"--with-ssl"
 .endif
 
+.if ${OSVERSION} > 900007
+BROKEN=		fails to build with new utmpx
+.endif
+
 .include <bsd.port.post.mk>
diff --git a/irc/solid-ircd/Makefile b/irc/solid-ircd/Makefile
index 653cd4656e52..8165fae08ff6 100644
--- a/irc/solid-ircd/Makefile
+++ b/irc/solid-ircd/Makefile
@@ -27,4 +27,10 @@ CONFIGURE_ARGS+=	--disable-openssl
 USE_OPENSSL=	yes
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} > 900007
+BROKEN=		fails to build with new utmpx
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/japanese/aterm/Makefile b/japanese/aterm/Makefile
index a083d3b66406..72d084664309 100644
--- a/japanese/aterm/Makefile
+++ b/japanese/aterm/Makefile
@@ -32,6 +32,12 @@ CONFIGURE_ARGS?= \
 		--enable-fading --enable-utmp --enable-wtmp \
 		--enable-kanji --enable-linespace --enable-xim
 
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} > 900007
+BROKEN=		fails to build with new utmpx
+.endif
+
 .if defined(WITH_MENUBAR)
 CONFIGURE_ARGS+= --enable-menubar
 .endif
@@ -47,4 +53,4 @@ do-install:
 	${INSTALL_MAN} ${WRKSRC}/doc/aterm.1 ${PREFIX}/man/man1/
 	@${CHMOD} 4711 ${PREFIX}/bin/aterm
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/japanese/kon2-16dot/Makefile b/japanese/kon2-16dot/Makefile
index 5dd9f77e8224..3e2d1ca0e4b3 100644
--- a/japanese/kon2-16dot/Makefile
+++ b/japanese/kon2-16dot/Makefile
@@ -30,6 +30,12 @@ MANLANG=	ja
 PORTDOCS=	README README.FreeBSD
 DOCDIR=		${PREFIX}/share/doc/kon2
 
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} > 900007
+BROKEN=		fails to build with new utmpx
+.endif
+
 .if !defined(KONFONT)
 KONFONT=16dot
 KON16FONT=Startup
@@ -61,4 +67,4 @@ post-install:
 	cd ${WRKSRC}/doc && ${INSTALL_DATA} ${PORTDOCS} ${DOCDIR}
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/japanese/rxvt/Makefile b/japanese/rxvt/Makefile
index 8609a2ed7558..038102e0f5ab 100644
--- a/japanese/rxvt/Makefile
+++ b/japanese/rxvt/Makefile
@@ -33,6 +33,10 @@ RXVTLIB=	${PREFIX}/lib/X11/rxvt
 
 .include <bsd.port.pre.mk>
 
+.if ${OSVERSION} > 900007
+BROKEN=		fails to build with new utmpx
+.endif
+
 pre-install:
 	@${MKDIR} ${DOCDIR}
 	@${INSTALL_DATA} ${FILESDIR}/README.ja ${DOCDIR}
diff --git a/japanese/sj3-server/Makefile b/japanese/sj3-server/Makefile
index 3b25776599cc..e7a7fca30b85 100644
--- a/japanese/sj3-server/Makefile
+++ b/japanese/sj3-server/Makefile
@@ -43,6 +43,10 @@ POSTPATCHES.nodocports= \
 
 .include <bsd.port.pre.mk>
 
+.if ${OSVERSION} > 900007
+BROKEN=		fails to build with new utmpx
+.endif
+
 post-patch:
 	cd ${WRKSRC} && ${CAT} ${POSTPATCHES} | ${PATCH}
 .if defined(NOPORTDOCS)
diff --git a/korean/eterm/Makefile b/korean/eterm/Makefile
index ce50fa3b5e45..461469597a59 100644
--- a/korean/eterm/Makefile
+++ b/korean/eterm/Makefile
@@ -29,6 +29,12 @@ CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib" LOCALBASE="${LOCALBASE}"
 MAN1=		Eterm.1
 MAKE_JOBS_UNSAFE=	yes
 
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} > 900007
+BROKEN=		fails to build with new utmpx
+.endif
+
 pre-patch:
 	@${PERL} -pi -e 's,<malloc.h>,<stdlib.h>,' \
 		${WRKSRC}/libmej/debug.c ${WRKSRC}/libmej/strings.c
@@ -45,4 +51,4 @@ post-install:
 			${DOCSDIR}
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/korean/gtkcomm/Makefile b/korean/gtkcomm/Makefile
index 66d6108c8608..49d9f122550a 100644
--- a/korean/gtkcomm/Makefile
+++ b/korean/gtkcomm/Makefile
@@ -20,8 +20,14 @@ USE_PERL5_BUILD=yes
 USE_GNOME=	imlib
 GNU_CONFIGURE=	yes
 
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} > 900007
+BROKEN=		fails to build with new utmpx
+.endif
+
 pre-patch:
 	@${PERL} -pi -e 's^-l(pthread|c_r)^${PTHREAD_LIBS}^g ; \
 		 s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/korean/hanterm/Makefile b/korean/hanterm/Makefile
index 7549a0edef6b..343ba7a83150 100644
--- a/korean/hanterm/Makefile
+++ b/korean/hanterm/Makefile
@@ -23,6 +23,12 @@ USE_XORG=	ice sm x11 xaw xext xmu xpm xt
 NO_INSTALL_MANPAGES= yes
 ALL_TARGET=	hanterm
 
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} > 900007
+BROKEN=		fails to build with new utmpx
+.endif
+
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/hanterm ${PREFIX}/bin
 	${INSTALL_DATA} ${WRKSRC}/Hanterm.ad \
@@ -33,4 +39,4 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/ChangeLog ${DOCSDIR}/
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/lang/harbour/Makefile b/lang/harbour/Makefile
index e63fdf487319..2a7793fd1bc6 100644
--- a/lang/harbour/Makefile
+++ b/lang/harbour/Makefile
@@ -60,6 +60,8 @@ pre-install:
 BROKEN=		Leaves files behind on deinstall
 .elif ${ARCH} == "sparc64"
 BROKEN=		Does not compile on sparc64: assertion failed
+.elif ${OSVERSION} > 900007
+BROKEN=		fails to build with new utmpx
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/mail/smfsav/Makefile b/mail/smfsav/Makefile
index 3a129d62be5e..6657036cc154 100644
--- a/mail/smfsav/Makefile
+++ b/mail/smfsav/Makefile
@@ -34,6 +34,12 @@ USE_RC_SUBR=	smfsav
 
 SUB_FILES=	pkg-message
 
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} > 900007
+BROKEN=		fails to build with new utmpx
+.endif
+
 pre-build:
 	@${ECHO}
 	@${ECHO} [*] Compiling BIND 8 to make SmfSav able to resolve DNS names
@@ -56,4 +62,4 @@ post-install:
 	${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
 	@${CAT} ${PKGMESSAGE}
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/misc/wminfo/Makefile b/misc/wminfo/Makefile
index 42b7addbebc5..cf426dc14bbb 100644
--- a/misc/wminfo/Makefile
+++ b/misc/wminfo/Makefile
@@ -28,4 +28,10 @@ post-patch:
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/wminfo ${PREFIX}/bin
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} > 900007
+BROKEN=		fails to build with new utmpx
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/net/sendfile/Makefile b/net/sendfile/Makefile
index f878dda865b3..a26fb9bcbe07 100644
--- a/net/sendfile/Makefile
+++ b/net/sendfile/Makefile
@@ -36,4 +36,10 @@ post-install:
 	  ${CP} -p ${PREFIX}/etc/sendfile.deny.sample ${PREFIX}/etc/sendfile.deny ; \
 	fi
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} > 900007
+BROKEN=		fails to build with new utmpx
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/net/socks5/Makefile b/net/socks5/Makefile
index e6c1550cc99e..1fb5bfa89149 100644
--- a/net/socks5/Makefile
+++ b/net/socks5/Makefile
@@ -44,6 +44,12 @@ MAN1=		runsocks.1 socks5.1 stopsocks.1 socks5_clients.1
 MAN5=		libsocks5.conf.5 socks5.conf.5 socks5.passwd.5
 CONFIGURE_ENV=	LIBS=-lcrypt
 
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} > 900007
+BROKEN=		fails to build with new utmpx
+.endif
+
 post-install:
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${EXAMPLESDIR}
@@ -52,4 +58,4 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/doc/* ${DOCSDIR}
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/security/heimdal/Makefile b/security/heimdal/Makefile
index b2e8ad12af5a..007ad0ba1fd2 100644
--- a/security/heimdal/Makefile
+++ b/security/heimdal/Makefile
@@ -35,6 +35,10 @@ PLIST=		${WRKDIR}/PLIST
 
 .include <bsd.port.pre.mk>
 
+.if ${OSVERSION} > 900007
+BROKEN=		fails to build with new utmpx
+.endif
+
 .if ${ARCH} == "amd64"
 CFLAGS+=	-fPIC
 .endif
diff --git a/security/ipsec-tools/Makefile b/security/ipsec-tools/Makefile
index 97d04838278b..04d101cea4e1 100644
--- a/security/ipsec-tools/Makefile
+++ b/security/ipsec-tools/Makefile
@@ -59,6 +59,10 @@ PORTDOCS=	*
 
 .include <bsd.port.pre.mk>
 
+.if ${OSVERSION} > 900007
+BROKEN=		fails to build with new utmpx
+.endif
+
 .ifdef(WITH_DEBUG)
 CONFIGURE_ARGS+=	--enable-debug
 .else
diff --git a/sysutils/hyperic-sigar/Makefile b/sysutils/hyperic-sigar/Makefile
index 7aff4f760fc2..85d49e5f500b 100644
--- a/sysutils/hyperic-sigar/Makefile
+++ b/sysutils/hyperic-sigar/Makefile
@@ -23,10 +23,16 @@ USE_ANT=	yes
 USE_PERL5_BUILD=yes
 USE_LDCONFIG=	yes
 
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} > 900007
+BROKEN=		fails to build with new utmpx
+.endif
+
 do-install:
 	${MKDIR} ${PREFIX}/include ${PREFIX}/lib ${JAVAJARDIR}
 	${INSTALL_DATA} ${WRKSRC}/sigar-bin/include/*.h ${PREFIX}/include/
 	${INSTALL_DATA} ${WRKSRC}/sigar-bin/lib/libsigar-*.so ${PREFIX}/lib/libsigar.so
 	${INSTALL_DATA} ${WRKSRC}/sigar-bin/lib/sigar.jar ${JAVAJARDIR}/
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/sysutils/sge60/Makefile b/sysutils/sge60/Makefile
index 5ec4dd504f75..3dd366e94c11 100644
--- a/sysutils/sge60/Makefile
+++ b/sysutils/sge60/Makefile
@@ -93,6 +93,10 @@ EXCEPTFILES=	arc_depend_irix.asc arc_depend_solaris.asc man testsuite
 
 .include <bsd.port.pre.mk>
 
+.if ${OSVERSION} > 900007
+BROKEN=		fails to build with new utmpx
+.endif
+
 .if defined(WITH_BDB)
 LIB_DEPENDS=	db-4.2:${PORTSDIR}/databases/db42
 PLIST_SUB+=	BDB_SPOOL=
diff --git a/sysutils/sge61/Makefile b/sysutils/sge61/Makefile
index 6d2b4ff1b635..52f09936fc17 100644
--- a/sysutils/sge61/Makefile
+++ b/sysutils/sge61/Makefile
@@ -98,6 +98,10 @@ EXCEPTFILES=	arc_depend_irix.asc arc_depend_solaris.asc man testsuite
 
 .include <bsd.port.pre.mk>
 
+.if ${OSVERSION} > 900007
+BROKEN=		fails to build with new utmpx
+.endif
+
 .if defined(WITH_BDB)
 LIB_DEPENDS=	db-4.2:${PORTSDIR}/databases/db42
 PLIST_SUB+=	BDB_SPOOL=
diff --git a/sysutils/sge62/Makefile b/sysutils/sge62/Makefile
index 3044ef2f2a75..d33f7b02e12e 100644
--- a/sysutils/sge62/Makefile
+++ b/sysutils/sge62/Makefile
@@ -88,6 +88,8 @@ EXCEPTFILES=	arc_depend_irix.asc arc_depend_solaris.asc man testsuite
 
 .if ${ARCH} == "sparc64"
 BROKEN=		Does not configure on sparc64
+.elif ${OSVERSION} > 900007
+BROKEN=		fails to build with new utmpx
 .endif
 
 .if defined(WITH_BDB)
diff --git a/sysutils/wtmp-tools/Makefile b/sysutils/wtmp-tools/Makefile
index f6962ad9c0ef..042c9a32012a 100644
--- a/sysutils/wtmp-tools/Makefile
+++ b/sysutils/wtmp-tools/Makefile
@@ -19,6 +19,12 @@ MANCOMPRESSED=	yes
 PORTDOCS=	*
 PLIST_FILES=	bin/t2w
 
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} > 900007
+BROKEN=		fails to build with new utmpx
+.endif
+
 post-patch:
 	@${REINPLACE_CMD} -e 's,^prefix.*=.*$$,prefix = ${PREFIX},' \
 		${WRKSRC}/Makefile
@@ -26,4 +32,4 @@ post-patch:
 	@${REINPLACE_CMD} -e '/$$(docdir)\/wtmp-tool/d' ${WRKSRC}/Makefile
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/sysutils/yawho/Makefile b/sysutils/yawho/Makefile
index 2eeb9f617f1d..038e8b0a88bf 100644
--- a/sysutils/yawho/Makefile
+++ b/sysutils/yawho/Makefile
@@ -20,4 +20,10 @@ PLIST_FILES=	bin/yawho
 pre-patch:
 	@${REINPLACE_CMD} -E -e 's/kp_.?proc\.._/ki_/' ${WRKSRC}/process.c
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} > 900007
+BROKEN=		fails to build with new utmpx
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/x11/wterm/Makefile b/x11/wterm/Makefile
index 5a72ffdf1d29..055096037bd2 100644
--- a/x11/wterm/Makefile
+++ b/x11/wterm/Makefile
@@ -28,6 +28,12 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/WINGs"
 MAN1=		wterm.1
 PLIST_FILES=	bin/wterm
 
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} > 900007
+BROKEN=		fails to build with new utmpx
+.endif
+
 post-extract:
 	${RM} -f ${WRKSRC}/config.cache
 	${RM} -f ${WRKSRC}/src/*.o
@@ -35,4 +41,4 @@ post-extract:
 post-install:
 	@${CHMOD} 4711 ${PREFIX}/bin/wterm
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>