Remove pear ports obsolated by devel/pear and switch

dependencies of all the other pear ports.

Discussed with:	thierry, antonio@php.net

22 files changed, 37 insertions, 37 deletions

diff --git a/net/pear-Auth_RADIUS/Makefile b/net/pear-Auth_RADIUS/Makefile
index 8f2258881771..c917897b7c75 100644
--- a/net/pear-Auth_RADIUS/Makefile
+++ b/net/pear-Auth_RADIUS/Makefile
@@ -12,7 +12,7 @@ CATEGORIES=	net security pear
 MAINTAINER=	antonio@php.net
 COMMENT=	PEAR wrapper classes for the RADIUS PECL
 
-BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR
+BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 USE_PHP=	radius
@@ -22,5 +22,5 @@ FILES=		RADIUS.php
 EXAMPLES=	radius-acct.php radius-auth.php
 
 .include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear-PEAR/Makefile.common"
+.include "${PORTSDIR}/devel/pear/bsd.pear.mk"
 .include <bsd.port.post.mk>
diff --git a/net/pear-Net_CheckIP/Makefile b/net/pear-Net_CheckIP/Makefile
index 0878dd2aae99..6b121f88b95c 100644
--- a/net/pear-Net_CheckIP/Makefile
+++ b/net/pear-Net_CheckIP/Makefile
@@ -12,12 +12,12 @@ CATEGORIES=	net pear
 MAINTAINER=	antonio@php.net
 COMMENT=	Check the syntax of IPv4 addresses
 
-BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR
+BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 CATEGORY=	Net
 FILES=		CheckIP.php
 
 .include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear-PEAR/Makefile.common"
+.include "${PORTSDIR}/devel/pear/bsd.pear.mk"
 .include <bsd.port.post.mk>
diff --git a/net/pear-Net_DIME/Makefile b/net/pear-Net_DIME/Makefile
index c2bccc0bdebe..1bc5fd8969e3 100644
--- a/net/pear-Net_DIME/Makefile
+++ b/net/pear-Net_DIME/Makefile
@@ -12,7 +12,7 @@ CATEGORIES=	net pear
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	The PEAR::Net_DIME class implements DIME encoding
 
-BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR
+BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 CATEGORY=	Net
@@ -21,5 +21,5 @@ TESTS=		dime_message_test.php dime_record_test.php
 _TESTSDIR=	test
 
 .include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear-PEAR/Makefile.common"
+.include "${PORTSDIR}/devel/pear/bsd.pear.mk"
 .include <bsd.port.post.mk>
