Use MASTER_SITE_PERL_CPAN. Use MAN? macros. CATEGORIES+= -> CATEGORIES.

34 files changed, 223 insertions, 413 deletions

diff --git a/archivers/p5-Compress-Zlib/Makefile b/archivers/p5-Compress-Zlib/Makefile
index 08d3f4ec993f..58abbbd88bd7 100644
--- a/archivers/p5-Compress-Zlib/Makefile
+++ b/archivers/p5-Compress-Zlib/Makefile
@@ -3,7 +3,7 @@
 # Date created:				October 20th 1996
 # Whom:	      				James FitzGibbon <jfitz@FreeBSD.org>
 #
-#   $Id: Makefile,v 1.3 1996/11/12 02:17:33 obrien Exp $
+#   $Id: Makefile,v 1.4 1996/11/17 05:43:01 obrien Exp $
 #
 
 DISTNAME=	Compress-Zlib-0.4
@@ -17,14 +17,10 @@ MAINTAINER=	jfitz@FreeBSD.ORG
 BUILD_DEPENDS= 	perl5.003:${PORTSDIR}/lang/perl5
 RUN_DEPENDS=	perl5.003:${PORTSDIR}/lang/perl5
 
+MAN3=		Compress::Zlib.3
+MANPREFIX=	${PREFIX}/lib/perl5
+
 do-configure:
 		@ cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PREFIX}/bin/perl Makefile.PL
 
-post-install:
-.if !defined(NOMANCOMPRESS)
-		@ for file in Compress::Zlib; do \
-			gzip -9nf ${PREFIX}/lib/perl5/man/man3/$$file.3; \
-		done
-.endif
-
 .include <bsd.port.mk>
diff --git a/devel/p5-BSD-Resource/Makefile b/devel/p5-BSD-Resource/Makefile
index 27ffaca689bc..2bff1ed28b88 100644
--- a/devel/p5-BSD-Resource/Makefile
+++ b/devel/p5-BSD-Resource/Makefile
@@ -3,33 +3,24 @@
 # Date created:				October 20th 1996
 # Whom:	      				James FitzGibbon <jfitz@FreeBSD.org>
 #
-#   $Id: Makefile,v 1.1.1.1 1996/10/23 23:56:54 jfitz Exp $
+#   $Id: Makefile,v 1.2 1996/10/24 09:57:45 jfitz Exp $
 #
 
 DISTNAME=	BSD-Resource-1.03
 PKGNAME=	p5-BSD-Resource-1.03
-CATEGORIES+=	devel
-MASTER_SITES=	ftp://ftp.digital.com/pub/plan/perl/CPAN/modules/by-module/BSD/ \
-		ftp://ftp.cdrom.com/pub/perl/CPAN/modules/by-module/BSD/ \
-		ftp://ftp.cis.ufl.edu/pub/perl/CPAN/modules/by-module/BSD/ \
-		ftp://ftp.leo.org/pub/comp/programming/languages/perl/CPAN/modules/by-module/BSD/ \
-		ftp://ftp.demon.co.uk/pub/mirrors/perl/CPAN/modules/by-module/BSD/ \
-		ftp://ftp.lab.kdd.co.jp/lang/perl/CPAN/modules/by-module/BSD/
+CATEGORIES=	devel
+MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
+MASTER_SITE_SUBDIR=	BSD
 
 MAINTAINER=	jfitz@FreeBSD.ORG
 
 BUILD_DEPENDS= 	perl5.003:${PORTSDIR}/lang/perl5
 RUN_DEPENDS=	perl5.003:${PORTSDIR}/lang/perl5
 
+MAN3=		BSD::Resource.3
+MANPREFIX=	${PREFIX}/lib/perl5
 
 do-configure:
 		@ cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PREFIX}/bin/perl Makefile.PL
 
-post-install:
-.if !defined(NOMANCOMPRESS)
-		@ for file in BSD::Resource; do \
-			gzip -9nf ${PREFIX}/lib/perl5/man/man3/$$file.3; \
-		done
-.endif
-
 .include <bsd.port.mk>
diff --git a/devel/p5-C-Scan/Makefile b/devel/p5-C-Scan/Makefile
index e06e2bde0aea..28792f221f4d 100644
--- a/devel/p5-C-Scan/Makefile
+++ b/devel/p5-C-Scan/Makefile
@@ -3,18 +3,14 @@
 # Date created:				October 20th 1996
 # Whom:	      				James FitzGibbon <jfitz@FreeBSD.org>
 #
-#   $Id: Makefile,v 1.3 1996/10/24 10:58:01 asami Exp $
+#   $Id: Makefile,v 1.4 1996/10/24 11:18:40 asami Exp $
 #
 
 DISTNAME=	C-Scan-0.3
 PKGNAME=	p5-C-Scan-0.3
-CATEGORIES+=	devel
-MASTER_SITES=	ftp://ftp.digital.com/pub/plan/perl/CPAN/modules/by-module/C/ \
-		ftp://ftp.cdrom.com/pub/perl/CPAN/modules/by-module/C/ \
-		ftp://ftp.cis.ufl.edu/pub/perl/CPAN/modules/by-module/C/ \
-		ftp://ftp.leo.org/pub/comp/programming/languages/perl/CPAN/modules/by-module/C/ \
-		ftp://ftp.demon.co.uk/pub/mirrors/perl/CPAN/modules/by-module/C/ \
-		ftp://ftp.lab.kdd.co.jp/lang/perl/CPAN/modules/by-module/C/
+CATEGORIES=	devel
+MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
+MASTER_SITE_SUBDIR=	C
 
 MAINTAINER=	jfitz@FreeBSD.ORG
 
@@ -22,14 +18,10 @@ BUILD_DEPENDS= 	perl5.003:${PORTSDIR}/lang/perl5 \
 		${PREFIX}/lib/perl5/site_perl/Data/Flow.pm:${PORTSDIR}/devel/p5-Data-Flow
 RUN_DEPENDS=	perl5.003:${PORTSDIR}/lang/perl5
 
+MAN3=		C::Scan.3
+MANPREFIX=	${PREFIX}/lib/perl5
+
 do-configure:
 		@ cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PREFIX}/bin/perl Makefile.PL
 
-post-install:
-.if !defined(NOMANCOMPRESS)
-		@ for file in C::Scan; do \
-			gzip -9nf ${PREFIX}/lib/perl5/man/man3/$$file.3; \
-		done
-.endif
-
 .include <bsd.port.mk>
diff --git a/devel/p5-Config-IniFiles/Makefile b/devel/p5-Config-IniFiles/Makefile
index 3c5b314d0f7d..855dae69bcee 100644
--- a/devel/p5-Config-IniFiles/Makefile
+++ b/devel/p5-Config-IniFiles/Makefile
@@ -3,32 +3,24 @@
 # Date created:				October 21st 1996
 # Whom:	      				James FitzGibbon <jfitz@FreeBSD.org>
 #
-#   $Id: Makefile,v 1.1.1.1 1996/10/24 08:11:10 jfitz Exp $
+#   $Id: Makefile,v 1.2 1996/10/24 09:59:09 jfitz Exp $
 #
 
 DISTNAME=	IniConf.pm-0.91
 PKGNAME=	p5-IniConf-0.91
-CATEGORIES+=	devel
-MASTER_SITES=	ftp://ftp.digital.com/pub/plan/perl/CPAN/modules/by-module/IniConf/ \
-		ftp://ftp.cdrom.com/pub/perl/CPAN/modules/by-module/IniConf/ \
-		ftp://ftp.cis.ufl.edu/pub/perl/CPAN/modules/by-module/IniConf/ \
-		ftp://ftp.leo.org/pub/comp/programming/languages/perl/CPAN/modules/by-module/IniConf/ \
-		ftp://ftp.demon.co.uk/pub/mirrors/perl/CPAN/modules/by-module/IniConf/ \
-		ftp://ftp.lab.kdd.co.jp/lang/perl/CPAN/modules/by-module/IniConf/
+CATEGORIES=	devel
+MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
+MASTER_SITE_SUBDIR=	IniConf
 
 MAINTAINER=	jfitz@FreeBSD.ORG
 
 BUILD_DEPENDS= 	perl5.003:${PORTSDIR}/lang/perl5
 RUN_DEPENDS=	perl5.003:${PORTSDIR}/lang/perl5
 
+MAN3=		IniConf.pm.3
+MANPREFIX=	${PREFIX}/lib/perl5
+
 do-configure:
 		@ cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PREFIX}/bin/perl Makefile.PL
 
-post-install:
-.if !defined(NOMANCOMPRESS)
-		@ for file in IniConf.pm; do \
-			gzip -9nf ${PREFIX}/lib/perl5/man/man3/$$file.3; \
-		done
-.endif
-
 .include <bsd.port.mk>
diff --git a/devel/p5-ConfigReader/Makefile b/devel/p5-ConfigReader/Makefile
index 76282518ff3d..134e98655199 100644
--- a/devel/p5-ConfigReader/Makefile
+++ b/devel/p5-ConfigReader/Makefile
@@ -3,18 +3,14 @@
 # Date created:				October 20th 1996
 # Whom:	      				James FitzGibbon <jfitz@FreeBSD.org>
 #
-#   $Id: Makefile,v 1.1.1.1 1996/10/24 07:56:23 jfitz Exp $
+#   $Id: Makefile,v 1.2 1996/10/24 09:58:07 jfitz Exp $
 #
 
 DISTNAME=	ConfigReader-0.5
 PKGNAME=	p5-ConfigReader-0.5
