Index: editors/emacs/Makefile
===================================================================
--- editors/emacs/Makefile	(revision 471374)
+++ editors/emacs/Makefile	(working copy)
@@ -163,10 +163,11 @@
 M17N_CONFIGURE_WITH=	m17n-flt
 MAGICK_LIB_DEPENDS=	libMagickCore-6.so:graphics/ImageMagick
 MAGICK_CONFIGURE_WITH=	imagemagick
+MAILUTILS_CONFIGURE_ENV_OFF=	ac_cv_prog_liblockfile=no ac_cv_lib_lockfile_maillock=no
 MAILUTILS_CONFIGURE_WITH=	mailutils
 MAILUTILS_LIB_DEPENDS=	libmailutils.so:mail/mailutils
+MAILUTILS_PLIST_FILES_OFF=	libexec/emacs/${EMACS_VER}/${CONFIGURE_TARGET}/movemail
 MODULES_CONFIGURE_WITH=	modules
-MAILUTILS_PLIST_FILES_OFF=	libexec/emacs/${EMACS_VER}/${CONFIGURE_TARGET}/movemail
 MOTIF_USES=		motif
 MOTIF_CONFIGURE_ON=	--with-x-toolkit=motif
 MOTIF_LIB_DEPENDS=	libXp.so:x11/libXp
Index: editors/emacs-devel/Makefile
===================================================================
--- editors/emacs-devel/Makefile	(revision 471374)
+++ editors/emacs-devel/Makefile	(working copy)
@@ -30,8 +30,7 @@
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-gameuser=games:games
-CONFIGURE_ENV=	ac_cv_header_sys_sysinfo_h=no \
-		ac_cv_prog_liblockfile=no
+CONFIGURE_ENV=	ac_cv_header_sys_sysinfo_h=no
 INFO=		ada-mode auth autotype bovine calc ccmode cl dbus dired-x \
 		ebrowse ede ediff edt efaq eieio eintr elisp emacs emacs-gnutls \
 		emacs-mime epa erc ert eshell eudc eww flymake forms gnus \
@@ -122,6 +121,7 @@
 M17N_IMPLIES=		XFT
 MAGICK_LIB_DEPENDS=	libMagickCore-6.so:graphics/ImageMagick
 MAGICK_CONFIGURE_WITH=	imagemagick
+MAILUTILS_CONFIGURE_ENV_OFF=	ac_cv_prog_liblockfile=no ac_cv_lib_lockfile_maillock=no
 MAILUTILS_CONFIGURE_WITH=	mailutils
 MAILUTILS_LIB_DEPENDS=	libmailutils.so:mail/mailutils
 MODULES_CONFIGURE_WITH=	modules