diff --git a/archivers/pear-File_Archive/Makefile b/archivers/pear-File_Archive/Makefile
index aa850162349b..b46813d5677f 100644
--- a/archivers/pear-File_Archive/Makefile
+++ b/archivers/pear-File_Archive/Makefile
@@ -8,13 +8,12 @@ CATEGORIES=	archivers www pear
 MAINTAINER=	miwi@FreeBSD.org
 COMMENT=	PEAR class to manipulate tar, gz, tgz, bz2, tbz, zip, ar (deb) files
 
-BUILD_DEPENDS=	${PEARDIR}/MIME/Type.php:${PORTSDIR}/mail/pear-MIME_Type \
-		${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
-RUN_DEPENDS=	${PEARDIR}/MIME/Type.php:${PORTSDIR}/mail/pear-MIME_Type \
-		${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
+BUILD_DEPENDS=	${PEARDIR}/MIME/Type.php:${PORTSDIR}/mail/pear-MIME_Type
+RUN_DEPENDS=	${PEARDIR}/MIME/Type.php:${PORTSDIR}/mail/pear-MIME_Type
+
+USES=	pear
 
 USE_PHP=	bz2 pcre zlib
-LATEST_LINK=	pear-${PORTNAME}
 
 OPTIONS_DEFINE=	PEAR_MAIL PEAR_MAIL_MIME PEAR_CACHE_LITE
 
@@ -22,21 +21,8 @@ PEAR_MAIL_DESC=		PEAR::Mail support
 PEAR_MAIL_MIME_DESC=	PEAR::Mail_Mime support
 PEAR_CACHE_LITE_DESC=	PEAR::Cache_Lite support
 
-PEAR_AUTOINSTALL=	YES
+PEAR_MAIL_RUN_DEPENDS=	${PEARDIR}/Mail.php:${PORTSDIR}/mail/pear-Mail
+PEAR_MAIL_MIME_RUN_DEPENDS=	${PEARDIR}/Mail/mime.php:${PORTSDIR}/mail/pear-Mail_Mime
+PEAR_CACHE_LITE_RUN_DEPENDS+=	${PEARDIR}/Cache/Lite.php:${PORTSDIR}/sysutils/pear-Cache_Lite
 
-.include <bsd.port.pre.mk>
-
-.if ${PORT_OPTIONS:MPEAR_MAIL}
-RUN_DEPENDS+=	${PEARDIR}/Mail.php:${PORTSDIR}/mail/pear-Mail
-.endif
-
-.if ${PORT_OPTIONS:MPEAR_MAIL_MIME}
-RUN_DEPENDS+=	${PEARDIR}/Mail/mime.php:${PORTSDIR}/mail/pear-Mail_Mime
-.endif
-
-.if ${PORT_OPTIONS:MPEAR_CACHE_LITE}
-RUN_DEPENDS+=	${PEARDIR}/Cache/Lite.php:${PORTSDIR}/sysutils/pear-Cache_Lite
-.endif
-
-.include "${PORTSDIR}/devel/pear/bsd.pear.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/archivers/pear-PHP_Archiv/Makefile b/archivers/pear-PHP_Archiv/Makefile
index 061cd450a286..29f01d59f33f 100644
--- a/archivers/pear-PHP_Archiv/Makefile
+++ b/archivers/pear-PHP_Archiv/Makefile
@@ -8,11 +8,6 @@ CATEGORIES=	archivers
 MAINTAINER=	miwi@FreeBSD.org
 COMMENT=	Create and Use PHP Archive files
 
-BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
-RUN_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
+USES=	pear
 
-PEAR_AUTOINSTALL=	yes
-
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear/bsd.pear.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>