-CATEGORIES+=	devel
-MASTER_SITES=	ftp://ftp.digital.com/pub/plan/perl/CPAN/modules/by-module/ConfigReader/ \
-		ftp://ftp.cdrom.com/pub/perl/CPAN/modules/by-module/ConfigReader/ \
-		ftp://ftp.cis.ufl.edu/pub/perl/CPAN/modules/by-module/ConfigReader/ \
-		ftp://ftp.leo.org/pub/comp/programming/languages/perl/CPAN/modules/by-module/ConfigReader/ \
-		ftp://ftp.demon.co.uk/pub/mirrors/perl/CPAN/modules/by-module/ConfigReader/ \
-		ftp://ftp.lab.kdd.co.jp/lang/perl/CPAN/modules/by-module/ConfigReader/
+CATEGORIES=	devel
+MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
+MASTER_SITE_SUBDIR=	ConfigReader
 
 MAINTAINER=	jfitz@FreeBSD.ORG
 
diff --git a/devel/p5-Curses/Makefile b/devel/p5-Curses/Makefile
index c5382d55e7a6..d646215ad327 100644
--- a/devel/p5-Curses/Makefile
+++ b/devel/p5-Curses/Makefile
@@ -3,35 +3,27 @@
 # Date created:				October 17th 1996
 # Whom:	      				James FitzGibbon <jfitz@FreeBSD.org>
 #
-#   $Id: Makefile,v 1.1.1.1 1996/10/24 07:57:07 jfitz Exp $
+#   $Id: Makefile,v 1.2 1996/10/24 09:58:18 jfitz Exp $
 #
 
 DISTNAME=	Curses-1.0
 PKGNAME=	p5-Curses-1.0
-CATEGORIES+=	devel
-MASTER_SITES=	ftp://ftp.digital.com/pub/plan/perl/CPAN/modules/by-module/Curses/ \
-		ftp://ftp.cdrom.com/pub/perl/CPAN/modules/by-module/Curses/ \
-		ftp://ftp.cis.ufl.edu/pub/perl/CPAN/modules/by-module/Curses/ \
-		ftp://ftp.leo.org/pub/comp/programming/languages/perl/CPAN/modules/by-module/Curses/ \
-		ftp://ftp.demon.co.uk/pub/mirrors/perl/CPAN/modules/by-module/Curses/ \
-		ftp://ftp.lab.kdd.co.jp/lang/perl/CPAN/modules/by-module/Curses/
+CATEGORIES=	devel
+MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
+MASTER_SITE_SUBDIR=	Curses
 
 MAINTAINER=	jfitz@FreeBSD.ORG
 
 BUILD_DEPENDS= 	perl5.003:${PORTSDIR}/lang/perl5
 RUN_DEPENDS=	perl5.003:${PORTSDIR}/lang/perl5
 
+MAN3=		Curses.3
+MANPREFIX=	${PREFIX}/lib/perl5
+
 pre-configure:
 		@ ln -s ${WRKSRC}/hints/c-freebsd.ncurses.h ${WRKSRC}/c-config.h
 
 do-configure:
 		@ cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PREFIX}/bin/perl Makefile.PL
 
-post-install:
-.if !defined(NOMANCOMPRESS)
-		@ for file in Curses; do \
-			gzip -9nf ${PREFIX}/lib/perl5/man/man3/$$file.3; \
-		done
-.endif
-
 .include <bsd.port.mk>
diff --git a/devel/p5-Data-Flow/Makefile b/devel/p5-Data-Flow/Makefile
index 1e1dfdd30221..9382cd6f1e50 100644
--- a/devel/p5-Data-Flow/Makefile
+++ b/devel/p5-Data-Flow/Makefile
@@ -3,32 +3,24 @@
 # Date created:				October 20th 1996
 # Whom:	      				James FitzGibbon <jfitz@FreeBSD.org>
 #
-#   $Id: Makefile,v 1.1.1.1 1996/10/24 07:59:26 jfitz Exp $
+#   $Id: Makefile,v 1.2 1996/10/24 09:58:25 jfitz Exp $
 #
 
 DISTNAME=	Data-Flow-0.04
 PKGNAME=	p5-Data-Flow-0.04
-CATEGORIES+=	devel
-MASTER_SITES=	ftp://ftp.digital.com/pub/plan/perl/CPAN/modules/by-module/Data/ \
-		ftp://ftp.cdrom.com/pub/perl/CPAN/modules/by-module/Data/ \
-		ftp://ftp.cis.ufl.edu/pub/perl/CPAN/modules/by-module/Data/ \
-		ftp://ftp.leo.org/pub/comp/programming/languages/perl/CPAN/modules/by-module/Data/ \
-		ftp://ftp.demon.co.uk/pub/mirrors/perl/CPAN/modules/by-module/Data/ \
-		ftp://ftp.lab.kdd.co.jp/lang/perl/CPAN/modules/by-module/Data/
+CATEGORIES=	devel
+MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
+MASTER_SITE_SUBDIR=	Data
 
 MAINTAINER=	jfitz@FreeBSD.ORG
 
 BUILD_DEPENDS= 	perl5.003:${PORTSDIR}/lang/perl5
 RUN_DEPENDS=	perl5.003:${PORTSDIR}/lang/perl5
 
+MAN3=		Data::Flow.3
+MANPREFIX=	${PREFIX}/lib/perl5
+
 do-configure:
 		@ cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PREFIX}/bin/perl Makefile.PL
 
-post-install:
-.if !defined(NOMANCOMPRESS)
-		@ for file in Data::Flow; do \
-			gzip -9nf ${PREFIX}/lib/perl5/man/man3/$$file.3; \
-		done
-.endif
-
 .include <bsd.port.mk>
diff --git a/devel/p5-File-BasicFlock/Makefile b/devel/p5-File-BasicFlock/Makefile
index ab9780eef8e8..b031dcf6f88a 100644
--- a/devel/p5-File-BasicFlock/Makefile
+++ b/devel/p5-File-BasicFlock/Makefile
@@ -3,32 +3,24 @@
 # Date created:				
 # Whom:	      				James FitzGibbon <jfitz@FreeBSD.org>
 #
-#   $Id: Makefile,v 1.1.1.1 1996/10/24 08:01:27 jfitz Exp $
+#   $Id: Makefile,v 1.2 1996/10/24 09:58:36 jfitz Exp $
 #
 
 DISTNAME=	File-BasicFLock-96.072401
 PKGNAME=	p5-File-BasicFlock-96.072401
-CATEGORIES+=	devel
-MASTER_SITES=	ftp://ftp.digital.com/pub/plan/perl/CPAN/modules/by-module/File/ \
-		ftp://ftp.cdrom.com/pub/perl/CPAN/modules/by-module/File/ \
-		ftp://ftp.cis.ufl.edu/pub/perl/CPAN/modules/by-module/File/ \
-		ftp://ftp.leo.org/pub/comp/programming/languages/perl/CPAN/modules/by-module/File/ \
-		ftp://ftp.demon.co.uk/pub/mirrors/perl/CPAN/modules/by-module/File/ \
-		ftp://ftp.lab.kdd.co.jp/lang/perl/CPAN/modules/by-module/File/
+CATEGORIES=	devel
+MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
+MASTER_SITE_SUBDIR=	File
 
 MAINTAINER=	jfitz@FreeBSD.ORG
 
 BUILD_DEPENDS= 	perl5.003:${PORTSDIR}/lang/perl5
 RUN_DEPENDS=	perl5.003:${PORTSDIR}/lang/perl5
 
+MAN3=		File::BasicFlock.3
+MANPREFIX=	${PREFIX}/lib/perl5
+
 do-configure:
 		@ cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PREFIX}/bin/perl Makefile.PL
 
-post-install:
-.if !defined(NOMANCOMPRESS)
-		@ for file in File::BasicFlock; do \
-			gzip -9nf ${PREFIX}/lib/perl5/man/man3/$$file.3; \
-		done
-.endif
-
 .include <bsd.port.mk>
diff --git a/devel/p5-File-Lock/Makefile b/devel/p5-File-Lock/Makefile
index 5e20651d0dc7..1eef6fbd5816 100644
--- a/devel/p5-File-Lock/Makefile
+++ b/devel/p5-File-Lock/Makefile
@@ -3,18 +3,14 @@
 # Date created:				October 17th 1996
 # Whom:	      				James FitzGibbon <jfitz@FreeBSD.org>
 #
-#   $Id: Makefile,v 1.1.1.1 1996/10/24 08:02:43 jfitz Exp $
+#   $Id: Makefile,v 1.2 1996/10/24 09:58:38 jfitz Exp $
 #
 
 DISTNAME=	File-Lock-0.9
 PKGNAME=	p5-File-Lock-0.9
-CATEGORIES+=	devel
-MASTER_SITES=	ftp://ftp.digital.com/pub/plan/perl/CPAN/modules/by-module/File/ \
-		ftp://ftp.cdrom.com/pub/perl/CPAN/modules/by-module/File/ \
-		ftp://ftp.cis.ufl.edu/pub/perl/CPAN/modules/by-module/File/ \
-		ftp://ftp.leo.org/pub/comp/programming/languages/perl/CPAN/modules/by-module/File/ \
-		ftp://ftp.demon.co.uk/pub/mirrors/perl/CPAN/modules/by-module/File/ \
-		ftp://ftp.lab.kdd.co.jp/lang/perl/CPAN/modules/by-module/File/
+CATEGORIES=	devel
+MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
+MASTER_SITE_SUBDIR=	File
 
 MAINTAINER=	jfitz@FreeBSD.ORG
 
