3 files changed, 32 insertions, 15 deletions

diff --git a/mail/heirloom-mailx/Makefile b/mail/heirloom-mailx/Makefile
index 0717b1329ea4..63ad4e786b10 100644
--- a/mail/heirloom-mailx/Makefile
+++ b/mail/heirloom-mailx/Makefile
@@ -5,14 +5,15 @@
 # $FreeBSD$
 #
 
-PORTNAME=	nail
-PORTVERSION=	11.25
+PORTNAME=	mailx
+PORTVERSION=	12.1
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITE_SUBDIR=	heirloom
+PKGNAMEPREFIX=	${MASTER_SITE_SUBDIR}-
 
 MAINTAINER=	ports@logvinov.com
-COMMENT=	BSD mail utility with MIME extensions
+COMMENT=	BSD mail utility with MIME, IMAP, POP3, SMTP, and S/MIME extensions
 
 USE_BZIP2=	yes
 USE_ICONV=	yes
@@ -24,21 +25,29 @@ MAKE_ARGS=	PREFIX="${PREFIX}" \
 		LDFLAGS="${LDFLAGS}" \
 		IPv6="-DHAVE_IPv6_FUNCS"
 
-MAN1=		nail.1
-PLIST_FILES=	bin/nail \
-		"@unexec if cmp -s %D/etc/nail.rc %D/etc/nail.rc.default; then rm -f %D/etc/nail.rc; fi " \
+MAN1=		${PORTNAME}.1
+PORTDOCS=	AUTHORS COPYING ChangeLog README TODO
+
+PLIST_FILES=	bin/${PORTNAME} \
+		"@unexec if cmp -s %D/etc/nail.rc %D/etc/nail.rc.default; then ${RM} -f %D/etc/nail.rc; fi " \
 		"etc/nail.rc.default" \
-		"@exec [ -f %B/nail.rc ] || cp %B/%f %B/nail.rc"
+		"@exec [ -f %B/nail.rc ] || ${CP} %B/%f %B/nail.rc"
 
 CPPFLAGS=	-I${LOCALBASE}/include
 LDFLAGS=	-L${LOCALBASE}/lib
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/nail ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/nail.1 ${MANPREFIX}/man/man1
+	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/${MAN1} ${MAN1PREFIX}/man/man1
 	${INSTALL_DATA} ${WRKSRC}/nail.rc ${PREFIX}/etc/nail.rc.default
 .if !exists(${PREFIX}/etc/nail.rc)
 	${INSTALL_DATA} ${WRKSRC}/nail.rc ${PREFIX}/etc
 .endif
+.if !defined(NOPORTDOCS)
+	@${MKDIR} ${DOCSDIR}
+.for i in ${PORTDOCS}
+	${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}
+.endfor
+.endif
 
 .include <bsd.port.mk>
diff --git a/mail/heirloom-mailx/distinfo b/mail/heirloom-mailx/distinfo
index 9f928a83a4e9..54a96f28462d 100644
--- a/mail/heirloom-mailx/distinfo
+++ b/mail/heirloom-mailx/distinfo
@@ -1,3 +1,3 @@
-MD5 (nail-11.25.tar.bz2) = 54f42db31911d734fcf37a89b72d4df7
-SHA256 (nail-11.25.tar.bz2) = ae831aa7ebee1a348d84cb37228fe784b32c6ccf2d06edfba141de8f165515c5
-SIZE (nail-11.25.tar.bz2) = 267959
+MD5 (mailx-12.1.tar.bz2) = b78962f9384a9134adeb9ba1619aa6da
+SHA256 (mailx-12.1.tar.bz2) = 8f14933d3bca269b142ffac7b628d5a153e29d771d5430433edb444bfb3fdb9b
+SIZE (mailx-12.1.tar.bz2) = 268853
diff --git a/mail/heirloom-mailx/pkg-descr b/mail/heirloom-mailx/pkg-descr
index 0b4272e2f2f4..60b4b5b690b5 100644
--- a/mail/heirloom-mailx/pkg-descr
+++ b/mail/heirloom-mailx/pkg-descr
@@ -1,3 +1,11 @@
-BSD mail utility with MIME extensions
+Heirloom mailx (formerly known as "nail") is derived from Berkeley
+Mail and provides the functionality of the System V and POSIX mailx
+commands. Additional features include support for MIME, IMAP
+(including caching and disconnected use), POP3, SMTP, S/MIME,
+international character sets, maildir folders, message threading,
+powerful search methods, scoring, and a Bayesian junk mail filter.
+Mailx can be used as a mail batch language in nearly the same way as
+it is used interactively. It can thus act as a mailbox filter, can
+fetch mail from remote accounts, and can send files as attachments.
 
-WWW: http://nail.sourceforge.net/
+WWW: http://heirloom.sourceforge.net/mailx.html