diff --git a/net/p5-Net-Wake/Makefile b/net/p5-Net-Wake/Makefile
index 2e75843807c..3dcdbca1840 100644
--- a/net/p5-Net-Wake/Makefile
+++ b/net/p5-Net-Wake/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.1.1.1 2004/04/17 10:39:10 xsa Exp $
+# $OpenBSD: Makefile,v 1.2 2006/12/22 16:44:25 steven Exp $
 
 COMMENT=	"perl5 module for Wake On LAN"
 
+MODULES=	cpan
 DISTNAME=	Net-Wake-0.02
-PKGNAME=	p5-${DISTNAME}
-CATEGORIES=	net perl5
+CATEGORIES=	net
 
 MAINTAINER=	Okan Demirmen <okan@demirmen.com>
 
@@ -14,10 +14,4 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Net/}
-
-CONFIGURE_STYLE=perl
-
-PKG_ARCH=	*
-
 .include <bsd.port.mk>
diff --git a/textproc/p5-Object-MultiType/Makefile b/textproc/p5-Object-MultiType/Makefile
index 8985f137741..20e6c9a4d9e 100644
--- a/textproc/p5-Object-MultiType/Makefile
+++ b/textproc/p5-Object-MultiType/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.1.1.1 2005/07/23 07:49:44 aanriot Exp $
+# $OpenBSD: Makefile,v 1.2 2006/12/22 16:44:25 steven Exp $
 
 COMMENT=	"Perl Objects as Hash, Array and Scalar at the same time"
 
+MODULES=	cpan
 DISTNAME=	Object-MultiType-0.05
-PKGNAME=	p5-${DISTNAME}
-CATEGORIES=	textproc perl5
+CATEGORIES=	textproc
 
 MAINTAINER=	Okan Demirmen <okan@demirmen.com>
 
@@ -14,10 +14,4 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Object/}
-
-CONFIGURE_STYLE=perl
-
-PKG_ARCH=	*
-
 .include <bsd.port.mk>
diff --git a/textproc/p5-XML-Smart/Makefile b/textproc/p5-XML-Smart/Makefile
index da3078f4413..81a51144b06 100644
--- a/textproc/p5-XML-Smart/Makefile
+++ b/textproc/p5-XML-Smart/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.2 2005/07/23 14:15:38 aanriot Exp $
+# $OpenBSD: Makefile,v 1.3 2006/12/22 16:44:25 steven Exp $
 
 COMMENT=	"access/create XML files/datas easily"
 
+MODULES=	cpan
 DISTNAME=	XML-Smart-1.6.9
-PKGNAME=	p5-${DISTNAME}
-CATEGORIES=	textproc perl5
+CATEGORIES=	textproc
 
 MAINTAINER=	Okan Demirmen <okan@demirmen.com>
 
@@ -14,13 +14,6 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=XML/}
-
-CONFIGURE_STYLE=perl
-
-BUILD_DEPENDS=	${RUN_DEPENDS}                                                 
 RUN_DEPENDS=	::textproc/p5-Object-MultiType
 
-PKG_ARCH=	*
-
 .include <bsd.port.mk>