diff --git a/sysutils/lsof/Makefile b/sysutils/lsof/Makefile
index c10c57817ede..c6c08d52beb5 100644
--- a/sysutils/lsof/Makefile
+++ b/sysutils/lsof/Makefile
@@ -1,81 +1,85 @@
 # ex:ts=8
 # Ports collection makefile for:  lsof
 # Date created:			  Sat July 20, 1996
 # Whom:				  David O'Brien (obrien@FreeBSD.org)
 #
 # $FreeBSD$
 #
 
 PORTNAME=	lsof
-PORTVERSION=	4.56.3
+PORTVERSION=	4.56.4
 CATEGORIES=	sysutils
 MASTER_SITES=	ftp://vic.cc.purdue.edu/pub/tools/unix/lsof/  \
 		ftp://vic.cc.purdue.edu/pub/tools/unix/lsof/NEW/ \
 		ftp://ftp.cert.dfn.de/pub/tools/admin/lsof/  \
 		ftp://ftp.cert.dfn.de/pub/tools/admin/lsof/NEW/  \
 		ftp://ftp.auscert.org.au/pub/mirrors/vic.cc.purdue.edu/lsof/  \
 		ftp://ftp.web.ad.jp/pub/UNIX/tools/lsof/  \
 		ftp://ftp.web.ad.jp/pub/UNIX/tools/lsof/NEW/  \
 		ftp://ftp.sunet.se/pub/unix/admin/lsof/  \
 		ftp://ftp.sunet.se/pub/unix/admin/lsof/NEW/
 #DISTNAME=	${PORTNAME}_${PORTVERSION}_W
-DISTNAME=	${PORTNAME}_4.57C.freebsd
+DISTNAME=	${PORTNAME}_4.57D.freebsd
 
 MAINTAINER=	obrien@FreeBSD.org
 
 WRKSRC=		${WRKDIR}/${SRCBALL_NAME}
 HAS_CONFIGURE=	yes
 CONFIGURE_SCRIPT=	Configure
 CONFIGURE_ARGS=	-n freebsd
 CONFIGURE_ENV=	LSOF_CC="${CC}"
 FREEBSD_SYS?=	/usr/src/sys
 MAN8=		lsof.8
 
-.if defined(PACKAGE_BUILDING)
-.if !exists(${FREEBSD_SYS}/miscfs/fdesc/fdesc.h)
-BROKEN=	'please install kernel source for official package builds'
-.endif
-.endif
-
 SRCBALL_NAME=	${DISTNAME:S/_W$//}
 
 post-extract:
 	@( cd ${WRKDIR} ; \
 	EXPMD5=`${GREP} MD5 README.${SRCBALL_NAME} | ${SED} 's/^[ ]*//'` ; \
 	CALCMD5=`${MD5} ${SRCBALL_NAME}.tar` ; \
 	if [ "$${EXPMD5}"X != "$${CALCMD5}"X ]; then \
 		${ECHO} "Expected and calculated MD5 signatures don't agree." ; \
 		${ECHO} "($$EXPMD5 != $$CALCMD5)" ; \
 		exit 1 ; \
 	fi ; \
 	${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS:S/z//} ${SRCBALL_NAME}.tar \
 	${EXTRACT_AFTER_ARGS} \
 	)
 	@( cd ${WRKSRC} ; ${ECHO} "y" | ./Inventory || exit 1 )
 
 #pre-patch:
 #	@${ECHO_MSG} "===>  Applying distribution patches for ${PKGNAME}"
 #	@${SED} -e "s|^--- d|--- dialects/freebsd/d|"  \
 #		${DISTDIR}/freebsd_3.0_patch > ${WRKDIR}/p
 #	${PATCH} ${PATCH_DIST_ARGS} < ${WRKDIR}/p
 
 do-install:
 	${INSTALL} ${COPY} ${STRIP} -o ${BINOWN} -m 2755 -g kmem ${WRKSRC}/lsof ${PREFIX}/sbin
 	${INSTALL_MAN} ${WRKSRC}/lsof.8 ${PREFIX}/man/man8/lsof.8
 	@${MKDIR} ${PREFIX}/share/lsof
 	${INSTALL_SCRIPT} ${WRKSRC}/scripts/* ${PREFIX}/share/lsof
 	@${CHMOD} 0444 ${PREFIX}/share/lsof/00*
 
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} < 500019
 .if !exists(${FREEBSD_SYS}/miscfs/fdesc/fdesc.h)
-post-install:
+.if defined(PACKAGE_BUILDING)
+BROKEN=	'please install kernel source for official package builds'
+.endif
+
+pre-configure:
+	@${ECHO} ""
 	@${ECHO} "************************************************************"
 	@${ECHO} "*                      W a r n i n g                       *"
 	@${ECHO} "* A more capable version of LSOF is built if you have      *"
 	@${ECHO} "* the complete kernel source installed.                    *"
 	@${ECHO} "* If your kernel sources are somewhere other than          *"
 	@${ECHO} "* /usr/src/sys, you may set the FREEBSD_SYS variable       *"
 	@${ECHO} "* to the correct path.                                     *"
 	@${ECHO} "************************************************************"
+	@${ECHO} ""
+.endif
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/sysutils/lsof/distinfo b/sysutils/lsof/distinfo
index f23607553148..cc8eef5a4608 100644
--- a/sysutils/lsof/distinfo
+++ b/sysutils/lsof/distinfo
@@ -1 +1 @@
-MD5 (lsof_4.57C.freebsd.tar.gz) = e5f68722c716bc497af45b250bb3eb38
+MD5 (lsof_4.57D.freebsd.tar.gz) = e42cb1d4643bb4915ab887ecabcd47e2