--- Makefile.orig	2009-08-22 01:27:45.000000000 +0100
+++ Makefile	2009-10-13 19:47:32.000000000 +0100
@@ -5,12 +5,12 @@
 # $FreeBSD: ports/mail/heirloom-mailx/Makefile,v 1.55 2009/08/22 00:27:45 amdmi3 Exp $
 #
 
-PORTNAME=	mailx
+PORTNAME=	heirloom-mailx
 PORTVERSION=	12.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	mail ipv6
-MASTER_SITES=	SF/heirloom/heirloom-${PORTNAME}/${PORTVERSION}
-PKGNAMEPREFIX=	${MASTER_SITE_SUBDIR}-
+MASTER_SITES=	SF/heirloom/${PORTNAME}/${PORTVERSION}
+DISTNAME=	mailx-${PORTVERSION}
 
 MAINTAINER=	avl@FreeBSD.org
 COMMENT=	BSD mail utility with MIME, IMAP, POP3, SMTP and S/MIME extensions
@@ -29,10 +29,10 @@
 		CPPFLAGS="${CPPFLAGS}" \
 		LDFLAGS="${LDFLAGS}"
 
-MAN1=		${PORTNAME}.1
+MAN1=		mailx.1
 PORTDOCS=	AUTHORS COPYING ChangeLog README TODO
 
-PLIST_FILES=	bin/${PORTNAME} \
+PLIST_FILES=	bin/mailx \
 		"@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"
@@ -47,7 +47,7 @@
 .endif
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/mailx ${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)