diff --git a/archivers/p5-Compress-Zlib/Makefile b/archivers/p5-Compress-Zlib/Makefile
index a13e949b1df..5bb5bf99a02 100644
--- a/archivers/p5-Compress-Zlib/Makefile
+++ b/archivers/p5-Compress-Zlib/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.12 2000/06/02 11:47:31 espie Exp $
+# $OpenBSD: Makefile,v 1.13 2000/06/02 11:56:22 espie Exp $
 
 DISTNAME=	Compress-Zlib-1.08
 PKGNAME=	p5-Cmprs-Zlib-1.08
@@ -13,7 +13,6 @@ PERMIT_PACKAGE_CDROM=   Yes
 PERMIT_PACKAGE_FTP=     Yes
 PERMIT_DISTFILES_CDROM= Yes
 PERMIT_DISTFILES_FTP=   Yes
-FAKE=			Yes
 CONFIGURE_STYLE=	perl
 
 .include <bsd.port.mk>
diff --git a/audio/p5-MPEG-MP3Info/Makefile b/audio/p5-MPEG-MP3Info/Makefile
index 08e55dd8431..513e1a9c1ed 100644
--- a/audio/p5-MPEG-MP3Info/Makefile
+++ b/audio/p5-MPEG-MP3Info/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.3 2000/04/08 14:28:48 espie Exp $
+# $OpenBSD: Makefile,v 1.4 2000/06/02 11:56:23 espie Exp $
 
 DISTNAME=       MPEG-MP3Info-0.71
 PKGNAME=        MPEG-MP3Info-0.71
 CATEGORIES=	audio perl5
-NEED_VERSION=	1.251
+NEED_VERSION=	1.290
 
 MAINTAINER=	angelos@openbsd.org
 MASTER_SITES=	http://www.perl.com/CPAN-local/authors/id/CNANDOR/
@@ -13,23 +13,6 @@ PERMIT_PACKAGE_CDROM=   Yes
 PERMIT_PACKAGE_FTP=     Yes
 PERMIT_DISTFILES_CDROM= Yes
 PERMIT_DISTFILES_FTP=   Yes
-FAKE=			Yes
-
-pre-fake:
-	@mkdir -p ${WRKINST}`/usr/bin/perl -e 'use Config; print $$Config{installarchlib}, "\n";'`
-
-do-configure:
-	@arch=`/usr/bin/perl -e 'use Config; print $$Config{archname}, "\n";'`; \
-	cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} \
-	/usr/bin/perl Makefile.PL \
-	    PREFIX='$${DESTDIR}${PREFIX}' \
-	    INSTALLSITELIB='$${DESTDIR}${PREFIX}/libdata/perl5/site_perl' \
-	    INSTALLSITEARCH="\$${INSTALLSITELIB}/$$arch" \
-	    INSTALLPRIVLIB='$${DESTDIR}/usr/libdata/perl5' \
-	    INSTALLARCHLIB="\$${INSTALLPRIVLIB}/$$arch" \
-	    INSTALLMAN1DIR='$${DESTDIR}${PREFIX}/man/man1' \
-	    INSTALLMAN3DIR='$${DESTDIR}${PREFIX}/man/man3' \
-	    INSTALLBIN='$${PREFIX}/bin' \
-	    INSTALLSCRIPT='$${INSTALLBIN}'
+CONFIGURE_STYLE=	perl
 
 .include <bsd.port.mk>
diff --git a/audio/p5-cddb/Makefile b/audio/p5-cddb/Makefile
index f6616953752..d5d9f6573df 100644
--- a/audio/p5-cddb/Makefile
+++ b/audio/p5-cddb/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.3 2000/04/08 14:32:55 espie Exp $
+# $OpenBSD: Makefile,v 1.4 2000/06/02 11:56:23 espie Exp $
 
 DISTNAME=       CDDB-1.02
 PKGNAME=        CDDB-1.02
 CATEGORIES=	audio perl5
-NEED_VERSION=	1.251
+NEED_VERSION=	1.290
 
 MAINTAINER=	angelos@openbsd.org
 MASTER_SITES=	http://www.perl.com/CPAN-local/authors/id/R/RC/RCAPUTO/
