--- editors/emacs/Makefile	(revision 468382)
+++ editors/emacs/Makefile	(working copy)
@@ -3,7 +3,7 @@ 
 
 PORTNAME=	emacs
 PORTVERSION=	${EMACS_VER}
-PORTREVISION=	4
+PORTREVISION=	5
 PORTEPOCH=	3
 CATEGORIES=	editors ipv6
 MASTER_SITES=	GNU
@@ -15,6 +15,9 @@ 
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BROKEN_aarch64=	Fails to link: missing sbrk
+
+LIB_DEPENDS+=	liblockfile.so:devel/liblockfile
+
 CONFLICTS_INSTALL=	emacs-devel emacs-devel_nox
 
 FLAVORS=		full canna nox
@@ -32,8 +35,7 @@ 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--localstatedir=/var \
 		--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 \
--- editors/emacs-devel/Makefile	(revision 468382)
+++ editors/emacs-devel/Makefile	(working copy)
@@ -3,7 +3,7 @@ 
 
 PORTNAME=	emacs
 DISTVERSION=	${EMACS_VER}.${EMACS_REV}
-PORTREVISION=	2
+PORTREVISION=	3
 PORTEPOCH=	2
 CATEGORIES=	editors ipv6
 PKGNAMESUFFIX=	-devel
@@ -14,6 +14,8 @@ 
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
+LIB_DEPENDS+=	liblockfile.so:devel/liblockfile
+
 CONFLICTS_INSTALL=	emacs emacs-canna emacs-nox
 
 FLAVORS=		full nox
@@ -31,8 +33,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 \