Index: head/mail/xmail/Makefile
===================================================================
--- head/mail/xmail/Makefile	(revision 547269)
+++ head/mail/xmail/Makefile	(revision 547270)
@@ -1,17 +1,24 @@
 # Created by: Stephen Roznowski <sjr1@flash.net>
 # $FreeBSD$
 
 PORTNAME=	xmail
 PORTVERSION=	1.6
 PORTREVISION=	2
 CATEGORIES=	mail
 MASTER_SITES=	XCONTRIB/applications
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
 MAINTAINER=	sjroz@verizon.net
 COMMENT=	X-based interface to the Berkeley mail program
 
+LICENSE=	MIT
+LICENSE_FILE=	${WRKSRC}/COPYRIGHT
+
 USES=		imake xorg
-USE_XORG=	xbitmaps xaw
+USE_XORG=	ice sm x11 xaw xbitmaps xext xmu xpm xt
+
+post-patch:
+# Fix the build with -fno-common (for Clang 11 and GCC 10)
+	@${REINPLACE_CMD} -e '/In_Bogus_Mail_File;/d' ${WRKSRC}/xmail.c
 
 .include <bsd.port.mk>