@@ -13,23 +13,6 @@ PERMIT_PACKAGE_CDROM=   Yes
 PERMIT_PACKAGE_FTP=     Yes
 PERMIT_DISTFILES_CDROM= Yes
 PERMIT_DISTFILES_FTP=   Yes
-FAKE=			Yes
-
-pre-fake:
-	@mkdir -p ${WRKINST}`/usr/bin/perl -e 'use Config; print $$Config{installarchlib}, "\n";'`
-
-do-configure:
-	@arch=`/usr/bin/perl -e 'use Config; print $$Config{archname}, "\n";'`; \
-	cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} \
-	/usr/bin/perl Makefile.PL \
-	    PREFIX='$${DESTDIR}${PREFIX}' \
-	    INSTALLSITELIB='$${DESTDIR}${PREFIX}/libdata/perl5/site_perl' \
-	    INSTALLSITEARCH="\$${INSTALLSITELIB}/$$arch" \
-	    INSTALLPRIVLIB='$${DESTDIR}/usr/libdata/perl5' \
-	    INSTALLARCHLIB="\$${INSTALLPRIVLIB}/$$arch" \
-	    INSTALLMAN1DIR='$${DESTDIR}${PREFIX}/man/man1' \
-	    INSTALLMAN3DIR='$${DESTDIR}${PREFIX}/man/man3' \
-	    INSTALLBIN='$${PREFIX}/bin' \
-	    INSTALLSCRIPT='$${INSTALLBIN}'
+CONFIGURE_STYLE=	perl
 
 .include <bsd.port.mk>
diff --git a/converters/p5-Convert-UU/Makefile b/converters/p5-Convert-UU/Makefile
index 2b9bb37bbb7..4743423d57e 100644
--- a/converters/p5-Convert-UU/Makefile
+++ b/converters/p5-Convert-UU/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.14 2000/04/08 14:17:52 espie Exp $
+# $OpenBSD: Makefile,v 1.15 2000/06/02 11:56:23 espie Exp $
 
 DISTNAME=	Convert-UU-0.40
 PKGNAME=	Convert-UU-0.40
 CATEGORIES=	converters perl5
-NEED_VERSION=	1.251
+NEED_VERSION=	1.290
 
 MAINTAINER=	angelos@openbsd.org
 
@@ -14,23 +14,7 @@ PERMIT_DISTFILES_FTP=	Yes
 
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Convert
-FAKE=			Yes
 
-pre-fake:
-	@mkdir -p ${WRKINST}`/usr/bin/perl -e 'use Config; print $$Config{installarchlib}, "\n";'`
-
-do-configure:
-	@arch=`/usr/bin/perl -e 'use Config; print $$Config{archname}, "\n";'`; \
-	cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} \
-	/usr/bin/perl Makefile.PL \
-	    PREFIX='$${DESTDIR}${PREFIX}' \
-	    INSTALLSITELIB='$${DESTDIR}${PREFIX}/libdata/perl5/site_perl' \
-	    INSTALLSITEARCH="\$${INSTALLSITELIB}/$$arch" \
-	    INSTALLPRIVLIB='$${DESTDIR}/usr/libdata/perl5' \
-	    INSTALLARCHLIB="\$${INSTALLPRIVLIB}/$$arch" \
-	    INSTALLMAN1DIR='$${DESTDIR}${PREFIX}/man/man1' \
-	    INSTALLMAN3DIR='$${DESTDIR}${PREFIX}/man/man3' \
-	    INSTALLBIN='$${PREFIX}/bin' \
-	    INSTALLSCRIPT='$${INSTALLBIN}'
+CONFIGURE_STYLE=	perl
 
 .include <bsd.port.mk>
diff --git a/converters/p5-MIME-Base64/Makefile b/converters/p5-MIME-Base64/Makefile
index 33fabbbfba6..286e261fa52 100644
--- a/converters/p5-MIME-Base64/Makefile
+++ b/converters/p5-MIME-Base64/Makefile
@@ -1,8 +1,9 @@
-# $OpenBSD: Makefile,v 1.11 2000/04/08 14:22:30 espie Exp $
+# $OpenBSD: Makefile,v 1.12 2000/06/02 11:56:23 espie Exp $
 
 DISTNAME=       MIME-Base64-2.11
 PKGNAME=        MIME-Base64-2.11
 CATEGORIES=	converters perl5