diff --git a/devel/p5-File-Slurp/Makefile b/devel/p5-File-Slurp/Makefile
index 04cb3d6400a3..cbfb2dcd7db0 100644
--- a/devel/p5-File-Slurp/Makefile
+++ b/devel/p5-File-Slurp/Makefile
@@ -3,32 +3,24 @@
 # Date created:				October 17th 1996
 # Whom:	      				James FitzGibbon <jfitz@FreeBSD.org>
 #
-#   $Id: Makefile,v 1.1.1.1 1996/10/24 08:04:17 jfitz Exp $
+#   $Id: Makefile,v 1.2 1996/10/24 09:58:41 jfitz Exp $
 #
 
 DISTNAME=	File-Slurp-96.042202
 PKGNAME=	p5-File-Slurp-96.042202
-CATEGORIES+=	devel
-MASTER_SITES=	ftp://ftp.digital.com/pub/plan/perl/CPAN/modules/by-module/File/ \
-		ftp://ftp.cdrom.com/pub/perl/CPAN/modules/by-module/File/ \
-		ftp://ftp.cis.ufl.edu/pub/perl/CPAN/modules/by-module/File/ \
-		ftp://ftp.leo.org/pub/comp/programming/languages/perl/CPAN/modules/by-module/File/ \
-		ftp://ftp.demon.co.uk/pub/mirrors/perl/CPAN/modules/by-module/File/ \
-		ftp://ftp.lab.kdd.co.jp/lang/perl/CPAN/modules/by-module/File/
+CATEGORIES=	devel
+MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
+MASTER_SITE_SUBDIR=	File
 
 MAINTAINER=	jfitz@FreeBSD.ORG
 
 BUILD_DEPENDS= 	perl5.003:${PORTSDIR}/lang/perl5
 RUN_DEPENDS=	perl5.003:${PORTSDIR}/lang/perl5
 
+MAN3=		File::Slurp.3
+MANPREFIX=	${PREFIX}/lib/perl5
+
 do-configure:
 		@ cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PREFIX}/bin/perl Makefile.PL
 
-post-install:
-.if !defined(NOMANCOMPRESS)
-		@ for file in File::Slurp; do \
-			gzip -9nf ${PREFIX}/lib/perl5/man/man3/$$file.3; \
-		done
-.endif
-
 .include <bsd.port.mk>
diff --git a/devel/p5-File-Tools/Makefile b/devel/p5-File-Tools/Makefile
index 2bdcd9b7b397..34f6347917bd 100644
--- a/devel/p5-File-Tools/Makefile
+++ b/devel/p5-File-Tools/Makefile
@@ -3,32 +3,24 @@
 # Date created:				October 17th 1996
 # Whom:	      				James FitzGibbon <jfitz@FreeBSD.org>
 #
-#   $Id: Makefile,v 1.1.1.1 1996/10/24 08:06:28 jfitz Exp $
+#   $Id: Makefile,v 1.2 1996/10/24 09:58:45 jfitz Exp $
 #
 
 DISTNAME=	File-Tools-2.0
 PKGNAME=	p5-File-Tools-2.0
-CATEGORIES+=	devel
-MASTER_SITES=	ftp://ftp.digital.com/pub/plan/perl/CPAN/modules/by-module/File/ \
-		ftp://ftp.cdrom.com/pub/perl/CPAN/modules/by-module/File/ \
-		ftp://ftp.cis.ufl.edu/pub/perl/CPAN/modules/by-module/File/ \
-		ftp://ftp.leo.org/pub/comp/programming/languages/perl/CPAN/modules/by-module/File/ \
-		ftp://ftp.demon.co.uk/pub/mirrors/perl/CPAN/modules/by-module/File/ \
-		ftp://ftp.lab.kdd.co.jp/lang/perl/CPAN/modules/by-module/File/
+CATEGORIES=	devel
+MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
+MASTER_SITE_SUBDIR=	File
 
 MAINTAINER=	jfitz@FreeBSD.ORG
 
 BUILD_DEPENDS= 	perl5.003:${PORTSDIR}/lang/perl5
 RUN_DEPENDS=	perl5.003:${PORTSDIR}/lang/perl5
 
+MAN3=		File::Tools.3 File::Recurse.3 File::Copy.3
+MANPREFIX=	${PREFIX}/lib/perl5
+
 do-configure:
 		@ cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PREFIX}/bin/perl Makefile.PL
 
-post-install:
-.if !defined(NOMANCOMPRESS)
-		@ for file in File::Tools File::Recurse File::Copy; do \
-			gzip -9nf ${PREFIX}/lib/perl5/man/man3/$$file.3; \
-		done
-.endif
-
 .include <bsd.port.mk>
diff --git a/devel/p5-Include/Makefile b/devel/p5-Include/Makefile
index 4872f07c252e..0eec5256f83b 100644
--- a/devel/p5-Include/Makefile
+++ b/devel/p5-Include/Makefile
@@ -3,32 +3,24 @@
 # Date created:				October 21st 1996
 # Whom:	      				James FitzGibbon <jfitz@FreeBSD.org>
 #
-#   $Id: Makefile,v 1.1.1.1 1996/10/24 08:08:20 jfitz Exp $
+#   $Id: Makefile,v 1.2 1996/10/24 09:59:04 jfitz Exp $
 #
 
 DISTNAME=	Include-1.02a
 PKGNAME=	p5-Include-1.02a
-CATEGORIES+=	devel
-MASTER_SITES=	ftp://ftp.digital.com/pub/plan/perl/CPAN/modules/by-module/Include/ \
-		ftp://ftp.cdrom.com/pub/perl/CPAN/modules/by-module/Include/ \
-		ftp://ftp.cis.ufl.edu/pub/perl/CPAN/modules/by-module/Include/ \
-		ftp://ftp.leo.org/pub/comp/programming/languages/perl/CPAN/modules/by-module/Include/ \
-		ftp://ftp.demon.co.uk/pub/mirrors/perl/CPAN/modules/by-module/Include/ \
-		ftp://ftp.lab.kdd.co.jp/lang/perl/CPAN/modules/by-module/Include/
+CATEGORIES=	devel
+MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
+MASTER_SITE_SUBDIR=	Include
 
 MAINTAINER=	jfitz@FreeBSD.ORG
 
 BUILD_DEPENDS= 	perl5.003:${PORTSDIR}/lang/perl5
 RUN_DEPENDS=	perl5.003:${PORTSDIR}/lang/perl5
 
+MAN3=		Include
+MANPREFIX=	${PREFIX}/lib/perl5
+
 do-configure:
 		@ cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PREFIX}/bin/perl Makefile.PL
 
-post-install:
-.if !defined(NOMANCOMPRESS)
-		@ for file in Include; do \
-			gzip -9nf ${PREFIX}/lib/perl5/man/man3/$$file.3; \
-		done
-.endif
-
 .include <bsd.port.mk>
diff --git a/devel/p5-IniConf/Makefile b/devel/p5-IniConf/Makefile
index 3c5b314d0f7d..855dae69bcee 100644
--- a/devel/p5-IniConf/Makefile
+++ b/devel/p5-IniConf/Makefile
@@ -3,32 +3,24 @@
 # Date created:				October 21st 1996
 # Whom:	      				James FitzGibbon <jfitz@FreeBSD.org>
 #
-#   $Id: Makefile,v 1.1.1.1 1996/10/24 08:11:10 jfitz Exp $
+#   $Id: Makefile,v 1.2 1996/10/24 09:59:09 jfitz Exp $
 #
 
 DISTNAME=	IniConf.pm-0.91
 PKGNAME=	p5-IniConf-0.91
-CATEGORIES+=	devel
-MASTER_SITES=	ftp://ftp.digital.com/pub/plan/perl/CPAN/modules/by-module/IniConf/ \
-		ftp://ftp.cdrom.com/pub/perl/CPAN/modules/by-module/IniConf/ \
-		ftp://ftp.cis.ufl.edu/pub/perl/CPAN/modules/by-module/IniConf/ \
-		ftp://ftp.leo.org/pub/comp/programming/languages/perl/CPAN/modules/by-module/IniConf/ \
-		ftp://ftp.demon.co.uk/pub/mirrors/perl/CPAN/modules/by-module/IniConf/ \
-		ftp://ftp.lab.kdd.co.jp/lang/perl/CPAN/modules/by-module/IniConf/
+CATEGORIES=	devel
+MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
+MASTER_SITE_SUBDIR=	IniConf
 
 MAINTAINER=	jfitz@FreeBSD.ORG
 
 BUILD_DEPENDS= 	perl5.003:${PORTSDIR}/lang/perl5
 RUN_DEPENDS=	perl5.003:${PORTSDIR}/lang/perl5
 
+MAN3=		IniConf.pm.3
+MANPREFIX=	${PREFIX}/lib/perl5
+
 do-configure:
 		@ cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PREFIX}/bin/perl Makefile.PL
 
-post-install:
-.if !defined(NOMANCOMPRESS)
-		@ for file in IniConf.pm; do \
-			gzip -9nf ${PREFIX}/lib/perl5/man/man3/$$file.3; \
-		done
-.endif
-
 .include <bsd.port.mk>
