aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Dupre <ale@FreeBSD.org>2005-12-09 19:24:52 +0000
committerAlex Dupre <ale@FreeBSD.org>2005-12-09 19:24:52 +0000
commit4e3717ee4f0ddc854af6193ae45f72c6664750bc (patch)
treeb2e0cd59999f67b65cab83ec61743d1e3168c3d0
parent4e6ebc04cb2ecb570b58d17b068cbf5ef58196bd (diff)
downloadports-4e3717ee4f0ddc854af6193ae45f72c6664750bc.tar.gz
ports-4e3717ee4f0ddc854af6193ae45f72c6664750bc.zip
Notes
-rw-r--r--MOVED6
-rw-r--r--archivers/Makefile1
-rw-r--r--archivers/pear-Archive_Tar/Makefile27
-rw-r--r--archivers/pear-Archive_Tar/distinfo2
-rw-r--r--archivers/pear-Archive_Tar/pkg-descr7
-rw-r--r--archivers/pear-File_Archive/Makefile2
-rw-r--r--benchmarks/pear-Benchmark/Makefile4
-rw-r--r--chinese/phpbb-tw/Makefile2
-rw-r--r--databases/pear-DB/Makefile4
-rw-r--r--databases/pear-DBA/Makefile4
-rw-r--r--databases/pear-DB_DataObject/Makefile2
-rw-r--r--databases/pear-DB_DataObject_FormBuilder/Makefile2
-rw-r--r--databases/pear-DB_Pager/Makefile4
-rw-r--r--databases/pear-DB_QueryTool/Makefile2
-rw-r--r--databases/pear-DB_Table/Makefile2
-rw-r--r--databases/pear-DB_ldap/Makefile2
-rw-r--r--databases/pear-DB_ldap2/Makefile2
-rw-r--r--databases/pear-MDB/Makefile2
-rw-r--r--databases/pear-MDB2/Makefile2
-rw-r--r--databases/pear-MDB_QueryTool/Makefile2
-rw-r--r--devel/Makefile5
-rw-r--r--devel/beautifyphp/Makefile2
-rw-r--r--devel/pear-Config/Makefile4
-rw-r--r--devel/pear-Console_Getargs/Makefile4
-rw-r--r--devel/pear-Console_Getopt/Makefile22
-rw-r--r--devel/pear-Console_Getopt/distinfo3
-rw-r--r--devel/pear-Console_Getopt/pkg-descr4
-rw-r--r--devel/pear-Console_Table/Makefile4
-rw-r--r--devel/pear-Date/Makefile4
-rw-r--r--devel/pear-Event_Dispatcher/Makefile4
-rw-r--r--devel/pear-FSM/Makefile4
-rw-r--r--devel/pear-HTML_BBCodeParser/Makefile2
-rw-r--r--devel/pear-HTML_CSS/Makefile2
-rw-r--r--devel/pear-HTML_Common/Makefile4
-rw-r--r--devel/pear-HTML_Form/Makefile4
-rw-r--r--devel/pear-HTML_Javascript/Makefile4
-rw-r--r--devel/pear-HTML_Page2/Makefile2
-rw-r--r--devel/pear-HTML_QuickForm/Makefile2
-rw-r--r--devel/pear-HTML_QuickForm2/Makefile2
-rw-r--r--devel/pear-HTML_QuickForm_Controller/Makefile2
-rw-r--r--devel/pear-HTML_QuickForm_SelectFilter/Makefile2
-rw-r--r--devel/pear-HTML_QuickForm_advmultiselect/Makefile2
-rw-r--r--devel/pear-HTML_Select/Makefile2
-rw-r--r--devel/pear-HTML_Select_Common/Makefile2
-rw-r--r--devel/pear-HTML_Table/Makefile2
-rw-r--r--devel/pear-HTML_Template_Flexy/Makefile4
-rw-r--r--devel/pear-HTML_Template_IT/Makefile4
-rw-r--r--devel/pear-HTML_Template_PHPLIB/Makefile4
-rw-r--r--devel/pear-HTML_Template_Sigma/Makefile4
-rw-r--r--devel/pear-HTML_TreeMenu/Makefile4
-rw-r--r--devel/pear-I18N/Makefile4
-rw-r--r--devel/pear-OLE/Makefile4
-rw-r--r--devel/pear-PEAR/Makefile79
-rw-r--r--devel/pear-PEAR/Makefile.common239
-rw-r--r--devel/pear-PEAR/distinfo2
-rw-r--r--devel/pear-PEAR/files/patch-scripts::pearcmd.php19
-rw-r--r--devel/pear-PEAR/pkg-deinstall25
-rw-r--r--devel/pear-PEAR/pkg-descr12
-rw-r--r--devel/pear-PEAR/pkg-install21
-rw-r--r--devel/pear-PEAR_PackageFileManager/Makefile4
-rw-r--r--devel/pear-PHPDoc/Makefile4
-rw-r--r--devel/pear-PHPUnit/Makefile4
-rw-r--r--devel/pear-PHPUnit2/Makefile2
-rw-r--r--devel/pear-PHPUnit3/Makefile2
-rw-r--r--devel/pear-PHP_Beautifier/Makefile2
-rw-r--r--devel/pear-PHP_Compat/Makefile4
-rw-r--r--devel/pear-PHP_CompatInfo/Makefile4
-rw-r--r--devel/pear-Pager/Makefile4
-rw-r--r--devel/pear-Structures_DataGrid/Makefile4
-rw-r--r--devel/pear-System_Command/Makefile4
-rw-r--r--devel/pear-Text_Diff/Makefile4
-rw-r--r--devel/pear-VFS/Makefile4
-rw-r--r--devel/pear-Validate/Makefile4
-rw-r--r--devel/pear-Var_Dump/Makefile4
-rw-r--r--devel/pear-XML_NITF/Makefile2
-rw-r--r--devel/pear-XML_Parser/Makefile4
-rw-r--r--devel/pear-XML_RPC/Makefile36
-rw-r--r--devel/pear-XML_RPC/distinfo2
-rw-r--r--devel/pear-XML_RPC/pkg-descr5
-rw-r--r--devel/pear-XML_RSS/Makefile4
-rw-r--r--devel/pear-XML_SVG/Makefile4
-rw-r--r--devel/pear-XML_Serializer/Makefile2
-rw-r--r--devel/pear-XML_Transformer/Makefile2
-rw-r--r--devel/pear-XML_Tree/Makefile4
-rw-r--r--devel/pear-XML_Util/Makefile4
-rw-r--r--devel/pear-XML_XPath/Makefile4
-rw-r--r--devel/pear-apd/Makefile4
-rw-r--r--devel/php4-pear/Makefile19
-rw-r--r--devel/php5-pear/Makefile19
-rw-r--r--ftp/pear-Net_FTP/Makefile4
-rw-r--r--games/pear-Games_Chess/Makefile4
-rw-r--r--graphics/pear-Image_Barcode/Makefile4
-rw-r--r--graphics/pear-Image_Canvas/Makefile4
-rw-r--r--graphics/pear-Image_Color/Makefile4
-rw-r--r--graphics/pear-Image_Graph/Makefile4
-rw-r--r--irc/pear-Net_SmartIRC/Makefile4
-rw-r--r--mail/pear-Contact_Vcard_Build/Makefile4
-rw-r--r--mail/pear-Contact_Vcard_Parse/Makefile4
-rw-r--r--mail/pear-MIME_Type/Makefile4
-rw-r--r--mail/pear-Mail/Makefile4
-rw-r--r--mail/pear-Mail_Mime/Makefile4
-rw-r--r--mail/pear-Mail_Queue/Makefile2
-rw-r--r--mail/pear-Net_Cyrus/Makefile2
-rw-r--r--mail/pear-Net_IMAP/Makefile2
-rw-r--r--mail/pear-Net_LMTP/Makefile2
-rw-r--r--math/pear-Structures_Graph/Makefile4
-rw-r--r--misc/pear-Services_Weather/Makefile4
-rw-r--r--misc/pear-Text_Figlet/Makefile4
-rw-r--r--net/pear-Auth_RADIUS/Makefile4
-rw-r--r--net/pear-Net_CheckIP/Makefile4
-rw-r--r--net/pear-Net_DIME/Makefile4
-rw-r--r--net/pear-Net_DNSBL/Makefile2
-rw-r--r--net/pear-Net_Dict/Makefile2
-rw-r--r--net/pear-Net_Finger/Makefile2
-rw-r--r--net/pear-Net_IPv6/Makefile4
-rw-r--r--net/pear-Net_Ident/Makefile4
-rw-r--r--net/pear-Net_LDAP/Makefile4
-rw-r--r--net/pear-Net_LDAP2/Makefile4
-rw-r--r--net/pear-Net_NNTP/Makefile2
-rw-r--r--net/pear-Net_POP3/Makefile2
-rw-r--r--net/pear-Net_Ping/Makefile4
-rw-r--r--net/pear-Net_SMTP/Makefile2
-rw-r--r--net/pear-Net_Server/Makefile4
-rw-r--r--net/pear-Net_Sieve/Makefile2
-rw-r--r--net/pear-Net_Socket/Makefile4
-rw-r--r--net/pear-Net_URL/Makefile4
-rw-r--r--net/pear-Net_URL2/Makefile4
-rw-r--r--net/pear-Net_UserAgent_Detect/Makefile4
-rw-r--r--net/pear-Net_UserAgent_Mobile/Makefile4
-rw-r--r--net/pear-SOAP/Makefile4
-rw-r--r--security/pear-Auth/Makefile4
-rw-r--r--security/pear-Auth_HTTP/Makefile2
-rw-r--r--security/pear-Auth_PrefManager/Makefile2
-rw-r--r--security/pear-Auth_SASL/Makefile2
-rw-r--r--security/pear-Crypt_Blowfish/Makefile4
-rw-r--r--security/pear-Crypt_CBC/Makefile4
-rw-r--r--security/pear-Crypt_CHAP/Makefile4
-rw-r--r--security/pear-Crypt_HMAC/Makefile4
-rw-r--r--security/pear-Crypt_RC4/Makefile4
-rw-r--r--security/pear-Crypt_RSA/Makefile4
-rw-r--r--security/pear-File_HtAccess/Makefile4
-rw-r--r--security/pear-File_Passwd/Makefile4
-rw-r--r--security/pear-File_SMBPasswd/Makefile2
-rw-r--r--security/pear-LiveUser/Makefile2
-rw-r--r--security/pear-LiveUser_Admin/Makefile2
-rw-r--r--security/pear-Text_Password/Makefile2
-rw-r--r--sysutils/pear-Cache/Makefile2
-rw-r--r--sysutils/pear-Cache_Lite/Makefile4
-rw-r--r--sysutils/pear-File/Makefile4
-rw-r--r--sysutils/pear-File_Find/Makefile4
-rw-r--r--sysutils/pear-File_Fstab/Makefile4
-rw-r--r--sysutils/pear-File_Gettext/Makefile4
-rw-r--r--sysutils/pear-I18Nv2/Makefile4
-rw-r--r--sysutils/pear-Log/Makefile4
-rw-r--r--sysutils/pear-Translation2/Makefile4
-rw-r--r--textproc/pear-Numbers_Roman/Makefile4
-rw-r--r--textproc/pear-Numbers_Words/Makefile4
-rw-r--r--textproc/pear-Spreadsheet_Excel_Writer/Makefile4
-rw-r--r--textproc/pear-XML_Beautifier/Makefile2
-rw-r--r--textproc/pear-XML_HTMLSax/Makefile4
-rw-r--r--textproc/pear-XML_Wddx/Makefile2
-rw-r--r--www/pear-HTTP/Makefile4
-rw-r--r--www/pear-HTTP_Client/Makefile2
-rw-r--r--www/pear-HTTP_Download/Makefile2
-rw-r--r--www/pear-HTTP_Header/Makefile2
-rw-r--r--www/pear-HTTP_Request/Makefile2
-rw-r--r--www/pear-HTTP_Server/Makefile2
-rw-r--r--www/pear-HTTP_Session/Makefile4
-rw-r--r--www/pear-HTTP_Session2/Makefile4
-rw-r--r--www/pear-HTTP_Upload/Makefile4
-rw-r--r--www/pear-Text_Wiki/Makefile4
-rw-r--r--www/phpbb/Makefile2
-rw-r--r--www/postnuke/Makefile2
173 files changed, 253 insertions, 796 deletions
diff --git a/MOVED b/MOVED
index e644db5353b2..f924bf240b2b 100644
--- a/MOVED
+++ b/MOVED
@@ -1988,3 +1988,9 @@ www/p5-HTML-Chuncks|www/p5-HTML-Chunks|2005-12-01|corrected directory
devel/p5-Test-Builder-Tester|devel/p5-Test-Simple|2005-12-02|Included in Test::Simple package
www/apache2|www/apache20|2005-12-03|renamed for consistency with other apache ports
www/linux-sunbird|deskutils/linux-sunbird|2005-12-07|Moved to more suitable category
+devel/php4-pear||2005-12-09|Obsolated by devel/pear port
+devel/php5-pear||2005-12-09|Obsolated by devel/pear port
+archivers/pear-Archive_Tar||2005-12-09|Obsolated by devel/pear port
+devel/pear-Console_Getopt||2005-12-09|Obsolated by devel/pear port
+devel/pear-XML_RPC||2005-12-09|Obsolated by devel/pear port
+devel/pear-PEAR|devel/pear|2005-12-09|New pear bootstrap code
diff --git a/archivers/Makefile b/archivers/Makefile
index 3a331a64134c..b04e45abcb4f 100644
--- a/archivers/Makefile
+++ b/archivers/Makefile
@@ -66,7 +66,6 @@
SUBDIR += par2cmdline
SUBDIR += parchive
SUBDIR += pbzip2
- SUBDIR += pear-Archive_Tar
SUBDIR += pear-File_Archive
SUBDIR += pecl-zip
SUBDIR += php4-bz2
diff --git a/archivers/pear-Archive_Tar/Makefile b/archivers/pear-Archive_Tar/Makefile
deleted file mode 100644
index 96a866e5157a..000000000000
--- a/archivers/pear-Archive_Tar/Makefile
+++ /dev/null
@@ -1,27 +0,0 @@
-# Ports collection makefile for: pear-Archive_Tar
-# Date created: 28 November 2002
-# Whom: Thierry Thomas (<thierry@pompo.net>)
-#
-# $FreeBSD$
-#
-
-PORTNAME= Archive_Tar
-PORTVERSION= 1.3.1
-CATEGORIES= archivers pear
-
-MAINTAINER= antonio@php.net
-COMMENT= PEAR tar file management class
-
-USE_PHP= yes
-WANT_PHP_PEAR= yes
-
-CATEGORY= Archive
-FILES= Tar.php
-DOCS= Archive_Tar.txt
-
-post-extract:
- @${MV} ${WRKSRC}/Archive/* ${WRKSRC}
-
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear-PEAR/Makefile.common"
-.include <bsd.port.post.mk>
diff --git a/archivers/pear-Archive_Tar/distinfo b/archivers/pear-Archive_Tar/distinfo
deleted file mode 100644
index 49cf152f6056..000000000000
--- a/archivers/pear-Archive_Tar/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (PEAR/Archive_Tar-1.3.1.tgz) = 31e54ce401302065d43888223a0be4d9
-SIZE (PEAR/Archive_Tar-1.3.1.tgz) = 15102
diff --git a/archivers/pear-Archive_Tar/pkg-descr b/archivers/pear-Archive_Tar/pkg-descr
deleted file mode 100644
index ac2a39f5200a..000000000000
--- a/archivers/pear-Archive_Tar/pkg-descr
+++ /dev/null
@@ -1,7 +0,0 @@
-This class provides handling of tar files in PHP.
-
-It supports creating, listing, extracting and adding to tar files.
-Gzip support is available if PHP has the zlib extension built-in or
-loaded. Bz2 compression is also supported with the bz2 extension loaded.
-
-WWW: http://pear.php.net/package/Archive_Tar/
diff --git a/archivers/pear-File_Archive/Makefile b/archivers/pear-File_Archive/Makefile
index 5c5cfbd513a6..e673358112b5 100644
--- a/archivers/pear-File_Archive/Makefile
+++ b/archivers/pear-File_Archive/Makefile
@@ -68,5 +68,5 @@ RUN_DEPENDS+= ${PEARDIR}/Mail/mime.php:${PORTSDIR}/mail/pear-Mail_Mime
RUN_DEPENDS+= ${PEARDIR}/Cache/Lite.php:${PORTSDIR}/sysutils/pear-Cache_Lite
.endif
-.include "${PORTSDIR}/devel/pear-PEAR/Makefile.common"
+.include "${PORTSDIR}/devel/pear/bsd.pear.mk"
.include <bsd.port.post.mk>
diff --git a/benchmarks/pear-Benchmark/Makefile b/benchmarks/pear-Benchmark/Makefile
index 98ceea2635ee..f06a02bc39c3 100644
--- a/benchmarks/pear-Benchmark/Makefile
+++ b/benchmarks/pear-Benchmark/Makefile
@@ -12,7 +12,7 @@ CATEGORIES= benchmarks devel www pear
MAINTAINER= antonio@php.net
COMMENT= PEAR framework to benchmark PHP scripts or function calls
-BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR
+BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
RUN_DEPENDS= ${BUILD_DEPENDS}
USE_PHP= bcmath
@@ -23,5 +23,5 @@ EXAMPLES= timer_example.php
_EXAMPLESDIR= doc
.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/chinese/phpbb-tw/Makefile b/chinese/phpbb-tw/Makefile
index ceade5428602..dbe048570fe4 100644
--- a/chinese/phpbb-tw/Makefile
+++ b/chinese/phpbb-tw/Makefile
@@ -18,7 +18,7 @@ DISTNAME= phpBB-${PORTVERSION}
MAINTAINER= chinsan.tw@gmail.com
COMMENT= The Traditional Chinese version of phpBB
-RUN_DEPENDS= ${LOCALBASE}/share/pear/System.php:${PORTSDIR}/devel/pear-PEAR
+RUN_DEPENDS= ${LOCALBASE}/share/pear/System.php:${PORTSDIR}/devel/pear
CONFLICTS= phpbb-[0-9]*
diff --git a/databases/pear-DB/Makefile b/databases/pear-DB/Makefile
index 0653dd256f11..2ca5238aa132 100644
--- a/databases/pear-DB/Makefile
+++ b/databases/pear-DB/Makefile
@@ -13,7 +13,7 @@ CATEGORIES= databases www pear
MAINTAINER= antonio@php.net
COMMENT= PEAR Database Abstraction Layer
-BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR
+BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
RUN_DEPENDS= ${BUILD_DEPENDS}
USE_REINPLACE= yes
@@ -40,7 +40,7 @@ TESTS= db_error.phpt db_parsedsn.phpt db_factory.phpt db_ismanip.phpt \
_DOCSDIR= doc
.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear-PEAR/Makefile.common"
+.include "${PORTSDIR}/devel/pear/bsd.pear.mk"
post-patch:
.for file in ${FILES}
diff --git a/databases/pear-DBA/Makefile b/databases/pear-DBA/Makefile
index 0d201d0757cb..70c18ca63d14 100644
--- a/databases/pear-DBA/Makefile
+++ b/databases/pear-DBA/Makefile
@@ -12,7 +12,7 @@ CATEGORIES= databases www pear
MAINTAINER= antonio@php.net
COMMENT= Berkely-style database abstraction class
-BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR
+BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
RUN_DEPENDS= ${BUILD_DEPENDS}
FILES= DBA.php DBA/Compatibility.php DBA/Driver/File.php DBA/Driver/Builtin.php
@@ -20,5 +20,5 @@ TESTS= benchmark_drivers.php test_drivers.php test_compatibility.php
DOCS= README.txt
.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/databases/pear-DB_DataObject/Makefile b/databases/pear-DB_DataObject/Makefile
index 519420ce4625..11a8d358851b 100644
--- a/databases/pear-DB_DataObject/Makefile
+++ b/databases/pear-DB_DataObject/Makefile
@@ -36,5 +36,5 @@ post-patch:
RUN_DEPENDS+= ${PEARDIR}/Validate.php:${PORTSDIR}/devel/pear-Validate
.endif
-.include "${PORTSDIR}/devel/pear-PEAR/Makefile.common"
+.include "${PORTSDIR}/devel/pear/bsd.pear.mk"
.include <bsd.port.post.mk>
diff --git a/databases/pear-DB_DataObject_FormBuilder/Makefile b/databases/pear-DB_DataObject_FormBuilder/Makefile
index 8d1852bffb45..614015a719ec 100644
--- a/databases/pear-DB_DataObject_FormBuilder/Makefile
+++ b/databases/pear-DB_DataObject_FormBuilder/Makefile
@@ -36,5 +36,5 @@ RUN_DEPENDS+= ${PEARDIR}/Date.php:${PORTSDIR}/devel/pear-Date
RUN_DEPENDS+= ${PEARDIR}/HTML/Table.php:${PORTSDIR}/devel/pear-HTML_Table
.endif
-.include "${PORTSDIR}/devel/pear-PEAR/Makefile.common"
+.include "${PORTSDIR}/devel/pear/bsd.pear.mk"
.include <bsd.port.post.mk>
diff --git a/databases/pear-DB_Pager/Makefile b/databases/pear-DB_Pager/Makefile
index ed573b7b8a44..731515181751 100644
--- a/databases/pear-DB_Pager/Makefile
+++ b/databases/pear-DB_Pager/Makefile
@@ -13,7 +13,7 @@ DISTNAME= ${PORTNAME}-${PORTVERSION}
MAINTAINER= toshiya@saitoh.nu
COMMENT= PEAR Database Abstraction Layer
-BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR \
+BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear \
${PEARDIR}/DB.php:${PORTSDIR}/databases/pear-DB
RUN_DEPENDS= ${BUILD_DEPENDS}
@@ -21,5 +21,5 @@ NO_BUILD= yes
FILES= Pager.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/databases/pear-DB_QueryTool/Makefile b/databases/pear-DB_QueryTool/Makefile
index f352e5912fe5..7262dfc6038d 100644
--- a/databases/pear-DB_QueryTool/Makefile
+++ b/databases/pear-DB_QueryTool/Makefile
@@ -39,5 +39,5 @@ TESTS= Common.php Get.php GetAll.php GetCount.php GetQueryString.php index.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/databases/pear-DB_Table/Makefile b/databases/pear-DB_Table/Makefile
index ef51c715ce0d..60a9ec0fc315 100644
--- a/databases/pear-DB_Table/Makefile
+++ b/databases/pear-DB_Table/Makefile
@@ -40,5 +40,5 @@ post-extract:
RUN_DEPENDS+= ${PEARDIR}/HTML/QuickForm.php:${PORTSDIR}/devel/pear-HTML_QuickForm
.endif
-.include "${PORTSDIR}/devel/pear-PEAR/Makefile.common"
+.include "${PORTSDIR}/devel/pear/bsd.pear.mk"
.include <bsd.port.post.mk>
diff --git a/databases/pear-DB_ldap/Makefile b/databases/pear-DB_ldap/Makefile
index f5d97cd983ce..7d67c5b247d0 100644
--- a/databases/pear-DB_ldap/Makefile
+++ b/databases/pear-DB_ldap/Makefile
@@ -19,5 +19,5 @@ CATEGORY= DB
FILES= ldap.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/databases/pear-DB_ldap2/Makefile b/databases/pear-DB_ldap2/Makefile
index f5d97cd983ce..7d67c5b247d0 100644
--- a/databases/pear-DB_ldap2/Makefile
+++ b/databases/pear-DB_ldap2/Makefile
@@ -19,5 +19,5 @@ CATEGORY= DB
FILES= ldap.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/databases/pear-MDB/Makefile b/databases/pear-MDB/Makefile
index 204c298e0df0..407f01286b53 100644
--- a/databases/pear-MDB/Makefile
+++ b/databases/pear-MDB/Makefile
@@ -44,5 +44,5 @@ _DOCSDIR= .
_TESTDIR= 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/databases/pear-MDB2/Makefile b/databases/pear-MDB2/Makefile
index 3285329ccc5c..5b79666ee53f 100644
--- a/databases/pear-MDB2/Makefile
+++ b/databases/pear-MDB2/Makefile
@@ -57,5 +57,5 @@ TESTS= clitest.php Console_TestListener.php driver_test.schema \
_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/databases/pear-MDB_QueryTool/Makefile b/databases/pear-MDB_QueryTool/Makefile
index e0e6fb667e3d..2ee2bbe20ab6 100644
--- a/databases/pear-MDB_QueryTool/Makefile
+++ b/databases/pear-MDB_QueryTool/Makefile
@@ -39,5 +39,5 @@ TESTS= Common.php index.php Get.php GetAll.php GetCount.php GetQueryString.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/devel/Makefile b/devel/Makefile
index cdfdee2abcbf..69bfe5c354cf 100644
--- a/devel/Makefile
+++ b/devel/Makefile
@@ -1241,7 +1241,6 @@
SUBDIR += pear
SUBDIR += pear-Config
SUBDIR += pear-Console_Getargs
- SUBDIR += pear-Console_Getopt
SUBDIR += pear-Console_Table
SUBDIR += pear-Date
SUBDIR += pear-Event_Dispatcher
@@ -1266,7 +1265,6 @@
SUBDIR += pear-HTML_TreeMenu
SUBDIR += pear-I18N
SUBDIR += pear-OLE
- SUBDIR += pear-PEAR
SUBDIR += pear-PEAR_PackageFileManager
SUBDIR += pear-PHPDoc
SUBDIR += pear-PHPUnit
@@ -1283,7 +1281,6 @@
SUBDIR += pear-Var_Dump
SUBDIR += pear-XML_NITF
SUBDIR += pear-XML_Parser
- SUBDIR += pear-XML_RPC
SUBDIR += pear-XML_RSS
SUBDIR += pear-XML_SVG
SUBDIR += pear-XML_Serializer
@@ -1306,7 +1303,6 @@
SUBDIR += php4-ncurses
SUBDIR += php4-pcntl
SUBDIR += php4-pcre
- SUBDIR += php4-pear
SUBDIR += php4-readline
SUBDIR += php4-shmop
SUBDIR += php4-sysvmsg
@@ -1319,7 +1315,6 @@
SUBDIR += php5-ncurses
SUBDIR += php5-pcntl
SUBDIR += php5-pcre
- SUBDIR += php5-pear
SUBDIR += php5-readline
SUBDIR += php5-shmop
SUBDIR += php5-sysvmsg
diff --git a/devel/beautifyphp/Makefile b/devel/beautifyphp/Makefile
index 31cec47bae6f..7f3fe4ea7657 100644
--- a/devel/beautifyphp/Makefile
+++ b/devel/beautifyphp/Makefile
@@ -15,7 +15,7 @@ DISTNAME= beautify_php_${PORTVERSION}
MAINTAINER= leeym@FreeBSD.org
COMMENT= PEAR beautifier for PHP4
-RUN_DEPENDS= ${LOCALBASE}/share/pear/System.php:${PORTSDIR}/devel/pear-PEAR
+RUN_DEPENDS= ${LOCALBASE}/share/pear/System.php:${PORTSDIR}/devel/pear
USE_REINPLACE= yes
NO_BUILD= yes
diff --git a/devel/pear-Config/Makefile b/devel/pear-Config/Makefile
index 44e4aeba22c4..30cd8e6f1168 100644
--- a/devel/pear-Config/Makefile
+++ b/devel/pear-Config/Makefile
@@ -12,7 +12,7 @@ CATEGORIES= devel www pear
MAINTAINER= antonio@php.net
COMMENT= Your configurations swiss-army knife
-BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR
+BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
RUN_DEPENDS= ${PEARDIR}/XML/Parser.php:${PORTSDIR}/devel/pear-XML_Parser \
${PEARDIR}/XML/Util.php:${PORTSDIR}/devel/pear-XML_Util
@@ -23,5 +23,5 @@ FILES= Config.php Config/Container.php Config/Container/Apache.php \
DOCS= Apache.php IniCommented.php IniFromScratch.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/devel/pear-Console_Getargs/Makefile b/devel/pear-Console_Getargs/Makefile
index a0f39fab3737..b89e3b82742a 100644
--- a/devel/pear-Console_Getargs/Makefile
+++ b/devel/pear-Console_Getargs/Makefile
@@ -12,7 +12,7 @@ CATEGORIES= devel www pear
MAINTAINER= antonio@php.net
COMMENT= PEAR command-line arguments parser
-BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR
+BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
RUN_DEPENDS= ${BUILD_DEPENDS}
CATEGORY= Console
@@ -22,5 +22,5 @@ TESTS= Console_TestListener.php Getargs_basic_testcase.php \
Getargs_getValues_testcase.php test.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/devel/pear-Console_Getopt/Makefile b/devel/pear-Console_Getopt/Makefile
deleted file mode 100644
index a213ba681e8f..000000000000
--- a/devel/pear-Console_Getopt/Makefile
+++ /dev/null
@@ -1,22 +0,0 @@
-# Ports collection makefile for: pear-Console_Getopt
-# Date created: 23 October 2002
-# Whom: Thierry Thomas (<thierry@pompo.net>)
-#
-# $FreeBSD$
-#
-
-PORTNAME= Console_Getopt
-PORTVERSION= 1.2
-CATEGORIES= devel www pear
-
-MAINTAINER= ports@FreeBSD.org
-COMMENT= PEAR command-line option parser
-
-WANT_PHP_PEAR= yes
-USE_PHP= yes
-
-FILES= Console/Getopt.php
-
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear-PEAR/Makefile.common"
-.include <bsd.port.post.mk>
diff --git a/devel/pear-Console_Getopt/distinfo b/devel/pear-Console_Getopt/distinfo
deleted file mode 100644
index 9d078b2267f8..000000000000
--- a/devel/pear-Console_Getopt/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (PEAR/Console_Getopt-1.2.tgz) = 8f9ec8253c04350bc01ee7ca941e24b6
-SHA256 (PEAR/Console_Getopt-1.2.tgz) = 90bc64b35832af79625ccd7a1cd981ae26adbe58e1296a052cc3947d9c959e0c
-SIZE (PEAR/Console_Getopt-1.2.tgz) = 3370
diff --git a/devel/pear-Console_Getopt/pkg-descr b/devel/pear-Console_Getopt/pkg-descr
deleted file mode 100644
index d198cccb852b..000000000000
--- a/devel/pear-Console_Getopt/pkg-descr
+++ /dev/null
@@ -1,4 +0,0 @@
-This is a PHP implementation of "getopt" supporting both short and long
-options.
-
-WWW: http://pear.php.net/manual/en/package.console.php
diff --git a/devel/pear-Console_Table/Makefile b/devel/pear-Console_Table/Makefile
index 43bba5ffd3d9..9a9f7e157307 100644
--- a/devel/pear-Console_Table/Makefile
+++ b/devel/pear-Console_Table/Makefile
@@ -12,12 +12,12 @@ CATEGORIES= devel pear
MAINTAINER= ports@FreeBSD.org
COMMENT= PHP class that makes it easy to build console style tables
-BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR
+BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
RUN_DEPENDS= ${BUILD_DEPENDS}
CATEGORY= Console
FILES= Table.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/devel/pear-Date/Makefile b/devel/pear-Date/Makefile
index bb812d851007..1bdea5cb3545 100644
--- a/devel/pear-Date/Makefile
+++ b/devel/pear-Date/Makefile
@@ -12,7 +12,7 @@ CATEGORIES= devel www pear
MAINTAINER= antonio@php.net
COMMENT= PEAR Date and Time Zone Classes
-BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR
+BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
RUN_DEPENDS= ${BUILD_DEPENDS}
FILES= Date.php Date/Calc.php Date/Human.php Date/Span.php \
@@ -27,5 +27,5 @@ DOCS= TODO
_DOCSDIR= .
.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/devel/pear-Event_Dispatcher/Makefile b/devel/pear-Event_Dispatcher/Makefile
index 9f0c1c51a52a..d0f020524180 100644
--- a/devel/pear-Event_Dispatcher/Makefile
+++ b/devel/pear-Event_Dispatcher/Makefile
@@ -12,7 +12,7 @@ CATEGORIES= devel pear
MAINTAINER= antonio@php.net
COMMENT= PEAR dispatch notifications using PHP callbacks
-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:
.endfor
.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/devel/pear-FSM/Makefile b/devel/pear-FSM/Makefile
index 346b82458e22..49ad15356a7d 100644
--- a/devel/pear-FSM/Makefile
+++ b/devel/pear-FSM/Makefile
@@ -12,7 +12,7 @@ CATEGORIES= devel www pear
MAINTAINER= antonio@php.net
COMMENT= PEAR Finite State Machine
-BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR
+BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
RUN_DEPENDS= ${BUILD_DEPENDS}
FILES= FSM.php
@@ -22,5 +22,5 @@ EXAMPLES= rpn.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/devel/pear-HTML_BBCodeParser/Makefile b/devel/pear-HTML_BBCodeParser/Makefile
index 9794a4dc403b..be600104beeb 100644
--- a/devel/pear-HTML_BBCodeParser/Makefile
+++ b/devel/pear-HTML_BBCodeParser/Makefile
@@ -27,5 +27,5 @@ EXAMPLES= BBCodeParser.ini parser.php
_EXAMPLESDIR= BBCodeParser/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>
diff --git a/devel/pear-HTML_CSS/Makefile b/devel/pear-HTML_CSS/Makefile
index 3725b312a352..c4485b1ace7d 100644
--- a/devel/pear-HTML_CSS/Makefile
+++ b/devel/pear-HTML_CSS/Makefile
@@ -20,5 +20,5 @@ FILES= CSS.php
EXAMPLES= CSS_InHeader.php CSS_Inline.php CSS_Stylesheet.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/devel/pear-HTML_Common/Makefile b/devel/pear-HTML_Common/Makefile
index f42011b50641..cc3c82946fb0 100644
--- a/devel/pear-HTML_Common/Makefile
+++ b/devel/pear-HTML_Common/Makefile
@@ -12,12 +12,12 @@ CATEGORIES= devel www pear
MAINTAINER= ports@FreeBSD.org
COMMENT= PEAR::HTML_Common is a base class for other HTML classes
-BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR
+BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
RUN_DEPENDS= ${BUILD_DEPENDS}
CATEGORY= HTML
FILES= Common.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/devel/pear-HTML_Form/Makefile b/devel/pear-HTML_Form/Makefile
index d6f76c605208..52df200f3c8a 100644
--- a/devel/pear-HTML_Form/Makefile
+++ b/devel/pear-HTML_Form/Makefile
@@ -12,7 +12,7 @@ CATEGORIES= devel pear
MAINTAINER= antonio@php.net
COMMENT= PEAR simple HTML form package
-BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR
+BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
RUN_DEPENDS= ${BUILD_DEPENDS}
USE_REINPLACE= yes
@@ -25,7 +25,7 @@ post-extract:
@${MV} ${WRKSRC}/HTML/* ${WRKSRC}
.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear-PEAR/Makefile.common"
+.include "${PORTSDIR}/devel/pear/bsd.pear.mk"
post-patch:
@${REINPLACE_CMD} -e "s|@include_path@|${PREFIX}/${LPEARDIR}|g" \
diff --git a/devel/pear-HTML_Javascript/Makefile b/devel/pear-HTML_Javascript/Makefile
index 8009e8dec9ed..27c832519fc4 100644
--- a/devel/pear-HTML_Javascript/Makefile
+++ b/devel/pear-HTML_Javascript/Makefile
@@ -12,7 +12,7 @@ CATEGORIES= devel www pear
MAINTAINER= antonio@php.net
COMMENT= Provides an interface for creating simple JS scripts
-BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR
+BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
RUN_DEPENDS= ${BUILD_DEPENDS}
CATEGORY= HTML
@@ -21,5 +21,5 @@ EXAMPLES= javascript.php js.php
TESTS= js.php output.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/devel/pear-HTML_Page2/Makefile b/devel/pear-HTML_Page2/Makefile
index f69885559a2d..9ecf84ca0c9b 100644
--- a/devel/pear-HTML_Page2/Makefile
+++ b/devel/pear-HTML_Page2/Makefile
@@ -26,5 +26,5 @@ post-patch:
@${REINPLACE_CMD} -e "s# ##g" ${WRKSRC}/Page2.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/devel/pear-HTML_QuickForm/Makefile b/devel/pear-HTML_QuickForm/Makefile
index 8192dfea1581..541f0f818641 100644
--- a/devel/pear-HTML_QuickForm/Makefile
+++ b/devel/pear-HTML_QuickForm/Makefile
@@ -49,5 +49,5 @@ DOCS= elements.php filters.php formrule.php groups.php rules-builtin.php rules-
renderers/templates/styles/fancygroup.html
.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/devel/pear-HTML_QuickForm2/Makefile b/devel/pear-HTML_QuickForm2/Makefile
index 8192dfea1581..541f0f818641 100644
--- a/devel/pear-HTML_QuickForm2/Makefile
+++ b/devel/pear-HTML_QuickForm2/Makefile
@@ -49,5 +49,5 @@ DOCS= elements.php filters.php formrule.php groups.php rules-builtin.php rules-
renderers/templates/styles/fancygroup.html
.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/devel/pear-HTML_QuickForm_Controller/Makefile b/devel/pear-HTML_QuickForm_Controller/Makefile
index a072f8d6ed69..eae4e2543c20 100644
--- a/devel/pear-HTML_QuickForm_Controller/Makefile
+++ b/devel/pear-HTML_QuickForm_Controller/Makefile
@@ -22,5 +22,5 @@ EXAMPLES= simple.php tabbed.php wizard.php regWizard.php upload.php \
templates/upload.html statemachine.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/devel/pear-HTML_QuickForm_SelectFilter/Makefile b/devel/pear-HTML_QuickForm_SelectFilter/Makefile
index ef4a0f23d9f3..17315b96d2ca 100644
--- a/devel/pear-HTML_QuickForm_SelectFilter/Makefile
+++ b/devel/pear-HTML_QuickForm_SelectFilter/Makefile
@@ -20,5 +20,5 @@ CATEGORY= HTML/QuickForm
FILES= SelectFilter.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/devel/pear-HTML_QuickForm_advmultiselect/Makefile b/devel/pear-HTML_QuickForm_advmultiselect/Makefile
index 8fc13e16bcd5..cba480912440 100644
--- a/devel/pear-HTML_QuickForm_advmultiselect/Makefile
+++ b/devel/pear-HTML_QuickForm_advmultiselect/Makefile
@@ -20,5 +20,5 @@ CATEGORY= HTML/QuickForm
FILES= advmultiselect.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/devel/pear-HTML_Select/Makefile b/devel/pear-HTML_Select/Makefile
index edaf57dd4fd2..6269ab538368 100644
--- a/devel/pear-HTML_Select/Makefile
+++ b/devel/pear-HTML_Select/Makefile
@@ -19,5 +19,5 @@ CATEGORY= HTML
FILES= Select.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/devel/pear-HTML_Select_Common/Makefile b/devel/pear-HTML_Select_Common/Makefile
index 5f488cf06c16..5d6299d25a9e 100644
--- a/devel/pear-HTML_Select_Common/Makefile
+++ b/devel/pear-HTML_Select_Common/Makefile
@@ -25,5 +25,5 @@ EXAMPLES= Country.php FRDepartements.php UKCounty.php USState.php
_EXAMPLESDIR= Select/Common/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/devel/pear-HTML_Table/Makefile b/devel/pear-HTML_Table/Makefile
index b3695323e92b..23074b88c566 100644
--- a/devel/pear-HTML_Table/Makefile
+++ b/devel/pear-HTML_Table/Makefile
@@ -21,5 +21,5 @@ EXAMPLES= Table_example1.php Table_example2.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/devel/pear-HTML_Template_Flexy/Makefile b/devel/pear-HTML_Template_Flexy/Makefile
index d506a6a6649d..d1ab09c2eb04 100644
--- a/devel/pear-HTML_Template_Flexy/Makefile
+++ b/devel/pear-HTML_Template_Flexy/Makefile
@@ -12,7 +12,7 @@ CATEGORIES= devel www pear
MAINTAINER= antonio@php.net
COMMENT= An extremely powerful Tokenizer driven Template engine
-BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR
+BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
RUN_DEPENDS= ${BUILD_DEPENDS}
LATEST_LINK= pear-HTML_Template_Flexy
@@ -67,5 +67,5 @@ RUN_DEPENDS+= ${PEARDIR}/Translation2.php:${PORTSDIR}/sysutils/pear-Translation2
.endif
.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/devel/pear-HTML_Template_IT/Makefile b/devel/pear-HTML_Template_IT/Makefile
index b1544e9919a1..418f4c342e4c 100644
--- a/devel/pear-HTML_Template_IT/Makefile
+++ b/devel/pear-HTML_Template_IT/Makefile
@@ -13,7 +13,7 @@ CATEGORIES= devel www pear
MAINTAINER= ports@FreeBSD.org
COMMENT= PEAR template API
-BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR
+BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
RUN_DEPENDS= ${BUILD_DEPENDS}
CATEGORY= HTML/Template
@@ -30,5 +30,5 @@ do-install-tests-msg: .USE
@${ECHO_MSG} " <http://pear.php.net/package-info.php?package=PHPUnit>;;)."
.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/devel/pear-HTML_Template_PHPLIB/Makefile b/devel/pear-HTML_Template_PHPLIB/Makefile
index b6c526c8a2be..6ec2f2b54a00 100644
--- a/devel/pear-HTML_Template_PHPLIB/Makefile
+++ b/devel/pear-HTML_Template_PHPLIB/Makefile
@@ -13,7 +13,7 @@ CATEGORIES= devel www pear
MAINTAINER= ports@FreeBSD.org
COMMENT= PEAR template API ported from PHPLIB
-BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR
+BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
RUN_DEPENDS= ${BUILD_DEPENDS}
CATEGORY= HTML/Template
@@ -27,5 +27,5 @@ do-install-tests-msg: .USE
@${ECHO_MSG} " <http://pear.php.net/package-info.php?package=Benchmark>;;;)."
.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/devel/pear-HTML_Template_Sigma/Makefile b/devel/pear-HTML_Template_Sigma/Makefile
index 1573aa0a11bf..0145c5377442 100644
--- a/devel/pear-HTML_Template_Sigma/Makefile
+++ b/devel/pear-HTML_Template_Sigma/Makefile
@@ -12,7 +12,7 @@ CATEGORIES= devel www pear
MAINTAINER= klammer@webonaut.com
COMMENT= PEAR template API
-BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR
+BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
RUN_DEPENDS= ${BUILD_DEPENDS}
CATEGORY= HTML/Template
@@ -34,5 +34,5 @@ do-install-tests-msg: .USE
@${ECHO_MSG} " <http://pear.php.net/package-info.php?package=PHPUnit>;;)."
.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/devel/pear-HTML_TreeMenu/Makefile b/devel/pear-HTML_TreeMenu/Makefile
index dbd667063e72..15c5469c80b7 100644
--- a/devel/pear-HTML_TreeMenu/Makefile
+++ b/devel/pear-HTML_TreeMenu/Makefile
@@ -12,7 +12,7 @@ CATEGORIES= devel www pear
MAINTAINER= antonio@php.net
COMMENT= Provides an API to create a HTML tree
-BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR
+BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
RUN_DEPENDS= ${BUILD_DEPENDS}
CATEGORY= HTML
@@ -36,5 +36,5 @@ DOCS= HTML_TreeMenu.doc HTML_TreeMenu.pdf example.php map_fs.php
_DATADIR= .
.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/devel/pear-I18N/Makefile b/devel/pear-I18N/Makefile
index 35a00aea9062..e3b9dd2f9763 100644
--- a/devel/pear-I18N/Makefile
+++ b/devel/pear-I18N/Makefile
@@ -12,7 +12,7 @@ CATEGORIES= devel www pear
MAINTAINER= ports@FreeBSD.org
COMMENT= PEAR internationalization package
-BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR
+BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
RUN_DEPENDS= ${BUILD_DEPENDS}
CATEGORY= I18N
@@ -34,5 +34,5 @@ EXAMPLES= I18N_Currency.php I18N_DateTime.php I18N_Message.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/devel/pear-OLE/Makefile b/devel/pear-OLE/Makefile
index 4d5c776f33da..c452936cf595 100644
--- a/devel/pear-OLE/Makefile
+++ b/devel/pear-OLE/Makefile
@@ -12,12 +12,12 @@ CATEGORIES= devel www pear
MAINTAINER= pav@FreeBSD.org
COMMENT= PEAR class for reading and writing OLE containers
-BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR
+BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
RUN_DEPENDS= ${BUILD_DEPENDS}
CATEGORY= OLE
FILES= OLE.php PPS.php PPS/File.php PPS/Root.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/devel/pear-PEAR/Makefile b/devel/pear-PEAR/Makefile
deleted file mode 100644
index c6accc603eb3..000000000000
--- a/devel/pear-PEAR/Makefile
+++ /dev/null
@@ -1,79 +0,0 @@
-# Ports collection makefile for: pear-PEAR
-# Date created: 22 October 2002
-# Whom: Thierry Thomas (<thierry@pompo.net>)
-#
-# $FreeBSD$
-#
-
-PORTNAME= PEAR
-PORTVERSION= 1.4.4
-CATEGORIES= devel www pear
-
-MAINTAINER= antonio@php.net
-COMMENT= PEAR Base System
-
-BUILD_DEPENDS= ${PEARDIR}/Archive/Tar.php:${PORTSDIR}/archivers/pear-Archive_Tar \
- ${PEARDIR}/Console/Getopt.php:${PORTSDIR}/devel/pear-Console_Getopt \
- ${PEARDIR}/XML/RPC.php:${PORTSDIR}/devel/pear-XML_RPC
-RUN_DEPENDS= ${BUILD_DEPENDS}
-
-USE_REINPLACE= yes
-
-FILES= OS/Guess.php PEAR/ChannelFile/Parser.php PEAR/Command/Auth.xml \
- PEAR/Command/Auth.php PEAR/Command/Build.xml PEAR/Command/Build.php \
- PEAR/Command/Channels.xml PEAR/Command/Channels.php \
- PEAR/Command/Common.php PEAR/Command/Config.xml PEAR/Command/Config.php \
- PEAR/Command/Install.xml PEAR/Command/Install.php \
- PEAR/Command/Package.xml PEAR/Command/Package.php \
- PEAR/Command/Pickle.xml PEAR/Command/Pickle.php \
- PEAR/Command/Registry.xml PEAR/Command/Registry.php \
- PEAR/Command/Remote.xml PEAR/Command/Remote.php \
- PEAR/Command/Mirror.xml PEAR/Command/Mirror.php \
- PEAR/Command/Test.xml PEAR/Command/Test.php PEAR/Downloader/Package.php \
- PEAR/Frontend/CLI.php PEAR/Installer/Role/Common.php \
- PEAR/Installer/Role/Data.xml PEAR/Installer/Role/Data.php \
- PEAR/Installer/Role/Doc.xml PEAR/Installer/Role/Doc.php \
- PEAR/Installer/Role/Ext.xml PEAR/Installer/Role/Ext.php \
- PEAR/Installer/Role/Php.xml PEAR/Installer/Role/Php.php \
- PEAR/Installer/Role/Script.xml PEAR/Installer/Role/Script.php \
- PEAR/Installer/Role/Src.xml PEAR/Installer/Role/Src.php \
- PEAR/Installer/Role/Test.xml PEAR/Installer/Role/Test.php \
- PEAR/Installer/Role.php PEAR/PackageFile/Generator/v1.php \
- PEAR/PackageFile/Generator/v2.php PEAR/PackageFile/Parser/v1.php \
- PEAR/PackageFile/Parser/v2.php PEAR/PackageFile/v2/rw.php \
- PEAR/PackageFile/v2/Validator.php PEAR/PackageFile/v1.php \
- PEAR/PackageFile/v2.php PEAR/REST/10.php PEAR/REST/11.php \
- PEAR/Task/Postinstallscript/rw.php PEAR/Task/Replace/rw.php \
- PEAR/Task/Unixeol/rw.php PEAR/Task/Windowseol/rw.php \
- PEAR/Task/Common.php PEAR/Task/Postinstallscript.php \
- PEAR/Task/Replace.php PEAR/Task/Unixeol.php PEAR/Task/Windowseol.php \
- PEAR/Validator/PECL.php PEAR/Autoloader.php PEAR/Builder.php \
- PEAR/ChannelFile.php PEAR/Command.php PEAR/Common.php PEAR/Config.php \
- PEAR/Dependency.php PEAR/DependencyDB.php PEAR/Dependency2.php \
- PEAR/Downloader.php PEAR/ErrorStack.php PEAR/Exception.php \
- PEAR/Frontend.php PEAR/Installer.php PEAR/Packager.php \
- PEAR/PackageFile.php PEAR/Registry.php PEAR/Remote.php PEAR/REST.php \
- PEAR/RunTest.php PEAR/Validate.php PEAR/XMLParser.php package.dtd \
- template.spec PEAR.php System.php
-SCRIPTFILES= pear2
-
-.include <bsd.port.pre.mk>
-
-pre-patch:
-.for dosfile in ${FILES} scripts/pearcmd.php
- @${MV} ${WRKSRC}/${dosfile} ${WRKSRC}/${dosfile}.dos
- @${TR} -d '\r' < ${WRKSRC}/${dosfile}.dos > ${WRKSRC}/${dosfile}
-.endfor
-
-post-patch:
-.for origfile in ${FILES}
- @${REINPLACE_CMD} -e 's|@pear_version@|${PORTVERSION}|g' \
- -e 's|@PEAR-VER@|${PORTVERSION}|g' \
- -e 's|@DATA-DIR@|${PEARDIR}|g' \
- ${WRKSRC}/${origfile}
-.endfor
- @${SED} "s|@pear_version@|${PORTVERSION}|g" \
- ${WRKSRC}/scripts/pearcmd.php > ${WRKSRC}/pear-${SCRIPTFILES}
-
-.include "${PORTSDIR}/devel/pear-PEAR/Makefile.common"
-.include <bsd.port.post.mk>
diff --git a/devel/pear-PEAR/Makefile.common b/devel/pear-PEAR/Makefile.common
deleted file mode 100644
index 9271f7afa218..000000000000
--- a/devel/pear-PEAR/Makefile.common
+++ /dev/null
@@ -1,239 +0,0 @@
-# $FreeBSD$
-
-# Common code for pear- ports.
-
-MASTER_SITES= http://pear.php.net/get/
-PKGNAMEPREFIX= pear-
-EXTRACT_SUFX= .tgz
-DIST_SUBDIR= PEAR
-
-USE_REINPLACE= yes
-
-.if !defined(USE_PHPIZE)
-NO_BUILD= yes
-.endif
-
-.if exists(${LOCALBASE}/bin/php-config)
-PHP_BASE!= ${LOCALBASE}/bin/php-config --prefix
-.else
-PHP_BASE= ${LOCALBASE}
-.endif
-LPEARDIR= share/pear
-LPKGREGDIR= ${LPEARDIR}/packages/${PKGNAME}
-LDATADIR= ${LPEARDIR}/data/${PORTNAME}
-LDOCSDIR= share/doc/pear/${PORTNAME}
-LEXAMPLESDIR= share/examples/pear/${PORTNAME}
-LSQLSDIR= ${LPEARDIR}/sql/${PORTNAME}
-LSCRIPTSDIR= bin
-LTESTSDIR= ${LPEARDIR}/tests/${PORTNAME}
-PEARDIR= ${PHP_BASE}/${LPEARDIR}
-PKGREGDIR= ${PHP_BASE}/${LPKGREGDIR}
-DATADIR= ${PHP_BASE}/${LDATADIR}
-DOCSDIR= ${PHP_BASE}/${LDOCSDIR}
-EXAMPLESDIR= ${PHP_BASE}/${LEXAMPLESDIR}
-SQLSDIR= ${PHP_BASE}/${LSQLSDIR}
-SCRIPTFILESDIR= ${LOCALBASE}/bin
-TESTSDIR= ${PHP_BASE}/${LTESTSDIR}
-.if defined(CATEGORY) && !empty(CATEGORY)
-LINSTDIR= ${LPEARDIR}/${CATEGORY}
-.else
-LINSTDIR= ${LPEARDIR}
-.endif
-INSTDIR= ${PHP_BASE}/${LINSTDIR}
-
-.if !defined(USE_PHPIZE) && !exists(${.CURDIR}/pkg-plist)
-PLIST= ${WRKDIR}/PLIST
-.endif
-PLIST_SUB= PEARDIR=${LPEARDIR} PKGREGDIR=${LPKGREGDIR} \
- TESTSDIR=${LTESTSDIR} INSTDIR=${LINSTDIR} SQLSDIR=${LSQLSDIR} \
- SCRIPTFILESDIR=${LCRIPTSDIR}
-
-PKGINSTALL= ${PORTSDIR}/devel/pear-PEAR/pkg-install
-PKGDEINSTALL= ${PORTSDIR}/devel/pear-PEAR/pkg-deinstall
-
-FILES?=
-DATA?=
-DOCS?=
-EXAMPLES?=
-SQLS?=
-SCRIPTFILES?=
-TESTS?=
-_DATADIR?= data
-_DOCSDIR?= docs
-_EXAMPLESDIR?= examples
-_SQLSDIR?= sql
-_TESTSDIR?= tests
-
-# this is an easy way to eliminate duplicate entries in a variable :)
-# if someone knows how to achieve the result without this terrible
-# hack, please tell me!
-.for v in FILES DOCS TESTS EXAMPLES SQLS SCRIPTFILES DATA
-X${v}DIRS= ${${v}:M*/*:C;/[^/]+$;;}
-. for XD in ${X${v}DIRS}
-ALREADYTHERE= 0
-. for D in ${${v}DIRS}
-DD= ${D}
-. if ${DD} == ${XD}
-ALREADYTHERE= 1
-. endif
-. endfor
-. if ${ALREADYTHERE} == 0
-${v}DIRS+= ${XD}
-. endif
-. endfor
-.endfor
-
-pre-install:
-.if exists(${LOCALBASE}/lib/php.DIST_PHP) \
- || exists(${PHP_BASE}/lib/php.DIST_PHP) \
- || exists(${LOCALBASE}/.PEAR.pkg) \
- || exists(${PHP_BASE}/.PEAR.pkg)
- @${ECHO_MSG} ""
- @${ECHO_MSG} " Sorry, the PEAR structure has been modified;"
- @${ECHO_MSG} " Please deinstall your installed pear- ports."
- @${ECHO_MSG} ""
- @${FALSE}
-.endif
-
-DIRFILTER= ${SED} -En '\:^.*/[^/]*$$:s:^(.+)/[^/]*$$:\1:p' | ${SORT} -ru
-
-.if !defined(USE_PHPIZE)
-do-generate-plist:
-. if !exists(${.CURDIR}/pkg-plist)
- @${ECHO_MSG} "===> Generating packing list"; \
- (for file in ${FILES}; do echo "${LINSTDIR}/$${file}"; done; \
- for file in ${TESTS}; do echo "${LTESTSDIR}/$${file}"; done; \
- for file in ${DATA}; do echo "${LDATADIR}/$${file}"; done; \
- for file in ${SQLS}; do echo "${LSQLSDIR}/$${file}"; done; \
- for file in ${SCRIPTFILES}; do echo "${LSCRIPTSDIR}/$${file}"; done; \
- for file in ${DOCS}; do echo "%%PORTDOCS%%${LDOCSDIR}/$${file}"; done; \
- for file in ${EXAMPLES}; do echo "%%PORTDOCS%%${LEXAMPLESDIR}/$${file}"; done; \
- echo "${LPKGREGDIR}/package.xml"; \
- for d in ${FILES} ${FILES:H}; do echo $${d}; done | ${DIRFILTER} | \
- while read dir; do echo "@dirrm ${LINSTDIR}/$${dir}"; done; \
- for d in ${TESTS}; do echo $${d}; done | ${DIRFILTER} | \
- while read dir; do echo "@dirrm ${LTESTSDIR}/$${dir}"; done; \
- for d in ${DATA}; do echo $${d}; done | ${DIRFILTER} | \
- while read dir; do echo "@dirrm ${LDATADIR}/$${dir}"; done; \
- for d in ${SQLS}; do echo $${d}; done | ${DIRFILTER} | \
- while read dir; do echo "@dirrm ${LSQLSDIR}/$${dir}"; done; \
- for d in ${DOCS}; do echo $${d}; done | ${DIRFILTER} | \
- while read dir; do echo "%%PORTDOCS%%@dirrm ${LDOCSDIR}/$${dir}"; done; \
- for d in ${EXAMPLES}; do echo $${d}; done | ${DIRFILTER} | \
- while read dir; do echo "%%PORTDOCS%%@dirrm ${LEXAMPLESDIR}/$${dir}"; done; \
- if [ -n "${TESTS}" ]; then echo "@dirrm ${LTESTSDIR}"; fi; \
- if [ -n "${DATA}" ]; then echo "@dirrm ${LDATADIR}"; fi; \
- if [ -n "${SQLS}" ]; then echo "@dirrm ${LSQLSDIR}"; fi; \
- if [ -n "${DOCS}" ]; then echo "%%PORTDOCS%%@dirrm ${LDOCSDIR}"; fi; \
- if [ -n "${EXAMPLES}" ]; then echo "%%PORTDOCS%%@dirrm ${LEXAMPLESDIR}"; fi; \
- echo "@dirrm ${LPKGREGDIR}"; \
- echo "@unexec rmdir %D/${LINSTDIR} 2> /dev/null || true"; \
- echo "@unexec rmdir %D/${LINSTDIR:H} 2> /dev/null || true"; \
- echo "@unexec rmdir %D/${LPEARDIR}/.registry 2> /dev/null || true"; \
- echo "@unexec rmdir %D/${LPEARDIR}/packages 2> /dev/null || true"; \
- echo "@unexec rmdir %D/${LPEARDIR} 2> /dev/null || true"; \
- echo "@unexec rmdir %D/${LDOCSDIR:H} 2> /dev/null || true"; \
- echo "@unexec rmdir %D/${LEXAMPLESDIR:H} 2> /dev/null || true"; \
- echo "@unexec rmdir %D/${LTESTSDIR:H} 2> /dev/null || true"; \
- echo "@unexec rmdir %D/${LDATADIR:H} 2> /dev/null || true"; \
- echo "@unexec rmdir %D/${LSCRIPTSDIR:H} 2> /dev/null || true"; \
- echo "@unexec rmdir %D/${LSQLSDIR:H} 2> /dev/null || true") > ${PLIST}
-. endif
-
-. for t in files docs tests sqls scriptfiles examples data
-. if !target(do-install-${t}-msg)
-do-install-${t}-msg: .USE
-. endif
-. endfor
-
-pre-install: do-generate-plist
-do-install: do-install-files do-install-docs do-install-tests do-install-sqls \
- do-install-scriptfiles do-install-examples do-install-data
-
-do-install-files: do-install-files-msg
- @${MKDIR} ${INSTDIR}
-. for dir in ${FILESDIRS}
- @${MKDIR} ${INSTDIR}/${dir}
-. endfor
-. for file in ${FILES}
- @${INSTALL_DATA} ${WRKSRC}/${file} ${INSTDIR}/${file}
-. endfor
-
-do-install-docs: do-install-docs-msg
-. if !defined(NOPORTDOCS) && !empty(DOCS)
- @${ECHO_MSG} "===> Installing documentation in ${DOCSDIR}."
- @${MKDIR} ${DOCSDIR}
-. for dir in ${DOCSDIRS}
- @${MKDIR} ${DOCSDIR}/${dir}
-. endfor
-. for file in ${DOCS}
- @${INSTALL_DATA} ${WRKSRC}/${_DOCSDIR}/${file} ${DOCSDIR}/${file}
-. endfor
-. endif
-
-do-install-tests: do-install-tests-msg
-. if !empty(TESTS)
- @${ECHO_MSG} "===> Installing tests in ${TESTSDIR}."
- @${MKDIR} ${TESTSDIR}
-. for dir in ${TESTSDIRS}
- @${MKDIR} ${TESTSDIR}/${dir}
-. endfor
-. for file in ${TESTS}
- @${INSTALL_DATA} ${WRKSRC}/${_TESTSDIR}/${file} ${TESTSDIR}/${file}
-. endfor
-. endif
-
-do-install-data: do-install-data-msg
-. if !empty(DATA)
- @${ECHO_MSG} "===> Installing data in ${DATADIR}."
- @${MKDIR} ${DATADIR}
-. for dir in ${DATADIRS}
- @${MKDIR} ${DATADIR}/${dir}
-. endfor
-. for file in ${DATA}
- @${INSTALL_DATA} ${WRKSRC}/${_DATADIR}/${file} ${DATADIR}/${file}
-. endfor
-. endif
-
-do-install-sqls: do-install-sqls-msg
-. if !empty(SQLS)
- @${ECHO_MSG} "===> Installing sqls in ${SQLSDIR}."
- @${MKDIR} ${SQLSDIR}
-. for dir in ${SQLSDIRS}
- @${MKDIR} ${SQLSDIR}/${dir}
-. endfor
-. for file in ${SQLS}
- @${INSTALL_DATA} ${WRKSRC}/${_SQLSDIR}/${file} ${SQLSDIR}/${file}
-. endfor
-. endif
-
-do-install-scriptfiles: do-install-scriptfiles-msg
-. if !empty(SCRIPTFILES)
- @${ECHO_MSG} "===> Installing scripts in ${SCRIPTFILESDIR}."
-. for file in ${SCRIPTFILES}
- @${CP} ${WRKSRC}/pear-${file} ${WRKSRC}/${file}
- @${REINPLACE_CMD} -e "s|@php_bin@|${SCRIPTFILESDIR}/php|g" ${WRKSRC}/${file}
- @${REINPLACE_CMD} -e "s|@php_dir@|${PREFIX}/lib/php|g" ${WRKSRC}/${file}
- @${REINPLACE_CMD} -e "s|@include_path@|${PREFIX}/${LPEARDIR}|g" ${WRKSRC}/${file}
- @${INSTALL_SCRIPT} ${WRKSRC}/${file} ${SCRIPTFILESDIR}/${file}
-. endfor
-. endif
-
-do-install-examples: do-install-examples-msg
-. if !defined(NOPORTDOCS) && !empty(EXAMPLES)
- @${ECHO_MSG} "===> Installing examples in ${EXAMPLESDIR}."
- @${MKDIR} ${EXAMPLESDIR}
-. for dir in ${EXAMPLESDIRS}
- @${MKDIR} ${EXAMPLESDIR}/${dir}
-. endfor
-. for file in ${EXAMPLES}
- @${INSTALL_DATA} ${WRKSRC}/${_EXAMPLESDIR}/${file} ${EXAMPLESDIR}/${file}
-. endfor
-. endif
-.endif
-
-post-install:
- @${MKDIR} ${PKGREGDIR}
- @${INSTALL_DATA} ${WRKDIR}/package.xml ${PKGREGDIR}
- @${SETENV} PKG_PREFIX=${PREFIX} \
- ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
diff --git a/devel/pear-PEAR/distinfo b/devel/pear-PEAR/distinfo
deleted file mode 100644
index f6f6473d88ab..000000000000
--- a/devel/pear-PEAR/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (PEAR/PEAR-1.4.4.tgz) = 20c5d38b16b364bbf5395e6890f048e4
-SIZE (PEAR/PEAR-1.4.4.tgz) = 276978
diff --git a/devel/pear-PEAR/files/patch-scripts::pearcmd.php b/devel/pear-PEAR/files/patch-scripts::pearcmd.php
deleted file mode 100644
index 1d0c6d7f62a9..000000000000
--- a/devel/pear-PEAR/files/patch-scripts::pearcmd.php
+++ /dev/null
@@ -1,19 +0,0 @@
---- scripts/pearcmd.php.orig Sun Nov 6 21:17:11 2005
-+++ scripts/pearcmd.php Sun Nov 6 21:19:20 2005
-@@ -1,3 +1,4 @@
-+#!@php_bin@ -nq
- <?php
- //
- // +----------------------------------------------------------------------+
-@@ -29,8 +30,10 @@
- /**
- * @nodep Gtk
- */
-+dl('pcre.so');
-+dl('xml.so');
- if ('@include_path@' != '@'.'include_path'.'@') {
-- ini_set('include_path', '@include_path@');
-+ ini_set('include_path', '@include_path@:@include_path@/bootstrap');
- $raw = false;
- } else {
- // this is a raw, uninstalled pear, either a cvs checkout, or php distro
diff --git a/devel/pear-PEAR/pkg-deinstall b/devel/pear-PEAR/pkg-deinstall
deleted file mode 100644
index 94de0bfd249e..000000000000
--- a/devel/pear-PEAR/pkg-deinstall
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-# Remove package declaration from PEAR's registry.
-
-if [ x$2 != xDEINSTALL ]; then
- exit
-fi
-PKG_NAME=${1%%-[0-9._]*}
-PACKAGE=$(echo $PKG_NAME | sed 's/pear-//')
-
-PEAR=${PKG_PREFIX}/bin/pear
-PEAR2=${PKG_PREFIX}/bin/pear2
-
-if [ ${PACKAGE} = "PEAR" ] \
-|| [ ${PACKAGE} = "Archive_Tar" ] \
-|| [ ${PACKAGE} = "Console_Getopt" ] \
-|| [ ${PACKAGE} = "XML_RPC" ]; then
- PEAR_INSTALLER=${PEAR}
-else
- PEAR_INSTALLER=${PEAR2}
-fi
-
-${PEAR_INSTALLER} uninstall -r -n ${PACKAGE} || true
diff --git a/devel/pear-PEAR/pkg-descr b/devel/pear-PEAR/pkg-descr
deleted file mode 100644
index bead70c52d2d..000000000000
--- a/devel/pear-PEAR/pkg-descr
+++ /dev/null
@@ -1,12 +0,0 @@
-The PEAR package contains:
-* the PEAR installer, for creating, distributing and installing packages
-* the alpha-quality PEAR_Exception php5-only exception class
-* the beta-quality PEAR_ErrorStack advanced error handling mechanism
-* the PEAR_Error error handling mechanism
-* the OS_Guess class for retrieving info about the OS where PHP is
- running on
-* the System class for quick handling common operations with files and
- directories
-* the PEAR base class
-
-WWW: http://pear.php.net/package/PEAR/
diff --git a/devel/pear-PEAR/pkg-install b/devel/pear-PEAR/pkg-install
deleted file mode 100644
index a27d7b6e1fdf..000000000000
--- a/devel/pear-PEAR/pkg-install
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-# Register the package $1 in the port registry
-
-PREFIX=${PKG_PREFIX:=%%PREFIX%%}
-PEAR=${PREFIX}/bin/pear
-PEAR2=${PREFIX}/bin/pear2
-PKGREGDIR=${PREFIX}/share/pear/packages/$1
-
-if [ -f "${PEAR2}" ]; then
- PEAR_INSTALLER=${PEAR2}
-else
- PEAR_INSTALLER=${PEAR}
-fi
-
-[ "x$1" = "x" ] && exit 1
-if [ "x$2" = "xPOST-INSTALL" ]; then
- ${PEAR_INSTALLER} install -r -n -f ${PKGREGDIR}/package.xml
-fi
diff --git a/devel/pear-PEAR_PackageFileManager/Makefile b/devel/pear-PEAR_PackageFileManager/Makefile
index 89885aaf9068..f04c833cf505 100644
--- a/devel/pear-PEAR_PackageFileManager/Makefile
+++ b/devel/pear-PEAR_PackageFileManager/Makefile
@@ -12,7 +12,7 @@ CATEGORIES= devel www pear
MAINTAINER= antonio@php.net
COMMENT= PEAR class to maintain PEAR packages
-BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR
+BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
RUN_DEPENDS= ${BUILD_DEPENDS}
LATEST_LINK= pear-${PORTNAME}
@@ -140,5 +140,5 @@ RUN_DEPENDS+= ${PEARDIR}/PHP/CompatInfo.php:${PORTSDIR}/devel/pear-PHP_CompatInf
RUN_DEPENDS+= ${PEARDIR}/XML/Tree.php:${PORTSDIR}/devel/pear-XML_Tree
.endif
-.include "${PORTSDIR}/devel/pear-PEAR/Makefile.common"
+.include "${PORTSDIR}/devel/pear/bsd.pear.mk"
.include <bsd.port.post.mk>
diff --git a/devel/pear-PHPDoc/Makefile b/devel/pear-PHPDoc/Makefile
index 79beebed9ad7..f517abc17bce 100644
--- a/devel/pear-PHPDoc/Makefile
+++ b/devel/pear-PHPDoc/Makefile
@@ -12,7 +12,7 @@ CATEGORIES= devel www pear
MAINTAINER= tux@pinguru.net
COMMENT= Tool to generate documentation from the source
-BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR
+BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
RUN_DEPENDS= ${BUILD_DEPENDS}
CATEGORY= PHPDoc
@@ -100,7 +100,7 @@ DATA= renderer/html/default/class.html \
SCRIPTFILES= phpdoc
.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear-PEAR/Makefile.common"
+.include "${PORTSDIR}/devel/pear/bsd.pear.mk"
post-patch:
@${REINPLACE_CMD} -e "s,@php_dir@,${PEARDIR}," \
diff --git a/devel/pear-PHPUnit/Makefile b/devel/pear-PHPUnit/Makefile
index bfd91e473913..b8b78a2995ec 100644
--- a/devel/pear-PHPUnit/Makefile
+++ b/devel/pear-PHPUnit/Makefile
@@ -12,7 +12,7 @@ CATEGORIES= devel www pear
MAINTAINER= tux@pinguru.net
COMMENT= PEAR regression testing framework for unit tests
-BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR
+BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
RUN_DEPENDS= ${BUILD_DEPENDS}
FILES= PHPUnit.php PHPUnit/GUI/Gtk.php PHPUnit/GUI/HTML.php \
@@ -23,5 +23,5 @@ FILES= PHPUnit.php PHPUnit/GUI/Gtk.php PHPUnit/GUI/HTML.php \
PHPUnit/TestResult.php PHPUnit/TestSuite.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/devel/pear-PHPUnit2/Makefile b/devel/pear-PHPUnit2/Makefile
index e6595000557b..664b9589347d 100644
--- a/devel/pear-PHPUnit2/Makefile
+++ b/devel/pear-PHPUnit2/Makefile
@@ -90,5 +90,5 @@ post-patch:
RUN_DEPENDS+= ${PEARDIR}/Log.php:${PORTSDIR}/sysutils/pear-Log
.endif
-.include "${PORTSDIR}/devel/pear-PEAR/Makefile.common"
+.include "${PORTSDIR}/devel/pear/bsd.pear.mk"
.include <bsd.port.post.mk>
diff --git a/devel/pear-PHPUnit3/Makefile b/devel/pear-PHPUnit3/Makefile
index e6595000557b..664b9589347d 100644
--- a/devel/pear-PHPUnit3/Makefile
+++ b/devel/pear-PHPUnit3/Makefile
@@ -90,5 +90,5 @@ post-patch:
RUN_DEPENDS+= ${PEARDIR}/Log.php:${PORTSDIR}/sysutils/pear-Log
.endif
-.include "${PORTSDIR}/devel/pear-PEAR/Makefile.common"
+.include "${PORTSDIR}/devel/pear/bsd.pear.mk"
.include <bsd.port.post.mk>
diff --git a/devel/pear-PHP_Beautifier/Makefile b/devel/pear-PHP_Beautifier/Makefile
index 806cde63d429..229bf668cb21 100644
--- a/devel/pear-PHP_Beautifier/Makefile
+++ b/devel/pear-PHP_Beautifier/Makefile
@@ -63,5 +63,5 @@ post-patch:
. endfor
.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/devel/pear-PHP_Compat/Makefile b/devel/pear-PHP_Compat/Makefile
index f6bb3934f994..b0b4dd659e5d 100644
--- a/devel/pear-PHP_Compat/Makefile
+++ b/devel/pear-PHP_Compat/Makefile
@@ -12,7 +12,7 @@ CATEGORIES= devel www pear
MAINTAINER= antonio@php.net
COMMENT= Provides missing functionality for older versions of PHP
-BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR
+BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
RUN_DEPENDS= ${BUILD_DEPENDS}
CATEGORY= PHP
@@ -132,5 +132,5 @@ TESTS= loadconstant.phpt loadfunction.phpt loadversion.phpt \
function/vprintf.phpt function/vsprintf.phpt
.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/devel/pear-PHP_CompatInfo/Makefile b/devel/pear-PHP_CompatInfo/Makefile
index 5c98a8828f56..c3033307abd3 100644
--- a/devel/pear-PHP_CompatInfo/Makefile
+++ b/devel/pear-PHP_CompatInfo/Makefile
@@ -12,7 +12,7 @@ CATEGORIES= devel pear
MAINTAINER= antonio@php.net
COMMENT= PEAR class to find out the minimum version and extensions required
-BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR
+BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
RUN_DEPENDS= ${BUILD_DEPENDS}
USE_PHP= tokenizer
@@ -73,5 +73,5 @@ post-extract:
RUN_DEPENDS+= ${PEARDIR}/Console/Table.php:${PORTSDIR}/devel/pear-Console_Table
.endif
-.include "${PORTSDIR}/devel/pear-PEAR/Makefile.common"
+.include "${PORTSDIR}/devel/pear/bsd.pear.mk"
.include <bsd.port.post.mk>
diff --git a/devel/pear-Pager/Makefile b/devel/pear-Pager/Makefile
index 9ed8880b3a80..71dcaf12c7c5 100644
--- a/devel/pear-Pager/Makefile
+++ b/devel/pear-Pager/Makefile
@@ -12,7 +12,7 @@ CATEGORIES= devel www pear
MAINTAINER= antonio@php.net
COMMENT= PEAR data paging class
-BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR
+BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
RUN_DEPENDS= ${BUILD_DEPENDS}
CATEGORY= Pager
@@ -27,5 +27,5 @@ TESTS= all_tests.php pager_include.php pager_jumping_noData_test.php \
pager_wrapper_test.php simple_include.php README
.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/devel/pear-Structures_DataGrid/Makefile b/devel/pear-Structures_DataGrid/Makefile
index f48730559307..e4649fb94680 100644
--- a/devel/pear-Structures_DataGrid/Makefile
+++ b/devel/pear-Structures_DataGrid/Makefile
@@ -12,7 +12,7 @@ CATEGORIES= devel www pear
MAINTAINER= nick@foobar.org
COMMENT= Simple HTML data structure package
-BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR
+BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
RUN_DEPENDS= ${PEARDIR}/HTML/Table.php:${PORTSDIR}/devel/pear-HTML_Table \
${PEARDIR}/Pager/Pager.php:${PORTSDIR}/devel/pear-Pager \
${PEARDIR}/Spreadsheet/Excel/Writer.php:${PORTSDIR}/textproc/pear-Spreadsheet_Excel_Writer \
@@ -35,5 +35,5 @@ FILES= DataGrid.php DataGrid/Core.php DataGrid/Column.php \
DataGrid/Record/DataObject.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/devel/pear-System_Command/Makefile b/devel/pear-System_Command/Makefile
index e03166251f1e..dc2ca1af6211 100644
--- a/devel/pear-System_Command/Makefile
+++ b/devel/pear-System_Command/Makefile
@@ -12,12 +12,12 @@ CATEGORIES= devel pear
MAINTAINER= antonio@php.net
COMMENT= PEAR command line execution interface
-BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR
+BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
RUN_DEPENDS= ${BUILD_DEPENDS}
CATEGORY= System
FILES= Command.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/devel/pear-Text_Diff/Makefile b/devel/pear-Text_Diff/Makefile
index 47c5da037277..9928c23f0cae 100644
--- a/devel/pear-Text_Diff/Makefile
+++ b/devel/pear-Text_Diff/Makefile
@@ -12,7 +12,7 @@ CATEGORIES= devel pear
MAINTAINER= joseph@randomnetworks.com
COMMENT= Engine for performing and rendering text diffs
-BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR
+BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
RUN_DEPENDS= ${BUILD_DEPENDS}
CATEGORY= Text
@@ -32,5 +32,5 @@ EXAMPLES= 1.txt \
_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/devel/pear-VFS/Makefile b/devel/pear-VFS/Makefile
index 14e6998e7b5a..a2a2ec7f9da2 100644
--- a/devel/pear-VFS/Makefile
+++ b/devel/pear-VFS/Makefile
@@ -12,7 +12,7 @@ CATEGORIES= devel pear
MAINTAINER= ports@FreeBSD.org
COMMENT= PEAR Virtual File System API
-BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR \
+BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear \
${PEARDIR}/Log.php:${PORTSDIR}/sysutils/pear-Log
RUN_DEPENDS= ${BUILD_DEPENDS}
@@ -28,5 +28,5 @@ post-patch:
@${MV} ${WRKSRC}/scripts/vfs.php ${WRKSRC}/pear-vfs.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/devel/pear-Validate/Makefile b/devel/pear-Validate/Makefile
index 5aad1694ec28..89f16b468e40 100644
--- a/devel/pear-Validate/Makefile
+++ b/devel/pear-Validate/Makefile
@@ -12,7 +12,7 @@ CATEGORIES= devel www pear
MAINTAINER= antonio@php.net
COMMENT= Validation class
-BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR
+BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
RUN_DEPENDS= ${BUILD_DEPENDS}
FILES= Validate.php Validate/Finance.php \
@@ -34,7 +34,7 @@ USE_REINPLACE= yes
REINPLACE_ARGS= -i ""
.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear-PEAR/Makefile.common"
+.include "${PORTSDIR}/devel/pear/bsd.pear.mk"
post-patch:
.for f in ${DATAFILES}
diff --git a/devel/pear-Var_Dump/Makefile b/devel/pear-Var_Dump/Makefile
index 4384024a4330..0d088a9670a5 100644
--- a/devel/pear-Var_Dump/Makefile
+++ b/devel/pear-Var_Dump/Makefile
@@ -12,7 +12,7 @@ CATEGORIES= devel www pear
MAINTAINER= antonio@php.net
COMMENT= Provides methods for dumping structured information about a variable
-BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR
+BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
RUN_DEPENDS= ${BUILD_DEPENDS}
FILES= Var_Dump.php Var_Dump/Renderer.php Var_Dump/Renderer/Common.php \
@@ -36,5 +36,5 @@ post-extract:
${MV} ${WRKSRC}/php/* ${WRKSRC}
.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/devel/pear-XML_NITF/Makefile b/devel/pear-XML_NITF/Makefile
index 0f1661608f57..37b28e15d75b 100644
--- a/devel/pear-XML_NITF/Makefile
+++ b/devel/pear-XML_NITF/Makefile
@@ -19,5 +19,5 @@ CATEGORY= XML
FILES= NITF.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/devel/pear-XML_Parser/Makefile b/devel/pear-XML_Parser/Makefile
index f972c5851260..680657438ebb 100644
--- a/devel/pear-XML_Parser/Makefile
+++ b/devel/pear-XML_Parser/Makefile
@@ -12,7 +12,7 @@ CATEGORIES= devel pear
MAINTAINER= antonio@php.net
COMMENT= PEAR XML parsing class based on PHP's bundled expat
-BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR
+BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
RUN_DEPENDS= ${BUILD_DEPENDS}
CATEGORY= XML
@@ -23,5 +23,5 @@ EXAMPLES= xml_parser_file.php xml_parser_file.xml xml_parser_handler.php \
xml_parser_simple2.xml xml_parser_simple_handler.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/devel/pear-XML_RPC/Makefile b/devel/pear-XML_RPC/Makefile
deleted file mode 100644
index 8568186c262e..000000000000
--- a/devel/pear-XML_RPC/Makefile
+++ /dev/null
@@ -1,36 +0,0 @@
-# Ports collection makefile for: pear-XML_RPC
-# Date created: 4 October 2003
-# Whom: Thierry Thomas (<thierry@pompo.net>)
-#
-# $FreeBSD$
-#
-
-PORTNAME= XML_RPC
-PORTVERSION= 1.4.3
-CATEGORIES= devel www pear
-
-MAINTAINER= antonio@php.net
-COMMENT= PHP implementation of the XML-RPC protocol
-
-USE_PHP= yes
-WANT_PHP_PEAR= yes
-
-CATEGORY= XML
-FILES= RPC.php RPC/Server.php RPC/Dump.php
-TESTS= protoport.php test_Dump.php
-
-post-extract:
- @${MKDIR} ${WRKSRC}/RPC
- @${MV} ${WRKSRC}/Server.php ${WRKSRC}/Dump.php ${WRKSRC}/RPC
-
-post-patch:
-.for file in ${FILES}
- @${REINPLACE_CMD} -e "s|@package_version@|${PORTVERSION}|" ${WRKSRC}/${file}
-.endfor
-.for file in ${TESTS}
- @${REINPLACE_CMD} -e "s|@package_version@|${PORTVERSION}|" ${WRKSRC}/tests/${file}
-.endfor
-
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear-PEAR/Makefile.common"
-.include <bsd.port.post.mk>
diff --git a/devel/pear-XML_RPC/distinfo b/devel/pear-XML_RPC/distinfo
deleted file mode 100644
index 406b37c441cc..000000000000
--- a/devel/pear-XML_RPC/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (PEAR/XML_RPC-1.4.3.tgz) = 83138a445e424102db17b3b9588dbfef
-SIZE (PEAR/XML_RPC-1.4.3.tgz) = 27198
diff --git a/devel/pear-XML_RPC/pkg-descr b/devel/pear-XML_RPC/pkg-descr
deleted file mode 100644
index 2df4a18b393a..000000000000
--- a/devel/pear-XML_RPC/pkg-descr
+++ /dev/null
@@ -1,5 +0,0 @@
-A PEAR-ified version of Useful Inc's XML-RPC for PHP.
-
-It has support for HTTP/HTTPS transport, proxies and authentication.
-
-WWW: http://pear.php.net/package/XML_RPC/
diff --git a/devel/pear-XML_RSS/Makefile b/devel/pear-XML_RSS/Makefile
index 590f56bd2655..ca186fb97abb 100644
--- a/devel/pear-XML_RSS/Makefile
+++ b/devel/pear-XML_RSS/Makefile
@@ -13,7 +13,7 @@ CATEGORIES= devel www pear
MAINTAINER= ports@FreeBSD.org
COMMENT= PEAR RSS parser
-BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR
+BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
RUN_DEPENDS= ${BUILD_DEPENDS} \
${PEARDIR}/XML/Tree.php:${PORTSDIR}/devel/pear-XML_Tree
@@ -22,5 +22,5 @@ FILES= RSS.php
TESTS= test.rss 01-parse.phpt
.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/devel/pear-XML_SVG/Makefile b/devel/pear-XML_SVG/Makefile
index 59d887b55f44..9cb7b4b499ed 100644
--- a/devel/pear-XML_SVG/Makefile
+++ b/devel/pear-XML_SVG/Makefile
@@ -12,12 +12,12 @@ CATEGORIES= devel www pear
MAINTAINER= antonio@php.net
COMMENT= PEAR object-oriented API for building SVG documents
-BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR
+BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
RUN_DEPENDS= ${BUILD_DEPENDS}
CATEGORY= XML
FILES= SVG.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/devel/pear-XML_Serializer/Makefile b/devel/pear-XML_Serializer/Makefile
index 66e3b92400ac..770c3f69eac1 100644
--- a/devel/pear-XML_Serializer/Makefile
+++ b/devel/pear-XML_Serializer/Makefile
@@ -43,5 +43,5 @@ post-extract:
.endfor
.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/devel/pear-XML_Transformer/Makefile b/devel/pear-XML_Transformer/Makefile
index cee195da8f81..8b27e802f78c 100644
--- a/devel/pear-XML_Transformer/Makefile
+++ b/devel/pear-XML_Transformer/Makefile
@@ -27,5 +27,5 @@ DOCS= README
_DOCSDIR= .
.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/devel/pear-XML_Tree/Makefile b/devel/pear-XML_Tree/Makefile
index c6d5955f8182..b7c23967a3cd 100644
--- a/devel/pear-XML_Tree/Makefile
+++ b/devel/pear-XML_Tree/Makefile
@@ -13,12 +13,12 @@ CATEGORIES= devel www pear
MAINTAINER= ports@FreeBSD.org
COMMENT= PEAR class for representing XML data in a tree structure
-BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR
+BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
RUN_DEPENDS= ${BUILD_DEPENDS}
CATEGORY= XML
FILES= Tree.php Tree/Node.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/devel/pear-XML_Util/Makefile b/devel/pear-XML_Util/Makefile
index d7e9da0a2a8b..199aa2141f47 100644
--- a/devel/pear-XML_Util/Makefile
+++ b/devel/pear-XML_Util/Makefile
@@ -12,7 +12,7 @@ CATEGORIES= devel www pear
MAINTAINER= antonio@php.net
COMMENT= PEAR XML utility class
-BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR
+BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
RUN_DEPENDS= ${BUILD_DEPENDS}
CATEGORY= XML
@@ -20,5 +20,5 @@ FILES= Util.php
EXAMPLES= example.php example2.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/devel/pear-XML_XPath/Makefile b/devel/pear-XML_XPath/Makefile
index e6ddbe425b49..66d6ceaabfa3 100644
--- a/devel/pear-XML_XPath/Makefile
+++ b/devel/pear-XML_XPath/Makefile
@@ -13,7 +13,7 @@ CATEGORIES= devel www pear
MAINTAINER= ports@FreeBSD.org
COMMENT= PEAR class provided an XPath/DOM XML manipulation
-BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR
+BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
RUN_DEPENDS= ${BUILD_DEPENDS}
.if defined(PACKAGE_BUILDING)
@@ -26,5 +26,5 @@ EXAMPLES= XML_XPath_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/devel/pear-apd/Makefile b/devel/pear-apd/Makefile
index 9795ed7d7cfb..ae8fad4694b1 100644
--- a/devel/pear-apd/Makefile
+++ b/devel/pear-apd/Makefile
@@ -13,7 +13,7 @@ CATEGORIES= devel pear
MAINTAINER= ports@FreeBSD.org
COMMENT= A full-featured engine-level PHP profiler/debugger
-BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR
+BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
RUN_DEPENDS= ${BUILD_DEPENDS}
USE_PHP= yes
@@ -26,7 +26,7 @@ DUMP_DIR?= /var/tmp/apd
PORTDOCS= README
.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear-PEAR/Makefile.common"
+.include "${PORTSDIR}/devel/pear/bsd.pear.mk"
.if ${PHP_VER} == 4
APD_VER= 0.9.2
diff --git a/devel/php4-pear/Makefile b/devel/php4-pear/Makefile
deleted file mode 100644
index b40f00031dec..000000000000
--- a/devel/php4-pear/Makefile
+++ /dev/null
@@ -1,19 +0,0 @@
-# New ports collection makefile for: php4-pear
-# Date created: 7 Jul 2004
-# Whom: Alex Dupre <ale@FreeBSD.org>
-#
-# $FreeBSD$
-#
-
-CATEGORIES= devel
-PKGNAMESUFFIX= -pear
-
-MAINTAINER= ale@FreeBSD.org
-COMMENT= PEAR framework for PHP
-
-MASTERDIR= ${.CURDIR}/../../lang/php4
-
-PLIST= ${PKGDIR}/pkg-plist.pear
-PKGMESSAGE= ${PKGDIR}/pkg-message.pear
-
-.include "${MASTERDIR}/Makefile"
diff --git a/devel/php5-pear/Makefile b/devel/php5-pear/Makefile
deleted file mode 100644
index 7fa0140aed0c..000000000000
--- a/devel/php5-pear/Makefile
+++ /dev/null
@@ -1,19 +0,0 @@
-# New ports collection makefile for: php5-pear
-# Date created: 7 Jul 2004
-# Whom: Alex Dupre <ale@FreeBSD.org>
-#
-# $FreeBSD$
-#
-
-CATEGORIES= devel
-PKGNAMESUFFIX= -pear
-
-MAINTAINER= ale@FreeBSD.org
-COMMENT= PEAR framework for PHP
-
-MASTERDIR= ${.CURDIR}/../../lang/php5
-
-PLIST= ${PKGDIR}/pkg-plist.pear
-PKGMESSAGE= ${PKGDIR}/pkg-message.pear
-
-.include "${MASTERDIR}/Makefile"
diff --git a/ftp/pear-Net_FTP/Makefile b/ftp/pear-Net_FTP/Makefile
index bd892e2785aa..03a3ffb21aae 100644
--- a/ftp/pear-Net_FTP/Makefile
+++ b/ftp/pear-Net_FTP/Makefile
@@ -12,7 +12,7 @@ CATEGORIES= ftp www pear
MAINTAINER= antonio@php.net
COMMENT= PEAR OO interface to the PHP FTP functions plus some additions
-BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR
+BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
RUN_DEPENDS= ${BUILD_DEPENDS}
USE_PHP= ftp
@@ -26,5 +26,5 @@ post-extract:
@${MV} ${WRKSRC}/Net/* ${WRKSRC}
.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/games/pear-Games_Chess/Makefile b/games/pear-Games_Chess/Makefile
index 319ce1aa7be0..5fe6ec4ce083 100644
--- a/games/pear-Games_Chess/Makefile
+++ b/games/pear-Games_Chess/Makefile
@@ -12,7 +12,7 @@ CATEGORIES= games devel pear
MAINTAINER= xaa+ports@timewasters.nl
COMMENT= PEAR methods for constructing and validating chess games in PGN
-BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR
+BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
RUN_DEPENDS= ${BUILD_DEPENDS}
CATEGORY= Games
@@ -27,5 +27,5 @@ EXAMPLES= HTMLChess.php images/B.gif images/N.gif images/Q.gif \
images/dark/q.gif
.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/graphics/pear-Image_Barcode/Makefile b/graphics/pear-Image_Barcode/Makefile
index 5ab4cb60fcd8..0383dfe9cc75 100644
--- a/graphics/pear-Image_Barcode/Makefile
+++ b/graphics/pear-Image_Barcode/Makefile
@@ -12,7 +12,7 @@ CATEGORIES= graphics www pear
MAINTAINER= antonio@php.net
COMMENT= PEAR class for barcode generation
-BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR
+BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
RUN_DEPENDS= ${BUILD_DEPENDS}
USE_PHP= gd
@@ -33,5 +33,5 @@ _EXAMPLESDIR= docs/examples
RUN_DEPENDS+= ${PEARDIR}/PHP/Compat.php:${PORTSDIR}/devel/pear-PHP_Compat
.endif
-.include "${PORTSDIR}/devel/pear-PEAR/Makefile.common"
+.include "${PORTSDIR}/devel/pear/bsd.pear.mk"
.include <bsd.port.post.mk>
diff --git a/graphics/pear-Image_Canvas/Makefile b/graphics/pear-Image_Canvas/Makefile
index 18f0daf4cb5b..e93d8ed54af0 100644
--- a/graphics/pear-Image_Canvas/Makefile
+++ b/graphics/pear-Image_Canvas/Makefile
@@ -12,7 +12,7 @@ CATEGORIES= graphics www pear
MAINTAINER= numisemis@yahoo.com
COMMENT= An OO PEAR common interface to image drawing
-BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR
+BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
RUN_DEPENDS= ${PEARDIR}/Image/Color.php:${PORTSDIR}/graphics/pear-Image_Color
USE_PHP= gd
@@ -38,6 +38,6 @@ post-patch:
.endfor
.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/graphics/pear-Image_Color/Makefile b/graphics/pear-Image_Color/Makefile
index d83e4b6ba4ff..c0dff7458102 100644
--- a/graphics/pear-Image_Color/Makefile
+++ b/graphics/pear-Image_Color/Makefile
@@ -12,7 +12,7 @@ CATEGORIES= graphics www pear
MAINTAINER= tux@pinguru.net
COMMENT= PEAR::Image_Color manages and handles color data and conversions
-BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR
+BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
RUN_DEPENDS= ${BUILD_DEPENDS}
USE_PHP= gd
@@ -21,5 +21,5 @@ CATEGORY= Image
FILES= Color.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/graphics/pear-Image_Graph/Makefile b/graphics/pear-Image_Graph/Makefile
index a49d6f893600..e7ee40fee457 100644
--- a/graphics/pear-Image_Graph/Makefile
+++ b/graphics/pear-Image_Graph/Makefile
@@ -12,7 +12,7 @@ CATEGORIES= graphics www pear
MAINTAINER= nick@foobar.org
COMMENT= An OO PEAR graph rendering package
-BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR
+BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
RUN_DEPENDS= ${PEARDIR}/Log.php:${PORTSDIR}/sysutils/pear-Log \
${PEARDIR}/Image/Canvas.php:${PORTSDIR}/graphics/pear-Image_Canvas
@@ -170,6 +170,6 @@ post-patch:
.endfor
.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/irc/pear-Net_SmartIRC/Makefile b/irc/pear-Net_SmartIRC/Makefile
index ae9d033d5dd5..b35bc29bc293 100644
--- a/irc/pear-Net_SmartIRC/Makefile
+++ b/irc/pear-Net_SmartIRC/Makefile
@@ -12,7 +12,7 @@ CATEGORIES= irc www pear
MAINTAINER= antonio@php.net
COMMENT= PEAR class for communication with IRC networks
-BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR
+BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
RUN_DEPENDS= ${BUILD_DEPENDS}
CATEGORY= Net
@@ -97,5 +97,5 @@ DOCS= DOCUMENTATION HOWTO HTML/classtrees_Net_SmartIRC.html \
HTML/Net_SmartIRC/_SmartIRC-0.5.5_SmartIRC_php.html
.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/mail/pear-Contact_Vcard_Build/Makefile b/mail/pear-Contact_Vcard_Build/Makefile
index 8c87ea69d0f0..d3ecaf0e7ee3 100644
--- a/mail/pear-Contact_Vcard_Build/Makefile
+++ b/mail/pear-Contact_Vcard_Build/Makefile
@@ -12,7 +12,7 @@ CATEGORIES= mail www pear
MAINTAINER= antonio@php.net
COMMENT= PEAR class to build (create) and fetch vCard 2.1 and 3.0 text blocks
-BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR
+BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
RUN_DEPENDS= ${BUILD_DEPENDS}
FILES= Contact_Vcard_Build.php
@@ -20,5 +20,5 @@ TESTS= test.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/mail/pear-Contact_Vcard_Parse/Makefile b/mail/pear-Contact_Vcard_Parse/Makefile
index 64db5001c990..c0c7b188f30d 100644
--- a/mail/pear-Contact_Vcard_Parse/Makefile
+++ b/mail/pear-Contact_Vcard_Parse/Makefile
@@ -12,7 +12,7 @@ CATEGORIES= mail www pear
MAINTAINER= antonio@php.net
COMMENT= PEAR class to parse vCard 2.1 and 3.0 files
-BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR
+BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
RUN_DEPENDS= ${BUILD_DEPENDS}
FILES= Contact_Vcard_Parse.php
@@ -20,5 +20,5 @@ TESTS= test.php test.vcf
_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/mail/pear-MIME_Type/Makefile b/mail/pear-MIME_Type/Makefile
index 87c79a6b654f..bd2d818d5d27 100644
--- a/mail/pear-MIME_Type/Makefile
+++ b/mail/pear-MIME_Type/Makefile
@@ -12,7 +12,7 @@ CATEGORIES= mail www pear
MAINTAINER= antonio@php.net
COMMENT= PEAR class for dealing with MIME types
-BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR
+BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
RUN_DEPENDS= ${BUILD_DEPENDS}
LATEST_LINK= pear-${PORTNAME}
@@ -35,7 +35,7 @@ post-extract:
RUN_DEPENDS+= ${PEARDIR}/System/Command.php:${PORTSDIR}/devel/pear-System_Command
.endif
-.include "${PORTSDIR}/devel/pear-PEAR/Makefile.common"
+.include "${PORTSDIR}/devel/pear/bsd.pear.mk"
post-patch:
.for file in ${FILES}
diff --git a/mail/pear-Mail/Makefile b/mail/pear-Mail/Makefile
index 7b85f046445a..458e413a6cda 100644
--- a/mail/pear-Mail/Makefile
+++ b/mail/pear-Mail/Makefile
@@ -12,7 +12,7 @@ CATEGORIES= mail www pear
MAINTAINER= antonio@php.net
COMMENT= PEAR class that provides multiple interfaces for sending emails
-BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR
+BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
RUN_DEPENDS= ${BUILD_DEPENDS}
FILES= Mail.php Mail/mail.php Mail/null.php Mail/sendmail.php \
@@ -28,5 +28,5 @@ OPTIONS= PEAR_NET_SMTP "PEAR::Net_SMTP support" off
RUN_DEPENDS+= ${PEARDIR}/Net/SMTP.php:${PORTSDIR}/net/pear-Net_SMTP
.endif
-.include "${PORTSDIR}/devel/pear-PEAR/Makefile.common"
+.include "${PORTSDIR}/devel/pear/bsd.pear.mk"
.include <bsd.port.post.mk>
diff --git a/mail/pear-Mail_Mime/Makefile b/mail/pear-Mail_Mime/Makefile
index 3b3903e66886..92d17caf5003 100644
--- a/mail/pear-Mail_Mime/Makefile
+++ b/mail/pear-Mail_Mime/Makefile
@@ -12,7 +12,7 @@ CATEGORIES= mail www pear
MAINTAINER= antonio@php.net
COMMENT= PEAR classes to create and decode MIME messages
-BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR
+BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
RUN_DEPENDS= ${BUILD_DEPENDS}
CATEGORY= Mail
@@ -21,5 +21,5 @@ DATA= xmail.dtd xmail.xsl
_DATADIR= .
.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/mail/pear-Mail_Queue/Makefile b/mail/pear-Mail_Queue/Makefile
index 5b44971f2686..a4b5eaf6f77b 100644
--- a/mail/pear-Mail_Queue/Makefile
+++ b/mail/pear-Mail_Queue/Makefile
@@ -23,5 +23,5 @@ DOCS= add_example.php base.php mdb_mail_queue_schema.xml \
mysql.sql pgsql.sql send_example.php TODO README
.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/mail/pear-Net_Cyrus/Makefile b/mail/pear-Net_Cyrus/Makefile
index 5b9adfaf0eb3..76caaa21da7b 100644
--- a/mail/pear-Net_Cyrus/Makefile
+++ b/mail/pear-Net_Cyrus/Makefile
@@ -20,5 +20,5 @@ CATEGORY= Net
FILES= Cyrus.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/mail/pear-Net_IMAP/Makefile b/mail/pear-Net_IMAP/Makefile
index 7f83d05e6626..2acc7e9a100d 100644
--- a/mail/pear-Net_IMAP/Makefile
+++ b/mail/pear-Net_IMAP/Makefile
@@ -19,5 +19,5 @@ CATEGORY= Net
FILES= IMAP.php IMAPProtocol.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/mail/pear-Net_LMTP/Makefile b/mail/pear-Net_LMTP/Makefile
index 21b3acc2fe79..698246f27224 100644
--- a/mail/pear-Net_LMTP/Makefile
+++ b/mail/pear-Net_LMTP/Makefile
@@ -21,5 +21,5 @@ TESTS= test_lmtp.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/math/pear-Structures_Graph/Makefile b/math/pear-Structures_Graph/Makefile
index ca84cafa65ec..fd4d864cc77d 100644
--- a/math/pear-Structures_Graph/Makefile
+++ b/math/pear-Structures_Graph/Makefile
@@ -12,7 +12,7 @@ CATEGORIES= math devel pear
MAINTAINER= antonio@php.net
COMMENT= PEAR graph datastructure manipulation library
-BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR
+BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
RUN_DEPENDS= ${BUILD_DEPENDS}
CATEGORY= Structures
@@ -25,5 +25,5 @@ post-extract:
@${MV} ${WRKSRC}/Structures/* ${WRKSRC}/
.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/misc/pear-Services_Weather/Makefile b/misc/pear-Services_Weather/Makefile
index 42868d190e66..04d04160f97a 100644
--- a/misc/pear-Services_Weather/Makefile
+++ b/misc/pear-Services_Weather/Makefile
@@ -12,7 +12,7 @@ CATEGORIES= misc www pear
MAINTAINER= ports@FreeBSD.org
COMMENT= PEAR interface to various online weather-services
-BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR
+BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
RUN_DEPENDS= ${BUILD_DEPENDS}
.if !defined (WITHOUT_CACHE)
@@ -40,5 +40,5 @@ EXAMPLES= globalweather-basic.php ejse-basic.php metar-basic.php \
weather.com-extensive.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/misc/pear-Text_Figlet/Makefile b/misc/pear-Text_Figlet/Makefile
index 1651b4e52860..e433c083089d 100644
--- a/misc/pear-Text_Figlet/Makefile
+++ b/misc/pear-Text_Figlet/Makefile
@@ -12,7 +12,7 @@ CATEGORIES= misc www pear
MAINTAINER= antonio@php.net
COMMENT= Render text using FIGlet fonts
-BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR
+BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
RUN_DEPENDS= ${BUILD_DEPENDS}
CATEGORY= Text
@@ -23,5 +23,5 @@ EXAMPLES= figlet.php 3-d.flf alligator2.flf bell.flf block.flf contessa.flf \
_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-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>
diff --git a/security/pear-Auth/Makefile b/security/pear-Auth/Makefile
index c2cf5db3308f..3cce29f83fad 100644
--- a/security/pear-Auth/Makefile
+++ b/security/pear-Auth/Makefile
@@ -13,7 +13,7 @@ CATEGORIES= security pear
MAINTAINER= antonio@php.net
COMMENT= PEAR class for creating an authentication system
-BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR
+BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
RUN_DEPENDS= ${BUILD_DEPENDS}
LATEST_LINK= pear-Auth
@@ -68,5 +68,5 @@ RUN_DEPENDS+= ${PEARDIR}/Auth/RADIUS.php:${PORTSDIR}/net/pear-Auth_RADIUS
RUN_DEPENDS+= ${PEARDIR}/File/SMBPasswd.php:${PORTSDIR}/security/pear-File_SMBPasswd
.endif
-.include "${PORTSDIR}/devel/pear-PEAR/Makefile.common"
+.include "${PORTSDIR}/devel/pear/bsd.pear.mk"
.include <bsd.port.post.mk>
diff --git a/security/pear-Auth_HTTP/Makefile b/security/pear-Auth_HTTP/Makefile
index 9c78c38717ca..06db6a5f2552 100644
--- a/security/pear-Auth_HTTP/Makefile
+++ b/security/pear-Auth_HTTP/Makefile
@@ -24,5 +24,5 @@ post-extract:
@${MV} ${WRKSRC}/Auth_HTTP.php ${WRKSRC}/${FILES}
.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/security/pear-Auth_PrefManager/Makefile b/security/pear-Auth_PrefManager/Makefile
index 32166c2399fe..7bd7dbdacdaa 100644
--- a/security/pear-Auth_PrefManager/Makefile
+++ b/security/pear-Auth_PrefManager/Makefile
@@ -20,5 +20,5 @@ FILES= PrefManager.php
DOCS= PM_Example.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/security/pear-Auth_SASL/Makefile b/security/pear-Auth_SASL/Makefile
index aa0de7523595..3c61fcdf9fff 100644
--- a/security/pear-Auth_SASL/Makefile
+++ b/security/pear-Auth_SASL/Makefile
@@ -21,5 +21,5 @@ FILES= SASL.php SASL/Anonymous.php SASL/Common.php SASL/CramMD5.php \
SASL/DigestMD5.php SASL/Login.php SASL/Plain.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/security/pear-Crypt_Blowfish/Makefile b/security/pear-Crypt_Blowfish/Makefile
index 59b3edca48f9..584f822a3551 100644
--- a/security/pear-Crypt_Blowfish/Makefile
+++ b/security/pear-Crypt_Blowfish/Makefile
@@ -12,7 +12,7 @@ CATEGORIES= security www pear
MAINTAINER= antonio@php.net
COMMENT= PEAR class for blowfish encryption
-BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR
+BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
RUN_DEPENDS= ${BUILD_DEPENDS}
CATEGORY= Crypt
@@ -25,5 +25,5 @@ post-patch:
.endfor
.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/security/pear-Crypt_CBC/Makefile b/security/pear-Crypt_CBC/Makefile
index ad072385b797..bb74a323beb2 100644
--- a/security/pear-Crypt_CBC/Makefile
+++ b/security/pear-Crypt_CBC/Makefile
@@ -13,12 +13,12 @@ CATEGORIES= security www pear
MAINTAINER= ports@FreeBSD.org
COMMENT= PEAR class to emulate Perl's Crypt::CBC module
-BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR
+BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
RUN_DEPENDS= ${BUILD_DEPENDS}
CATEGORY= Crypt
FILES= CBC.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/security/pear-Crypt_CHAP/Makefile b/security/pear-Crypt_CHAP/Makefile
index 30264d2c7f1c..91476337e837 100644
--- a/security/pear-Crypt_CHAP/Makefile
+++ b/security/pear-Crypt_CHAP/Makefile
@@ -12,7 +12,7 @@ CATEGORIES= security www pear
MAINTAINER= antonio@php.net
COMMENT= PEAR class for generating CHAP packets
-BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR
+BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
RUN_DEPENDS= ${BUILD_DEPENDS}
USE_PHP= mcrypt mhash
@@ -22,5 +22,5 @@ FILES= CHAP.php
TESTS= chaptest.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/security/pear-Crypt_HMAC/Makefile b/security/pear-Crypt_HMAC/Makefile
index c4f1735cc063..c89fcf7f638e 100644
--- a/security/pear-Crypt_HMAC/Makefile
+++ b/security/pear-Crypt_HMAC/Makefile
@@ -12,7 +12,7 @@ CATEGORIES= security www pear
MAINTAINER= antonio@php.net
COMMENT= PEAR class to calculate RFC 2104 compliant hashes
-BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR
+BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
RUN_DEPENDS= ${BUILD_DEPENDS}
CATEGORY= Crypt
@@ -20,5 +20,5 @@ FILES= HMAC.php
TESTS= test.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/security/pear-Crypt_RC4/Makefile b/security/pear-Crypt_RC4/Makefile
index 778f8cc5d388..b02da02b2302 100644
--- a/security/pear-Crypt_RC4/Makefile
+++ b/security/pear-Crypt_RC4/Makefile
@@ -12,12 +12,12 @@ CATEGORIES= security www pear
MAINTAINER= antonio@php.net
COMMENT= PEAR encryption class for RC4 encryption
-BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR
+BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
RUN_DEPENDS= ${BUILD_DEPENDS}
CATEGORY= Crypt
FILES= Rc4.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/security/pear-Crypt_RSA/Makefile b/security/pear-Crypt_RSA/Makefile
index 88f5c2446a5b..2001cc15582a 100644
--- a/security/pear-Crypt_RSA/Makefile
+++ b/security/pear-Crypt_RSA/Makefile
@@ -12,7 +12,7 @@ CATEGORIES= security www pear
MAINTAINER= antonio@php.net
COMMENT= PEAR class allows you to use two-key strong cryptography
-BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR
+BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
RUN_DEPENDS= ${BUILD_DEPENDS}
OPTIONS= BCMATH "PHP BCMath extension support" off \
@@ -45,5 +45,5 @@ post-extract:
@${MV} ${WRKSRC}/LICENSE ${WRKSRC}/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/security/pear-File_HtAccess/Makefile b/security/pear-File_HtAccess/Makefile
index 65616222a220..a92c23100995 100644
--- a/security/pear-File_HtAccess/Makefile
+++ b/security/pear-File_HtAccess/Makefile
@@ -12,12 +12,12 @@ CATEGORIES= security www pear
MAINTAINER= antonio@php.net
COMMENT= PEAR class to manipulate .htaccess files
-BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR
+BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
RUN_DEPENDS= ${BUILD_DEPENDS}
CATEGORY= File
FILES= HtAccess.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/security/pear-File_Passwd/Makefile b/security/pear-File_Passwd/Makefile
index 68b5cf5b9d64..1364e87a68d7 100644
--- a/security/pear-File_Passwd/Makefile
+++ b/security/pear-File_Passwd/Makefile
@@ -12,7 +12,7 @@ CATEGORIES= security pear
MAINTAINER= antonio@php.net
COMMENT= PEAR class to manipulate many kinds of password files
-BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR
+BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
RUN_DEPENDS= ${BUILD_DEPENDS}
LATEST_LINK= pear-File_Passwd
@@ -34,5 +34,5 @@ TESTS= testsuite.php test_file_passwd.php test_common.php test_unix.php \
RUN_DEPENDS+= ${PEARDIR}/Crypt/CHAP.php:${PORTSDIR}/security/pear-Crypt_CHAP
.endif
-.include "${PORTSDIR}/devel/pear-PEAR/Makefile.common"
+.include "${PORTSDIR}/devel/pear/bsd.pear.mk"
.include <bsd.port.post.mk>
diff --git a/security/pear-File_SMBPasswd/Makefile b/security/pear-File_SMBPasswd/Makefile
index 399a52ea9fbe..1070ee5be8d4 100644
--- a/security/pear-File_SMBPasswd/Makefile
+++ b/security/pear-File_SMBPasswd/Makefile
@@ -22,5 +22,5 @@ FILES= SMBPasswd.php
EXAMPLES= smbpasswd.php smbpasswd
.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/security/pear-LiveUser/Makefile b/security/pear-LiveUser/Makefile
index d5f32c3a3c99..aab2237c8ad7 100644
--- a/security/pear-LiveUser/Makefile
+++ b/security/pear-LiveUser/Makefile
@@ -73,5 +73,5 @@ RUN_DEPENDS+= ${PEARDIR}/XML/Tree.php:${PORTSDIR}/devel/pear-XML_Tree
RUN_DEPENDS+= ${PEARDIR}/Crypt/Rc4.php:${PORTSDIR}/security/pear-Crypt_RC4
.endif
-.include "${PORTSDIR}/devel/pear-PEAR/Makefile.common"
+.include "${PORTSDIR}/devel/pear/bsd.pear.mk"
.include <bsd.port.post.mk>
diff --git a/security/pear-LiveUser_Admin/Makefile b/security/pear-LiveUser_Admin/Makefile
index f5a90ccde6a1..e0e5fc3ba807 100644
--- a/security/pear-LiveUser_Admin/Makefile
+++ b/security/pear-LiveUser_Admin/Makefile
@@ -70,5 +70,5 @@ RUN_DEPENDS+= ${PEARDIR}/XML/Tree.php:${PORTSDIR}/devel/pear-XML_Tree
RUN_DEPENDS+= ${PEARDIR}/Crypt/Rc4.php:${PORTSDIR}/security/pear-Crypt_RC4
.endif
-.include "${PORTSDIR}/devel/pear-PEAR/Makefile.common"
+.include "${PORTSDIR}/devel/pear/bsd.pear.mk"
.include <bsd.port.post.mk>
diff --git a/security/pear-Text_Password/Makefile b/security/pear-Text_Password/Makefile
index 2d8c676784cf..75e7b54fdf0e 100644
--- a/security/pear-Text_Password/Makefile
+++ b/security/pear-Text_Password/Makefile
@@ -22,5 +22,5 @@ TESTS= 01-text-password.phpt
WRKSRC= ${WRKDIR}/Text_Password-${PORTVERSION}
.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/sysutils/pear-Cache/Makefile b/sysutils/pear-Cache/Makefile
index 94dd80b7dbdc..22546f499c74 100644
--- a/sysutils/pear-Cache/Makefile
+++ b/sysutils/pear-Cache/Makefile
@@ -24,5 +24,5 @@ FILES= Application.php Cache.php Container.php Container/db.php \
OutputCompression.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/sysutils/pear-Cache_Lite/Makefile b/sysutils/pear-Cache_Lite/Makefile
index f93435bf05c7..0577bd8f2010 100644
--- a/sysutils/pear-Cache_Lite/Makefile
+++ b/sysutils/pear-Cache_Lite/Makefile
@@ -13,7 +13,7 @@ CATEGORIES= sysutils www pear
MAINTAINER= antonio@php.net
COMMENT= PEAR fast and safe little cache system
-BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR
+BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
RUN_DEPENDS= ${BUILD_DEPENDS}
CATEGORY= Cache
@@ -23,5 +23,5 @@ TESTS= test.php test2.php test3.php bench.php bench2.php bench3.php readme
_DOCSDIR= .
.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/sysutils/pear-File/Makefile b/sysutils/pear-File/Makefile
index 90175b86940e..6d5836f50563 100644
--- a/sysutils/pear-File/Makefile
+++ b/sysutils/pear-File/Makefile
@@ -13,7 +13,7 @@ CATEGORIES= sysutils www pear
MAINTAINER= antonio@php.net
COMMENT= PEAR common file and directory routines
-BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR
+BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
RUN_DEPENDS= ${BUILD_DEPENDS}
FILES= File.php File/Util.php File/CSV.php
@@ -22,5 +22,5 @@ TESTS= parser.php test.csv FileTest.php CSV/001.phpt CSV/001.csv \
CSV/004.csv CSV/005.phpt CSV/005.csv CSV/tests.txt
.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/sysutils/pear-File_Find/Makefile b/sysutils/pear-File_Find/Makefile
index 8143b1a403bf..3d7f74206598 100644
--- a/sysutils/pear-File_Find/Makefile
+++ b/sysutils/pear-File_Find/Makefile
@@ -12,7 +12,7 @@ CATEGORIES= sysutils www pear
MAINTAINER= antonio@php.net
COMMENT= PEAR class that facillitates the search of filesystems
-BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR
+BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
RUN_DEPENDS= ${BUILD_DEPENDS}
CATEGORY= File
@@ -21,5 +21,5 @@ TESTS= setup.php 01glob.phpt 02maptree.phpt 03maptreemultiple.phpt \
04search.phpt 05search_inside.phpt bug2773.phpt
.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/sysutils/pear-File_Fstab/Makefile b/sysutils/pear-File_Fstab/Makefile
index 27b739e9eb76..4fcc0f37860c 100644
--- a/sysutils/pear-File_Fstab/Makefile
+++ b/sysutils/pear-File_Fstab/Makefile
@@ -12,7 +12,7 @@ CATEGORIES= sysutils devel pear
MAINTAINER= antonio@php.net
COMMENT= PEAR class to read and write fstab files
-BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR
+BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
RUN_DEPENDS= ${BUILD_DEPENDS}
CATEGORY= File
@@ -28,5 +28,5 @@ post-extract:
.endfor
.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/sysutils/pear-File_Gettext/Makefile b/sysutils/pear-File_Gettext/Makefile
index 6f1e24b4bdd4..5c67796ebc93 100644
--- a/sysutils/pear-File_Gettext/Makefile
+++ b/sysutils/pear-File_Gettext/Makefile
@@ -12,7 +12,7 @@ CATEGORIES= sysutils devel pear
MAINTAINER= antonio@php.net
COMMENT= PEAR GNU Gettext file parser
-BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR
+BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
RUN_DEPENDS= ${BUILD_DEPENDS}
USE_PHP= yes
@@ -28,5 +28,5 @@ PHP_VERS= ${PHP_VERSION:S/.//g}
IGNORE= "You need PHP 4.1.0 or later to install PEAR::File_Gettext"
.endif
-.include "${PORTSDIR}/devel/pear-PEAR/Makefile.common"
+.include "${PORTSDIR}/devel/pear/bsd.pear.mk"
.include <bsd.port.post.mk>
diff --git a/sysutils/pear-I18Nv2/Makefile b/sysutils/pear-I18Nv2/Makefile
index 7116fd1bba4b..205434096ea1 100644
--- a/sysutils/pear-I18Nv2/Makefile
+++ b/sysutils/pear-I18Nv2/Makefile
@@ -12,7 +12,7 @@ CATEGORIES= sysutils devel pear
MAINTAINER= antonio@php.net
COMMENT= PEAR Internationalization
-BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR
+BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
RUN_DEPENDS= ${BUILD_DEPENDS}
USE_PHP= iconv
@@ -150,5 +150,5 @@ PHP_VERS= ${PHP_VERSION:S/.//g}
#IGNORE= "You need PHP 4.0.6 or later to install PEAR::I18Nv2"
.endif
-.include "${PORTSDIR}/devel/pear-PEAR/Makefile.common"
+.include "${PORTSDIR}/devel/pear/bsd.pear.mk"
.include <bsd.port.post.mk>
diff --git a/sysutils/pear-Log/Makefile b/sysutils/pear-Log/Makefile
index a5f0d9a0c41d..8fecc3e95695 100644
--- a/sysutils/pear-Log/Makefile
+++ b/sysutils/pear-Log/Makefile
@@ -12,7 +12,7 @@ CATEGORIES= sysutils www pear
MAINTAINER= antonio@php.net
COMMENT= PEAR logging utilities
-BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR
+BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
RUN_DEPENDS= ${BUILD_DEPENDS}
USE_PHP= yes
@@ -56,5 +56,5 @@ BUILD_DEPENDS+= ${PEARDIR}/DB.php:${PORTSDIR}/databases/pear-DB
BUILD_DEPENDS+= ${LOCALBASE}/lib/php/${PHP_EXT_DIR}/${extension}.so:${PORTSDIR}/databases/php5-sqlite
.endif
-.include "${PORTSDIR}/devel/pear-PEAR/Makefile.common"
+.include "${PORTSDIR}/devel/pear/bsd.pear.mk"
.include <bsd.port.post.mk>
diff --git a/sysutils/pear-Translation2/Makefile b/sysutils/pear-Translation2/Makefile
index 86ffb4c95c77..9c140f5a86f1 100644
--- a/sysutils/pear-Translation2/Makefile
+++ b/sysutils/pear-Translation2/Makefile
@@ -13,7 +13,7 @@ CATEGORIES= sysutils devel pear
MAINTAINER= antonio@php.net
COMMENT= PEAR class for multilingual applications management
-BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR
+BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
RUN_DEPENDS= ${BUILD_DEPENDS}
USE_PHP= yes
@@ -98,5 +98,5 @@ RUN_DEPENDS+= ${PEARDIR}/XML/Serializer.php:${PORTSDIR}/devel/pear-XML_Serialize
.endif
.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/textproc/pear-Numbers_Roman/Makefile b/textproc/pear-Numbers_Roman/Makefile
index 3067889bbcfd..0d3122f2f306 100644
--- a/textproc/pear-Numbers_Roman/Makefile
+++ b/textproc/pear-Numbers_Roman/Makefile
@@ -12,7 +12,7 @@ CATEGORIES= textproc devel pear
MAINTAINER= antonio@php.net
COMMENT= PEAR methods for converting to and from Roman Numerals
-BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR
+BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
RUN_DEPENDS= ${BUILD_DEPENDS}
CATEGORY= Numbers
@@ -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/textproc/pear-Numbers_Words/Makefile b/textproc/pear-Numbers_Words/Makefile
index 1adfc01b483b..698c8e5552de 100644
--- a/textproc/pear-Numbers_Words/Makefile
+++ b/textproc/pear-Numbers_Words/Makefile
@@ -12,7 +12,7 @@ CATEGORIES= textproc pear
MAINTAINER= meritus@innervision.pl
COMMENT= PEAR package provides methods for spelling numerals in words
-BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR
+BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
RUN_DEPENDS= ${BUILD_DEPENDS}
FILES= Words.php Words/lang.bg.php Words/lang.cs.php \
@@ -26,5 +26,5 @@ FILES= Words.php Words/lang.bg.php Words/lang.cs.php \
TESTS= test-numbers-words.php clitest.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/textproc/pear-Spreadsheet_Excel_Writer/Makefile b/textproc/pear-Spreadsheet_Excel_Writer/Makefile
index 25bb0c49ae23..bfd9ab8c751e 100644
--- a/textproc/pear-Spreadsheet_Excel_Writer/Makefile
+++ b/textproc/pear-Spreadsheet_Excel_Writer/Makefile
@@ -13,7 +13,7 @@ MAINTAINER= pav@FreeBSD.org
COMMENT= PEAR class for writing Microsoft Excel files
BUILD_DEPENDS= ${PEARDIR}/OLE/OLE.php:${PORTSDIR}/devel/pear-OLE \
- ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR
+ ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
RUN_DEPENDS= ${BUILD_DEPENDS}
CATEGORY= Spreadsheet/Excel
@@ -21,5 +21,5 @@ FILES= Writer.php Writer/BIFFwriter.php Writer/Format.php Writer/Parser.php \
Writer/Validator.php Writer/Workbook.php Writer/Worksheet.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/textproc/pear-XML_Beautifier/Makefile b/textproc/pear-XML_Beautifier/Makefile
index d28413d2f9b8..f025e7f76076 100644
--- a/textproc/pear-XML_Beautifier/Makefile
+++ b/textproc/pear-XML_Beautifier/Makefile
@@ -23,5 +23,5 @@ EXAMPLES= example1.php example2.php example3.php example4.php example5.php \
example6.php test.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/textproc/pear-XML_HTMLSax/Makefile b/textproc/pear-XML_HTMLSax/Makefile
index 9af9d06bf58e..e4897de0be27 100644
--- a/textproc/pear-XML_HTMLSax/Makefile
+++ b/textproc/pear-XML_HTMLSax/Makefile
@@ -12,7 +12,7 @@ CATEGORIES= textproc devel pear
MAINTAINER= antonio@php.net
COMMENT= PEAR SAX parser for HTML and other badly formed XML documents
-BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR
+BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
RUN_DEPENDS= ${BUILD_DEPENDS}
CATEGORY= XML
@@ -25,5 +25,5 @@ _EXAMPLESDIR= docs/examples
_TESTSDIR= docs/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/textproc/pear-XML_Wddx/Makefile b/textproc/pear-XML_Wddx/Makefile
index 831982c72e90..45735853af67 100644
--- a/textproc/pear-XML_Wddx/Makefile
+++ b/textproc/pear-XML_Wddx/Makefile
@@ -19,5 +19,5 @@ CATEGORY= XML
FILES= Wddx.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/www/pear-HTTP/Makefile b/www/pear-HTTP/Makefile
index cafcf5b84c21..d576a2a4fbb0 100644
--- a/www/pear-HTTP/Makefile
+++ b/www/pear-HTTP/Makefile
@@ -12,11 +12,11 @@ CATEGORIES= www devel pear
MAINTAINER= antonio@php.net
COMMENT= PEAR miscellaneous HTTP utilities
-BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR
+BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
RUN_DEPENDS= ${BUILD_DEPENDS}
FILES= HTTP.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/www/pear-HTTP_Client/Makefile b/www/pear-HTTP_Client/Makefile
index 5d4f019218ee..c82663aa4287 100644
--- a/www/pear-HTTP_Client/Makefile
+++ b/www/pear-HTTP_Client/Makefile
@@ -22,5 +22,5 @@ EXAMPLES= link-checker.php
_EXAMPLESDIR= 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/www/pear-HTTP_Download/Makefile b/www/pear-HTTP_Download/Makefile
index 05971a5bf2d8..d3d32f892eb2 100644
--- a/www/pear-HTTP_Download/Makefile
+++ b/www/pear-HTTP_Download/Makefile
@@ -20,5 +20,5 @@ FILES= Download.php Download/PgLOB.php Download/Archive.php
TESTS= send.php testcase.php data.txt
.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/www/pear-HTTP_Header/Makefile b/www/pear-HTTP_Header/Makefile
index 292034a06af0..2cd1c5062dd1 100644
--- a/www/pear-HTTP_Header/Makefile
+++ b/www/pear-HTTP_Header/Makefile
@@ -20,5 +20,5 @@ FILES= Header.php Header/Cache.php
TESTS= README.txt cacheresponse.php header.php header_cache.php response.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/www/pear-HTTP_Request/Makefile b/www/pear-HTTP_Request/Makefile
index 288b0ff3ca52..347c6099594c 100644
--- a/www/pear-HTTP_Request/Makefile
+++ b/www/pear-HTTP_Request/Makefile
@@ -22,5 +22,5 @@ EXAMPLES= download-progress.php 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/www/pear-HTTP_Server/Makefile b/www/pear-HTTP_Server/Makefile
index 396ed4496d8f..69a223350b08 100644
--- a/www/pear-HTTP_Server/Makefile
+++ b/www/pear-HTTP_Server/Makefile
@@ -21,5 +21,5 @@ FILES= Server.php Server/Request.php
EXAMPLES= HTTP_Server_File.php www/index.html
.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/www/pear-HTTP_Session/Makefile b/www/pear-HTTP_Session/Makefile
index 6145ca927186..4e6f50d59bfa 100644
--- a/www/pear-HTTP_Session/Makefile
+++ b/www/pear-HTTP_Session/Makefile
@@ -12,7 +12,7 @@ CATEGORIES= www devel pear
MAINTAINER= ports@FreeBSD.org
COMMENT= PEAR Object-oriented interface to the session_* family functions
-BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR
+BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
RUN_DEPENDS= ${BUILD_DEPENDS}
FILES= Session.php Session/Container.php Session/Container/DB.php
@@ -20,5 +20,5 @@ EXAMPLES= HTTP_Session_Example.php sessiondata.sql
_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/www/pear-HTTP_Session2/Makefile b/www/pear-HTTP_Session2/Makefile
index 6145ca927186..4e6f50d59bfa 100644
--- a/www/pear-HTTP_Session2/Makefile
+++ b/www/pear-HTTP_Session2/Makefile
@@ -12,7 +12,7 @@ CATEGORIES= www devel pear
MAINTAINER= ports@FreeBSD.org
COMMENT= PEAR Object-oriented interface to the session_* family functions
-BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR
+BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
RUN_DEPENDS= ${BUILD_DEPENDS}
FILES= Session.php Session/Container.php Session/Container/DB.php
@@ -20,5 +20,5 @@ EXAMPLES= HTTP_Session_Example.php sessiondata.sql
_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/www/pear-HTTP_Upload/Makefile b/www/pear-HTTP_Upload/Makefile
index edb5c36f32b0..d4a4a375520c 100644
--- a/www/pear-HTTP_Upload/Makefile
+++ b/www/pear-HTTP_Upload/Makefile
@@ -12,7 +12,7 @@ CATEGORIES= www devel pear
MAINTAINER= antonio@php.net
COMMENT= Easy and secure managment of files submitted via HTML Forms
-BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR
+BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
RUN_DEPENDS= ${BUILD_DEPENDS}
CATEGORY= HTTP
@@ -21,5 +21,5 @@ EXAMPLES= upload_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/www/pear-Text_Wiki/Makefile b/www/pear-Text_Wiki/Makefile
index bfe090c6a9a6..f3d77812ce0e 100644
--- a/www/pear-Text_Wiki/Makefile
+++ b/www/pear-Text_Wiki/Makefile
@@ -12,7 +12,7 @@ CATEGORIES= www pear
MAINTAINER= antonio@php.net
COMMENT= Abstracts parsing and rendering rules for Wiki markup
-BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR
+BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
RUN_DEPENDS= ${BUILD_DEPENDS}
USE_REINPLACE= yes
@@ -96,5 +96,5 @@ post-extract:
@${REINPLACE_CMD} -e "s|@package_version@|${PORTVERSION}|" ${WRKSRC}/Wiki.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/www/phpbb/Makefile b/www/phpbb/Makefile
index d0a3339d07cb..fbb0239bf6a5 100644
--- a/www/phpbb/Makefile
+++ b/www/phpbb/Makefile
@@ -15,7 +15,7 @@ DISTNAME= phpBB-${PORTVERSION}
MAINTAINER= liukang@bjut.edu.cn
COMMENT= A PHP-based bulletin board / discussion forum system
-RUN_DEPENDS= ${LOCALBASE}/share/pear/System.php:${PORTSDIR}/devel/pear-PEAR
+RUN_DEPENDS= ${LOCALBASE}/share/pear/System.php:${PORTSDIR}/devel/pear
CONFLICTS= phpbb-tw-[0-9]*
diff --git a/www/postnuke/Makefile b/www/postnuke/Makefile
index 9a657369bb5e..c84fbd761b9d 100644
--- a/www/postnuke/Makefile
+++ b/www/postnuke/Makefile
@@ -14,7 +14,7 @@ DISTNAME= PostNuke-0.761
MAINTAINER= ports@FreeBSD.org
COMMENT= An automated website package to distribute and manage content
-RUN_DEPENDS= ${LOCALBASE}/share/pear/System.php:${PORTSDIR}/devel/pear-PEAR
+RUN_DEPENDS= ${LOCALBASE}/share/pear/System.php:${PORTSDIR}/devel/pear
USE_MYSQL= YES