4 files changed, 27 insertions, 23 deletions

diff --git a/mail/pop-before-smtp/Makefile b/mail/pop-before-smtp/Makefile
index dc52728b6b06..5035de2c4656 100644
--- a/mail/pop-before-smtp/Makefile
+++ b/mail/pop-before-smtp/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	pop-before-smtp
-PORTVERSION=	1.35
+PORTVERSION=	1.37
 CATEGORIES=	mail perl5
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	popbsmtp
@@ -23,10 +23,10 @@ RUN_DEPENDS=	${SITE_PERL}/File/Tail.pm:${PORTSDIR}/devel/p5-File-Tail \
 NO_BUILD=	yes
 USE_PERL5=	yes
 USE_REINPLACE=	yes
-
+POD2MAN?=	pod2man
 PKGMESSAGE=	${WRKDIR}/.pkg-message
-
 DOCSDIR=	${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME}
+MAN8=		${PORTNAME}.8
 
 # Override this as you see fit
 POPBSMTP_RC_SCRIPT?=	${PREFIX}/etc/rc.d/pop-before-smtp.sh.sample
@@ -36,6 +36,9 @@ post-patch:
 		s|/etc/postfix/pop-before-smtp|${PREFIX}/etc/postfix/pop-before-smtp|g;' \
 		${WRKSRC}/pop-before-smtp
 
+pre-install:
+	@${POD2MAN} ${WRKSRC}/${PORTNAME} > ${PREFIX}/man/man8/${PORTNAME}.8
+
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/pop-before-smtp ${PREFIX}/sbin
 	${INSTALL_SCRIPT} \
@@ -46,15 +49,15 @@ do-install:
 	@${CHMOD} 755 ${POPBSMTP_RC_SCRIPT}
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
-.for file in COPYING ChangeLog README TODO
-	${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
+.for FILE in COPYING ChangeLog README TODO
+	${INSTALL_DATA} ${WRKSRC}/${FILE} ${DOCSDIR}
 .endfor
-.for file in README.QUICKSTART README.rootless-install
-	${INSTALL_DATA} ${WRKSRC}/contrib/${file} ${DOCSDIR}
+.for FILE in README.QUICKSTART README.rootless-install popauth.m4
+	${INSTALL_DATA} ${WRKSRC}/contrib/${FILE} ${DOCSDIR}
 .endfor
 	@${MKDIR} ${DOCSDIR}/popa3d
-.for file in README popa3d-0.4.patch
-	${INSTALL_DATA} ${WRKSRC}/contrib/popa3d/${file} ${DOCSDIR}/popa3d
+.for FILE in README popa3d-0.4.patch popa3d-0.6.4.patch
+	${INSTALL_DATA} ${WRKSRC}/contrib/popa3d/${FILE} ${DOCSDIR}/popa3d
 .endfor
 .endif
 
diff --git a/mail/pop-before-smtp/distinfo b/mail/pop-before-smtp/distinfo
index b61e55908d6e..4a3063377e34 100644
--- a/mail/pop-before-smtp/distinfo
+++ b/mail/pop-before-smtp/distinfo
@@ -1,2 +1,2 @@
-MD5 (pop-before-smtp-1.35.tar.gz) = c5f8d8ca835d690bf7105e9138232e26
-SIZE (pop-before-smtp-1.35.tar.gz) = 31885
+MD5 (pop-before-smtp-1.37.tar.gz) = 8c1fc935708163168f7870ccf730fc0e
+SIZE (pop-before-smtp-1.37.tar.gz) = 36249
diff --git a/mail/pop-before-smtp/pkg-message b/mail/pop-before-smtp/pkg-message
index 2189d2323fba..c9f547be9014 100644
--- a/mail/pop-before-smtp/pkg-message
+++ b/mail/pop-before-smtp/pkg-message
@@ -14,6 +14,4 @@
 *	'%PREFIX%/etc/pop-before-smtp.conf.pl.sample' and		*
 *	'%PREFIX%/share/docs/pop-before-smtp'.			*
 *									*
-*	There is no man page.						*
-*									*
 *************************************************************************
diff --git a/mail/pop-before-smtp/pkg-plist b/mail/pop-before-smtp/pkg-plist
index 26a619971a82..bcc73914cdf4 100644
--- a/mail/pop-before-smtp/pkg-plist
+++ b/mail/pop-before-smtp/pkg-plist
@@ -1,13 +1,16 @@
+@comment $FreeBSD$
 etc/pop-before-smtp-conf.pl.sample
 etc/rc.d/pop-before-smtp.sh.sample
 sbin/pop-before-smtp
-share/doc/pop-before-smtp/COPYING
-share/doc/pop-before-smtp/ChangeLog
-share/doc/pop-before-smtp/README
-share/doc/pop-before-smtp/README.QUICKSTART
-share/doc/pop-before-smtp/README.rootless-install
-share/doc/pop-before-smtp/TODO
-share/doc/pop-before-smtp/popa3d/README
-share/doc/pop-before-smtp/popa3d/popa3d-0.4.patch
-@dirrm share/doc/pop-before-smtp/popa3d
-@dirrm share/doc/pop-before-smtp
+%%PORTDOCS%%%%DOCSDIR%%/COPYING
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/README.QUICKSTART
+%%PORTDOCS%%%%DOCSDIR%%/README.rootless-install
+%%PORTDOCS%%%%DOCSDIR%%/popauth.m4
+%%PORTDOCS%%%%DOCSDIR%%/TODO
+%%PORTDOCS%%%%DOCSDIR%%/popa3d/README
+%%PORTDOCS%%%%DOCSDIR%%/popa3d/popa3d-0.4.patch
+%%PORTDOCS%%%%DOCSDIR%%/popa3d/popa3d-0.6.4.patch
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/popa3d
+%%PORTDOCS%%@dirrm %%DOCSDIR%%