diff --git a/devel/p5-Ioctl/Makefile b/devel/p5-Ioctl/Makefile
index 30491d65d34e..2aa0f2552a50 100644
--- a/devel/p5-Ioctl/Makefile
+++ b/devel/p5-Ioctl/Makefile
@@ -3,12 +3,12 @@
 # Date created:				October 21st 1996
 # Whom:	      				James FitzGibbon <jfitz@FreeBSD.org>
 #
-#   $Id: Makefile,v 1.1.1.1 1996/10/24 08:15:36 jfitz Exp $
+#   $Id: Makefile,v 1.2 1996/10/24 09:59:14 jfitz Exp $
 #
 
 DISTNAME=	Ioctl-0_7
 PKGNAME=	p5-Ioctl-0.7
-CATEGORIES+=	devel
+CATEGORIES=	devel
 MASTER_SITES=	ftp://ftp.digital.com/pub/plan/perl/CPAN/modules/by-module/Ioctl/ \
 		ftp://ftp.cdrom.com/pub/perl/CPAN/modules/by-module/Ioctl/ \
 		ftp://ftp.cis.ufl.edu/pub/perl/CPAN/modules/by-module/Ioctl/ \
@@ -24,11 +24,4 @@ RUN_DEPENDS=	perl5.003:${PORTSDIR}/lang/perl5
 do-configure:
 		@ cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PREFIX}/bin/perl Makefile.PL
 
-post-install:
-.if !defined(NOMANCOMPRESS)
-		@ for file in ; do \
-			gzip -9nf ${PREFIX}/lib/perl5/man/man3/$$file.3; \
-		done
-.endif
-
 .include <bsd.port.mk>
diff --git a/devel/p5-Religion/Makefile b/devel/p5-Religion/Makefile
index 26ccc55274d1..cbad16daee69 100644
--- a/devel/p5-Religion/Makefile
+++ b/devel/p5-Religion/Makefile
@@ -3,32 +3,24 @@
 # Date created:				October 24th 1996
 # Whom:	      				James FitzGibbon <jfitz@FreeBSD.org>
 #
-#   $Id: Makefile,v 1.2 1996/10/24 09:58:34 jfitz Exp $
+#   $Id: Makefile,v 1.1.1.1 1996/10/24 13:46:36 jfitz Exp $
 #
 
 DISTNAME=	Religion-1.04
 PKGNAME=	p5-Religion-1.04
-CATEGORIES+=	devel
-MASTER_SITES=	ftp://ftp.digital.com/pub/plan/perl/CPAN/modules/by-module/Religion/ \
-		ftp://ftp.cdrom.com/pub/perl/CPAN/modules/by-module/Religion/ \
-		ftp://ftp.cis.ufl.edu/pub/perl/CPAN/modules/by-module/Religion/ \
-		ftp://ftp.leo.org/pub/comp/programming/languages/perl/CPAN/modules/by-module/Religion/ \
-		ftp://ftp.demon.co.uk/pub/mirrors/perl/CPAN/modules/by-module/Religion/ \
-		ftp://ftp.lab.kdd.co.jp/lang/perl/CPAN/modules/by-module/Religion/
+CATEGORIES=	devel
+MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
+MASTER_SITE_SUBDIR=	Religion
 
 MAINTAINER=	jfitz@FreeBSD.ORG
 
 BUILD_DEPENDS= 	perl5.003:${PORTSDIR}/lang/perl5
 RUN_DEPENDS=	perl5.003:${PORTSDIR}/lang/perl5
 
+MAN3=		Religion
+MANPREFIX=	${PREFIX}/lib/perl5
+
 do-configure:
 		@ cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PREFIX}/bin/perl Makefile.PL
 
-post-install:
-.if !defined(NOMANCOMPRESS)
-		@ for file in Religion; do \
-			gzip -9nf ${PREFIX}/lib/perl5/man/man3/$$file.3; \
-		done
-.endif     
-
 .include <bsd.port.mk>
diff --git a/devel/p5-Resources/Makefile b/devel/p5-Resources/Makefile
index c435d155d369..3eed0b94963c 100644
--- a/devel/p5-Resources/Makefile
+++ b/devel/p5-Resources/Makefile
@@ -3,32 +3,24 @@
 # Date created:				October 24th 1996
 # Whom:	      				James FitzGibbon <jfitz@FreeBSD.org>
 #
-#   $Id: Makefile,v 1.2 1996/10/24 09:58:34 jfitz Exp $
+#   $Id: Makefile,v 1.1.1.1 1996/10/24 13:45:43 jfitz Exp $
 #
 
 DISTNAME=	Resources-1.03
 PKGNAME=	p5-Resources-1.03
-CATEGORIES+=	devel
-MASTER_SITES=	ftp://ftp.digital.com/pub/plan/perl/CPAN/modules/by-module/Resources/ \
-		ftp://ftp.cdrom.com/pub/perl/CPAN/modules/by-module/Resources/ \
-		ftp://ftp.cis.ufl.edu/pub/perl/CPAN/modules/by-module/Resources/ \
-		ftp://ftp.leo.org/pub/comp/programming/languages/perl/CPAN/modules/by-module/Resources/ \
-		ftp://ftp.demon.co.uk/pub/mirrors/perl/CPAN/modules/by-module/Resources/ \
-		ftp://ftp.lab.kdd.co.jp/lang/perl/CPAN/modules/by-module/Resources/
+CATEGORIES=	devel
+MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
+MASTER_SITE_SUBDIR=	Resources
 
 MAINTAINER=	jfitz@FreeBSD.ORG
 
 BUILD_DEPENDS= 	perl5.003:${PORTSDIR}/lang/perl5
 RUN_DEPENDS=	perl5.003:${PORTSDIR}/lang/perl5
 
+MAN3=		Resources
+MANPREFIX=	${PREFIX}/lib/perl5
+
 do-configure:
 		@ cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PREFIX}/bin/perl Makefile.PL
 
-post-install:
-.if !defined(NOMANCOMPRESS)
-		@ for file in Resources; do \
-			gzip -9nf ${PREFIX}/lib/perl5/man/man3/$$file.3; \
-		done
-.endif     
-
 .include <bsd.port.mk>
diff --git a/devel/p5-Time/Makefile b/devel/p5-Time/Makefile
index 2576492dbb2e..3feaad1de972 100644
--- a/devel/p5-Time/Makefile
+++ b/devel/p5-Time/Makefile
@@ -3,32 +3,25 @@
 # Date created:				October 12th 1996
 # Whom:	      				James FitzGibbon <jfitz@FreeBSD.org>
 #
-#   $Id: Makefile,v 1.1.1.1 1996/10/24 08:17:02 jfitz Exp $
+#   $Id: Makefile,v 1.2 1996/10/24 09:59:30 jfitz Exp $
 #
 
 DISTNAME=	Time-modules-96.100201
 PKGNAME=	p5-Time-961002
-CATEGORIES+=	devel
-MASTER_SITES=	ftp://ftp.digital.com/pub/plan/perl/CPAN/modules/by-module/Time/ \
-		ftp://ftp.cdrom.com/pub/perl/CPAN/modules/by-module/Time/ \
-		ftp://ftp.cis.ufl.edu/pub/perl/CPAN/modules/by-module/Time/ \
-		ftp://ftp.leo.org/pub/comp/programming/languages/perl/CPAN/modules/by-module/Time/ \
-		ftp://ftp.demon.co.uk/pub/mirrors/perl/CPAN/modules/by-module/Time/ \
-		ftp://ftp.lab.kdd.co.jp/lang/perl/CPAN/modules/by-module/Time/
+CATEGORIES=	devel
+MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
+MASTER_SITE_SUBDIR=	Time
 
 MAINTAINER=	jfitz@FreeBSD.ORG
 
 BUILD_DEPENDS= 	perl5.003:${PORTSDIR}/lang/perl5
 RUN_DEPENDS=	perl5.003:${PORTSDIR}/lang/perl5
 
+MAN3=		Time::CTime.3 Time::JulianDay.3 Time::ParseDate.3 \
+		Time::Timezone.3 Time::DaysInMonth.3
+MANPREFIX=	${PREFIX}/lib/perl5
+
 do-configure:
 		@ cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PREFIX}/bin/perl Makefile.PL
 
-post-install:
-.if !defined(NOMANCOMPRESS)
-		@ for file in Time::CTime Time::JulianDay Time::ParseDate Time::Timezone Time::DaysInMonth; do \
-			gzip -9nf ${PREFIX}/lib/perl5/man/man3/$$file.3; \
-		done
-.endif
-
 .include <bsd.port.mk>
diff --git a/graphics/p5-Image-Size/Makefile b/graphics/p5-Image-Size/Makefile
index 77727b814dbd..c2e9f3977336 100644
--- a/graphics/p5-Image-Size/Makefile
+++ b/graphics/p5-Image-Size/Makefile
@@ -3,18 +3,14 @@
 # Date created:				October 20th 1996
 # Whom:	      				James FitzGibbon <jfitz@FreeBSD.org>
 #
-#   $Id: Makefile,v 1.1.1.1 1996/10/24 08:20:02 jfitz Exp $
+#   $Id: Makefile,v 1.2 1996/10/24 09:58:59 jfitz Exp $
 #
 
 DISTNAME=	Image-Size-1.2
 PKGNAME=	p5-Image-Size-1.2