diff --git a/net/pear-Net_DNSBL/Makefile b/net/pear-Net_DNSBL/Makefile
index 21c8e1919507..d643fda99825 100644
--- a/net/pear-Net_DNSBL/Makefile
+++ b/net/pear-Net_DNSBL/Makefile
@@ -31,5 +31,5 @@ PHP_VERS=	${PHP_VERSION:S/.//g}
 IGNORE=		"You need PHP 4.3.6 or later to install PEAR::Net_DNSBL"
 .endif
 
-.include "${PORTSDIR}/devel/pear-PEAR/Makefile.common"
+.include "${PORTSDIR}/devel/pear/bsd.pear.mk"
 .include <bsd.port.post.mk>
diff --git a/net/pear-Net_Dict/Makefile b/net/pear-Net_Dict/Makefile
index 80b778f5a681..8f73b7f19531 100644
--- a/net/pear-Net_Dict/Makefile
+++ b/net/pear-Net_Dict/Makefile
@@ -22,5 +22,5 @@ FILES=		Dict.php
 DOCS=		dict.php
 
 .include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear-PEAR/Makefile.common"
+.include "${PORTSDIR}/devel/pear/bsd.pear.mk"
 .include <bsd.port.post.mk>
diff --git a/net/pear-Net_Finger/Makefile b/net/pear-Net_Finger/Makefile
index 2e88a471ace7..aeec13c8008f 100644
--- a/net/pear-Net_Finger/Makefile
+++ b/net/pear-Net_Finger/Makefile
@@ -19,5 +19,5 @@ CATEGORY=	Net
 FILES=		Finger.php
 
 .include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear-PEAR/Makefile.common"
+.include "${PORTSDIR}/devel/pear/bsd.pear.mk"
 .include <bsd.port.post.mk>
diff --git a/net/pear-Net_IPv6/Makefile b/net/pear-Net_IPv6/Makefile
index ef1106e4baff..67503bc42b14 100644
--- a/net/pear-Net_IPv6/Makefile
+++ b/net/pear-Net_IPv6/Makefile
@@ -12,12 +12,12 @@ CATEGORIES=	net pear
 MAINTAINER=	antonio@php.net
 COMMENT=	Check and validate IPv6 addresses
 
-BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR
+BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 CATEGORY=	Net
 FILES=		IPv6.php
 
 .include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear-PEAR/Makefile.common"
+.include "${PORTSDIR}/devel/pear/bsd.pear.mk"
 .include <bsd.port.post.mk>
diff --git a/net/pear-Net_Ident/Makefile b/net/pear-Net_Ident/Makefile
index debb4fb542a7..4b9c1eee082d 100644
--- a/net/pear-Net_Ident/Makefile
+++ b/net/pear-Net_Ident/Makefile
@@ -12,12 +12,12 @@ CATEGORIES=	net www pear
 MAINTAINER=	antonio@php.net
 COMMENT=	PEAR identification protocol implementation
 
-BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR
+BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 CATEGORY=	Net
 FILES=		Ident.php
 
 .include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear-PEAR/Makefile.common"
+.include "${PORTSDIR}/devel/pear/bsd.pear.mk"
 .include <bsd.port.post.mk>
diff --git a/net/pear-Net_LDAP/Makefile b/net/pear-Net_LDAP/Makefile
index 377b06743a15..6814d6cc8933 100644
--- a/net/pear-Net_LDAP/Makefile
+++ b/net/pear-Net_LDAP/Makefile
@@ -12,7 +12,7 @@ CATEGORIES=	net pear
 MAINTAINER=	tux@pinguru.net
 COMMENT=	OO interface for searching and manipulating LDAP-entries
 
-BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR
+BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 USE_PHP=	ldap
@@ -25,5 +25,5 @@ _DOCSDIR=	./doc
 TESTS=		tests.php
 
 .include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear-PEAR/Makefile.common"
+.include "${PORTSDIR}/devel/pear/bsd.pear.mk"
 .include <bsd.port.post.mk>
diff --git a/net/pear-Net_LDAP2/Makefile b/net/pear-Net_LDAP2/Makefile
index 377b06743a15..6814d6cc8933 100644
--- a/net/pear-Net_LDAP2/Makefile
+++ b/net/pear-Net_LDAP2/Makefile
@@ -12,7 +12,7 @@ CATEGORIES=	net pear
 MAINTAINER=	tux@pinguru.net
 COMMENT=	OO interface for searching and manipulating LDAP-entries
 
-BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR
+BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 USE_PHP=	ldap
@@ -25,5 +25,5 @@ _DOCSDIR=	./doc
 TESTS=		tests.php
 
 .include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear-PEAR/Makefile.common"
+.include "${PORTSDIR}/devel/pear/bsd.pear.mk"
 .include <bsd.port.post.mk>
diff --git a/net/pear-Net_NNTP/Makefile b/net/pear-Net_NNTP/Makefile
index 96c3449af70b..f9e69c3279b4 100644
--- a/net/pear-Net_NNTP/Makefile
+++ b/net/pear-Net_NNTP/Makefile
@@ -22,5 +22,5 @@ EXAMPLES=	index.php group.php read.php
 _EXAMPLESDIR=	docs/examples/news.php.net
 
 .include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear-PEAR/Makefile.common"
+.include "${PORTSDIR}/devel/pear/bsd.pear.mk"
 .include <bsd.port.post.mk>
diff --git a/net/pear-Net_POP3/Makefile b/net/pear-Net_POP3/Makefile
index 4b3ca1cf0285..c2d2de6b0402 100644
--- a/net/pear-Net_POP3/Makefile
+++ b/net/pear-Net_POP3/Makefile
@@ -21,5 +21,5 @@ TESTS=		Net_POP3_example.php
 _TESTSDIR=	.
 
 .include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear-PEAR/Makefile.common"
+.include "${PORTSDIR}/devel/pear/bsd.pear.mk"
 .include <bsd.port.post.mk>
diff --git a/net/pear-Net_Ping/Makefile b/net/pear-Net_Ping/Makefile
index 416f656e85d0..d709ce973d5b 100644
--- a/net/pear-Net_Ping/Makefile
+++ b/net/pear-Net_Ping/Makefile
@@ -12,7 +12,7 @@ CATEGORIES=	net pear
 MAINTAINER=	antonio@php.net
 COMMENT=	PEAR class to execute ping
 
-BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR
+BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 CATEGORY=	Net
@@ -22,5 +22,5 @@ EXAMPLES=	example.php
 _EXAMPLESDIR=	docs/examples
 
 .include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear-PEAR/Makefile.common"
+.include "${PORTSDIR}/devel/pear/bsd.pear.mk"
 .include <bsd.port.post.mk>
diff --git a/net/pear-Net_SMTP/Makefile b/net/pear-Net_SMTP/Makefile
index 9c0f19b35afe..027087c7d67e 100644
--- a/net/pear-Net_SMTP/Makefile
+++ b/net/pear-Net_SMTP/Makefile
@@ -32,5 +32,5 @@ OPTIONS=	PEAR_AUTH_SASL "PEAR::Auth_SASL support" off
 BUILD_DEPENDS+=	${PEARDIR}/Auth/SASL.php:${PORTSDIR}/security/pear-Auth_SASL
 .endif
 
-.include "${PORTSDIR}/devel/pear-PEAR/Makefile.common"
+.include "${PORTSDIR}/devel/pear/bsd.pear.mk"
 .include <bsd.port.post.mk>
diff --git a/net/pear-Net_Server/Makefile b/net/pear-Net_Server/Makefile
index 2d7f88da7e1b..86c419e9fd76 100644
--- a/net/pear-Net_Server/Makefile
+++ b/net/pear-Net_Server/Makefile
@@ -12,7 +12,7 @@ CATEGORIES=	net pear
 MAINTAINER=	tux@pinguru.net
 COMMENT=	Generic server class
 
-BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR
+BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 USE_PHP=	sockets pcntl
@@ -24,5 +24,5 @@ DOCS=		todo.txt
 EXAMPLES=	talkback.php
 
 .include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear-PEAR/Makefile.common"
+.include "${PORTSDIR}/devel/pear/bsd.pear.mk"
 .include <bsd.port.post.mk>
diff --git a/net/pear-Net_Sieve/Makefile b/net/pear-Net_Sieve/Makefile
index c14f13c302c4..6d4b74485050 100644
--- a/net/pear-Net_Sieve/Makefile
+++ b/net/pear-Net_Sieve/Makefile
@@ -21,5 +21,5 @@ TESTS=		test_sieve.php
 _TESTSDIR=	.
 
 .include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear-PEAR/Makefile.common"
+.include "${PORTSDIR}/devel/pear/bsd.pear.mk"
 .include <bsd.port.post.mk>
diff --git a/net/pear-Net_Socket/Makefile b/net/pear-Net_Socket/Makefile
index 06380a85c448..2ed0639eafb0 100644
--- a/net/pear-Net_Socket/Makefile
+++ b/net/pear-Net_Socket/Makefile
@@ -12,12 +12,12 @@ CATEGORIES=	net www pear
 MAINTAINER=	antonio@php.net
 COMMENT=	PEAR Network Socket Interface
 
-BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR
+BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 CATEGORY=	Net
 FILES=		Socket.php
 
 .include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear-PEAR/Makefile.common"
+.include "${PORTSDIR}/devel/pear/bsd.pear.mk"
 .include <bsd.port.post.mk>
diff --git a/net/pear-Net_URL/Makefile b/net/pear-Net_URL/Makefile
index 2e895314c29a..e27a27b20b13 100644
--- a/net/pear-Net_URL/Makefile
+++ b/net/pear-Net_URL/Makefile
@@ -12,7 +12,7 @@ CATEGORIES=	net www pear
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Easy parsing of URLs
 
-BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR
+BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 CATEGORY=	Net
@@ -21,5 +21,5 @@ EXAMPLES=	example.php
 _EXAMPLESDIR=	docs
 
 .include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear-PEAR/Makefile.common"
+.include "${PORTSDIR}/devel/pear/bsd.pear.mk"
 .include <bsd.port.post.mk>
diff --git a/net/pear-Net_URL2/Makefile b/net/pear-Net_URL2/Makefile
index 2e895314c29a..e27a27b20b13 100644
--- a/net/pear-Net_URL2/Makefile
+++ b/net/pear-Net_URL2/Makefile
@@ -12,7 +12,7 @@ CATEGORIES=	net www pear
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Easy parsing of URLs
 
-BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR
+BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 CATEGORY=	Net
@@ -21,5 +21,5 @@ EXAMPLES=	example.php
 _EXAMPLESDIR=	docs
 
 .include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear-PEAR/Makefile.common"
+.include "${PORTSDIR}/devel/pear/bsd.pear.mk"
 .include <bsd.port.post.mk>
diff --git a/net/pear-Net_UserAgent_Detect/Makefile b/net/pear-Net_UserAgent_Detect/Makefile
index 05d263dc5808..f45dd9c33a2d 100644
--- a/net/pear-Net_UserAgent_Detect/Makefile
+++ b/net/pear-Net_UserAgent_Detect/Makefile
@@ -12,7 +12,7 @@ CATEGORIES=	net www pear
 MAINTAINER=	antonio@php.net
 COMMENT=	PEAR class that detects web browser, version and platform
 
-BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR
+BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 USE_REINPLACE=	yes
@@ -28,5 +28,5 @@ post-extract:
 		${WRKSRC}/tests/${TESTS}
 
 .include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear-PEAR/Makefile.common"
+.include "${PORTSDIR}/devel/pear/bsd.pear.mk"
 .include <bsd.port.post.mk>
diff --git a/net/pear-Net_UserAgent_Mobile/Makefile b/net/pear-Net_UserAgent_Mobile/Makefile
index 7359a9c7eb2d..7efb28cbeda7 100644
--- a/net/pear-Net_UserAgent_Mobile/Makefile
+++ b/net/pear-Net_UserAgent_Mobile/Makefile
@@ -12,7 +12,7 @@ CATEGORIES=	net www pear
 MAINTAINER=	smatsui@karashi.org
 COMMENT=	PEAR class that parses HTTP mobile user agent string
 
-BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR
+BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 CATEGORY=	Net/UserAgent
@@ -26,5 +26,5 @@ TESTS=		00-compile.phpt 01-request.phpt 02-docomo.phpt \
 		09-fallback-on-nomatch.phpt DoCoMoMap.xml
 
 .include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear-PEAR/Makefile.common"
+.include "${PORTSDIR}/devel/pear/bsd.pear.mk"
 .include <bsd.port.post.mk>
diff --git a/net/pear-SOAP/Makefile b/net/pear-SOAP/Makefile
index 40eb5fed2669..59ffb455d802 100644
--- a/net/pear-SOAP/Makefile
+++ b/net/pear-SOAP/Makefile
@@ -12,7 +12,7 @@ CATEGORIES=	net www pear
 MAINTAINER=	antonio@php.net
 COMMENT=	PEAR SOAP Client/Server for PHP
 
-BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR
+BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 CATEGORY=	SOAP
@@ -33,5 +33,5 @@ EXAMPLES=	attachment.php client.php com_client.php \
 _EXAMPLESDIR=	example
 
 .include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear-PEAR/Makefile.common"
+.include "${PORTSDIR}/devel/pear/bsd.pear.mk"
 .include <bsd.port.post.mk>