diff --git a/devel/p5-Algorithm-CurveFit/Makefile b/devel/p5-Algorithm-CurveFit/Makefile
index 1d0d7056b22..d33c50080bb 100644
--- a/devel/p5-Algorithm-CurveFit/Makefile
+++ b/devel/p5-Algorithm-CurveFit/Makefile
@@ -1,8 +1,9 @@
-# $OpenBSD: Makefile,v 1.1.1.1 2009/06/12 17:06:32 jasper Exp $
+# $OpenBSD: Makefile,v 1.2 2010/10/03 17:23:41 jasper Exp $
 
 COMMENT =	nonlinear least squares curve fitting
 
 DISTNAME =	Algorithm-CurveFit-1.04
+REVISION =	0
 CATEGORIES =	devel
 HOMEPAGE =	http://search.cpan.org/~smueller/Algorithm-CurveFit/
 MAINTAINER =	Markus Bergkvist <markus.bergkvist@telia.com>
@@ -23,10 +24,6 @@ MAKE_ENV +=	TEST_POD=1
 
 CONFIGURE_STYLE =	modbuild
 
-post-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/p5-Algorithm-CurveFit
-	${INSTALL_DATA} ${WRKSRC}/examples/*.pl \
-		${PREFIX}/share/examples/p5-Algorithm-CurveFit
-
+MODCPAN_EXAMPLES=	Yes
 
 .include <bsd.port.mk>
diff --git a/devel/p5-Algorithm-CurveFit/pkg/PLIST b/devel/p5-Algorithm-CurveFit/pkg/PLIST
index 3f4029e4f1b..a05b931ab3a 100644
--- a/devel/p5-Algorithm-CurveFit/pkg/PLIST
+++ b/devel/p5-Algorithm-CurveFit/pkg/PLIST
@@ -1,7 +1,8 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2009/06/12 17:06:32 jasper Exp $
+@comment $OpenBSD: PLIST,v 1.2 2010/10/03 17:23:41 jasper Exp $
 ${P5SITE}/Algorithm/
 ${P5SITE}/Algorithm/CurveFit.pm
 @man man/man3p/Algorithm::CurveFit.3p
 share/examples/p5-Algorithm-CurveFit/
+share/examples/p5-Algorithm-CurveFit/examplefit.data
 share/examples/p5-Algorithm-CurveFit/examplefit.pl
 share/examples/p5-Algorithm-CurveFit/examplefit_generate_data.pl
diff --git a/devel/p5-AnyEvent/Makefile b/devel/p5-AnyEvent/Makefile
index 55c209a312f..373d4f0eef3 100644
--- a/devel/p5-AnyEvent/Makefile
+++ b/devel/p5-AnyEvent/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.12 2009/10/09 23:24:21 sthen Exp $
+# $OpenBSD: Makefile,v 1.13 2010/10/03 17:23:41 jasper Exp $
 
 COMMENT=	provide framework for multiple event loops
 
@@ -13,10 +13,7 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
-EG_DIR= 	${PREFIX}/share/examples/p5-AnyEvent/
-
-post-install:
-	${INSTALL_DATA_DIR} ${EG_DIR}
-	${INSTALL_DATA} ${WRKSRC}/eg/* ${EG_DIR}
+MODCPAN_EXAMPLES=	Yes
+MODCPAN_EXAMPLES_DIST=	eg
 
 .include <bsd.port.mk>
diff --git a/devel/p5-Curses-UI/Makefile b/devel/p5-Curses-UI/Makefile
index ebd32d81df0..9fbe64f3cca 100644
--- a/devel/p5-Curses-UI/Makefile
+++ b/devel/p5-Curses-UI/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.10 2009/04/02 16:49:48 giovanni Exp $
+# $OpenBSD: Makefile,v 1.11 2010/10/03 17:23:41 jasper Exp $
 
 COMMENT=	curses based user interface framework for Perl
 
@@ -20,10 +20,6 @@ PERMIT_DISTFILES_FTP=	Yes
 
 MAKE_ENV=	TEST_POD=Yes
 
-EXAMPLE_DIR=	${PREFIX}/share/examples/p5-Curses-UI
-
-post-install:
-	${INSTALL_DATA_DIR} ${EXAMPLE_DIR}
-	${INSTALL_DATA} ${WRKSRC}/examples/* ${EXAMPLE_DIR}
+MODCPAN_EXAMPLES=	Yes
 
 .include <bsd.port.mk>
diff --git a/devel/p5-DateTime-Format-Builder/Makefile b/devel/p5-DateTime-Format-Builder/Makefile
index 3c91543ce11..a53fbe77eac 100644
--- a/devel/p5-DateTime-Format-Builder/Makefile
+++ b/devel/p5-DateTime-Format-Builder/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.4 2008/10/08 12:41:46 jasper Exp $
+# $OpenBSD: Makefile,v 1.5 2010/10/03 17:23:41 jasper Exp $
 
 COMMENT= 	create DateTime parser classes and objects
 
@@ -23,9 +23,6 @@ REGRESS_DEPENDS=::devel/p5-DateTime-Format-HTTP \
 
 CONFIGURE_STYLE=modbuild
 
-post-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/p5-DateTime-Format-Builder
-	${INSTALL_DATA} ${WRKSRC}/examples/*.pm \
-		${PREFIX}/share/examples/p5-DateTime-Format-Builder
+MODCPAN_EXAMPLES=Yes
 
 .include <bsd.port.mk>
diff --git a/devel/p5-OLE-Storage_Lite/Makefile b/devel/p5-OLE-Storage_Lite/Makefile
index 0b02ddee097..0e3b07930a5 100644
--- a/devel/p5-OLE-Storage_Lite/Makefile
+++ b/devel/p5-OLE-Storage_Lite/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.4 2008/10/05 21:15:25 jasper Exp $
+# $OpenBSD: Makefile,v 1.5 2010/10/03 17:23:41 jasper Exp $
 
 COMMENT=	simple class for OLE document interface
 
@@ -12,12 +12,10 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
+MODCPAN_EXAMPLES=	Yes
+MODCPAN_EXAMPLES_DIST=	sample
+
 post-extract:
 	@find ${WRKDIST} -type f -exec perl -pi -e 's/\r$$//' {} \;
 
-post-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/p5-OLE-Storage_Lite
-	${INSTALL_DATA} ${WRKSRC}/sample/* \
-		${PREFIX}/share/examples/p5-OLE-Storage_Lite
-
 .include <bsd.port.mk>
diff --git a/devel/p5-POE-Component-Pluggable/Makefile b/devel/p5-POE-Component-Pluggable/Makefile
index c6e0c1bcd17..4413c05a914 100644
--- a/devel/p5-POE-Component-Pluggable/Makefile
+++ b/devel/p5-POE-Component-Pluggable/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.5 2009/10/25 22:24:14 jasper Exp $
+# $OpenBSD: Makefile,v 1.6 2010/10/03 17:23:41 jasper Exp $
 
 COMMENT=		base class for creating plugin enabled POE Components
 
@@ -16,10 +16,6 @@ MODULES=		cpan
 RUN_DEPENDS=		:p5-POE->=1.0002:devel/p5-POE \
 			::devel/p5-Task-Weaken
 
-EG_DIR= 		${PREFIX}/share/examples/p5-POE-Component-Pluggable
-
-post-install:
-	${INSTALL_DATA_DIR} ${EG_DIR}
-	${INSTALL_DATA} ${WRKSRC}/examples/* ${EG_DIR}
+MODCPAN_EXAMPLES=	Yes
 
 .include <bsd.port.mk>
diff --git a/devel/p5-Perl-Critic/Makefile b/devel/p5-Perl-Critic/Makefile
index 60d88fa24d5..fa367d1993b 100644
--- a/devel/p5-Perl-Critic/Makefile
+++ b/devel/p5-Perl-Critic/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.10 2010/06/30 18:35:52 jim Exp $
+# $OpenBSD: Makefile,v 1.11 2010/10/03 17:23:41 jasper Exp $
 
 COMMENT=	critique perl source code for best practices
 
@@ -35,9 +35,6 @@ MAKE_ENV+=	TEST_POD=Yes
 
 CONFIGURE_STYLE=modbuild
 
-post-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/p5-Perl-Critic
-	${INSTALL_DATA} ${WRKSRC}/examples/* \
-		${PREFIX}/share/examples/p5-Perl-Critic
+MODCPAN_EXAMPLES=	Yes
 
 .include <bsd.port.mk>