+NEED_VERSION=	1.290
 
 MAINTAINER=	angelos@openbsd.org
 
@@ -13,24 +14,7 @@ PERMIT_DISTFILES_FTP=	Yes
 
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=     MIME
-FAKE=			Yes
-
-pre-fake:
-	@mkdir -p ${WRKINST}`/usr/bin/perl -e 'use Config; print $$Config{installarchlib}, "\n";'`
-
-do-configure:
-	@arch=`/usr/bin/perl -e 'use Config; print $$Config{archname}, "\n";'`; \
-	cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} \
-	/usr/bin/perl Makefile.PL \
-	    PREFIX='$${DESTDIR}${PREFIX}' \
-	    INSTALLSITELIB='$${DESTDIR}${PREFIX}/libdata/perl5/site_perl' \
-	    INSTALLSITEARCH="\$${INSTALLSITELIB}/$$arch" \
-	    INSTALLPRIVLIB='$${DESTDIR}/usr/libdata/perl5' \
-	    INSTALLARCHLIB="\$${INSTALLPRIVLIB}/$$arch" \
-	    INSTALLMAN1DIR='$${DESTDIR}${PREFIX}/man/man1' \
-	    INSTALLMAN3DIR='$${DESTDIR}${PREFIX}/man/man3' \
-	    INSTALLBIN='$${PREFIX}/bin' \
-	    INSTALLSCRIPT='$${INSTALLBIN}'
+CONFIGURE_STYLE=	perl
 
 
 .include <bsd.port.mk>
diff --git a/databases/p5-DBD-Pg/Makefile b/databases/p5-DBD-Pg/Makefile
index ac74a5a325f..7fcb29f3079 100644
--- a/databases/p5-DBD-Pg/Makefile
+++ b/databases/p5-DBD-Pg/Makefile
@@ -1,10 +1,9 @@
-# $OpenBSD: Makefile,v 1.16 2000/05/28 17:27:52 espie Exp $
+# $OpenBSD: Makefile,v 1.17 2000/06/02 11:56:23 espie Exp $
 
 DISTNAME=	DBD-Pg-0.93
 PKGNAME=	p5-DBD-Pg-0.93
 CATEGORIES=	databases perl5
-NEED_VERSION=	 1.230
-FAKE=		Yes
+NEED_VERSION=	 1.290
 
 MAINTAINER=	kevlo@openbsd.org
 
@@ -18,24 +17,8 @@ MASTER_SITE_SUBDIR=	DBD
 
 BUILD_DEPENDS= /usr/local/libdata/perl5/site_perl/i386-openbsd/DBI.pm::databases/p5-DBI 
 LIB_DEPENDS= pq.2.::databases/postgresql
+CONFIGURE_STYLE=	perl
 
-CONFIGURE_ENV+=	"POSTGRES_HOME=${PREFIX}/pgsql"
-
-pre-fake:
-	@mkdir -p ${WRKINST}`/usr/bin/perl -e 'use Config; print $$Config{installarchlib}, "\n";'`
-
-do-configure:
-	@arch=`/usr/bin/perl -e 'use Config; print $$Config{archname}, "\n";'`; \
-	cd ${WRKSRC}; ${SETENV} ${CONFIGURE_ENV} \
-	/usr/bin/perl Makefile.PL \
-	    PREFIX='$${DESTDIR}${PREFIX}' \
-	    INSTALLSITELIB='$${DESTDIR}${PREFIX}/libdata/perl5/site_perl' \
-	    INSTALLSITEARCH="\$${INSTALLSITELIB}/$$arch" \
-	    INSTALLPRIVLIB='$${DESTDIR}/usr/libdata/perl5' \
-	    INSTALLARCHLIB="\$${INSTALLPRIVLIB}/$$arch" \
-	    INSTALLMAN1DIR='$${DESTDIR}${PREFIX}/man/man1' \
-	    INSTALLMAN3DIR='$${DESTDIR}${PREFIX}/man/man3' \
-	    INSTALLBIN='$${PREFIX}/bin' \
-	    INSTALLSCRIPT='$${INSTALLBIN}'
+MAKE_ENV+=	"POSTGRES_HOME=${PREFIX}/pgsql"
 
 .include <bsd.port.mk>