-CATEGORIES+=	graphics www
-MASTER_SITES=	ftp://ftp.digital.com/pub/plan/perl/CPAN/modules/by-module/Image/ \
-		ftp://ftp.cdrom.com/pub/perl/CPAN/modules/by-module/Image/ \
-		ftp://ftp.cis.ufl.edu/pub/perl/CPAN/modules/by-module/Image/ \
-		ftp://ftp.leo.org/pub/comp/programming/languages/perl/CPAN/modules/by-module/Image/ \
-		ftp://ftp.demon.co.uk/pub/mirrors/perl/CPAN/modules/by-module/Image/ \
-		ftp://ftp.lab.kdd.co.jp/lang/perl/CPAN/modules/by-module/Image/
+CATEGORIES=	graphics www
+MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
+MASTER_SITE_SUBDIR=	Image
 
 MAINTAINER=	jfitz@FreeBSD.ORG
 
diff --git a/mail/p5-Mail-Folder/Makefile b/mail/p5-Mail-Folder/Makefile
index a4221fdb537f..1856255dd69e 100644
--- a/mail/p5-Mail-Folder/Makefile
+++ b/mail/p5-Mail-Folder/Makefile
@@ -3,7 +3,7 @@
 # Date created:				October 24th 1996
 # Whom:	      				James FitzGibbon <jfitz@FreeBSD.org>
 #
-#   $Id: Makefile,v 1.2 1996/11/10 21:32:04 obrien Exp $
+#   $Id: Makefile,v 1.3 1996/11/17 07:42:42 obrien Exp $
 #
 
 DISTNAME=	MailFolder-0.03
@@ -17,14 +17,10 @@ MAINTAINER=	jfitz@FreeBSD.ORG
 BUILD_DEPENDS= 	perl5.003:${PORTSDIR}/lang/perl5
 RUN_DEPENDS=	perl5.003:${PORTSDIR}/lang/perl5
 
+MAN3=		Mail::Folder.3 Mail::Folder::Emaul.3 Mail::Folder::Mbox.3
+MANPREFIX=	${PREFIX}/lib/perl5
+
 do-configure:
 		@ cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PREFIX}/bin/perl Makefile.PL
 
-post-install:
-.if !defined(NOMANCOMPRESS)
-		@ for file in Mail::Folder Mail::Folder::Emaul Mail::Folder::Mbox; do \
-			gzip -9nf ${PREFIX}/lib/perl5/man/man3/$$file.3; \
-		done
-.endif     
-
 .include <bsd.port.mk>
diff --git a/mail/p5-Mail-POP3Client/Makefile b/mail/p5-Mail-POP3Client/Makefile
index 3378ae85f19f..02eab1422313 100644
--- a/mail/p5-Mail-POP3Client/Makefile
+++ b/mail/p5-Mail-POP3Client/Makefile
@@ -3,7 +3,7 @@
 # Date created:				October 24th 1996
 # Whom:	      				James FitzGibbon <jfitz@FreeBSD.org>
 #
-#   $Id: Makefile,v 1.2 1996/11/10 21:32:08 obrien Exp $
+#   $Id: Makefile,v 1.3 1996/11/17 07:42:44 obrien Exp $
 #
 
 DISTNAME=	POP3Client-1_14
@@ -17,14 +17,10 @@ MAINTAINER=	jfitz@FreeBSD.ORG
 BUILD_DEPENDS= 	perl5.003:${PORTSDIR}/lang/perl5
 RUN_DEPENDS=	perl5.003:${PORTSDIR}/lang/perl5
 
+MAN3=		Mail::POP3Client.3
+MANPREFIX=	${PREFIX}/lib/perl5
+
 do-configure:
 		@ cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PREFIX}/bin/perl Makefile.PL
 
-post-install:
-.if !defined(NOMANCOMPRESS)
-		@ for file in Mail::POP3Client; do \
-			gzip -9nf ${PREFIX}/lib/perl5/man/man3/$$file.3; \
-		done
-.endif     
-
 .include <bsd.port.mk>
diff --git a/mail/p5-Mail-Tools/Makefile b/mail/p5-Mail-Tools/Makefile
index 8be95ac13b42..020f25ae823b 100644
--- a/mail/p5-Mail-Tools/Makefile
+++ b/mail/p5-Mail-Tools/Makefile
@@ -3,7 +3,7 @@
 # Date created:				October 24th 1996
 # Whom:	      				James FitzGibbon <jfitz@FreeBSD.org>
 #
-#   $Id: Makefile,v 1.2 1996/11/10 21:32:12 obrien Exp $
+#   $Id: Makefile,v 1.3 1996/11/17 07:42:45 obrien Exp $
 #
 
 DISTNAME=	MailTools-1.06
@@ -19,14 +19,12 @@ BUILD_DEPENDS= 	perl5.003:${PORTSDIR}/lang/perl5 \
 		${PREFIX}/lib/perl5/site_perl/Net/Domain.pm:${PORTSDIR}/net/p5-Net
 RUN_DEPENDS=	perl5.003:${PORTSDIR}/lang/perl5
 
+MAN3=		Mail::Address.3 Mail::Cap.3 Mail::Field.3 Mail::Header.3 \
+		Mail::Internet.3 Mail::MIME.3 Mail::Mailer.3 Mail::Send.3 \
+		Mail::Util.3
+MANPREFIX=	${PREFIX}/lib/perl5
+
 do-configure:
 		@ cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PREFIX}/bin/perl Makefile.PL
 
-post-install:
-.if !defined(NOMANCOMPRESS)
-		@ for file in Mail::Address Mail::Cap Mail::Field Mail::Header Mail::Internet Mail::MIME Mail::Mailer Mail::Send Mail::Util; do \
-			gzip -9nf ${PREFIX}/lib/perl5/man/man3/$$file.3; \
-		done
-.endif
-		
 .include <bsd.port.mk>
diff --git a/net/p5-Archie/Makefile b/net/p5-Archie/Makefile
index 0deeaef0d9c7..6df3fe18c1e7 100644
--- a/net/p5-Archie/Makefile
+++ b/net/p5-Archie/Makefile
@@ -3,18 +3,14 @@
 # Date created:				October 19th 1996
 # Whom:	      				James FitzGibbon <jfitz@FreeBSD.org>
 #
-#   $Id: Makefile,v 1.1.1.1 1996/10/24 08:28:51 jfitz Exp $
+#   $Id: Makefile,v 1.2 1996/10/24 09:57:30 jfitz Exp $
 #
 
 DISTNAME=	perl_archie.1.5
 PKGNAME=	p5-Archie-1.5
-CATEGORIES+=	net
-MASTER_SITES=	ftp://ftp.digital.com/pub/plan/perl/CPAN/modules/by-module/Archie/ \
-		ftp://ftp.cdrom.com/pub/perl/CPAN/modules/by-module/Archie/ \
-		ftp://ftp.cis.ufl.edu/pub/perl/CPAN/modules/by-module/Archie/ \
-		ftp://ftp.leo.org/pub/comp/programming/languages/perl/CPAN/modules/by-module/Archie/ \
-		ftp://ftp.demon.co.uk/pub/mirrors/perl/CPAN/modules/by-module/Archie/ \
-		ftp://ftp.lab.kdd.co.jp/lang/perl/CPAN/modules/by-module/Archie/
+CATEGORIES=	net
+MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
+MASTER_SITE_SUBDIR=	Archie
 
 MAINTAINER=	jfitz@FreeBSD.ORG
 
diff --git a/net/p5-Net/Makefile b/net/p5-Net/Makefile
index dd3e5521c172..766c87ab9909 100644
--- a/net/p5-Net/Makefile
+++ b/net/p5-Net/Makefile
@@ -3,18 +3,14 @@
 # Date created:				September 30th 1996
 # Whom:	      				James FitzGibbon <jfitz@FreeBSD.org>
 #
-#   $Id: Makefile,v 1.1.1.1 1996/10/24 08:32:19 jfitz Exp $
+#   $Id: Makefile,v 1.2 1996/10/24 09:59:22 jfitz Exp $
 #
 
 DISTNAME=	libnet-1.01
 PKGNAME=	p5-Net-1.01
-CATEGORIES+=	net
-MASTER_SITES=	ftp://ftp.digital.com/pub/plan/perl/CPAN/modules/by-module/Net/ \
-		ftp://ftp.cdrom.com/pub/perl/CPAN/modules/by-module/Net/ \
-		ftp://ftp.cis.ufl.edu/pub/perl/CPAN/modules/by-module/Net/ \
-		ftp://ftp.leo.org/pub/comp/programming/languages/perl/CPAN/modules/by-module/Net/ \
-		ftp://ftp.demon.co.uk/pub/mirrors/perl/CPAN/modules/by-module/Net/ \
-		ftp://ftp.lab.kdd.co.jp/lang/perl/CPAN/modules/by-module/Net/
+CATEGORIES=	net
+MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
+MASTER_SITE_SUBDIR=	Net
 
 MAINTAINER=	jfitz@FreeBSD.ORG
 
@@ -22,14 +18,12 @@ BUILD_DEPENDS= 	perl5.003:${PORTSDIR}/lang/perl5 \
 		${PREFIX}/lib/perl5/IO::Socket.pm:${PORTSDIR}/net/p5-IO
 RUN_DEPENDS=	perl5.003:${PORTSDIR}/lang/perl5
 
+MAN3=		Net::Time.3 Net::DummyInetd.3 Net::NNTP.3 Net::SNPP.3 \
+		Net::POP3.3 Net::Cmd.3 Net::SMTP.3 Net::Domain.3 \
+		Net::FTP.3 Net::Netrc.3 Net::Telnet.3
+MANPREFIX=	${PREFIX}/lib/perl5
+
 do-configure:
 		@ cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PREFIX}/bin/perl Makefile.PL
 
