Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/shells/zsh/Makefile,v
retrieving revision 1.129
diff -u -r1.129 Makefile
--- Makefile	6 Nov 2011 18:35:06 -0000	1.129
+++ Makefile	13 Nov 2011 10:45:12 -0000
@@ -66,6 +66,12 @@
 
 .include <bsd.port.pre.mk>
 
+# This port won't build with both utmpx.h and utmp.h existing; this scenario
+# will happen if a system has been upgraded from <900007 without make delete-old
+.if ${OSVERSION} >= 900007 && exists(/usr/include/utmp.h)
+IGNORE=	/usr/include/utmp.h should not exist on this system, please remove it.  It has been replaced by utmpx.h
+.endif
+
 .if defined(WITH_ZSH_GDBM)
 LIB_DEPENDS+=		gdbm.4:${PORTSDIR}/databases/gdbm
 PLIST_SUB+=		GDBM=""
Index: files/patch-Src_watch.c
===================================================================
RCS file: files/patch-Src_watch.c
diff -N files/patch-Src_watch.c
--- files/patch-Src_watch.c	13 Nov 2011 09:56:07 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,15 +0,0 @@
---- Src/watch.c.orig	2011-11-13 10:39:47.736213000 +0100
-+++ Src/watch.c	2011-11-13 10:47:22.110214518 +0100
-@@ -30,8 +30,11 @@
- #include "zsh.mdh"
- 
- /* Headers for utmp/utmpx structures */
--#ifdef HAVE_UTMP_H
-+#if defined(HAVE_UTMP_H) && !defined(HAVE_UTMPX_H)
- # include <utmp.h>
-+#else
-+# undef HAVE_STRUCT_UTMP
-+# undef HAVE_STRUCT_UTMP_UT_HOST
- #endif
- #ifdef HAVE_UTMPX_H
- # include <utmpx.h>