Index: head/mail/xmailbox/Makefile
===================================================================
--- head/mail/xmailbox/Makefile	(revision 349809)
+++ head/mail/xmailbox/Makefile	(revision 349810)
@@ -1,39 +1,33 @@
 # Created by: Andrey Zakhvatov
 # $FreeBSD$
 
-PORTNAME=		xmailbox
-PORTVERSION=		2.5
-PORTREVISION=		2
-CATEGORIES=		mail
-MASTER_SITES=		${MASTER_SITE_XCONTRIB}
-MASTER_SITE_SUBDIR=	applications
+PORTNAME=	xmailbox
+PORTVERSION=	2.5
+PORTREVISION=	2
+CATEGORIES=	mail
+MASTER_SITES=	XCONTRIB/applications
 
-MAINTAINER=		ports@FreeBSD.org
+MAINTAINER=	freebsd@skysmurf.nl
 COMMENT=	Mailbox checker with sound and animation for X Window System
 
-DEPRECATED=	Unmaintained since 2000
-EXPIRATION_DATE=	2014-04-11
 USES=		imake
 USE_XORG=	xaw
-MAN1=		xmailbox.1
 
-NO_STAGE=	yes
-
 OPTIONS_DEFINE=	DOCS
 
 .include <bsd.port.options.mk>
 
 post-patch:
 	@${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/XMailbox.ad
 
 post-install:
-	@${MKDIR} ${PREFIX}/share/xmailbox
-	${INSTALL_DATA} ${WRKSRC}/dingdong.au ${PREFIX}/share/xmailbox
-	${INSTALL_DATA} ${WRKSRC}/ugotmail.au ${PREFIX}/share/xmailbox
+	@${MKDIR} ${STAGEDIR}${PREFIX}/share/xmailbox
+	${INSTALL_DATA} ${WRKSRC}/dingdong.au ${STAGEDIR}${PREFIX}/share/xmailbox
+	${INSTALL_DATA} ${WRKSRC}/ugotmail.au ${STAGEDIR}${PREFIX}/share/xmailbox
 .if ${PORT_OPTIONS:MDOCS}
-	@${MKDIR} ${PREFIX}/share/doc/xmailbox
-	${INSTALL_DATA} ${WRKSRC}/DISCLAIMER ${PREFIX}/share/doc/xmailbox
-	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/xmailbox
+	@${MKDIR} ${STAGEDIR}${PREFIX}/share/doc/xmailbox
+	${INSTALL_DATA} ${WRKSRC}/DISCLAIMER ${STAGEDIR}${PREFIX}/share/doc/xmailbox
+	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${PREFIX}/share/doc/xmailbox
 .endif
 
 .include <bsd.port.mk>
Index: head/mail/xmailbox/pkg-plist
===================================================================
--- head/mail/xmailbox/pkg-plist	(revision 349809)
+++ head/mail/xmailbox/pkg-plist	(revision 349810)
@@ -1,8 +1,9 @@
 bin/xmailbox
 lib/X11/app-defaults/XMailbox
+man/man1/xmailbox.1.gz
 %%PORTDOCS%%share/doc/xmailbox/DISCLAIMER
 %%PORTDOCS%%share/doc/xmailbox/README
 share/xmailbox/dingdong.au
 share/xmailbox/ugotmail.au
 %%PORTDOCS%%@dirrm share/doc/xmailbox
 @dirrm share/xmailbox