-post-install:
-.if !defined(NOMANCOMPRESS)
-		@ for file in Net::Time Net::DummyInetd Net::NNTP Net::SNPP Net::POP3 Net::Cmd Net::SMTP Net::Domain Net::FTP Net::Netrc Net::Telnet; do \
-			gzip -9nf ${PREFIX}/lib/perl5/man/man3/$$file.3; \
-		done
-.endif           
-
 .include <bsd.port.mk>
diff --git a/security/p5-Crypt-IDEA/Makefile b/security/p5-Crypt-IDEA/Makefile
index 7f76a0cb1549..d264475aab21 100644
--- a/security/p5-Crypt-IDEA/Makefile
+++ b/security/p5-Crypt-IDEA/Makefile
@@ -3,7 +3,7 @@
 # Date created:				October 20th 1996
 # Whom:	      				James FitzGibbon <jfitz@FreeBSD.org>
 #
-#   $Id: Makefile,v 1.2 1996/10/24 09:58:14 jfitz Exp $
+#   $Id: Makefile,v 1.3 1996/11/17 07:57:59 obrien Exp $
 #
 
 DISTNAME=	Crypt-IDEA-1.0
@@ -11,6 +11,7 @@ PKGNAME=	p5-Crypt-IDEA-1.0
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Crypt
+
 MAINTAINER=	jfitz@FreeBSD.ORG
 
 BUILD_DEPENDS= 	perl5.003:${PORTSDIR}/lang/perl5
diff --git a/www/p5-CGI-modules/Makefile b/www/p5-CGI-modules/Makefile
index 7e6e03ff0132..70f3b234ab32 100644
--- a/www/p5-CGI-modules/Makefile
+++ b/www/p5-CGI-modules/Makefile
@@ -3,18 +3,14 @@
 # Date created:				September 30th 1996
 # Whom:	      				James FitzGibbon <jfitz@FreeBSD.org>
 #
-#   $Id: Makefile,v 1.1.1.1 1996/10/24 08:40:27 jfitz Exp $
+#   $Id: Makefile,v 1.2 1996/10/24 09:57:59 jfitz Exp $
 #
 
 DISTNAME=	CGI-modules-2.75
 PKGNAME=	p5-CGI-2.75
-CATEGORIES+=	www
-MASTER_SITES=	ftp://ftp.digital.com/pub/plan/perl/CPAN/modules/by-module/CGI/ \
-		ftp://ftp.cdrom.com/pub/perl/CPAN/modules/by-module/CGI/ \
-		ftp://ftp.cis.ufl.edu/pub/perl/CPAN/modules/by-module/CGI/ \
-		ftp://ftp.leo.org/pub/comp/programming/languages/perl/CPAN/modules/by-module/CGI/ \
-		ftp://ftp.demon.co.uk/pub/mirrors/perl/CPAN/modules/by-module/CGI/ \
-		ftp://ftp.lab.kdd.co.jp/lang/perl/CPAN/modules/by-module/CGI/
+CATEGORIES=	www
+MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
+MASTER_SITE_SUBDIR=	CGI
 
 MAINTAINER=	jfitz@FreeBSD.ORG
 
@@ -22,14 +18,11 @@ BUILD_DEPENDS= 	perl5.003:${PORTSDIR}/lang/perl5 \
 		${PREFIX}/lib/perl5/site_perl/URI/Escape.pm:${PORTSDIR}/www/p5-libwww
 RUN_DEPENDS=	perl5.003:${PORTSDIR}/lang/perl5
 
+MAN3=		CGI::Base.3 CGI::BasePlus.3 CGI::Carp.3 CGI::Form.3 \
+		CGI::MiniSvr.3 CGI::Request.3
+MANPREFIX=	${PREFIX}/lib/perl5
+
 do-configure:
 		@ cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PREFIX}/bin/perl Makefile.PL
 
-post-install:	
-.if !defined(NOMANCOMPRESS)
-		@ for file in CGI::Base.3 CGI::BasePlus.3 CGI::Carp.3 CGI::Form.3 CGI::MiniSvr.3 CGI::Request.3; do \
-			gzip -9nf ${PREFIX}/lib/perl5/man/man3/$$file; \
-		done
-.endif
-
 .include <bsd.port.mk>
diff --git a/www/p5-CGI/Makefile b/www/p5-CGI/Makefile
index 7e6e03ff0132..70f3b234ab32 100644
--- a/www/p5-CGI/Makefile
+++ b/www/p5-CGI/Makefile
@@ -3,18 +3,14 @@
 # Date created:				September 30th 1996
 # Whom:	      				James FitzGibbon <jfitz@FreeBSD.org>
 #
-#   $Id: Makefile,v 1.1.1.1 1996/10/24 08:40:27 jfitz Exp $
+#   $Id: Makefile,v 1.2 1996/10/24 09:57:59 jfitz Exp $
 #
 
 DISTNAME=	CGI-modules-2.75
 PKGNAME=	p5-CGI-2.75
-CATEGORIES+=	www
-MASTER_SITES=	ftp://ftp.digital.com/pub/plan/perl/CPAN/modules/by-module/CGI/ \
-		ftp://ftp.cdrom.com/pub/perl/CPAN/modules/by-module/CGI/ \
-		ftp://ftp.cis.ufl.edu/pub/perl/CPAN/modules/by-module/CGI/ \
-		ftp://ftp.leo.org/pub/comp/programming/languages/perl/CPAN/modules/by-module/CGI/ \
-		ftp://ftp.demon.co.uk/pub/mirrors/perl/CPAN/modules/by-module/CGI/ \
-		ftp://ftp.lab.kdd.co.jp/lang/perl/CPAN/modules/by-module/CGI/
+CATEGORIES=	www
+MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
+MASTER_SITE_SUBDIR=	CGI
 
 MAINTAINER=	jfitz@FreeBSD.ORG
 
@@ -22,14 +18,11 @@ BUILD_DEPENDS= 	perl5.003:${PORTSDIR}/lang/perl5 \
 		${PREFIX}/lib/perl5/site_perl/URI/Escape.pm:${PORTSDIR}/www/p5-libwww
 RUN_DEPENDS=	perl5.003:${PORTSDIR}/lang/perl5
 
+MAN3=		CGI::Base.3 CGI::BasePlus.3 CGI::Carp.3 CGI::Form.3 \
+		CGI::MiniSvr.3 CGI::Request.3
+MANPREFIX=	${PREFIX}/lib/perl5
+
 do-configure:
 		@ cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PREFIX}/bin/perl Makefile.PL
 
-post-install:	
-.if !defined(NOMANCOMPRESS)
-		@ for file in CGI::Base.3 CGI::BasePlus.3 CGI::Carp.3 CGI::Form.3 CGI::MiniSvr.3 CGI::Request.3; do \
-			gzip -9nf ${PREFIX}/lib/perl5/man/man3/$$file; \
-		done
-.endif
-
 .include <bsd.port.mk>
diff --git a/www/p5-CGI_Lite/Makefile b/www/p5-CGI_Lite/Makefile
index 63f55434e37b..3b041b922204 100644
--- a/www/p5-CGI_Lite/Makefile
+++ b/www/p5-CGI_Lite/Makefile
@@ -3,22 +3,18 @@
 # Date created:				September 30th 1996
 # Whom:	      				James FitzGibbon <jfitz@FreeBSD.org>
 #
-#   $Id: Makefile,v 1.1.1.1 1996/10/24 08:41:38 jfitz Exp $
+#   $Id: Makefile,v 1.2 1996/10/24 09:58:02 jfitz Exp $
 #
 
 DISTNAME=	CGI_Lite-1.62.pm
 PKGNAME=	p5-CGI_Lite-1.62
-CATEGORIES+=	www
-MASTER_SITES=	ftp://ftp.digital.com/pub/plan/perl/CPAN/modules/by-module/CGI_Lite/ \
-		ftp://ftp.cdrom.com/pub/perl/CPAN/modules/by-module/CGI_Lite/ \
-		ftp://ftp.cis.ufl.edu/pub/perl/CPAN/modules/by-module/CGI_Lite/ \
-		ftp://ftp.leo.org/pub/comp/programming/languages/perl/CPAN/modules/by-module/CGI_Lite/ \
-		ftp://ftp.demon.co.uk/pub/mirrors/perl/CPAN/modules/by-module/CGI_Lite/ \
-		ftp://ftp.lab.kdd.co.jp/lang/perl/CPAN/modules/by-module/CGI_Lite/
+CATEGORIES=	www
+MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
+MASTER_SITE_SUBDIR=	CGI_Lite
+EXTRACT_SUFX=	.gz
 
 MAINTAINER=	jfitz@FreeBSD.ORG
 
-EXTRACT_SUFX=	.gz
 BUILD_DEPENDS= 	perl5.003:${PORTSDIR}/lang/perl5
 RUN_DEPENDS=	perl5.003:${PORTSDIR}/lang/perl5
 
diff --git a/www/p5-HTML-QuickCheck/Makefile b/www/p5-HTML-QuickCheck/Makefile
index 97286c7407e7..b06c7d33dd69 100644
--- a/www/p5-HTML-QuickCheck/Makefile
+++ b/www/p5-HTML-QuickCheck/Makefile
@@ -3,32 +3,24 @@
 # Date created:				October 20th 1996
 # Whom:	      				James FitzGibbon <jfitz@FreeBSD.org>
 #