diff --git a/databases/p5-DBI/Makefile b/databases/p5-DBI/Makefile
index bc03eb47340..b45ef73cfd7 100644
--- a/databases/p5-DBI/Makefile
+++ b/databases/p5-DBI/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.8 2000/04/08 14:40:27 espie Exp $
+# $OpenBSD: Makefile,v 1.9 2000/06/02 11:56:24 espie Exp $
 
 DISTNAME=	DBI-1.13
 PKGNAME=	p5-DBI-1.13
-CATEGORIES=	databases
-NEED_VERSION=	1.251
+CATEGORIES=	databases perl
+NEED_VERSION=	1.290
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR= DBI
 
@@ -13,23 +13,6 @@ PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
-FAKE=			Yes
-
-pre-fake:
-	@mkdir -p ${WRKINST}`/usr/bin/perl -e 'use Config; print $$Config{installarchlib}, "\n";'`
-
-do-configure:
-	@arch=`/usr/bin/perl -e 'use Config; print $$Config{archname}, "\n";'`; \
-	cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} \
-	/usr/bin/perl Makefile.PL \
-	    PREFIX='$${DESTDIR}${PREFIX}' \
-	    INSTALLSITELIB='$${DESTDIR}${PREFIX}/libdata/perl5/site_perl' \
-	    INSTALLSITEARCH="\$${INSTALLSITELIB}/$$arch" \
-	    INSTALLPRIVLIB='$${DESTDIR}/usr/libdata/perl5' \
-	    INSTALLARCHLIB="\$${INSTALLPRIVLIB}/$$arch" \
-	    INSTALLMAN1DIR='$${DESTDIR}${PREFIX}/man/man1' \
-	    INSTALLMAN3DIR='$${DESTDIR}${PREFIX}/man/man3' \
-	    INSTALLBIN='$${PREFIX}/bin' \
-	    INSTALLSCRIPT='$${INSTALLBIN}'
+CONFIGURE_STYLE=	perl
 
 .include <bsd.port.mk>
diff --git a/mail/p5-Mail-POP3Client/Makefile b/mail/p5-Mail-POP3Client/Makefile
index 75bb19d83ca..b01f0a4b676 100644
--- a/mail/p5-Mail-POP3Client/Makefile
+++ b/mail/p5-Mail-POP3Client/Makefile
@@ -3,13 +3,12 @@
 # Date created:				May 16 1998
 # Whom:	      				Angelos D. Keromytis
 #
-#   $OpenBSD: Makefile,v 1.5 2000/04/08 14:43:32 espie Exp $
+#   $OpenBSD: Makefile,v 1.6 2000/06/02 11:56:24 espie Exp $
 #
 
 DISTNAME=	POP3Client-2.3
 PKGNAME=	p5-Mail-POP3Client-2.3
 CATEGORIES=	mail perl5
-NEED_VERSION=	1.251
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Mail
 
@@ -19,23 +18,6 @@ PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
-FAKE=			Yes
-
-pre-fake:
-	@mkdir -p ${WRKINST}`/usr/bin/perl -e 'use Config; print $$Config{installarchlib}, "\n";'`
-
-do-configure:
-	@arch=`/usr/bin/perl -e 'use Config; print $$Config{archname}, "\n";'`; \
-	cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} \
-	/usr/bin/perl Makefile.PL \
-	    PREFIX='$${DESTDIR}${PREFIX}' \
-	    INSTALLSITELIB='$${DESTDIR}${PREFIX}/libdata/perl5/site_perl' \
-	    INSTALLSITEARCH="\$${INSTALLSITELIB}/$$arch" \
-	    INSTALLPRIVLIB='$${DESTDIR}/usr/libdata/perl5' \
-	    INSTALLARCHLIB="\$${INSTALLPRIVLIB}/$$arch" \
-	    INSTALLMAN1DIR='$${DESTDIR}${PREFIX}/man/man1' \
-	    INSTALLMAN3DIR='$${DESTDIR}${PREFIX}/man/man3' \
-	    INSTALLBIN='$${PREFIX}/bin' \
-	    INSTALLSCRIPT='$${INSTALLBIN}'
+CONFIGURE_STYLE=	perl
 
 .include <bsd.port.mk>