diff --git a/misc/p5-CreditCard/Makefile b/misc/p5-CreditCard/Makefile
index acab86c49cc..d4979ed9a14 100644
--- a/misc/p5-CreditCard/Makefile
+++ b/misc/p5-CreditCard/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.6 2002/05/13 23:31:26 espie Exp $
+# $OpenBSD: Makefile,v 1.7 2002/06/08 18:56:34 wilfried Exp $
 
 COMMENT=	"verify credit card pins"
 
@@ -14,12 +14,19 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
+CONFIGURE_STYLE=	perl
+
+NO_REGRESS=		Yes
+
+do-configure:
+
 do-build:
 	@cd ${WRKSRC} && pod2man CreditCard.pm > Business::CreditCard.3p
 
 do-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/libdata/perl5/site_perl/Business
-	${INSTALL_DATA} ${WRKSRC}/CreditCard.pm ${PREFIX}/libdata/perl5/site_perl/Business
-	${INSTALL_MAN} ${WRKSRC}/Business::CreditCard.3p ${PREFIX}/man/man3
+	${INSTALL_DATA_DIR} ${PREFIX}/${P5SITE}/Business
+	${INSTALL_DATA} ${WRKSRC}/CreditCard.pm ${PREFIX}/${P5SITE}/Business/
+	${INSTALL_MAN_DIR} ${PREFIX}/man/man3p/
+	${INSTALL_MAN} ${WRKSRC}/Business::CreditCard.3p ${PREFIX}/man/man3p/
 
 .include <bsd.port.mk>
diff --git a/misc/p5-CreditCard/pkg/PLIST b/misc/p5-CreditCard/pkg/PLIST
index 6fa78f0d310..c137523cf1f 100644
--- a/misc/p5-CreditCard/pkg/PLIST
+++ b/misc/p5-CreditCard/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2000/06/02 12:12:26 espie Exp $
-libdata/perl5/site_perl/Business/CreditCard.pm
-man/man3/Business::CreditCard.3p
-@dirrm libdata/perl5/site_perl/Business
+@comment $OpenBSD: PLIST,v 1.2 2002/06/08 18:56:34 wilfried Exp $
+${P5SITE}/Business/CreditCard.pm
+man/man3p/Business::CreditCard.3p
+@dirrm ${P5SITE}/Business
diff --git a/www/p5-HTML-Base/Makefile b/www/p5-HTML-Base/Makefile
index 64bcaef6ef9..2a20c19a8ab 100644
--- a/www/p5-HTML-Base/Makefile
+++ b/www/p5-HTML-Base/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.6 2002/05/15 17:58:50 espie Exp $
+# $OpenBSD: Makefile,v 1.7 2002/06/08 18:56:34 wilfried Exp $
 
 COMMENT=	"base HTML library"
 
@@ -13,15 +13,22 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
+CONFIGURE_STYLE=	perl
+
+NO_REGRESS=	Yes
+
 WRKDIST=	${WRKDIR}
 
+do-configure:
+
 do-build:
 	cd ${WRKSRC} && pod2man html_base.pod HTML::Base.3p
 
 do-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/HTML
+	${INSTALL_DATA_DIR} ${PREFIX}/${P5ARCH}/HTML
 	${INSTALL_DATA} ${WRKSRC}/HTML/Base.pm \
-		${PREFIX}/libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/HTML
-	${INSTALL_MAN} ${WRKSRC}/HTML::Base.3p ${PREFIX}/man/man3
+		${PREFIX}/${P5ARCH}/HTML/
+	${INSTALL_MAN_DIR} ${PREFIX}/man/man3p/
+	${INSTALL_MAN} ${WRKSRC}/HTML::Base.3p ${PREFIX}/man/man3p/
 
 .include <bsd.port.mk>
diff --git a/www/p5-HTML-Base/pkg/PLIST b/www/p5-HTML-Base/pkg/PLIST
index f977674e3da..d131865a6d3 100644
--- a/www/p5-HTML-Base/pkg/PLIST
+++ b/www/p5-HTML-Base/pkg/PLIST
@@ -1,3 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.2 2001/05/10 19:20:53 naddy Exp $
-libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/HTML/Base.pm
-man/man3/HTML::Base.3p
+@comment $OpenBSD: PLIST,v 1.3 2002/06/08 18:56:35 wilfried Exp $
+${P5ARCH}/HTML/Base.pm
+man/man3p/HTML::Base.3p