-#   $Id: Makefile,v 1.1.1.1 1996/10/24 08:44:45 jfitz Exp $
+#   $Id: Makefile,v 1.2 1996/10/24 09:58:50 jfitz Exp $
 #
 
 DISTNAME=	HTML-QuickCheck-1.0b1
 PKGNAME=	p5-HTML-QuickCheck-1.0b1
-CATEGORIES+=	www
-MASTER_SITES=	ftp://ftp.digital.com/pub/plan/perl/CPAN/modules/by-module/HTML/ \
-		ftp://ftp.cdrom.com/pub/perl/CPAN/modules/by-module/HTML/ \
-		ftp://ftp.cis.ufl.edu/pub/perl/CPAN/modules/by-module/HTML/ \
-		ftp://ftp.leo.org/pub/comp/programming/languages/perl/CPAN/modules/by-module/HTML/ \
-		ftp://ftp.demon.co.uk/pub/mirrors/perl/CPAN/modules/by-module/HTML/ \
-		ftp://ftp.lab.kdd.co.jp/lang/perl/CPAN/modules/by-module/HTML/
+CATEGORIES=	www
+MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
+MASTER_SITE_SUBDIR=	HTML
 
 MAINTAINER=	jfitz@FreeBSD.ORG
 
 BUILD_DEPENDS= 	perl5.003:${PORTSDIR}/lang/perl5
 RUN_DEPENDS=	perl5.003:${PORTSDIR}/lang/perl5
 
+MAN3=		HTML::QuickCheck.3
+MANPREFIX=	${PREFIX}/lib/perl5
+
 do-configure:
 		@ cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PREFIX}/bin/perl Makefile.PL
 
-post-install:
-.if !defined(NOMANCOMPRESS)
-		@ for file in HTML::QuickCheck; do \
-			gzip -9nf ${PREFIX}/lib/perl5/man/man3/$$file.3; \
-		done
-.endif
-
 .include <bsd.port.mk>
diff --git a/www/p5-HTML-Stream/Makefile b/www/p5-HTML-Stream/Makefile
index d588f36fc9b0..dd6328960c96 100644
--- a/www/p5-HTML-Stream/Makefile
+++ b/www/p5-HTML-Stream/Makefile
@@ -3,32 +3,24 @@
 # Date created:				October 20th 1996
 # Whom:	      				James FitzGibbon <jfitz@FreeBSD.org>
 #
-#   $Id: Makefile,v 1.1.1.1 1996/10/24 08:46:17 jfitz Exp $
+#   $Id: Makefile,v 1.2 1996/10/24 09:58:53 jfitz Exp $
 #
 
 DISTNAME=	HTML-Stream-1.24
 PKGNAME=	p5-HTML-Stream-1.24
-CATEGORIES+=	www
-MASTER_SITES=	ftp://ftp.digital.com/pub/plan/perl/CPAN/modules/by-module/HTML/ \
-		ftp://ftp.cdrom.com/pub/perl/CPAN/modules/by-module/HTML/ \
-		ftp://ftp.cis.ufl.edu/pub/perl/CPAN/modules/by-module/HTML/ \
-		ftp://ftp.leo.org/pub/comp/programming/languages/perl/CPAN/modules/by-module/HTML/ \
-		ftp://ftp.demon.co.uk/pub/mirrors/perl/CPAN/modules/by-module/HTML/ \
-		ftp://ftp.lab.kdd.co.jp/lang/perl/CPAN/modules/by-module/HTML/
+CATEGORIES=	www
+MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
+MASTER_SITE_SUBDIR=	HTML
 
 MAINTAINER=	jfitz@FreeBSD.ORG
 
 BUILD_DEPENDS= 	perl5.003:${PORTSDIR}/lang/perl5
 RUN_DEPENDS=	perl5.003:${PORTSDIR}/lang/perl5
 
+MAN3=		HTML::Stream.3
+MANPREFIX=	${PREFIX}/lib/perl5
+
 do-configure:
 		@ cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PREFIX}/bin/perl Makefile.PL
 
-post-install:
-.if !defined(NOMANCOMPRESS)
-		@ for file in HTML::Stream; do \
-			gzip -9nf ${PREFIX}/lib/perl5/man/man3/$$file.3; \
-		done
-.endif
-
 .include <bsd.port.mk>
diff --git a/www/p5-HTML/Makefile b/www/p5-HTML/Makefile
index 7e957fc0b6c4..e0938a56009d 100644
--- a/www/p5-HTML/Makefile
+++ b/www/p5-HTML/Makefile
@@ -3,18 +3,14 @@
 # Date created:				October 20th 1996
 # Whom:	      				James FitzGibbon <jfitz@FreeBSD.org>
 #
-#   $Id: Makefile,v 1.1.1.1 1996/10/24 08:42:50 jfitz Exp $
+#   $Id: Makefile,v 1.2 1996/10/24 09:58:48 jfitz Exp $
 #
 
 DISTNAME=	HTML-0.6
 PKGNAME=	p5-HTML-0.6
-CATEGORIES+=	www
-MASTER_SITES=	ftp://ftp.digital.com/pub/plan/perl/CPAN/modules/by-module/HTML/ \
-		ftp://ftp.cdrom.com/pub/perl/CPAN/modules/by-module/HTML/ \
-		ftp://ftp.cis.ufl.edu/pub/perl/CPAN/modules/by-module/HTML/ \
-		ftp://ftp.leo.org/pub/comp/programming/languages/perl/CPAN/modules/by-module/HTML/ \
-		ftp://ftp.demon.co.uk/pub/mirrors/perl/CPAN/modules/by-module/HTML/ \
-		ftp://ftp.lab.kdd.co.jp/lang/perl/CPAN/modules/by-module/HTML/
+CATEGORIES=	www
+MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
+MASTER_SITE_SUBDIR=	HTML
 
 MAINTAINER=	jfitz@FreeBSD.ORG
 
diff --git a/www/p5-HTTPD-Tools/Makefile b/www/p5-HTTPD-Tools/Makefile
index e5b2b4d8faa9..22c251c38d23 100644
--- a/www/p5-HTTPD-Tools/Makefile
+++ b/www/p5-HTTPD-Tools/Makefile
@@ -3,32 +3,24 @@
 # Date created:				October 20th 1996
 # Whom:	      				James FitzGibbon <jfitz@FreeBSD.org>
 #
-#   $Id: Makefile,v 1.1.1.1 1996/10/24 08:47:12 jfitz Exp $
+#   $Id: Makefile,v 1.2 1996/10/24 09:58:56 jfitz Exp $
 #
 
 DISTNAME=	HTTPD-Tools-0.52
 PKGNAME=	p5-HTTPD-Tools-0.52
-CATEGORIES+=	www
-MASTER_SITES=	ftp://ftp.digital.com/pub/plan/perl/CPAN/modules/by-module/HTTPD/ \
-		ftp://ftp.cdrom.com/pub/perl/CPAN/modules/by-module/HTTPD/ \
-		ftp://ftp.cis.ufl.edu/pub/perl/CPAN/modules/by-module/HTTPD/ \
-		ftp://ftp.leo.org/pub/comp/programming/languages/perl/CPAN/modules/by-module/HTTPD/ \
-		ftp://ftp.demon.co.uk/pub/mirrors/perl/CPAN/modules/by-module/HTTPD/ \
-		ftp://ftp.lab.kdd.co.jp/lang/perl/CPAN/modules/by-module/HTTPD/
+CATEGORIES=	www
+MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
+MASTER_SITE_SUBDIR=	HTTPD
 
 MAINTAINER=	jfitz@FreeBSD.ORG
 
 BUILD_DEPENDS= 	perl5.003:${PORTSDIR}/lang/perl5
 RUN_DEPENDS=	perl5.003:${PORTSDIR}/lang/perl5
 
+MAN3=		HTTPD::Authen.3 HTTPD::UserAdmin.3 HTTPD::GroupAdmin.3
+MANPREFIX=	${PREFIX}/lib/perl5
+
 do-configure:
 		@ cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PREFIX}/bin/perl Makefile.PL
 
-post-install:
-.if !defined(NOMANCOMPRESS)
-		@ for file in HTTPD::Authen HTTPD::UserAdmin HTTPD::GroupAdmin; do \
-			gzip -9nf ${PREFIX}/lib/perl5/man/man3/$$file.3; \
-		done
-.endif
-
 .include <bsd.port.mk>
diff --git a/www/p5-HTTPD-User-Manage/Makefile b/www/p5-HTTPD-User-Manage/Makefile
index e5b2b4d8faa9..22c251c38d23 100644
--- a/www/p5-HTTPD-User-Manage/Makefile
+++ b/www/p5-HTTPD-User-Manage/Makefile
@@ -3,32 +3,24 @@
 # Date created:				October 20th 1996
 # Whom:	      				James FitzGibbon <jfitz@FreeBSD.org>
 #
-#   $Id: Makefile,v 1.1.1.1 1996/10/24 08:47:12 jfitz Exp $
+#   $Id: Makefile,v 1.2 1996/10/24 09:58:56 jfitz Exp $
 #
 
 DISTNAME=	HTTPD-Tools-0.52
 PKGNAME=	p5-HTTPD-Tools-0.52
