From 79bc326aeee2263275cb5baac8da597ad3dfa4ad Mon Sep 17 00:00:00 2001
From: bluhm <bluhm@openbsd.org>
Date: Fri, 4 Aug 2017 09:27:03 +0000
Subject: [PATCH] Use configure style modinst instead of p5-Module-Install
 dependency. OK sthen@

---
 devel/p5-PerlIO-via-symlink/Makefile | 10 +++-------
 math/p5-Number-WithError/Makefile    |  6 ++++--
 misc/p5-File-MMagic-XS/Makefile      | 10 ++++------
 www/p5-WWW-Search-Ebay/Makefile      |  6 ++++--
 4 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/devel/p5-PerlIO-via-symlink/Makefile b/devel/p5-PerlIO-via-symlink/Makefile
index 7b5126bfe05..9123dead386 100644
--- a/devel/p5-PerlIO-via-symlink/Makefile
+++ b/devel/p5-PerlIO-via-symlink/Makefile
@@ -1,20 +1,16 @@
-# $OpenBSD: Makefile,v 1.15 2016/03/20 19:56:32 naddy Exp $
+# $OpenBSD: Makefile,v 1.16 2017/08/04 09:27:03 bluhm Exp $
 
 COMMENT=	create symlink from IO handle
 
 MODULES=	cpan
 PKG_ARCH=	*
 DISTNAME=	PerlIO-via-symlink-0.05
-REVISION=	2
+REVISION=	3
 CATEGORIES=	devel
 
 # Artistic
 PERMIT_PACKAGE_CDROM=	Yes
 
-BUILD_DEPENDS=	devel/p5-Module-Install
-
-# Don't use the bundled ancient copy of Module::Install.
-post-extract:
-	rm -r ${WRKSRC}/inc/
+CONFIGURE_STYLE =	modinst
 
 .include <bsd.port.mk>
diff --git a/math/p5-Number-WithError/Makefile b/math/p5-Number-WithError/Makefile
index 8850d042b06..3877ede86be 100644
--- a/math/p5-Number-WithError/Makefile
+++ b/math/p5-Number-WithError/Makefile
@@ -1,8 +1,9 @@
-# $OpenBSD: Makefile,v 1.1.1.1 2017/01/05 23:03:44 bluhm Exp $
+# $OpenBSD: Makefile,v 1.2 2017/08/04 09:27:03 bluhm Exp $
 
 COMMENT =	numbers with error propagation and scientific rounding
 
 DISTNAME =	Number-WithError-1.01
+REVISION =	0
 
 CATEGORIES =	math
 
@@ -12,13 +13,14 @@ MAINTAINER =		Alexander Bluhm <bluhm@openbsd.org>
 PERMIT_PACKAGE_CDROM =	Yes
 
 MODULES =		cpan
-BUILD_DEPENDS =		devel/p5-Module-Install>=1.00
 RUN_DEPENDS =		devel/p5-prefork>=1.00 \
                         devel/p5-Params-Util>=0.10
 TEST_DEPENDS =		devel/p5-Test-LectroTest \
 			devel/p5-Test-Pod-Coverage>=1.00 \
 			devel/p5-Test-Pod>=1.00
 
+CONFIGURE_STYLE =	modinst
+
 PKG_ARCH =		*
 
 # use system Module::Install instead of a private version in each perl module
diff --git a/misc/p5-File-MMagic-XS/Makefile b/misc/p5-File-MMagic-XS/Makefile
index 041179d4739..5104c15bc73 100644
--- a/misc/p5-File-MMagic-XS/Makefile
+++ b/misc/p5-File-MMagic-XS/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.12 2016/03/20 19:56:49 naddy Exp $
+# $OpenBSD: Makefile,v 1.13 2017/08/04 09:27:03 bluhm Exp $
 
 COMMENT =	guess file type with XS (a la mod_mime_magic)
 
 MODULES =	cpan
 DISTNAME =	File-MMagic-XS-0.09008
 CATEGORIES =	misc
-REVISION =	0
+REVISION =	1
 
 # Perl
 PERMIT_PACKAGE_CDROM =		Yes
@@ -16,10 +16,8 @@ BUILD_DEPENDS =	devel/p5-Module-Install-AuthorTests \
 		devel/p5-Module-Install-Repository \
 		devel/p5-Module-Install-XSUtil
 
+CONFIGURE_STYLE =	modinst
+
 MAKE_ENV +=	TEST_POD=1
 
-# Remove ancient copies of bundled modules.
-post-extract:
-	rm -fr ${WRKSRC}/inc/
-
 .include <bsd.port.mk>
diff --git a/www/p5-WWW-Search-Ebay/Makefile b/www/p5-WWW-Search-Ebay/Makefile
index 1c0b142709a..bd2a10f8a45 100644
--- a/www/p5-WWW-Search-Ebay/Makefile
+++ b/www/p5-WWW-Search-Ebay/Makefile
@@ -1,8 +1,9 @@
-# $OpenBSD: Makefile,v 1.12 2016/03/20 19:57:23 naddy Exp $
+# $OpenBSD: Makefile,v 1.13 2017/08/04 09:27:03 bluhm Exp $
 
 COMMENT=		backend for searching www.ebay.com
 
 DISTNAME =		WWW-Search-Ebay-3.042
+REVISION =		0
 CATEGORIES=		www
 
 # perl
@@ -12,9 +13,10 @@ MODULES=		cpan
 PKG_ARCH=		*
 
 RUN_DEPENDS=		www/p5-WWW-Search
-BUILD_DEPENDS=		devel/p5-Module-Install
 TEST_DEPENDS=		devel/p5-IO-Capture
 
 MAKE_ENV+=		TEST_POD="Yes"
 
+CONFIGURE_STYLE =	modinst
+
 .include <bsd.port.mk>