20 files changed, 78 insertions, 125 deletions

diff --git a/mail/elm+ME/Makefile b/mail/elm+ME/Makefile
index 30f89a5dc016..a7a8ce6640de 100644
--- a/mail/elm+ME/Makefile
+++ b/mail/elm+ME/Makefile
@@ -4,7 +4,7 @@
 # Date created:         26 June 1995
 # Whom:                 ache
 #
-# $Id: Makefile,v 1.31 1996/10/03 19:07:54 ache Exp $
+# $Id: Makefile,v 1.32 1996/11/10 21:31:04 obrien Exp $
 #
 
 DISTNAME=       elm-2.4ME+28
@@ -16,6 +16,8 @@ MASTER_SITES=   ftp://dionysos.fmi.fi/KEH/ \
 MAINTAINER=	ache@FreeBSD.ORG
 
 WRKSRC=         ${WRKDIR}/elm2.4.ME+.28
+MAN1=		answer.1 checkalias.1 elm.1 elmalias.1 fastmail.1 filter.1 \
+		listalias.1 messages.1 newalias.1 printmail.1 readmsg.1
 
 post-install:
 	cd ${WRKSRC}/nls; ${MAKE} install
diff --git a/mail/elm/Makefile b/mail/elm/Makefile
index 30f89a5dc016..a7a8ce6640de 100644
--- a/mail/elm/Makefile
+++ b/mail/elm/Makefile
@@ -4,7 +4,7 @@
 # Date created:         26 June 1995
 # Whom:                 ache
 #
-# $Id: Makefile,v 1.31 1996/10/03 19:07:54 ache Exp $
+# $Id: Makefile,v 1.32 1996/11/10 21:31:04 obrien Exp $
 #
 
 DISTNAME=       elm-2.4ME+28
@@ -16,6 +16,8 @@ MASTER_SITES=   ftp://dionysos.fmi.fi/KEH/ \
 MAINTAINER=	ache@FreeBSD.ORG
 
 WRKSRC=         ${WRKDIR}/elm2.4.ME+.28
+MAN1=		answer.1 checkalias.1 elm.1 elmalias.1 fastmail.1 filter.1 \
+		listalias.1 messages.1 newalias.1 printmail.1 readmsg.1
 
 post-install:
 	cd ${WRKSRC}/nls; ${MAKE} install
diff --git a/mail/exim-devel/Makefile b/mail/exim-devel/Makefile
index d7ad32ae3d24..ad7ad03afb81 100644
--- a/mail/exim-devel/Makefile
+++ b/mail/exim-devel/Makefile
@@ -3,7 +3,7 @@
 # Date created:		23 June 1996
 # Whom:			markm
 #
-# $Id: Makefile,v 1.4 1996/11/10 21:31:17 obrien Exp $
+# $Id: Makefile,v 1.5 1996/11/13 18:11:57 markm Exp $
 #
 
 DISTNAME=	exim-1.58
@@ -14,9 +14,9 @@ DISTFILES=	exim-1.58.tar.gz exim-texinfo-1.58.tar.gz
 MAINTAINER=	markm@FreeBSD.ORG
 
 do-configure:
-	mkdir ${WRKSRC}/Local
-	cp ${FILESDIR}/Makefile ${WRKSRC}/Local
-	cp ${FILESDIR}/eximon.conf ${WRKSRC}/Local
+	${MKDIR} ${WRKSRC}/Local
+	${CP} ${FILESDIR}/Makefile ${WRKSRC}/Local
+	${CP} ${FILESDIR}/eximon.conf ${WRKSRC}/Local
 	(cd ${WRKSRC}/doc ; ln -s ../../exim-texinfo-1.58/doc/* )
 
 .include <bsd.port.mk>
diff --git a/mail/exim-old/Makefile b/mail/exim-old/Makefile
index d7ad32ae3d24..ad7ad03afb81 100644
--- a/mail/exim-old/Makefile
+++ b/mail/exim-old/Makefile
@@ -3,7 +3,7 @@
 # Date created:		23 June 1996
 # Whom:			markm
 #
-# $Id: Makefile,v 1.4 1996/11/10 21:31:17 obrien Exp $
+# $Id: Makefile,v 1.5 1996/11/13 18:11:57 markm Exp $
 #
 
 DISTNAME=	exim-1.58
@@ -14,9 +14,9 @@ DISTFILES=	exim-1.58.tar.gz exim-texinfo-1.58.tar.gz
 MAINTAINER=	markm@FreeBSD.ORG
 
 do-configure:
-	mkdir ${WRKSRC}/Local
-	cp ${FILESDIR}/Makefile ${WRKSRC}/Local
-	cp ${FILESDIR}/eximon.conf ${WRKSRC}/Local
+	${MKDIR} ${WRKSRC}/Local
+	${CP} ${FILESDIR}/Makefile ${WRKSRC}/Local
+	${CP} ${FILESDIR}/eximon.conf ${WRKSRC}/Local
 	(cd ${WRKSRC}/doc ; ln -s ../../exim-texinfo-1.58/doc/* )
 
 .include <bsd.port.mk>
diff --git a/mail/exim/Makefile b/mail/exim/Makefile
index d7ad32ae3d24..ad7ad03afb81 100644
--- a/mail/exim/Makefile
+++ b/mail/exim/Makefile
@@ -3,7 +3,7 @@
 # Date created:		23 June 1996
 # Whom:			markm
 #
-# $Id: Makefile,v 1.4 1996/11/10 21:31:17 obrien Exp $
+# $Id: Makefile,v 1.5 1996/11/13 18:11:57 markm Exp $
 #
 
 DISTNAME=	exim-1.58
@@ -14,9 +14,9 @@ DISTFILES=	exim-1.58.tar.gz exim-texinfo-1.58.tar.gz
 MAINTAINER=	markm@FreeBSD.ORG
 
 do-configure:
-	mkdir ${WRKSRC}/Local
-	cp ${FILESDIR}/Makefile ${WRKSRC}/Local
-	cp ${FILESDIR}/eximon.conf ${WRKSRC}/Local
+	${MKDIR} ${WRKSRC}/Local
+	${CP} ${FILESDIR}/Makefile ${WRKSRC}/Local
+	${CP} ${FILESDIR}/eximon.conf ${WRKSRC}/Local
 	(cd ${WRKSRC}/doc ; ln -s ../../exim-texinfo-1.58/doc/* )
 
 .include <bsd.port.mk>
diff --git a/mail/exmh2/Makefile b/mail/exmh2/Makefile
index 1479a9f503be..b69d4dc7427a 100644
--- a/mail/exmh2/Makefile
+++ b/mail/exmh2/Makefile
@@ -3,7 +3,7 @@
 # Date released:		10 Oct 96
 # Whom:				Peter Wemm <peter@freebsd.org>
 #
-# $Id: Makefile,v 1.2 1996/10/15 11:27:26 peter Exp $
+# $Id: Makefile,v 1.3 1996/11/10 21:31:21 obrien Exp $
 #
 
 DISTNAME=	exmh-1.6.9
@@ -31,6 +31,8 @@ RUN_DEPENDS+=	mmencode:${PORTSDIR}/mail/metamail
 # faces
 # play
 
+MAN1=		exmh-custom.1 exmh-ref.1 exmh-use.1 exmh.1
+
 post-extract:
 	@rm -rf ${WRKSRC}/lib/*.orig
 
@@ -42,11 +44,5 @@ do-build:
 do-install:
 	@cd ${WRKSRC} && ${SETENV} PREFIX=${PREFIX} \
 		WRKSRC=${WRKSRC} ${SCRIPTDIR}/install
-.if !defined(NOMANCOMPRESS)
-	gzip -9f ${PREFIX}/man/man1/exmh-custom.1
-	gzip -9f ${PREFIX}/man/man1/exmh-ref.1
-	gzip -9f ${PREFIX}/man/man1/exmh-use.1
-	gzip -9f ${PREFIX}/man/man1/exmh.1
-.endif
 
 .include <bsd.port.mk>
diff --git a/mail/mailagent/Makefile b/mail/mailagent/Makefile
index cf601063460a..e0fd790e6b97 100644
--- a/mail/mailagent/Makefile
+++ b/mail/mailagent/Makefile
@@ -3,7 +3,7 @@
 # Date created:			23 Sep 1996
 # Whom:				Masafumi NAKANE <max@FreeBSD.ORG>
 #
-# $Id: Makefile,v 1.2 1996/11/02 20:24:00 max Exp $
+# $Id: Makefile,v 1.3 1996/11/10 21:31:33 obrien Exp $
 #
 
 DISTNAME=	mailagent-3.0pl44
@@ -30,14 +30,9 @@ CONFIGURE_ARGS=		-dres \
 			-Dnotifypatches='false'
 INSTALL_TARGET=	install install.man
 
-MANPAGES=			edusers.1 mailagent.1 maildist.1  \
-				maillist.1 mailpatch.1 package.1
+MAN1=			edusers.1 mailagent.1 maildist.1  \
+			maillist.1 mailpatch.1 package.1
 # Note that mailhelp.1 is intentionally left uncompressed as it is referred
 # from several other man pages with .so macro.
 
-post-install:
-.for manpage in ${MANPAGES}
-	${COMPRESS_MAN} ${PREFIX}/man/man1/${manpage}
-.endfor
-
 .include <bsd.port.mk>
diff --git a/mail/majordomo/Makefile b/mail/majordomo/Makefile
index 1719503f3aba..fdab592b373b 100644
--- a/mail/majordomo/Makefile
+++ b/mail/majordomo/Makefile
@@ -3,7 +3,7 @@
 # Date created:		23 October 1996
 # Whom:			jfitz@FreeBSD.ORG
 #
-# $Id: Makefile,v 1.2 1996/10/26 18:21:06 jfitz Exp $
+# $Id: Makefile,v 1.3 1996/11/10 21:31:37 obrien Exp $
 #
 
 DISTNAME=	majordomo-1.94
@@ -20,6 +20,8 @@ IS_INTERACTIVE= yes
 NO_PACKAGE=	yes
 ALL_TARGET=	wrapper
 INSTALL_TARGET=	install install-wrapper
+MAN1=		approve.1 bounce-remind.1 digest.1
+MAN8=		majordomo.8
 
 pre-configure:
 		@ ${SETENV} ${MAKE_ENV} /usr/bin/perl ${SCRIPTDIR}/createuser
@@ -56,12 +58,6 @@ post-install:
 		@ ln -sf ${PREFIX}/majordomo/lists/test-l.info ${PREFIX}/majordomo/lists/test-l-digest.info
 		@ ln -sf ${PREFIX}/majordomo/lists/test-l.passwd ${PREFIX}/majordomo/lists/test-l-digest.passwd
 		@ /bin/chmod 660 ${PREFIX}/majordomo/lists/test-l.passwd
-.if !defined(NOMANCOMPRESS)
-		@ for file in approve bounce-remind digest; do \
-			gzip -9nf ${PREFIX}/man/man1/$$file.1; \
-		done
-		@ gzip -9nf ${PREFIX}/man/man8/majordomo.8
-.endif
 		@ /usr/sbin/chown -R majordom.majordom ${PREFIX}/majordomo/lists
 		@ /bin/chmod -R 664 ${PREFIX}/majordomo/lists
 		@ /bin/chmod 775 ${PREFIX}/majordomo/lists
diff --git a/mail/metamail/Makefile b/mail/metamail/Makefile
index b8b2878e27a3..35d803aba07d 100644
--- a/mail/metamail/Makefile
+++ b/mail/metamail/Makefile
@@ -3,7 +3,7 @@
 # Date created:		17 Oct 1994
 # Whom:			torstenb
 #
-# $Id: Makefile,v 1.5 1995/05/06 00:23:00 torstenb Exp $
+# $Id: Makefile,v 1.6 1996/11/10 21:31:44 obrien Exp $
 #
 
 DISTNAME=	mm2.7
@@ -15,18 +15,12 @@ EXTRACT_SUFX=	.tar.Z
 MAINTAINER=	torstenb@FreeBSD.ORG
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/src
-
-post-install:
-	gzip -9nf ${PREFIX}/man/man1/audiocompose.1 \
-	${PREFIX}/man/man1/audiosend.1 ${PREFIX}/man/man1/extcompose.1 \
-	${PREFIX}/man/man1/getfilename.1 ${PREFIX}/man/man1/mailto-hebrew.1 \
-	${PREFIX}/man/man1/mailto.1 ${PREFIX}/man/man1/metamail.1 \
-	${PREFIX}/man/man1/metasend.1 ${PREFIX}/man/man1/mime.1 \
-	${PREFIX}/man/man1/mimencode.1 ${PREFIX}/man/man1/mmencode.1 \
-	${PREFIX}/man/man1/patch-metamail.1 ${PREFIX}/man/man1/richtext.1 \
-	${PREFIX}/man/man1/showaudio.1 ${PREFIX}/man/man1/showexternal.1 \
-	${PREFIX}/man/man1/shownonascii.1 ${PREFIX}/man/man1/showpartial.1 \
-	${PREFIX}/man/man1/showpicture.1 ${PREFIX}/man/man1/splitmail.1 \
-	${PREFIX}/man/man4/mailcap.4
+MAN1= 		gcaudiocompose.1 gcaudiosend.1 gcextcompose.1 \
+		gcgetfilename.1 gcmailto-hebrew.1 gcmailto.1 gcmetamail.1 \
+		gcmetasend.1 gcmime.1 gcmimencode.1 gcmmencode.1 \
+		gcpatch-metamail.1 gcrichtext.1 gcshowaudio.1 \
+		gcshowexternal.1 gcshownonascii.1 gcshowpartial.1 \
+		gcshowpicture.1 gcsplitmail.1 \
+MAN4=		mailcap.4
 
 .include <bsd.port.mk>
diff --git a/mail/mh/Makefile b/mail/mh/Makefile
index c5b05945e026..1f0078d8988e 100644
--- a/mail/mh/Makefile
+++ b/mail/mh/Makefile
@@ -3,7 +3,7 @@
 # Date created:		Oct 4, 1994
 # Whom:			pst
 #
-# $Id: Makefile,v 1.9 1996/04/27 19:16:34 pst Exp $
+# $Id: Makefile,v 1.10 1996/11/10 21:31:50 obrien Exp $
 #
 
 DISTNAME=	mh-6.8.3
@@ -17,22 +17,15 @@ PATCHFILES=	MH.6.8.4.Z
 
 MAINTAINER=	pst@FreeBSD.ORG
 
-MHMAN=	man1/ali.1 man1/anno.1 man1/burst.1 man1/comp.1 man1/dist.1 \
-	man1/folder.1 man1/forw.1 man1/inc.1 man1/mark.1 man1/mh-chart.1 \
-	man1/mh.1 man1/mhl.1 man1/mhook.1 man1/mhmail.1 man1/mhn.1 \
-	man1/mhparam.1 man1/mhpath.1 man1/msgchk.1 man1/msh.1 man1/next.1 \
-	man1/packf.1 man1/pick.1 man1/prev.1 man1/prompter.1 man1/rcvstore.1 \
-	man1/refile.1 man1/repl.1 man1/rmf.1 man1/rmm.1 man1/scan.1 \
-	man1/send.1 man1/show.1 man1/slocal.1 man1/sortm.1 man1/vmh.1 \
-	man1/whatnow.1 man1/whom.1 man5/mh-alias.5 man5/mh-format.5 \
-	man5/mh-mail.5 man5/mh-profile.5 man5/mh-sequence.5 man5/mh-tailor.5 \
-	man8/ap.8 man8/conflict.8 man8/dp.8 man8/install-mh.8 man8/post.8 \
-	man8/fmtdump.8
+MAN1=	ali.1 anno.1 burst.1 comp.1 dist.1 folder.1 forw.1 inc.1 mark.1  \
+	mh-chart.1 mh.1 mhl.1 mhook.1 mhmail.1 mhn.1 mhparam.1 mhpath.1  \
+	msgchk.1 msh.1 next.1 packf.1 pick.1 prev.1 prompter.1 rcvstore.1 \
+	refile.1 repl.1 rmf.1 rmm.1 scan.1 send.1 show.1 slocal.1 sortm.1  \
+	vmh.1 whatnow.1 whom.1
+MAN5=	mh-alias.5 mh-format.5 mh-mail.5 mh-profile.5 mh-sequence.5 mh-tailor.5 
+MAN8=	ap.8 conflict.8 dp.8 install-mh.8 post.8 fmtdump.8
 
 post-install:
 	/sbin/ldconfig -m ${PREFIX}/lib
-.if !defined(NOMANCOMPRESS)
-	for m in ${MHMAN}; do gzip -9nf ${PREFIX}/man/$$m; done
-.endif
 
 .include <bsd.port.mk>
diff --git a/mail/mutt-devel/Makefile b/mail/mutt-devel/Makefile
index 09c21d8bbb00..16231ec01996 100644
--- a/mail/mutt-devel/Makefile
+++ b/mail/mutt-devel/Makefile
@@ -4,7 +4,7 @@
 # Date created:         Thur July 25, 1996
 # Whom:                 David O'Brien (obrien@cs.ucdavis.edu)
 #
-# $Id: Makefile,v 1.2 1996/11/10 20:19:54 obrien Exp $
+# $Id: Makefile,v 1.3 1996/11/11 18:37:07 obrien Exp $
 
 DISTNAME=	${PKGNAME}-export
 PKGNAME=	mutt-0.49
@@ -34,12 +34,12 @@ DIST_SUBDIR=	Mutt
 WRKSRC=		${WRKDIR}/${PKGNAME}
 PATCH_DIST_STRIP=	
 GNU_CONFIGURE=	yes
+MAN1=		mutt.1
 
 
 post-install:
 	@####   don't strip until out of beta peroid
 	@#strip ${PREFIX}/bin/mutt
-	@gzip -9nf ${PREFIX}/man/man1/mutt.1
 .if !defined(NOPORTDOCS)
 	@${ECHO} "Installing Mutt documentation"
 	@${MKDIR} ${PREFIX}/share/doc/mutt && chmod a+rx ${PREFIX}/share/doc/mutt
diff --git a/mail/mutt/Makefile b/mail/mutt/Makefile
index 09c21d8bbb00..16231ec01996 100644
--- a/mail/mutt/Makefile
+++ b/mail/mutt/Makefile
@@ -4,7 +4,7 @@
 # Date created:         Thur July 25, 1996
 # Whom:                 David O'Brien (obrien@cs.ucdavis.edu)
 #
-# $Id: Makefile,v 1.2 1996/11/10 20:19:54 obrien Exp $
+# $Id: Makefile,v 1.3 1996/11/11 18:37:07 obrien Exp $
 
 DISTNAME=	${PKGNAME}-export
 PKGNAME=	mutt-0.49
@@ -34,12 +34,12 @@ DIST_SUBDIR=	Mutt
 WRKSRC=		${WRKDIR}/${PKGNAME}
 PATCH_DIST_STRIP=	
 GNU_CONFIGURE=	yes
+MAN1=		mutt.1
 
 
 post-install:
 	@####   don't strip until out of beta peroid
 	@#strip ${PREFIX}/bin/mutt
-	@gzip -9nf ${PREFIX}/man/man1/mutt.1
 .if !defined(NOPORTDOCS)
 	@${ECHO} "Installing Mutt documentation"
 	@${MKDIR} ${PREFIX}/share/doc/mutt && chmod a+rx ${PREFIX}/share/doc/mutt
diff --git a/mail/mutt14/Makefile b/mail/mutt14/Makefile
index 09c21d8bbb00..16231ec01996 100644
--- a/mail/mutt14/Makefile
+++ b/mail/mutt14/Makefile
@@ -4,7 +4,7 @@
 # Date created:         Thur July 25, 1996
 # Whom:                 David O'Brien (obrien@cs.ucdavis.edu)
 #
-# $Id: Makefile,v 1.2 1996/11/10 20:19:54 obrien Exp $
+# $Id: Makefile,v 1.3 1996/11/11 18:37:07 obrien Exp $
 
 DISTNAME=	${PKGNAME}-export
 PKGNAME=	mutt-0.49
@@ -34,12 +34,12 @@ DIST_SUBDIR=	Mutt
 WRKSRC=		${WRKDIR}/${PKGNAME}
 PATCH_DIST_STRIP=	
 GNU_CONFIGURE=	yes
+MAN1=		mutt.1
 
 
 post-install:
 	@####   don't strip until out of beta peroid
 	@#strip ${PREFIX}/bin/mutt
-	@gzip -9nf ${PREFIX}/man/man1/mutt.1
 .if !defined(NOPORTDOCS)
 	@${ECHO} "Installing Mutt documentation"
 	@${MKDIR} ${PREFIX}/share/doc/mutt && chmod a+rx ${PREFIX}/share/doc/mutt
diff --git a/mail/p5-Mail-Folder/Makefile b/mail/p5-Mail-Folder/Makefile
index d35adc58ef0b..a4221fdb537f 100644
--- a/mail/p5-Mail-Folder/Makefile
+++ b/mail/p5-Mail-Folder/Makefile
@@ -3,18 +3,14 @@
 # Date created:				October 24th 1996
 # Whom:	      				James FitzGibbon <jfitz@FreeBSD.org>
 #
-#   $Id: Makefile,v 1.1.1.1 1996/10/24 13:43:04 jfitz Exp $
+#   $Id: Makefile,v 1.2 1996/11/10 21:32:04 obrien Exp $
 #
 
 DISTNAME=	MailFolder-0.03
 PKGNAME=	p5-Mail-Folder-0.03
 CATEGORIES=	mail
-MASTER_SITES=	ftp://ftp.digital.com/pub/plan/perl/CPAN/modules/by-module/Mail/ \
-		ftp://ftp.cdrom.com/pub/perl/CPAN/modules/by-module/Mail/ \
-		ftp://ftp.cis.ufl.edu/pub/perl/CPAN/modules/by-module/Mail/ \
-		ftp://ftp.leo.org/pub/comp/programming/languages/perl/CPAN/modules/by-module/Mail/ \
-		ftp://ftp.demon.co.uk/pub/mirrors/perl/CPAN/modules/by-module/Mail/ \
-		ftp://ftp.lab.kdd.co.jp/lang/perl/CPAN/modules/by-module/Mail/
+MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
+MASTER_SITE_SUBDIR=	Mail
 
 MAINTAINER=	jfitz@FreeBSD.ORG
 
diff --git a/mail/p5-Mail-POP3Client/Makefile b/mail/p5-Mail-POP3Client/Makefile
index 12d48aa20961..3378ae85f19f 100644
--- a/mail/p5-Mail-POP3Client/Makefile
+++ b/mail/p5-Mail-POP3Client/Makefile
@@ -3,18 +3,14 @@
 # Date created:				October 24th 1996
 # Whom:	      				James FitzGibbon <jfitz@FreeBSD.org>
 #
-#   $Id: Makefile,v 1.1.1.1 1996/10/24 13:44:50 jfitz Exp $
+#   $Id: Makefile,v 1.2 1996/11/10 21:32:08 obrien Exp $
 #
 
 DISTNAME=	POP3Client-1_14
 PKGNAME=	p5-Mail-POP3Client-1.14
 CATEGORIES=	mail
-MASTER_SITES=	ftp://ftp.digital.com/pub/plan/perl/CPAN/modules/by-module/Mail/ \
-		ftp://ftp.cdrom.com/pub/perl/CPAN/modules/by-module/Mail/ \
-		ftp://ftp.cis.ufl.edu/pub/perl/CPAN/modules/by-module/Mail/ \
-		ftp://ftp.leo.org/pub/comp/programming/languages/perl/CPAN/modules/by-module/Mail/ \
-		ftp://ftp.demon.co.uk/pub/mirrors/perl/CPAN/modules/by-module/Mail/ \
-		ftp://ftp.lab.kdd.co.jp/lang/perl/CPAN/modules/by-module/Mail/
+MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
+MASTER_SITE_SUBDIR=	Mail
 
 MAINTAINER=	jfitz@FreeBSD.ORG
 
diff --git a/mail/p5-Mail-Tools/Makefile b/mail/p5-Mail-Tools/Makefile
index 65818a552b3a..8be95ac13b42 100644
--- a/mail/p5-Mail-Tools/Makefile
+++ b/mail/p5-Mail-Tools/Makefile
@@ -3,18 +3,14 @@
 # Date created:				October 24th 1996
 # Whom:	      				James FitzGibbon <jfitz@FreeBSD.org>
 #
-#   $Id: Makefile,v 1.1.1.1 1996/10/24 13:43:47 jfitz Exp $
+#   $Id: Makefile,v 1.2 1996/11/10 21:32:12 obrien Exp $
 #
 
 DISTNAME=	MailTools-1.06
 PKGNAME=	p5-Mail-Tools-1.06
 CATEGORIES=	mail
-MASTER_SITES=	ftp://ftp.digital.com/pub/plan/perl/CPAN/modules/by-module/Mail/ \
-		ftp://ftp.cdrom.com/pub/perl/CPAN/modules/by-module/Mail/ \
-		ftp://ftp.cis.ufl.edu/pub/perl/CPAN/modules/by-module/Mail/ \
-		ftp://ftp.leo.org/pub/comp/programming/languages/perl/CPAN/modules/by-module/Mail/ \
-		ftp://ftp.demon.co.uk/pub/mirrors/perl/CPAN/modules/by-module/Mail/ \
-		ftp://ftp.lab.kdd.co.jp/lang/perl/CPAN/modules/by-module/Mail/
+MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
+MASTER_SITE_SUBDIR=	Mail
 
 MAINTAINER=	jfitz@FreeBSD.ORG
 
diff --git a/mail/pine4/Makefile b/mail/pine4/Makefile
index 8eab7308aab1..73427ef9b603 100644
--- a/mail/pine4/Makefile
+++ b/mail/pine4/Makefile
@@ -3,7 +3,7 @@
 # Date created:		03 September 1994
 # Whom:			mr
 #
-# $Id: Makefile,v 1.12 1996/07/17 03:57:57 asami Exp $
+# $Id: Makefile,v 1.13 1996/11/10 21:32:21 obrien Exp $
 #
 
 DISTNAME=	pine3.95
@@ -11,13 +11,9 @@ PKGNAME=	pine-3.95
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.cac.washington.edu/pine/
 
-post-install:
-.if !defined(NOMANCOMPRESS)
-	gzip -9nf ${PREFIX}/man/man1/pine.1
-	gzip -9nf ${PREFIX}/man/man1/pico.1
-	gzip -9nf ${PREFIX}/man/man1/pilot.1
-	gzip -9nf ${PREFIX}/man/man8/imapd.8c
-	gzip -9nf ${PREFIX}/man/man8/ipopd.8c
-.endif
+MAINTAINER=	ports@FreeBSD.org
+
+MAN1= 		pine.1 pico.1 pilot.1
+MAN8=		imapd.8c ipopd.8c
 
 .include <bsd.port.mk>
diff --git a/mail/poppassd/Makefile b/mail/poppassd/Makefile
index a7b128fbdd3e..cc706e418057 100644
--- a/mail/poppassd/Makefile
+++ b/mail/poppassd/Makefile
@@ -3,7 +3,7 @@
 # Date Created:	21 August 1996
 # Whom:	Andrew Stevenson <andrew@ugh.net.au> based heavily on the changes by Stephen Melvin <melvin@zytek.com>
 #
-# $Id: Makefile,v 1.1.1.1 1996/11/03 20:45:24 jfitz Exp $
+# $Id: Makefile,v 1.2 1996/11/10 21:32:29 obrien Exp $
 #
 
 DISTNAME=	poppassd
@@ -19,12 +19,10 @@ EXTRACT_SUFX=
 EXTRACT_BEFORE_ARGS=	
 EXTRACT_AFTER_ARGS=	| /usr/bin/sed -e '1,16d' | /bin/sh
 ALL_TARGET=	poppassd
+MAN8=		poppassd.8
 
 post-install:
 	@ strip ${PREFIX}/libexec/poppassd
 	@ ${INSTALL_MAN} ${FILESDIR}/poppassd.8 ${PREFIX}/man/man8/
-.if !defined{NOMANCOMPRESS}
-	gzip -9nf ${PREFIX}/man/man8/poppassd.8
-.endif
 
 .include <bsd.port.mk>
diff --git a/mail/smail/Makefile b/mail/smail/Makefile
index bb9a620b6e70..4e793979ad99 100644
--- a/mail/smail/Makefile
+++ b/mail/smail/Makefile
@@ -3,7 +3,7 @@
 # Date created:		16 Oct 1994
 # Whom:			torstenb
 #
-# $Id: Makefile,v 1.11 1995/11/09 06:01:03 asami Exp $
+# $Id: Makefile,v 1.12 1996/11/10 21:32:45 obrien Exp $
 #
 
 DISTNAME=	smail-3.1.29.1
@@ -15,26 +15,19 @@ MAINTAINER=	torstenb@FreeBSD.ORG
 BUILD_DEPENDS=	bash:${PORTSDIR}/shells/bash
 
 MAKE_FLAGS=	"SHELL=${PREFIX}/bin/bash"
+MAN1=		pathto.1 uuwho.1 uupath.1
+MAN5=		smail.5
+MAN8=		pathalias.8 mkdbm.8 mkline.8 mksort.8 mkaliases.8 smail.8 \
+		mkpath.8 pathmerge.8 checkerr.8 getmap.8 mkhpath.8 savelog.8 \
+		mkuuwho.8 mailq.8 sendmail.8 runq.8 rmail.8 rsmtp.8 smtpd.8
 
 pre-install:
-	mkdir -p ${PREFIX}/lib/smail
+	${MKDIR} ${PREFIX}/lib/smail
 
 post-install:
-	@cp ${WRKSRC}/samples/generic/config ${PREFIX}/lib/smail/config.sample
-	@cp ${WRKSRC}/samples/generic/directors ${PREFIX}/lib/smail/directors.sample
-	@cp ${WRKSRC}/samples/generic/routers ${PREFIX}/lib/smail/routers.sample
-	@cp ${WRKSRC}/samples/generic/transports ${PREFIX}/lib/smail/transports.sample
-	gzip -9nf ${PREFIX}/man/man1/pathto.1 ${PREFIX}/man/man1/uuwho.1 \
-	${PREFIX}/man/man1/uupath.1 ${PREFIX}/man/man5/smail.5 \
-	${PREFIX}/man/man8/pathalias.8 ${PREFIX}/man/man8/mkdbm.8 \
-	${PREFIX}/man/man8/mkline.8 ${PREFIX}/man/man8/mksort.8 \
-	${PREFIX}/man/man8/mkaliases.8 ${PREFIX}/man/man8/smail.8 \
-	${PREFIX}/man/man8/mkpath.8 ${PREFIX}/man/man8/pathmerge.8 \
-	${PREFIX}/man/man8/checkerr.8 ${PREFIX}/man/man8/getmap.8 \
-	${PREFIX}/man/man8/mkhpath.8 ${PREFIX}/man/man8/savelog.8 \
-	${PREFIX}/man/man8/mkuuwho.8 ${PREFIX}/man/man8/mailq.8 \
-	${PREFIX}/man/man8/sendmail.8 ${PREFIX}/man/man8/runq.8 \
-	${PREFIX}/man/man8/rmail.8 ${PREFIX}/man/man8/rsmtp.8 \
-	${PREFIX}/man/man8/smtpd.8
+	@${INSTALL_DATA} ${WRKSRC}/samples/generic/config ${PREFIX}/lib/smail/config.sample
+	@${INSTALL_DATA} ${WRKSRC}/samples/generic/directors ${PREFIX}/lib/smail/directors.sample
+	@${INSTALL_DATA} ${WRKSRC}/samples/generic/routers ${PREFIX}/lib/smail/routers.sample
+	@${INSTALL_DATA} ${WRKSRC}/samples/generic/transports ${PREFIX}/lib/smail/transports.sample
 
 .include <bsd.port.mk>
diff --git a/mail/xfmail/Makefile b/mail/xfmail/Makefile
index 5195a1103f02..63f5fdbc43d3 100644
--- a/mail/xfmail/Makefile
+++ b/mail/xfmail/Makefile
@@ -3,7 +3,7 @@
 # Date created:		30 June 1996
 # Whom:			gena
 #
-# $Id: Makefile,v 1.5 1996/07/12 11:51:51 asami Exp $
+# $Id: Makefile,v 1.6 1996/11/10 21:32:49 obrien Exp $
 #
 
 DISTNAME=	xfmail
@@ -20,6 +20,6 @@ WRKSRC=		${WRKDIR}/xfmail/ui
 USE_X11=	yes
 
 pre-configure:
-	@(cd ${WRKSRC} ; cp Makefile.FreeBSD Makefile)
+	@(cd ${WRKSRC} ; ${CP} Makefile.FreeBSD Makefile)
 
 .include <bsd.port.mk>