-CATEGORIES+=	www
-MASTER_SITES=	ftp://ftp.digital.com/pub/plan/perl/CPAN/modules/by-module/HTTPD/ \
-		ftp://ftp.cdrom.com/pub/perl/CPAN/modules/by-module/HTTPD/ \
-		ftp://ftp.cis.ufl.edu/pub/perl/CPAN/modules/by-module/HTTPD/ \
-		ftp://ftp.leo.org/pub/comp/programming/languages/perl/CPAN/modules/by-module/HTTPD/ \
-		ftp://ftp.demon.co.uk/pub/mirrors/perl/CPAN/modules/by-module/HTTPD/ \
-		ftp://ftp.lab.kdd.co.jp/lang/perl/CPAN/modules/by-module/HTTPD/
+CATEGORIES=	www
+MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
+MASTER_SITE_SUBDIR=	HTTPD
 
 MAINTAINER=	jfitz@FreeBSD.ORG
 
 BUILD_DEPENDS= 	perl5.003:${PORTSDIR}/lang/perl5
 RUN_DEPENDS=	perl5.003:${PORTSDIR}/lang/perl5
 
+MAN3=		HTTPD::Authen.3 HTTPD::UserAdmin.3 HTTPD::GroupAdmin.3
+MANPREFIX=	${PREFIX}/lib/perl5
+
 do-configure:
 		@ cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PREFIX}/bin/perl Makefile.PL
 
-post-install:
-.if !defined(NOMANCOMPRESS)
-		@ for file in HTTPD::Authen HTTPD::UserAdmin HTTPD::GroupAdmin; do \
-			gzip -9nf ${PREFIX}/lib/perl5/man/man3/$$file.3; \
-		done
-.endif
-
 .include <bsd.port.mk>
diff --git a/www/p5-libwww/Makefile b/www/p5-libwww/Makefile
index 3bb7c3695e2e..49c563a65a8d 100644
--- a/www/p5-libwww/Makefile
+++ b/www/p5-libwww/Makefile
@@ -3,18 +3,14 @@
 # Date created:				September 30th 1996
 # Whom:	      				James FitzGibbon <jfitz@FreeBSD.org>
 #
-#   $Id: Makefile,v 1.1.1.1 1996/10/24 08:51:22 jfitz Exp $
+#   $Id: Makefile,v 1.2 1996/10/24 09:59:16 jfitz Exp $
 #
 
 DISTNAME=	libwww-perl-5.03
 PKGNAME=	p5-libwww-5.03
-CATEGORIES+=	www
-MASTER_SITES=	ftp://ftp.digital.com/pub/plan/perl/CPAN/modules/by-module/URI/ \
-		ftp://ftp.cdrom.com/pub/perl/CPAN/modules/by-module/URI/ \
-		ftp://ftp.cis.ufl.edu/pub/perl/CPAN/modules/by-module/URI/ \
-		ftp://ftp.leo.org/pub/comp/programming/languages/perl/CPAN/modules/by-module/URI/ \
-		ftp://ftp.demon.co.uk/pub/mirrors/perl/CPAN/modules/by-module/URI/ \
-		ftp://ftp.lab.kdd.co.jp/lang/perl/CPAN/modules/by-module/URI/
+CATEGORIES=	www
+MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
+MASTER_SITE_SUBDIR=	URI
 
 MAINTAINER=	jfitz@FreeBSD.ORG
 
@@ -23,14 +19,26 @@ BUILD_DEPENDS= 	perl5.003:${PORTSDIR}/lang/perl5 \
 		${PREFIX}/lib/perl5/site_perl/Net/FTP.pm:${PORTSDIR}/net/p5-Net
 RUN_DEPENDS=	perl5.003:${PORTSDIR}/lang/perl5
 
+MAN3=		File::CounterFile.3 File::Listing.3 Font::AFM.3 \
+		HTML::AsSubs.3 HTML::Element.3 HTML::Entities.3 \
+		HTML::FormatPS.3 HTML::FormatText.3 HTML::Formatter.3 \
+		HTML::HeadParser.3 HTML::LinkExtor.3 HTML::Parse.3 \
+		HTML::Parser.3 HTML::TreeBuilder.3 HTTP::Date.3 \
+		HTTP::Headers.3 HTTP::Message.3 HTTP::Negotiate.3 \
+		HTTP::Request.3 HTTP::Response.3 HTTP::Status.3 LWP.3 \
+		LWP::Debug.3 LWP::IO.3 LWP::MediaTypes.3 \
+		LWP::MemberMixin.3 LWP::Protocol.3 LWP::RobotUA.3 \
+		LWP::Simple.3 LWP::Socket.3 LWP::TkIO.3 LWP::UserAgent.3 \
+		MIME::Base64.3 MIME::QuotedPrint.3 URI::Escape.3 \
+		URI::URL.3 WWW::RobotRules.3 \
+		WWW::RobotRules::AnyDBM_File.3 lwpcook.3
+MANPREFIX=	${PREFIX}/lib/perl5
+
 do-configure:
 		@ cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PREFIX}/bin/perl Makefile.PL
 
 post-install:
 .if !defined(NOMANCOMPRESS)
-		@ for file in File::CounterFile File::Listing Font::AFM HTML::AsSubs HTML::Element HTML::Entities HTML::FormatPS HTML::FormatText HTML::Formatter HTML::HeadParser HTML::LinkExtor HTML::Parse HTML::Parser HTML::TreeBuilder HTTP::Date HTTP::Headers HTTP::Message HTTP::Negotiate HTTP::Request HTTP::Response HTTP::Status LWP LWP::Debug LWP::IO LWP::MediaTypes LWP::MemberMixin LWP::Protocol LWP::RobotUA LWP::Simple LWP::Socket LWP::TkIO LWP::UserAgent MIME::Base64 MIME::QuotedPrint URI::Escape URI::URL WWW::RobotRules WWW::RobotRules::AnyDBM_File lwpcook; do \
-			gzip -9nf ${PREFIX}/lib/perl5/man/man3/$$file.3; \
-		done
 		@ for file in lwp-mirror lwp-request lwp-rget; do \
 			gzip -9nf ${PREFIX}/man/man1/$$file.1; \
 		done
diff --git a/x11-toolkits/p5-Tk/Makefile b/x11-toolkits/p5-Tk/Makefile
index 6a90c56c9ae8..80027c4de411 100644
--- a/x11-toolkits/p5-Tk/Makefile
+++ b/x11-toolkits/p5-Tk/Makefile
@@ -3,18 +3,14 @@
 # Date created:				October 21st 1996
 # Whom:	      				James FitzGibbon <jfitz@FreeBSD.org>
 #
-#   $Id: Makefile,v 1.2 1996/10/24 09:23:56 jfitz Exp $
+#   $Id: Makefile,v 1.3 1996/10/24 09:59:32 jfitz Exp $
 #
 
 DISTNAME=	Tk400.200
 PKGNAME=	p5-Tk400-2.00
-CATEGORIES+=	x11
-MASTER_SITES=	ftp://ftp.digital.com/pub/plan/perl/CPAN/modules/by-module/Tk/ \
-		ftp://ftp.cdrom.com/pub/perl/CPAN/modules/by-module/Tk/ \
-		ftp://ftp.cis.ufl.edu/pub/perl/CPAN/modules/by-module/Tk/ \
-		ftp://ftp.leo.org/pub/comp/programming/languages/perl/CPAN/modules/by-module/Tk/ \
-		ftp://ftp.demon.co.uk/pub/mirrors/perl/CPAN/modules/by-module/Tk/ \
-		ftp://ftp.lab.kdd.co.jp/lang/perl/CPAN/modules/by-module/Tk/
+CATEGORIES=	x11
+MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
+MASTER_SITE_SUBDIR=	Tk
 
 MAINTAINER=	jfitz@FreeBSD.ORG
 
@@ -24,14 +20,20 @@ BUILD_DEPENDS= 	perl5.003:${PORTSDIR}/lang/perl5 \
 LIB_DEPENDS=	tk41\\.1\\.:${PORTSDIR}/x11/tk41
 RUN_DEPENDS=	perl5.003:${PORTSDIR}/lang/perl5
 
+MAN3=		Tk::After.3 Tk::Axis.3 Tk::ColorEditor.3 Tk::Dial.3 \
+		Tk::DragDrop::Common.3 Tk::DragDrop::SunConst.3 \
+		Tk::FileDialog.3 Tk::FileSelect.3 Tk::Font.3 \
+		Tk::Ghostscript.3 Tk::HTML::IO.3 Tk::IO.3 \
+		Tk::Internals.3 Tk::Parse.3 Tk::ROText.3 \
+		Tk::Table.3 Tk::Tcl-perl.3 Tk::TextUndo.3 \
+		Tk::UserGuide.3 Tk::WaitBox.3 Tk::pTk.3 blib.3
+MANPREFIX=	${PREFIX}/lib/perl5
+
 do-configure:
 		@ cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PREFIX}/bin/perl Makefile.PL
 
 post-install:
 .if !defined(NOMANCOMPRESS)
-		@ for file in Tk::After Tk::Axis Tk::ColorEditor Tk::Dial Tk::DragDrop::Common Tk::DragDrop::SunConst Tk::FileDialog Tk::FileSelect Tk::Font Tk::Ghostscript Tk::HTML::IO Tk::IO Tk::Internals Tk::Parse Tk::ROText Tk::Table Tk::Tcl-perl Tk::TextUndo Tk::UserGuide Tk::WaitBox Tk::pTk blib; do \
-			gzip -9nf ${PREFIX}/lib/perl5/man/man3/$$file.3; \
-		done
 		@ for file in tkweb; do \
 			gzip -9nf ${PREFIX}/man/man1/$$file.1; \
 		done