aboutsummaryrefslogtreecommitdiff
path: root/devel
diff options
context:
space:
mode:
authorBaptiste Daroussin <bapt@FreeBSD.org>2014-09-23 15:15:04 +0000
committerBaptiste Daroussin <bapt@FreeBSD.org>2014-09-23 15:15:04 +0000
commit31871ddfaba45321249f274b2d303abea45e8ea7 (patch)
treea4e3c1980b4c9585c313b5bef6a2960ed45f7559 /devel
parentfa1c1bc803087d85c45c38fd3a468fa5fd87d02c (diff)
downloadports-31871ddfaba45321249f274b2d303abea45e8ea7.tar.gz
ports-31871ddfaba45321249f274b2d303abea45e8ea7.zip
Convert to USES=pear
Notes
Notes: svn path=/head/; revision=369068
Diffstat (limited to 'devel')
-rw-r--r--devel/pear-Config/Makefile18
-rw-r--r--devel/pear-Console_Color/Makefile9
-rw-r--r--devel/pear-Console_CommandLine/Makefile9
-rw-r--r--devel/pear-Console_Getargs/Makefile9
-rw-r--r--devel/pear-Console_Table/Makefile9
-rw-r--r--devel/pear-Date/Makefile9
-rw-r--r--devel/pear-Date_Holidays/Makefile10
-rw-r--r--devel/pear-Date_Holidays_Austria/Makefile6
-rw-r--r--devel/pear-Date_Holidays_Brazil/Makefile6
-rw-r--r--devel/pear-Date_Holidays_Denmark/Makefile6
-rw-r--r--devel/pear-Date_Holidays_Discordian/Makefile6
-rw-r--r--devel/pear-Date_Holidays_EnglandWales/Makefile6
-rw-r--r--devel/pear-Date_Holidays_Germany/Makefile6
-rw-r--r--devel/pear-Date_Holidays_Iceland/Makefile6
-rw-r--r--devel/pear-Date_Holidays_Ireland/Makefile6
-rw-r--r--devel/pear-Date_Holidays_Italy/Makefile12
-rw-r--r--devel/pear-Date_Holidays_Italy/pkg-plist6
-rw-r--r--devel/pear-Date_Holidays_Japan/Makefile6
-rw-r--r--devel/pear-Date_Holidays_Netherlands/Makefile7
-rw-r--r--devel/pear-Date_Holidays_Norway/Makefile9
-rw-r--r--devel/pear-Date_Holidays_Norway/pkg-plist4
-rw-r--r--devel/pear-Date_Holidays_PHPdotNet/Makefile10
-rw-r--r--devel/pear-Date_Holidays_PHPdotNet/pkg-plist6
-rw-r--r--devel/pear-Date_Holidays_Romania/Makefile10
-rw-r--r--devel/pear-Date_Holidays_Slovenia/Makefile10
-rw-r--r--devel/pear-Date_Holidays_Sweden/Makefile6
-rw-r--r--devel/pear-Date_Holidays_UNO/Makefile12
-rw-r--r--devel/pear-Date_Holidays_USA/Makefile10
-rw-r--r--devel/pear-Date_Holidays_Ukraine/Makefile10
-rw-r--r--devel/pear-Event_Dispatcher/Makefile9
-rw-r--r--devel/pear-FSM/Makefile13
-rw-r--r--devel/pear-File_Iterator/Makefile12
-rw-r--r--devel/pear-HTML_BBCodeParser/Makefile6
-rw-r--r--devel/pear-HTML_CSS/Makefile6
-rw-r--r--devel/pear-HTML_Common/Makefile9
-rw-r--r--devel/pear-HTML_Common2/Makefile9
-rw-r--r--devel/pear-HTML_Form/Makefile9
-rw-r--r--devel/pear-HTML_Javascript/Makefile9
-rw-r--r--devel/pear-HTML_Page2/Makefile6
-rw-r--r--devel/pear-HTML_QuickForm/Makefile6
-rw-r--r--devel/pear-HTML_QuickForm2/Makefile7
-rw-r--r--devel/pear-HTML_QuickForm_Controller/Makefile6
-rw-r--r--devel/pear-HTML_QuickForm_Livesearch/Makefile6
-rw-r--r--devel/pear-HTML_QuickForm_Renderer_Tableless/Makefile6
-rw-r--r--devel/pear-HTML_QuickForm_SelectFilter/Makefile6
-rw-r--r--devel/pear-HTML_QuickForm_advmultiselect/Makefile6
-rw-r--r--devel/pear-HTML_Select/Makefile6
-rw-r--r--devel/pear-HTML_Select_Common/Makefile6
-rw-r--r--devel/pear-HTML_Table/Makefile6
-rw-r--r--devel/pear-HTML_Template_Flexy/Makefile23
-rw-r--r--devel/pear-HTML_Template_IT/Makefile13
-rw-r--r--devel/pear-HTML_Template_PHPLIB/Makefile15
-rw-r--r--devel/pear-HTML_Template_Sigma/Makefile14
-rw-r--r--devel/pear-HTML_TreeMenu/Makefile9
-rw-r--r--devel/pear-I18N/Makefile6
-rw-r--r--devel/pear-IO_Bit/Makefile8
-rw-r--r--devel/pear-Math_Fraction/Makefile9
-rw-r--r--devel/pear-Net_Gearman/Makefile6
-rw-r--r--devel/pear-OLE/Makefile9
-rw-r--r--devel/pear-PEAR_Info/Makefile16
-rw-r--r--devel/pear-PEAR_PackageFileManager/Makefile18
-rw-r--r--devel/pear-PEAR_PackageFileManager2/Makefile12
-rw-r--r--devel/pear-PEAR_PackageFileManager_Plugins/Makefile12
-rw-r--r--devel/pear-PHPDoc/Makefile9
-rw-r--r--devel/pear-PHPTAL/Makefile27
-rw-r--r--devel/pear-PHPUnit3/Makefile29
-rw-r--r--devel/pear-PHPUnit_MockObject/Makefile12
-rw-r--r--devel/pear-PHP_ArrayOf/Makefile9
-rw-r--r--devel/pear-PHP_Beautifier/Makefile7
-rw-r--r--devel/pear-PHP_CodeBrowser/Makefile12
-rw-r--r--devel/pear-PHP_CodeCoverage/Makefile23
-rw-r--r--devel/pear-PHP_CodeSniffer/Makefile9
-rw-r--r--devel/pear-PHP_Compat/Makefile9
-rw-r--r--devel/pear-PHP_CompatInfo/Makefile35
-rw-r--r--devel/pear-PHP_Depend/Makefile12
-rw-r--r--devel/pear-PHP_PMD/Makefile12
-rw-r--r--devel/pear-PHP_Parser/Makefile9
-rw-r--r--devel/pear-PHP_ParserGenerator/Makefile9
-rw-r--r--devel/pear-PHP_Timer/Makefile15
-rw-r--r--devel/pear-PHP_TokenStream/Makefile12
-rw-r--r--devel/pear-PHP_UML/Makefile7
-rw-r--r--devel/pear-PPW/Makefile7
-rw-r--r--devel/pear-Pager/Makefile9
-rw-r--r--devel/pear-PhpDocumentor/Makefile22
-rw-r--r--devel/pear-Pirum/Makefile14
-rw-r--r--devel/pear-SebastianBergmann_FinderFacade/Makefile14
-rw-r--r--devel/pear-SebastianBergmann_Git/Makefile8
-rw-r--r--devel/pear-SebastianBergmann_PHPCPD/Makefile12
-rw-r--r--devel/pear-SebastianBergmann_PHPLOC/Makefile9
-rw-r--r--devel/pear-SebastianBergmann_Version/Makefile14
-rw-r--r--devel/pear-Structure_LinkedList/Makefile6
-rw-r--r--devel/pear-Structures_DataGrid/Makefile7
-rw-r--r--devel/pear-Structures_DataGrid_Renderer_Console/Makefile7
-rw-r--r--devel/pear-Structures_DataGrid_Renderer_HTMLSortForm/Makefile7
-rw-r--r--devel/pear-Structures_DataGrid_Renderer_HTMLTable/Makefile7
-rw-r--r--devel/pear-Structures_DataGrid_Renderer_XUL/Makefile7
-rw-r--r--devel/pear-System_Command/Makefile9
-rw-r--r--devel/pear-Testing_Selenium/Makefile9
-rw-r--r--devel/pear-Text_Diff/Makefile9
-rw-r--r--devel/pear-TheSeer_DirectoryScanner/Makefile14
-rw-r--r--devel/pear-TheSeer_fDOMDocument/Makefile14
-rw-r--r--devel/pear-TheSeer_fXSL/Makefile14
-rw-r--r--devel/pear-TheSeer_phpDox/Makefile14
-rw-r--r--devel/pear-VFS/Makefile12
-rw-r--r--devel/pear-Validate/Makefile9
-rw-r--r--devel/pear-Validate_AU/Makefile9
-rw-r--r--devel/pear-Validate_Finance/Makefile6
-rw-r--r--devel/pear-Validate_Finance_CreditCard/Makefile9
-rw-r--r--devel/pear-Validate_US/Makefile6
-rw-r--r--devel/pear-Var_Dump/Makefile9
-rw-r--r--devel/pear-VersionControl_Git/Makefile9
-rw-r--r--devel/pear-VersionControl_SVN/Makefile12
-rw-r--r--devel/pear-XML_NITF/Makefile6
-rw-r--r--devel/pear-XML_Parser/Makefile9
-rw-r--r--devel/pear-XML_RSS/Makefile10
-rw-r--r--devel/pear-XML_SVG/Makefile9
-rw-r--r--devel/pear-XML_Serializer/Makefile6
-rw-r--r--devel/pear-XML_Transformer/Makefile6
-rw-r--r--devel/pear-XML_Tree/Makefile12
-rw-r--r--devel/pear-XML_Util/Makefile9
-rw-r--r--devel/pear-codegen/Makefile9
-rw-r--r--devel/pear-ezc_Base/Makefile12
-rw-r--r--devel/pear-ezc_ConsoleTools/Makefile12
-rw-r--r--devel/pear-htmlpurifier/Makefile8
-rw-r--r--devel/pear-pdepend-staticReflection/Makefile13
-rw-r--r--devel/pear-phing/Makefile7
126 files changed, 335 insertions, 922 deletions
diff --git a/devel/pear-Config/Makefile b/devel/pear-Config/Makefile
index d8106bf05358..a794b17970e2 100644
--- a/devel/pear-Config/Makefile
+++ b/devel/pear-Config/Makefile
@@ -8,25 +8,13 @@ CATEGORIES= devel www pear
MAINTAINER= miwi@FreeBSD.org
COMMENT= Your configurations swiss-army knife
-BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
-RUN_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
-
-LATEST_LINK= pear-${PORTNAME}
OPTIONS_DEFINE= PEAR_XML_PARSER PEAR_XML_UTIL
PEAR_XML_PARSER_DESC= PEAR::XML_Parser support
PEAR_XML_UTIL_DESC= PEAR::XML_Util support
-PEAR_AUTOINSTALL= yes
-
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MPEAR_XML_PARSER}
-RUN_DEPENDS+= ${PEARDIR}/XML/Parser.php:${PORTSDIR}/devel/pear-XML_Parser
-.endif
+USES= pear
-.if ${PORT_OPTIONS:MPEAR_XML_UTIL}
-RUN_DEPENDS+= ${PEARDIR}/XML/Util.php:${PORTSDIR}/devel/pear-XML_Util
-.endif
+PEAR_XML_PARSER_RUN_DEPENDS= ${PEARDIR}/XML/Parser.php:${PORTSDIR}/devel/pear-XML_Parser
+PEAR_XML_UTIL_RUN_DEPENDS= ${PEARDIR}/XML/Util.php:${PORTSDIR}/devel/pear-XML_Util
-.include "${PORTSDIR}/devel/pear/bsd.pear.mk"
.include <bsd.port.mk>
diff --git a/devel/pear-Console_Color/Makefile b/devel/pear-Console_Color/Makefile
index 4cdc0272fd35..aa0854b1d4fe 100644
--- a/devel/pear-Console_Color/Makefile
+++ b/devel/pear-Console_Color/Makefile
@@ -8,11 +8,6 @@ CATEGORIES= devel www pear
MAINTAINER= miwi@FreeBSD.org
COMMENT= PEAR use ANSI console colors
-BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
-RUN_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
+USES= pear
-PEAR_AUTOINSTALL= yes
-
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear/bsd.pear.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/pear-Console_CommandLine/Makefile b/devel/pear-Console_CommandLine/Makefile
index e95fa92df947..b555590faf8e 100644
--- a/devel/pear-Console_CommandLine/Makefile
+++ b/devel/pear-Console_CommandLine/Makefile
@@ -8,11 +8,6 @@ CATEGORIES= devel www pear
MAINTAINER= miwi@FreeBSD.org
COMMENT= Full featured command line options and arguments parser
-BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
-RUN_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
+USES= pear
-PEAR_AUTOINSTALL= yes
-
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear/bsd.pear.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/pear-Console_Getargs/Makefile b/devel/pear-Console_Getargs/Makefile
index b3e319985acc..00f4b35ac34a 100644
--- a/devel/pear-Console_Getargs/Makefile
+++ b/devel/pear-Console_Getargs/Makefile
@@ -8,11 +8,6 @@ CATEGORIES= devel www pear
MAINTAINER= miwi@FreeBSD.org
COMMENT= PEAR command-line arguments parser
-BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
-RUN_DEPENDS:= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
+USES= pear
-PEAR_AUTOINSTALL= yes
-
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear/bsd.pear.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/pear-Console_Table/Makefile b/devel/pear-Console_Table/Makefile
index c6f7a470f86f..0862e6e0ca44 100644
--- a/devel/pear-Console_Table/Makefile
+++ b/devel/pear-Console_Table/Makefile
@@ -8,11 +8,6 @@ CATEGORIES= devel pear
MAINTAINER= miwi@FreeBSD.org
COMMENT= PHP class that makes it easy to build console style tables
-BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
-RUN_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
+USES= pear
-PEAR_AUTOINSTALL= yes
-
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear/bsd.pear.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/pear-Date/Makefile b/devel/pear-Date/Makefile
index f8b5014b31be..6347c0bd6faa 100644
--- a/devel/pear-Date/Makefile
+++ b/devel/pear-Date/Makefile
@@ -8,11 +8,6 @@ CATEGORIES= devel www pear
MAINTAINER= miwi@FreeBSD.org
COMMENT= PEAR Date and Time Zone Classes
-BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
-RUN_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
+USES= pear
-PEAR_AUTOINSTALL= yes
-
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear/bsd.pear.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/pear-Date_Holidays/Makefile b/devel/pear-Date_Holidays/Makefile
index 955b3f88701b..9ab24fffa1dd 100644
--- a/devel/pear-Date_Holidays/Makefile
+++ b/devel/pear-Date_Holidays/Makefile
@@ -13,17 +13,11 @@ BUILD_DEPENDS= ${PEARDIR}/Date.php:${PORTSDIR}/devel/pear-Date \
RUN_DEPENDS= ${PEARDIR}/Date.php:${PORTSDIR}/devel/pear-Date \
${PEARDIR}/XML/Serializer.php:${PORTSDIR}/devel/pear-XML_Serializer
-PEAR_AUTOINSTALL= yes
+USES= pear
-LATEST_LINK= pear-Date_Holidays
OPTIONS_DEFINE= PEAR_CONSOLE_GETARGS
PEAR_CONSOLE_GETARGS_DESC= Console::Getargs support
-.include <bsd.port.options.mk>
+PEAR_CONSOLE_GETARGS_BUILD_DEPENDS=${PEARDIR}/Console/Getargs.php:${PORTSDIR}/devel/pear-Console_Getargs
-.if ${PORT_OPTIONS:MPEAR_CONSOLE_GETARGS}
-BUILD_DEPENDS+=${PEARDIR}/Console/Getargs.php:${PORTSDIR}/devel/pear-Console_Getargs
-.endif
-
-.include "${PORTSDIR}/devel/pear/bsd.pear.mk"
.include <bsd.port.mk>
diff --git a/devel/pear-Date_Holidays_Austria/Makefile b/devel/pear-Date_Holidays_Austria/Makefile
index 845e6b2081fc..ba04f0a2ff9f 100644
--- a/devel/pear-Date_Holidays_Austria/Makefile
+++ b/devel/pear-Date_Holidays_Austria/Makefile
@@ -10,8 +10,6 @@ COMMENT= Driver based class to calculate holidays in Austria
BUILD_DEPENDS= ${PEARDIR}/Date/Holidays.php:${PORTSDIR}/devel/pear-Date_Holidays
RUN_DEPENDS= ${PEARDIR}/Date/Holidays.php:${PORTSDIR}/devel/pear-Date_Holidays
-PEAR_AUTOINSTALL= yes
+USES= pear
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear/bsd.pear.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/pear-Date_Holidays_Brazil/Makefile b/devel/pear-Date_Holidays_Brazil/Makefile
index c156a90087f7..aef293456b9e 100644
--- a/devel/pear-Date_Holidays_Brazil/Makefile
+++ b/devel/pear-Date_Holidays_Brazil/Makefile
@@ -10,8 +10,6 @@ COMMENT= Driver based class to calculate holidays in Brazil
BUILD_DEPENDS= ${PEARDIR}/Date/Holidays.php:${PORTSDIR}/devel/pear-Date_Holidays
RUN_DEPENDS= ${PEARDIR}/Date/Holidays.php:${PORTSDIR}/devel/pear-Date_Holidays
-PEAR_AUTOINSTALL= yes
+USES= pear
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear/bsd.pear.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/pear-Date_Holidays_Denmark/Makefile b/devel/pear-Date_Holidays_Denmark/Makefile
index 3a67456ba4cd..e632bd8d4eb9 100644
--- a/devel/pear-Date_Holidays_Denmark/Makefile
+++ b/devel/pear-Date_Holidays_Denmark/Makefile
@@ -10,8 +10,6 @@ COMMENT= Driver based class to calculate holidays in Denmark
BUILD_DEPENDS= ${PEARDIR}/Date/Holidays.php:${PORTSDIR}/devel/pear-Date_Holidays
RUN_DEPENDS= ${PEARDIR}/Date/Holidays.php:${PORTSDIR}/devel/pear-Date_Holidays
-PEAR_AUTOINSTALL= yes
+USES= pear
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear/bsd.pear.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/pear-Date_Holidays_Discordian/Makefile b/devel/pear-Date_Holidays_Discordian/Makefile
index 9e9b48c5561a..c7b15aab8f6d 100644
--- a/devel/pear-Date_Holidays_Discordian/Makefile
+++ b/devel/pear-Date_Holidays_Discordian/Makefile
@@ -10,8 +10,6 @@ COMMENT= Driver based class to calculate Discordian holidays
BUILD_DEPENDS= ${PEARDIR}/Date/Holidays.php:${PORTSDIR}/devel/pear-Date_Holidays
RUN_DEPENDS= ${PEARDIR}/Date/Holidays.php:${PORTSDIR}/devel/pear-Date_Holidays
-PEAR_AUTOINSTALL= yes
+USES= pear
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear/bsd.pear.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/pear-Date_Holidays_EnglandWales/Makefile b/devel/pear-Date_Holidays_EnglandWales/Makefile
index 4c7070442f6c..54a26d3c6589 100644
--- a/devel/pear-Date_Holidays_EnglandWales/Makefile
+++ b/devel/pear-Date_Holidays_EnglandWales/Makefile
@@ -10,8 +10,6 @@ COMMENT= Driver based class to calculate holidays in England and Wales
BUILD_DEPENDS= ${PEARDIR}/Date/Holidays.php:${PORTSDIR}/devel/pear-Date_Holidays
RUN_DEPENDS= ${PEARDIR}/Date/Holidays.php:${PORTSDIR}/devel/pear-Date_Holidays
-PEAR_AUTOINSTALL= yes
+USES= pear
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear/bsd.pear.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/pear-Date_Holidays_Germany/Makefile b/devel/pear-Date_Holidays_Germany/Makefile
index 972b0fe1d08c..e3821979d20d 100644
--- a/devel/pear-Date_Holidays_Germany/Makefile
+++ b/devel/pear-Date_Holidays_Germany/Makefile
@@ -11,8 +11,6 @@ COMMENT= Driver based class to calculate holidays in Germany
BUILD_DEPENDS= ${PEARDIR}/Date/Holidays.php:${PORTSDIR}/devel/pear-Date_Holidays
RUN_DEPENDS= ${PEARDIR}/Date/Holidays.php:${PORTSDIR}/devel/pear-Date_Holidays
-PEAR_AUTOINSTALL= yes
+USES= pear
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear/bsd.pear.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/pear-Date_Holidays_Iceland/Makefile b/devel/pear-Date_Holidays_Iceland/Makefile
index 9bc78d14813a..fee6bf1d5ceb 100644
--- a/devel/pear-Date_Holidays_Iceland/Makefile
+++ b/devel/pear-Date_Holidays_Iceland/Makefile
@@ -10,8 +10,6 @@ COMMENT= Driver based class to calculate holidays in Iceland
BUILD_DEPENDS= ${PEARDIR}/Date/Holidays.php:${PORTSDIR}/devel/pear-Date_Holidays
RUN_DEPENDS= ${PEARDIR}/Date/Holidays.php:${PORTSDIR}/devel/pear-Date_Holidays
-PEAR_AUTOINSTALL= yes
+USES= pear
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear/bsd.pear.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/pear-Date_Holidays_Ireland/Makefile b/devel/pear-Date_Holidays_Ireland/Makefile
index 6cd422eb9374..bdd486571f02 100644
--- a/devel/pear-Date_Holidays_Ireland/Makefile
+++ b/devel/pear-Date_Holidays_Ireland/Makefile
@@ -10,8 +10,6 @@ COMMENT= Driver based class to calculate holidays in Ireland
BUILD_DEPENDS= ${PEARDIR}/Date/Holidays.php:${PORTSDIR}/devel/pear-Date_Holidays
RUN_DEPENDS= ${PEARDIR}/Date/Holidays.php:${PORTSDIR}/devel/pear-Date_Holidays
-PEAR_AUTOINSTALL= yes
+USES= pear
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear/bsd.pear.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/pear-Date_Holidays_Italy/Makefile b/devel/pear-Date_Holidays_Italy/Makefile
index b0d6b64f08d5..0bb8ca5e276b 100644
--- a/devel/pear-Date_Holidays_Italy/Makefile
+++ b/devel/pear-Date_Holidays_Italy/Makefile
@@ -8,14 +8,8 @@ MAINTAINER= miwi@FreeBSD.org
COMMENT= Driver based class to calculate holidays in Italy
BUILD_DEPENDS= ${PEARDIR}/Date/Holidays.php:${PORTSDIR}/devel/pear-Date_Holidays
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+RUN_DEPENDS= ${PEARDIR}/Date/Holidays.php:${PORTSDIR}/devel/pear-Date_Holidays
-CATEGORY= Date
-FILES= Holidays/Driver/Italy.php
-TESTS= Date_Holidays_Driver_Italy_TestSuite.php
+USES= pear
-PLIST_SUB= PORTVERSION=${PORTVERSION}
-
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear/bsd.pear.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/pear-Date_Holidays_Italy/pkg-plist b/devel/pear-Date_Holidays_Italy/pkg-plist
index fa098aa94162..866bd2976e85 100644
--- a/devel/pear-Date_Holidays_Italy/pkg-plist
+++ b/devel/pear-Date_Holidays_Italy/pkg-plist
@@ -1,5 +1,3 @@
+share/pear/packages/pear-Date_Holidays_Italy-0.1.1/package.xml
share/pear/Date/Holidays/Driver/Italy.php
-share/pear/packages/pear-Date_Holidays_Italy-%%PORTVERSION%%/package.xml
-share/pear/tests/Date_Holidays_Italy/Date_Holidays_Driver_Italy_TestSuite.php
-@dirrm share/pear/tests/Date_Holidays_Italy/
-@dirrm share/pear/packages/pear-Date_Holidays_Italy-%%PORTVERSION%%
+share/pear/tests/Date_Holidays_Italy/tests/Date_Holidays_Driver_Italy_TestSuite.php
diff --git a/devel/pear-Date_Holidays_Japan/Makefile b/devel/pear-Date_Holidays_Japan/Makefile
index 6cba40b2ddc9..1a758058ccfd 100644
--- a/devel/pear-Date_Holidays_Japan/Makefile
+++ b/devel/pear-Date_Holidays_Japan/Makefile
@@ -10,8 +10,6 @@ COMMENT= Driver based class to calculate holidays in Japan
BUILD_DEPENDS= ${PEARDIR}/Date/Holidays.php:${PORTSDIR}/devel/pear-Date_Holidays
RUN_DEPENDS= ${PEARDIR}/Date/Holidays.php:${PORTSDIR}/devel/pear-Date_Holidays
-PEAR_AUTOINSTALL=yes
+USES= pear
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear/bsd.pear.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/pear-Date_Holidays_Netherlands/Makefile b/devel/pear-Date_Holidays_Netherlands/Makefile
index bbf08edfef0e..0305140b4628 100644
--- a/devel/pear-Date_Holidays_Netherlands/Makefile
+++ b/devel/pear-Date_Holidays_Netherlands/Makefile
@@ -10,9 +10,6 @@ COMMENT= Driver based class to calculate holidays in the Netherlands
BUILD_DEPENDS= ${PEARDIR}/Date/Holidays.php:${PORTSDIR}/devel/pear-Date_Holidays
RUN_DEPENDS:= ${PEARDIR}/Date/Holidays.php:${PORTSDIR}/devel/pear-Date_Holidays
-PEAR_AUTOINSTALL= yes
-PLIST_SUB= PORTVERSION=${PORTVERSION}
+USES= pear
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear/bsd.pear.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/pear-Date_Holidays_Norway/Makefile b/devel/pear-Date_Holidays_Norway/Makefile
index d5583d6fdaaf..42c41403d98d 100644
--- a/devel/pear-Date_Holidays_Norway/Makefile
+++ b/devel/pear-Date_Holidays_Norway/Makefile
@@ -8,11 +8,8 @@ MAINTAINER= miwi@FreeBSD.org
COMMENT= Driver based class to calculate holidays in Norway
BUILD_DEPENDS= ${PEARDIR}/Date/Holidays.php:${PORTSDIR}/devel/pear-Date_Holidays
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+RUN_DEPENDS= ${PEARDIR}/Date/Holidays.php:${PORTSDIR}/devel/pear-Date_Holidays
-CATEGORY= Date
-FILES= Holidays/Driver/Norway.php
+USES= pear
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear/bsd.pear.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/pear-Date_Holidays_Norway/pkg-plist b/devel/pear-Date_Holidays_Norway/pkg-plist
index e5497d8bca1d..d6f18768bb77 100644
--- a/devel/pear-Date_Holidays_Norway/pkg-plist
+++ b/devel/pear-Date_Holidays_Norway/pkg-plist
@@ -1,3 +1,3 @@
-share/pear/Date/Holidays/Driver/Norway.php
share/pear/packages/pear-Date_Holidays_Norway-0.1.2/package.xml
-@dirrm share/pear/packages/pear-Date_Holidays_Norway-0.1.2
+share/pear/Date/Holidays/Driver/Norway.php
+share/pear/tests/Date_Holidays_Norway/tests/Date_Holidays_Driver_Norway_TestSuite.php
diff --git a/devel/pear-Date_Holidays_PHPdotNet/Makefile b/devel/pear-Date_Holidays_PHPdotNet/Makefile
index 8d7abda22c19..82e4091aeccb 100644
--- a/devel/pear-Date_Holidays_PHPdotNet/Makefile
+++ b/devel/pear-Date_Holidays_PHPdotNet/Makefile
@@ -8,12 +8,8 @@ MAINTAINER= miwi@FreeBSD.org
COMMENT= Driver based class to calculate birthdays of members of PHP.net
BUILD_DEPENDS= ${PEARDIR}/Date/Holidays.php:${PORTSDIR}/devel/pear-Date_Holidays
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+RUN_DEPENDS= ${PEARDIR}/Date/Holidays.php:${PORTSDIR}/devel/pear-Date_Holidays
-CATEGORY= Date
-FILES= Holidays/Driver/PHPdotNet.php
-TESTS= Date_Holidays_Driver_PHPdotNet_TestSuite.php
+USES= pear
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear/bsd.pear.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/pear-Date_Holidays_PHPdotNet/pkg-plist b/devel/pear-Date_Holidays_PHPdotNet/pkg-plist
index 56244f6dddc3..0ef16abc7325 100644
--- a/devel/pear-Date_Holidays_PHPdotNet/pkg-plist
+++ b/devel/pear-Date_Holidays_PHPdotNet/pkg-plist
@@ -1,5 +1,3 @@
-share/pear/Date/Holidays/Driver/PHPdotNet.php
share/pear/packages/pear-Date_Holidays_PHPdotNet-0.1.2/package.xml
-share/pear/tests/Date_Holidays_PHPdotNet/Date_Holidays_Driver_PHPdotNet_TestSuite.php
-@dirrm share/pear/tests/Date_Holidays_PHPdotNet
-@dirrm share/pear/packages/pear-Date_Holidays_PHPdotNet-0.1.2
+share/pear/Date/Holidays/Driver/PHPdotNet.php
+share/pear/tests/Date_Holidays_PHPdotNet/tests/Date_Holidays_Driver_PHPdotNet_TestSuite.php
diff --git a/devel/pear-Date_Holidays_Romania/Makefile b/devel/pear-Date_Holidays_Romania/Makefile
index 935df98b1a1c..d4d8c5bc3b48 100644
--- a/devel/pear-Date_Holidays_Romania/Makefile
+++ b/devel/pear-Date_Holidays_Romania/Makefile
@@ -8,12 +8,8 @@ MAINTAINER= miwi@FreeBSD.org
COMMENT= Driver based class to calculate holidays in Romania
BUILD_DEPENDS= ${PEARDIR}/Date/Holidays.php:${PORTSDIR}/devel/pear-Date_Holidays
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+RUN_DEPENDS= ${PEARDIR}/Date/Holidays.php:${PORTSDIR}/devel/pear-Date_Holidays
-CATEGORY= Date
-FILES= Holidays/Driver/Romania.php
-TESTS= Date_Holidays_Driver_Romania_TestSuite.php
+USES= pear
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear/bsd.pear.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/pear-Date_Holidays_Slovenia/Makefile b/devel/pear-Date_Holidays_Slovenia/Makefile
index af421d066ee5..d72fbf82f6c1 100644
--- a/devel/pear-Date_Holidays_Slovenia/Makefile
+++ b/devel/pear-Date_Holidays_Slovenia/Makefile
@@ -8,12 +8,8 @@ MAINTAINER= miwi@FreeBSD.org
COMMENT= Driver based class to calculate holidays in Slovenia
BUILD_DEPENDS= ${PEARDIR}/Date/Holidays.php:${PORTSDIR}/devel/pear-Date_Holidays
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+RUN_DEPENDS= ${PEARDIR}/Date/Holidays.php:${PORTSDIR}/devel/pear-Date_Holidays
-CATEGORY= Date
-FILES= Holidays/Driver/Slovenia.php
-TESTS= Date_Holidays_Driver_Slovenia_TestSuite.php
+USES= pear
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear/bsd.pear.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/pear-Date_Holidays_Sweden/Makefile b/devel/pear-Date_Holidays_Sweden/Makefile
index f18eba495689..f3d4240cae87 100644
--- a/devel/pear-Date_Holidays_Sweden/Makefile
+++ b/devel/pear-Date_Holidays_Sweden/Makefile
@@ -10,8 +10,6 @@ COMMENT= Driver based class to calculate holidays in Sweden
BUILD_DEPENDS= ${PEARDIR}/Date/Holidays.php:${PORTSDIR}/devel/pear-Date_Holidays
RUN_DEPENDS= ${PEARDIR}/Date/Holidays.php:${PORTSDIR}/devel/pear-Date_Holidays
-PEAR_AUTOINSTALL=yes
+USES= pear
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear/bsd.pear.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/pear-Date_Holidays_UNO/Makefile b/devel/pear-Date_Holidays_UNO/Makefile
index 181c7342463b..ba77fc626790 100644
--- a/devel/pear-Date_Holidays_UNO/Makefile
+++ b/devel/pear-Date_Holidays_UNO/Makefile
@@ -8,14 +8,8 @@ MAINTAINER= miwi@FreeBSD.org
COMMENT= Driver based class to calculate holidays in the UNO
BUILD_DEPENDS= ${PEARDIR}/Date/Holidays.php:${PORTSDIR}/devel/pear-Date_Holidays
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+RUN_DEPENDS= ${PEARDIR}/Date/Holidays.php:${PORTSDIR}/devel/pear-Date_Holidays
-CATEGORY= Date
-FILES= Holidays/Driver/UNO.php
-TESTS= Date_Holidays_Driver_UNO_TestSuite.php
+USES= pear
-PLIST_SUB= PORTVERSION=${PORTVERSION}
-
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear/bsd.pear.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/pear-Date_Holidays_USA/Makefile b/devel/pear-Date_Holidays_USA/Makefile
index b74c66ab6880..139e5c5a253e 100644
--- a/devel/pear-Date_Holidays_USA/Makefile
+++ b/devel/pear-Date_Holidays_USA/Makefile
@@ -8,12 +8,8 @@ MAINTAINER= miwi@FreeBSD.org
COMMENT= Driver based class to calculate holidays in the USA
BUILD_DEPENDS= ${PEARDIR}/Date/Holidays.php:${PORTSDIR}/devel/pear-Date_Holidays
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+BUILD_DEPENDS= ${PEARDIR}/Date/Holidays.php:${PORTSDIR}/devel/pear-Date_Holidays
-CATEGORY= Date
-FILES= Holidays/Driver/USA.php
-TESTS= Date_Holidays_Driver_USA_TestSuite.php
+USES= pear
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear/bsd.pear.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/pear-Date_Holidays_Ukraine/Makefile b/devel/pear-Date_Holidays_Ukraine/Makefile
index 350df260f2ec..4d0d3bd8b038 100644
--- a/devel/pear-Date_Holidays_Ukraine/Makefile
+++ b/devel/pear-Date_Holidays_Ukraine/Makefile
@@ -8,12 +8,8 @@ MAINTAINER= miwi@FreeBSD.org
COMMENT= Driver based class to calculate holidays in the Ukraine
BUILD_DEPENDS= ${PEARDIR}/Date/Holidays.php:${PORTSDIR}/devel/pear-Date_Holidays
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+RUN_DEPENDS= ${PEARDIR}/Date/Holidays.php:${PORTSDIR}/devel/pear-Date_Holidays
-CATEGORY= Date
-FILES= Holidays/Driver/Ukraine.php
-TESTS= Date_Holidays_Driver_Ukraine_TestSuite.php
+USES= pear
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear/bsd.pear.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/pear-Event_Dispatcher/Makefile b/devel/pear-Event_Dispatcher/Makefile
index 0e3b63d722ca..5b3ffee5e53f 100644
--- a/devel/pear-Event_Dispatcher/Makefile
+++ b/devel/pear-Event_Dispatcher/Makefile
@@ -8,16 +8,11 @@ CATEGORIES= devel pear
MAINTAINER= miwi@FreeBSD.org
COMMENT= PEAR dispatch notifications using PHP callbacks
-BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
-RUN_DEPENDS:= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
-
-PEAR_AUTOINSTALL= yes
+USES= pear
post-extract:
.for file in ${FILES}
@${REINPLACE_CMD} -e "s|@package_version@|${PORTVERSION}|" ${WRKSRC}/${file}
.endfor
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear/bsd.pear.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/pear-FSM/Makefile b/devel/pear-FSM/Makefile
index 4d3d75a3369b..6b5d2539a4bc 100644
--- a/devel/pear-FSM/Makefile
+++ b/devel/pear-FSM/Makefile
@@ -8,20 +8,11 @@ CATEGORIES= devel www pear
MAINTAINER= miwi@FreeBSD.org
COMMENT= PEAR Finite State Machine
-BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
-RUN_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
-
-PEAR_AUTOINSTALL= yes
-
-LATEST_LINK= pear-${PORTNAME}
OPTIONS_DEFINE= PEAR_GRAPGHVIZ
PEAR_GRAPGHVIZ_DESC= PEAR::GraphViz support
-.include <bsd.port.options.mk>
+USES= pear
-.if ${PORT_OPTIONS:MPEAR_GRAPHVIZ}
-RUN_DEPENDS+= ${PEARDIR}/GraphViz.php:${PORTSDIR}/graphics/pear-Image_GraphViz
-.endif
+PEAR_GRAPGHVIZ_RUN_DEPENDS= ${PEARDIR}/GraphViz.php:${PORTSDIR}/graphics/pear-Image_GraphViz
-.include "${PORTSDIR}/devel/pear/bsd.pear.mk"
.include <bsd.port.mk>
diff --git a/devel/pear-File_Iterator/Makefile b/devel/pear-File_Iterator/Makefile
index 0927a9ac23fd..f919d759419a 100644
--- a/devel/pear-File_Iterator/Makefile
+++ b/devel/pear-File_Iterator/Makefile
@@ -10,14 +10,10 @@ PKGNAMEPREFIX= pear-
MAINTAINER= gasol.wu@gmail.com
COMMENT= PEAR FileIterator implementation
-BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear \
- ${PEARDIR}/.channels/pear.phpunit.de.reg:${PORTSDIR}/devel/pear-channel-phpunit
-RUN_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear \
- ${PEARDIR}/.channels/pear.phpunit.de.reg:${PORTSDIR}/devel/pear-channel-phpunit
+BUILD_DEPENDS= ${PEARDIR}/.channels/pear.phpunit.de.reg:${PORTSDIR}/devel/pear-channel-phpunit
+RUN_DEPENDS= ${PEARDIR}/.channels/pear.phpunit.de.reg:${PORTSDIR}/devel/pear-channel-phpunit
+USES= pear
PEAR_CHANNEL= phpunit
-PEAR_AUTOINSTALL= yes
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear/bsd.pear.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/pear-HTML_BBCodeParser/Makefile b/devel/pear-HTML_BBCodeParser/Makefile
index 7cfdd491d70a..50425bf8c0cf 100644
--- a/devel/pear-HTML_BBCodeParser/Makefile
+++ b/devel/pear-HTML_BBCodeParser/Makefile
@@ -11,8 +11,6 @@ COMMENT= Parser to replace UBB style tags with their HTML equivalents
BUILD_DEPENDS= ${PEARDIR}/HTML/Common.php:${PORTSDIR}/devel/pear-HTML_Common
RUN_DEPENDS= ${PEARDIR}/HTML/Common.php:${PORTSDIR}/devel/pear-HTML_Common
-PEAR_AUTOINSTALL= yes
+USES= pear
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear/bsd.pear.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/pear-HTML_CSS/Makefile b/devel/pear-HTML_CSS/Makefile
index c73c1e5a685a..5c4b413caab1 100644
--- a/devel/pear-HTML_CSS/Makefile
+++ b/devel/pear-HTML_CSS/Makefile
@@ -11,8 +11,6 @@ COMMENT= PEAR class for generating CSS declarations
BUILD_DEPENDS= ${PEARDIR}/HTML/Common.php:${PORTSDIR}/devel/pear-HTML_Common
RUN_DEPENDS= ${PEARDIR}/HTML/Common.php:${PORTSDIR}/devel/pear-HTML_Common
-PEAR_AUTOINSTALL= yes
+USES= pear
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear/bsd.pear.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/pear-HTML_Common/Makefile b/devel/pear-HTML_Common/Makefile
index ed9196afec35..678b051a6e98 100644
--- a/devel/pear-HTML_Common/Makefile
+++ b/devel/pear-HTML_Common/Makefile
@@ -8,11 +8,6 @@ CATEGORIES= devel www pear
MAINTAINER= miwi@FreeBSD.org
COMMENT= PEAR::HTML_Common is a base class for other HTML classes
-BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
-RUN_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
+USES= pear
-PEAR_AUTOINSTALL= yes
-
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear/bsd.pear.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/pear-HTML_Common2/Makefile b/devel/pear-HTML_Common2/Makefile
index 52087d852e9a..3cf1770b3921 100644
--- a/devel/pear-HTML_Common2/Makefile
+++ b/devel/pear-HTML_Common2/Makefile
@@ -8,11 +8,6 @@ CATEGORIES= devel www pear
MAINTAINER= miwi@FreeBSD.org
COMMENT= PEAR::HTML_Common2 is a base class for other HTML classes
-BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
-RUN_DEPENDS:= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
+USES= pear
-PEAR_AUTOINSTALL= yes
-
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear/bsd.pear.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/pear-HTML_Form/Makefile b/devel/pear-HTML_Form/Makefile
index 988ee0ceedb6..70851b1aaee1 100644
--- a/devel/pear-HTML_Form/Makefile
+++ b/devel/pear-HTML_Form/Makefile
@@ -9,11 +9,6 @@ CATEGORIES= devel pear
MAINTAINER= miwi@FreeBSD.org
COMMENT= PEAR simple HTML form package
-BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
-RUN_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
+USES= pear
-PEAR_AUTOINSTALL= yes
-
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear/bsd.pear.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/pear-HTML_Javascript/Makefile b/devel/pear-HTML_Javascript/Makefile
index 7874100fbcc2..18baa2b0945c 100644
--- a/devel/pear-HTML_Javascript/Makefile
+++ b/devel/pear-HTML_Javascript/Makefile
@@ -8,11 +8,6 @@ CATEGORIES= devel www pear
MAINTAINER= miwi@FreeBSD.org
COMMENT= Provides an interface for creating simple JS scripts
-BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
-RUN_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
+USES= pear
-PEAR_AUTOINSTALL= yes
-
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear/bsd.pear.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/pear-HTML_Page2/Makefile b/devel/pear-HTML_Page2/Makefile
index 9ce1aa4d2017..5dcb53ae8c0c 100644
--- a/devel/pear-HTML_Page2/Makefile
+++ b/devel/pear-HTML_Page2/Makefile
@@ -12,8 +12,6 @@ COMMENT= PEAR base class for XHTML page generation
BUILD_DEPENDS= ${PEARDIR}/HTML/Common.php:${PORTSDIR}/devel/pear-HTML_Common
RUN_DEPENDS= ${PEARDIR}/HTML/Common.php:${PORTSDIR}/devel/pear-HTML_Common
-PEAR_AUTOINSTALL=yes
+USES= pear
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear/bsd.pear.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/pear-HTML_QuickForm/Makefile b/devel/pear-HTML_QuickForm/Makefile
index f6cfb6569d22..75046fe64a9c 100644
--- a/devel/pear-HTML_QuickForm/Makefile
+++ b/devel/pear-HTML_QuickForm/Makefile
@@ -11,8 +11,6 @@ COMMENT= Provide methods for creating, validating, and processing HTML forms
BUILD_DEPENDS= ${PEARDIR}/HTML/Common.php:${PORTSDIR}/devel/pear-HTML_Common
RUN_DEPENDS:= ${PEARDIR}/HTML/Common.php:${PORTSDIR}/devel/pear-HTML_Common
-PEAR_AUTOINSTALL= yes
+USES= pear
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear/bsd.pear.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/pear-HTML_QuickForm2/Makefile b/devel/pear-HTML_QuickForm2/Makefile
index 30f158e50686..978fdac42327 100644
--- a/devel/pear-HTML_QuickForm2/Makefile
+++ b/devel/pear-HTML_QuickForm2/Makefile
@@ -11,9 +11,6 @@ COMMENT= PHP5 rewrite of the HTML_QuickForm package
BUILD_DEPENDS= ${PEARDIR}/HTML/Common2.php:${PORTSDIR}/devel/pear-HTML_Common2
RUN_DEPENDS= ${PEARDIR}/HTML/Common2.php:${PORTSDIR}/devel/pear-HTML_Common2
-DEFAULT_PHP_VER=5
-PEAR_AUTOINSTALL= yes
+USES= pear
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear/bsd.pear.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/pear-HTML_QuickForm_Controller/Makefile b/devel/pear-HTML_QuickForm_Controller/Makefile
index bd05715b5a48..52dbf234653b 100644
--- a/devel/pear-HTML_QuickForm_Controller/Makefile
+++ b/devel/pear-HTML_QuickForm_Controller/Makefile
@@ -13,8 +13,6 @@ LICENSE= PHP301
BUILD_DEPENDS= ${PEARDIR}/HTML/QuickForm.php:${PORTSDIR}/devel/pear-HTML_QuickForm
RUN_DEPENDS= ${PEARDIR}/HTML/QuickForm.php:${PORTSDIR}/devel/pear-HTML_QuickForm
-PEAR_AUTOINSTALL= yes
+USES= pear
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear/bsd.pear.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/pear-HTML_QuickForm_Livesearch/Makefile b/devel/pear-HTML_QuickForm_Livesearch/Makefile
index 0cd0184d50d1..41db8e3651d4 100644
--- a/devel/pear-HTML_QuickForm_Livesearch/Makefile
+++ b/devel/pear-HTML_QuickForm_Livesearch/Makefile
@@ -13,8 +13,6 @@ BUILD_DEPENDS= ${PEARDIR}/HTML/QuickForm.php:${PORTSDIR}/devel/pear-HTML_QuickFo
RUN_DEPENDS:= ${PEARDIR}/HTML/QuickForm.php:${PORTSDIR}/devel/pear-HTML_QuickForm \
${PEARDIR}/HTML/AJAX.php:${PORTSDIR}/www/pear-HTML_AJAX
-PEAR_AUTOINSTALL= yes
+USES= pear
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear/bsd.pear.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/pear-HTML_QuickForm_Renderer_Tableless/Makefile b/devel/pear-HTML_QuickForm_Renderer_Tableless/Makefile
index befd39fc6c6d..0a4bba96120b 100644
--- a/devel/pear-HTML_QuickForm_Renderer_Tableless/Makefile
+++ b/devel/pear-HTML_QuickForm_Renderer_Tableless/Makefile
@@ -11,8 +11,6 @@ COMMENT= Implementation of Tableless Renderer for HTML_QuickForm
BUILD_DEPENDS= ${PEARDIR}/HTML/QuickForm.php:${PORTSDIR}/devel/pear-HTML_QuickForm
RUN_DEPENDS= ${PEARDIR}/HTML/QuickForm.php:${PORTSDIR}/devel/pear-HTML_QuickForm
-PEAR_AUTOINSTALL= yes
+USES= pear
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear/bsd.pear.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/pear-HTML_QuickForm_SelectFilter/Makefile b/devel/pear-HTML_QuickForm_SelectFilter/Makefile
index 9533a75fa5c3..a3da3f51f262 100644
--- a/devel/pear-HTML_QuickForm_SelectFilter/Makefile
+++ b/devel/pear-HTML_QuickForm_SelectFilter/Makefile
@@ -12,8 +12,6 @@ COMMENT= Element for PEAR::HTML_QuickForm that defines dynamic filters
BUILD_DEPENDS= ${PEARDIR}/HTML/QuickForm.php:${PORTSDIR}/devel/pear-HTML_QuickForm
RUN_DEPENDS= ${PEARDIR}/HTML/QuickForm.php:${PORTSDIR}/devel/pear-HTML_QuickForm
-PEAR_AUTOINSTALL= yes
+USES= pear
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear/bsd.pear.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/pear-HTML_QuickForm_advmultiselect/Makefile b/devel/pear-HTML_QuickForm_advmultiselect/Makefile
index 335b801a5426..f6fce0efd976 100644
--- a/devel/pear-HTML_QuickForm_advmultiselect/Makefile
+++ b/devel/pear-HTML_QuickForm_advmultiselect/Makefile
@@ -13,8 +13,6 @@ BUILD_DEPENDS= ${PEARDIR}/HTML/QuickForm.php:${PORTSDIR}/devel/pear-HTML_QuickFo
RUN_DEPENDS= ${PEARDIR}/HTML/QuickForm.php:${PORTSDIR}/devel/pear-HTML_QuickForm \
${PEARDIR}/HTML/Common.php:${PORTSDIR}/devel/pear-HTML_Common
-PEAR_AUTOINSTALL= yes
+USES= pear
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear/bsd.pear.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/pear-HTML_Select/Makefile b/devel/pear-HTML_Select/Makefile
index 9c50edcd7066..e95618273c3e 100644
--- a/devel/pear-HTML_Select/Makefile
+++ b/devel/pear-HTML_Select/Makefile
@@ -11,8 +11,6 @@ COMMENT= PEAR::HTML_Select is a class for generating HTML form select elements
BUILD_DEPENDS= ${PEARDIR}/HTML/Common.php:${PORTSDIR}/devel/pear-HTML_Common
RUN_DEPENDS= ${PEARDIR}/HTML/Common.php:${PORTSDIR}/devel/pear-HTML_Common
-PEAR_AUTOINSTALL= YES
+USES= pear
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear/bsd.pear.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/pear-HTML_Select_Common/Makefile b/devel/pear-HTML_Select_Common/Makefile
index 33efb1790c3c..53c5bec16b48 100644
--- a/devel/pear-HTML_Select_Common/Makefile
+++ b/devel/pear-HTML_Select_Common/Makefile
@@ -13,8 +13,6 @@ BUILD_DEPENDS= ${PEARDIR}/HTML/Common.php:${PORTSDIR}/devel/pear-HTML_Common \
RUN_DEPENDS= ${PEARDIR}/HTML/Common.php:${PORTSDIR}/devel/pear-HTML_Common \
${PEARDIR}/I18N/Common.php:${PORTSDIR}/devel/pear-I18N
-PEAR_AUTOINSTALL= yes
+USES= pear
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear/bsd.pear.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/pear-HTML_Table/Makefile b/devel/pear-HTML_Table/Makefile
index 73cec2bb9873..97b3eab3b551 100644
--- a/devel/pear-HTML_Table/Makefile
+++ b/devel/pear-HTML_Table/Makefile
@@ -11,8 +11,6 @@ COMMENT= Makes the design of HTML tables easy, flexible, reusable, and efficient
BUILD_DEPENDS= ${PEARDIR}/HTML/Common.php:${PORTSDIR}/devel/pear-HTML_Common
RUN_DEPENDS= ${PEARDIR}/HTML/Common.php:${PORTSDIR}/devel/pear-HTML_Common
-PEAR_AUTOINSTALL= yes
+USES= pear
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear/bsd.pear.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/pear-HTML_Template_Flexy/Makefile b/devel/pear-HTML_Template_Flexy/Makefile
index 10129e417105..f26e7fe261be 100644
--- a/devel/pear-HTML_Template_Flexy/Makefile
+++ b/devel/pear-HTML_Template_Flexy/Makefile
@@ -8,30 +8,15 @@ CATEGORIES= devel www pear
MAINTAINER= miwi@FreeBSD.org
COMMENT= Extremely powerful Tokenizer driven Template engine
-BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
-RUN_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
-
-LATEST_LINK= pear-HTML_Template_Flexy
OPTIONS_DEFINE= PEAR_HTML_JAVASCRIPT PEAR_FILE_GETTEXT PEAR_TRANSLATION2
PEAR_HTML_JAVASCRIPT_DESC= PEAR::HTML_Javascript support
PEAR_FILE_GETTEXT_DESC= PEAR::File_Gettext support
PEAR_TRANSLATION2_DESC= PEAR::Translation2 support
-PEAR_AUTOINSTALL= yes
-
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MPEAR_HTML_JAVASCRIPT}
-RUN_DEPENDS+= ${PEARDIR}/HTML/Javascript.php:${PORTSDIR}/devel/pear-HTML_Javascript
-.endif
-
-.if ${PORT_OPTIONS:MPEAR_FILE_GETTEXT}
-RUN_DEPENDS+= ${PEARDIR}/File/Gettext.php:${PORTSDIR}/sysutils/pear-File_Gettext
-.endif
+USES= pear
-.if ${PORT_OPTIONS:MPEAR_TRANSLATION2}
-RUN_DEPENDS+= ${PEARDIR}/Translation2.php:${PORTSDIR}/sysutils/pear-Translation2
-.endif
+PEAR_HTML_JAVASCRIPT_RUN_DEPENDS= ${PEARDIR}/HTML/Javascript.php:${PORTSDIR}/devel/pear-HTML_Javascript
+PEAR_FILE_GETTEXT_RUN_DEPENDS= ${PEARDIR}/File/Gettext.php:${PORTSDIR}/sysutils/pear-File_Gettext
+PEAR_TRANSLATION2_RUN_DEPENDS= ${PEARDIR}/Translation2.php:${PORTSDIR}/sysutils/pear-Translation2
-.include "${PORTSDIR}/devel/pear/bsd.pear.mk"
.include <bsd.port.mk>
diff --git a/devel/pear-HTML_Template_IT/Makefile b/devel/pear-HTML_Template_IT/Makefile
index 9cfcd00b4626..68a39a148d3c 100644
--- a/devel/pear-HTML_Template_IT/Makefile
+++ b/devel/pear-HTML_Template_IT/Makefile
@@ -9,15 +9,6 @@ CATEGORIES= devel www pear
MAINTAINER= miwi@FreeBSD.org
COMMENT= PEAR Integrated template API
-BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
-RUN_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
+USES= pear
-PEAR_AUTOINSTALL= yes
-
-do-install-tests-msg: .USE
- @${ECHO_MSG} " (These tests require PHPUnit - see"
- @${ECHO_MSG} " <http://pear.php.net/package-info.php?package=PHPUnit>;;)."
-
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear/bsd.pear.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/pear-HTML_Template_PHPLIB/Makefile b/devel/pear-HTML_Template_PHPLIB/Makefile
index d8064f80cb2c..de68498ec53f 100644
--- a/devel/pear-HTML_Template_PHPLIB/Makefile
+++ b/devel/pear-HTML_Template_PHPLIB/Makefile
@@ -11,17 +11,6 @@ COMMENT= PEAR template API ported from PHPLIB
LICENSE= LGPL3
-BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
-RUN_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
+USES= pear
-PEAR_AUTOINSTALL= yes
-
-do-install-tests-msg: .USE
- @${ECHO_MSG} " (These tests require PEAR::Benchmark - see"
- @${ECHO_MSG} " <http://pear.php.net/package-info.php?package=Benchmark>;;;)."
- @${ECHO_MSG} " (These tests also require PEAR::PHPUnit - see"
- @${ECHO_MSG} " <http://pear.php.net/package/PHPUnit>;;;)."
-
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear/bsd.pear.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/pear-HTML_Template_Sigma/Makefile b/devel/pear-HTML_Template_Sigma/Makefile
index 5699e9e1284e..2adf52aee578 100644
--- a/devel/pear-HTML_Template_Sigma/Makefile
+++ b/devel/pear-HTML_Template_Sigma/Makefile
@@ -8,17 +8,7 @@ CATEGORIES= devel www pear
MAINTAINER= miwi@FreeBSD.org
COMMENT= PEAR template API
-BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
-RUN_DEPENDS:= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
-
USE_PHP= ctype
+USES= pear
-PEAR_AUTOINSTALL= yes
-
-do-install-tests-msg: .USE
- @${ECHO_MSG} " (These tests require PHPUnit - see"
- @${ECHO_MSG} " <http://pear.php.net/package-info.php?package=PHPUnit>;;)."
-
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear/bsd.pear.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/pear-HTML_TreeMenu/Makefile b/devel/pear-HTML_TreeMenu/Makefile
index fd1faef3a63b..01e10884359d 100644
--- a/devel/pear-HTML_TreeMenu/Makefile
+++ b/devel/pear-HTML_TreeMenu/Makefile
@@ -8,11 +8,6 @@ CATEGORIES= devel www pear
MAINTAINER= miwi@FreeBSD.org
COMMENT= Provides an API to create a HTML tree
-BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
-RUN_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
+USES= pear
-PEAR_AUTOINSTALL= yes
-
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear/bsd.pear.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/pear-I18N/Makefile b/devel/pear-I18N/Makefile
index 97058fe3f325..601d20f3ea9d 100644
--- a/devel/pear-I18N/Makefile
+++ b/devel/pear-I18N/Makefile
@@ -11,8 +11,6 @@ COMMENT= PEAR internationalization package
BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
RUN_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
-PEAR_AUTOINSTALL= yes
+USES= pear
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear/bsd.pear.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/pear-IO_Bit/Makefile b/devel/pear-IO_Bit/Makefile
index ae4036927ef9..e0d915f03190 100644
--- a/devel/pear-IO_Bit/Makefile
+++ b/devel/pear-IO_Bit/Makefile
@@ -15,12 +15,10 @@ COMMENT= PEAR bit utility
LICENSE= MIT
BUILD_DEPENDS= ${PEARDIR}/.channels/openpear.org.reg:${PORTSDIR}/devel/pear-channel-openpear
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+RUN_DEPENDS= ${PEARDIR}/.channels/openpear.org.reg:${PORTSDIR}/devel/pear-channel-openpear
+USES= pear
USE_PHP= yes
PEAR_CHANNEL= openpear
-PEAR_AUTOINSTALL= yes
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear/bsd.pear.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/pear-Math_Fraction/Makefile b/devel/pear-Math_Fraction/Makefile
index 1176b7fd47f8..08e4d6784ea6 100644
--- a/devel/pear-Math_Fraction/Makefile
+++ b/devel/pear-Math_Fraction/Makefile
@@ -8,11 +8,6 @@ CATEGORIES= devel www pear
MAINTAINER= miwi@FreeBSD.org
COMMENT= Classes that represent and manipulate fractions
-BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
-RUN_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
+USES= pear
-PEAR_AUTOINSTALL= yes
-
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear/bsd.pear.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/pear-Net_Gearman/Makefile b/devel/pear-Net_Gearman/Makefile
index 186791f70312..4be7f9e5bf3a 100644
--- a/devel/pear-Net_Gearman/Makefile
+++ b/devel/pear-Net_Gearman/Makefile
@@ -15,8 +15,6 @@ BUILD_DEPENDS= ${LOCALBASE}/share/pear/PEAR.php:${PORTSDIR}/devel/pear
RUN_DEPENDS= ${LOCALBASE}/share/pear/PEAR.php:${PORTSDIR}/devel/pear
USE_PHP= json mbstring
-PEAR_AUTOINSTALL= yes
+USES= pear
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear/bsd.pear.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/pear-OLE/Makefile b/devel/pear-OLE/Makefile
index 6d2bf4540b88..8581a21209f2 100644
--- a/devel/pear-OLE/Makefile
+++ b/devel/pear-OLE/Makefile
@@ -8,11 +8,6 @@ CATEGORIES= devel www pear
MAINTAINER= 5u623l20@gmail.com
COMMENT= PEAR class for reading and writing OLE containers
-BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
-RUN_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
+USES= pear
-PEAR_AUTOINSTALL= yes
-
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear/bsd.pear.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/pear-PEAR_Info/Makefile b/devel/pear-PEAR_Info/Makefile
index 607cdcb19c76..dc76ccab0e33 100644
--- a/devel/pear-PEAR_Info/Makefile
+++ b/devel/pear-PEAR_Info/Makefile
@@ -8,23 +8,15 @@ CATEGORIES= devel www pear
MAINTAINER= miwi@FreeBSD.org
COMMENT= Show Information about your PEAR install and its packages
-BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear \
- ${PEARDIR}/Console/Getargs.php:${PORTSDIR}/devel/pear-Console_Getargs
-RUN_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear \
- ${PEARDIR}/Console/Getargs.php:${PORTSDIR}/devel/pear-Console_Getargs
+BUILD_DEPENDS= ${PEARDIR}/Console/Getargs.php:${PORTSDIR}/devel/pear-Console_Getargs
+RUN_DEPENDS= ${PEARDIR}/Console/Getargs.php:${PORTSDIR}/devel/pear-Console_Getargs
-LATEST_LINK= pear-PEAR_Info
OPTIONS_DEFINE= PEAR_PHPUNIT3
OPTIONS_DEFAULT= PEAR_PHPUNIT3
PEAR_PHPUNIT3_DESC= PEAR::PHPUnit3 support
-PEAR_AUTOINSTALL= yes
+USES= pear
-.include <bsd.port.options.mk>
+PEAR_PHPUNIT3_RUN_DEPENDS= ${PEARDIR}/PHPUnit/Autoload.php:${PORTSDIR}/devel/pear-PHPUnit3
-.if ${PORT_OPTIONS:MPEAR_PHPUNIT3}
-RUN_DEPENDS+= ${PEARDIR}/PHPUnit/Autoload.php:${PORTSDIR}/devel/pear-PHPUnit3
-.endif
-
-.include "${PORTSDIR}/devel/pear/bsd.pear.mk"
.include <bsd.port.mk>
diff --git a/devel/pear-PEAR_PackageFileManager/Makefile b/devel/pear-PEAR_PackageFileManager/Makefile
index 238a8ad30c0b..339e51688d77 100644
--- a/devel/pear-PEAR_PackageFileManager/Makefile
+++ b/devel/pear-PEAR_PackageFileManager/Makefile
@@ -8,25 +8,13 @@ CATEGORIES= devel www pear
MAINTAINER= miwi@FreeBSD.org
COMMENT= PEAR class to maintain PEAR packages
-BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
-RUN_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
-
-LATEST_LINK= pear-${PORTNAME}
OPTIONS_DEFINE= PEAR_PHP_COMPATINFO PEAR_XML_TREE
PEAR_PHP_COMPATINFO_DESC= PEAR::PHP_CompatInfo support
PEAR_XML_TREE_DESC= PEAR::XML_Tree support
-PEAR_AUTOINSTALL= yes
-
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MPEAR_PHP_COMPATINFO}
-RUN_DEPENDS+= ${PEARDIR}/PHP/CompatInfo.php:${PORTSDIR}/devel/pear-PHP_CompatInfo
-.endif
+USES= pear
-.if ${PORT_OPTIONS:MPEAR_XML_TREE}
-RUN_DEPENDS+= ${PEARDIR}/XML/Tree.php:${PORTSDIR}/devel/pear-XML_Tree
-.endif
+PEAR_PHP_COMPATINFO_RUN_DEPENDS= ${PEARDIR}/PHP/CompatInfo.php:${PORTSDIR}/devel/pear-PHP_CompatInfo
+PEAR_XML_TREE_RUN_DEPENDS= ${PEARDIR}/XML/Tree.php:${PORTSDIR}/devel/pear-XML_Tree
-.include "${PORTSDIR}/devel/pear/bsd.pear.mk"
.include <bsd.port.mk>
diff --git a/devel/pear-PEAR_PackageFileManager2/Makefile b/devel/pear-PEAR_PackageFileManager2/Makefile
index b987a8319945..98e2a4247c26 100644
--- a/devel/pear-PEAR_PackageFileManager2/Makefile
+++ b/devel/pear-PEAR_PackageFileManager2/Makefile
@@ -11,13 +11,9 @@ COMMENT= PEAR class to maintain PEAR packages
LICENSE= BSD
-BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear \
- ${PEARDIR}/PEAR/PackageFileManager/Plugins.php:${PORTSDIR}/devel/pear-PEAR_PackageFileManager_Plugins
-RUN_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear \
- ${PEARDIR}/PEAR/PackageFileManager/Plugins.php:${PORTSDIR}/devel/pear-PEAR_PackageFileManager_Plugins
+BUILD_DEPENDS= ${PEARDIR}/PEAR/PackageFileManager/Plugins.php:${PORTSDIR}/devel/pear-PEAR_PackageFileManager_Plugins
+RUN_DEPENDS= ${PEARDIR}/PEAR/PackageFileManager/Plugins.php:${PORTSDIR}/devel/pear-PEAR_PackageFileManager_Plugins
-PEAR_AUTOINSTALL= yes
+USES= pear
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear/bsd.pear.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/pear-PEAR_PackageFileManager_Plugins/Makefile b/devel/pear-PEAR_PackageFileManager_Plugins/Makefile
index d3dc7b55e9ec..2ae91b644037 100644
--- a/devel/pear-PEAR_PackageFileManager_Plugins/Makefile
+++ b/devel/pear-PEAR_PackageFileManager_Plugins/Makefile
@@ -8,15 +8,11 @@ CATEGORIES= devel www pear
MAINTAINER= ports@FreeBSD.org
COMMENT= The plugins for PEAR_PackageFileManager
-BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear \
- ${PEARDIR}/XML/Serializer.php:${PORTSDIR}/devel/pear-XML_Serializer
-RUN_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear \
- ${PEARDIR}/XML/Serializer.php:${PORTSDIR}/devel/pear-XML_Serializer
+BUILD_DEPENDS= ${PEARDIR}/XML/Serializer.php:${PORTSDIR}/devel/pear-XML_Serializer
+RUN_DEPENDS= ${PEARDIR}/XML/Serializer.php:${PORTSDIR}/devel/pear-XML_Serializer
LICENSE= BSD
-PEAR_AUTOINSTALL= yes
+USES= pear
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear/bsd.pear.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/pear-PHPDoc/Makefile b/devel/pear-PHPDoc/Makefile
index cab68a38e030..958a8017093e 100644
--- a/devel/pear-PHPDoc/Makefile
+++ b/devel/pear-PHPDoc/Makefile
@@ -8,11 +8,6 @@ CATEGORIES= devel www pear
MAINTAINER= ports@FreeBSD.org
COMMENT= Tool to generate documentation from the source
-BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
-RUN_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
+USES= pear
-PEAR_AUTOINSTALL= yes
-
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear/bsd.pear.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/pear-PHPTAL/Makefile b/devel/pear-PHPTAL/Makefile
index 7a4fc2f8818a..0a46468a8c9a 100644
--- a/devel/pear-PHPTAL/Makefile
+++ b/devel/pear-PHPTAL/Makefile
@@ -9,33 +9,18 @@ MASTER_SITES= http://phptal.org/files/
MAINTAINER= tj@FreeBSD.org
COMMENT= PEAR PHPTAL is a XML/XHTML template library for PHP
-BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
-RUN_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
-
OPTIONS_DEFINE= GETTEXT SIMPLEXML JSON
GETTEXT_DESC= Enable GetText Support
SIMPLEXML_DESC= Enable SimpleXML Support
JSON_DESC= Enable JSON Support
-.include <bsd.port.options.mk>
+EXTRACT_SUFX= .tar.gz
+USES= pear
USE_PHP= ctype hash
-.if ${PORT_OPTIONS:MGETTEXT}
-USE_PHP+= gettext
-.endif
-
-.if ${PORT_OPTIONS:MSIMPLEXML}
-USE_PHP+= simplexml
-.endif
-
-.if ${PORT_OPTIONS:MJSON}
-USE_PHP+= json
-.endif
-
-PEAR_DIST_SUFX= .tar.gz
-PEAR_AUTOINSTALL= yes
+GETTEXT_USE= PHP=gettext
+SIMPLEXML_USE= PHP=simplexml
+JSON_USE= PHP=json
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear/bsd.pear.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/pear-PHPUnit3/Makefile b/devel/pear-PHPUnit3/Makefile
index 53ca8e4e4b3e..f718e115efcf 100644
--- a/devel/pear-PHPUnit3/Makefile
+++ b/devel/pear-PHPUnit3/Makefile
@@ -11,16 +11,14 @@ COMMENT= PEAR regression testing framework for unit tests
LICENSE= BSD
-BUILD_DEPENDS= pear>=1.9.4:${PORTSDIR}/devel/pear \
- pear-File_Iterator>=1.3.1:${PORTSDIR}/devel/pear-File_Iterator \
+BUILD_DEPENDS= pear-File_Iterator>=1.3.1:${PORTSDIR}/devel/pear-File_Iterator \
pear-Text_Template>=1.1.1:${PORTSDIR}/textproc/pear-Text_Template \
pear-PHP_CodeCoverage>=1.2.1:${PORTSDIR}/devel/pear-PHP_CodeCoverage \
pear-PHP_Timer>=1.0.2:${PORTSDIR}/devel/pear-PHP_Timer \
pear-PHPUnit_MockObject>=1.2.0:${PORTSDIR}/devel/pear-PHPUnit_MockObject \
pear-Symfony_Component_Yaml>=2.1.0:${PORTSDIR}/textproc/pear-Symfony_Component_Yaml \
${PEARDIR}/.channels/pear.phpunit.de.reg:${PORTSDIR}/devel/pear-channel-phpunit
-RUN_DEPENDS= pear>=1.9.4:${PORTSDIR}/devel/pear \
- pear-File_Iterator>=1.3.1:${PORTSDIR}/devel/pear-File_Iterator \
+RUN_DEPENDS= pear-File_Iterator>=1.3.1:${PORTSDIR}/devel/pear-File_Iterator \
pear-Text_Template>=1.1.1:${PORTSDIR}/textproc/pear-Text_Template \
pear-PHP_CodeCoverage>=1.2.1:${PORTSDIR}/devel/pear-PHP_CodeCoverage \
pear-PHP_Timer>=1.0.2:${PORTSDIR}/devel/pear-PHP_Timer \
@@ -30,10 +28,8 @@ RUN_DEPENDS= pear>=1.9.4:${PORTSDIR}/devel/pear \
CONFLICTS= pear-PHPUnit-[12]*
+USES= pear
PEAR_CHANNEL= phpunit
-PEAR_AUTOINSTALL= yes
-
-LATEST_LINK= pear-PHPUnit3
OPTIONS_DEFINE= JSON SIMPLEXML TOKENIZER
JSON_DESC= Enable JSON support
@@ -42,19 +38,8 @@ TOKENIZER_DESC= Enable Tokenizer support
USE_PHP= dom spl pcre
-.include <bsd.port.pre.mk>
-
-.if ${PORT_OPTIONS:MJSON}
-USE_PHP+= json
-.endif
-
-.if ${PORT_OPTIONS:MSIMPLEXML}
-USE_PHP+= simplexml
-.endif
-
-.if ${PORT_OPTIONS:MTOKENIZER}
-USE_PHP+= tokenizer
-.endif
+JSON_USE= PHP=json
+SIMPLEXML_USE= PHP=simplexml
+TOKENIZER_USE= PHP=tokenizer
-.include "${PORTSDIR}/devel/pear/bsd.pear.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/pear-PHPUnit_MockObject/Makefile b/devel/pear-PHPUnit_MockObject/Makefile
index 77f5be8732c0..4dfbc3c55ffa 100644
--- a/devel/pear-PHPUnit_MockObject/Makefile
+++ b/devel/pear-PHPUnit_MockObject/Makefile
@@ -12,16 +12,12 @@ COMMENT= Mock Object library for PHPUnit
LICENSE= BSD
-BUILD_DEPENDS= pear>=1.9.4:${PORTSDIR}/devel/pear \
- ${PEARDIR}/Text/Template.php:${PORTSDIR}/textproc/pear-Text_Template \
+BUILD_DEPENDS= ${PEARDIR}/Text/Template.php:${PORTSDIR}/textproc/pear-Text_Template \
${PEARDIR}/.channels/pear.phpunit.de.reg:${PORTSDIR}/devel/pear-channel-phpunit
-RUN_DEPENDS= pear>=1.9.4:${PORTSDIR}/devel/pear \
- ${PEARDIR}/Text/Template.php:${PORTSDIR}/textproc/pear-Text_Template \
+RUN_DEPENDS= ${PEARDIR}/Text/Template.php:${PORTSDIR}/textproc/pear-Text_Template \
${PEARDIR}/.channels/pear.phpunit.de.reg:${PORTSDIR}/devel/pear-channel-phpunit
+USES= pear
PEAR_CHANNEL= phpunit
-PEAR_AUTOINSTALL= yes
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear/bsd.pear.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/pear-PHP_ArrayOf/Makefile b/devel/pear-PHP_ArrayOf/Makefile
index 85875fbd149b..274c483e0bd2 100644
--- a/devel/pear-PHP_ArrayOf/Makefile
+++ b/devel/pear-PHP_ArrayOf/Makefile
@@ -8,11 +8,6 @@ CATEGORIES= devel www pear
MAINTAINER= miwi@FreeBSD.org
COMMENT= Abstract class package to create arrays of specific element types
-BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
-RUN_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
+USES= pear
-PEAR_AUTOINSTALL= yes
-
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear/bsd.pear.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/pear-PHP_Beautifier/Makefile b/devel/pear-PHP_Beautifier/Makefile
index 728a64291b36..2e5afdeba2c1 100644
--- a/devel/pear-PHP_Beautifier/Makefile
+++ b/devel/pear-PHP_Beautifier/Makefile
@@ -12,10 +12,7 @@ COMMENT= PEAR beautifier for PHP
BUILD_DEPENDS= ${PEARDIR}/Log.php:${PORTSDIR}/sysutils/pear-Log
RUN_DEPENDS= ${PEARDIR}/Log.php:${PORTSDIR}/sysutils/pear-Log
+USES= pear
USE_PHP= tokenizer bz2
-PEAR_AUTOINSTALL= yes
-DEFAULT_PHP_VER=5
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear/bsd.pear.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/pear-PHP_CodeBrowser/Makefile b/devel/pear-PHP_CodeBrowser/Makefile
index 27df4d8cbddf..5586f2fc1bfc 100644
--- a/devel/pear-PHP_CodeBrowser/Makefile
+++ b/devel/pear-PHP_CodeBrowser/Makefile
@@ -10,19 +10,15 @@ PKGNAMEPREFIX= pear-
MAINTAINER= gasol.wu@gmail.com
COMMENT= Code browser that augments the code with information
-BUILD_DEPENDS= pear>=1.8.1:${PORTSDIR}/devel/pear \
- pear-Console_CommandLine>=1.1.3:${PORTSDIR}/devel/pear-Console_CommandLine \
+BUILD_DEPENDS= pear-Console_CommandLine>=1.1.3:${PORTSDIR}/devel/pear-Console_CommandLine \
pear-File_Iterator>=1.3.0:${PORTSDIR}/devel/pear-File_Iterator \
pear-Log>=1.2.1:${PORTSDIR}/sysutils/pear-Log
-RUN_DEPENDS= pear>=1.8.1:${PORTSDIR}/devel/pear \
- pear-Console_CommandLine>=1.1.3:${PORTSDIR}/devel/pear-Console_CommandLine \
+RUN_DEPENDS= pear-Console_CommandLine>=1.1.3:${PORTSDIR}/devel/pear-Console_CommandLine \
pear-File_Iterator>=1.3.0:${PORTSDIR}/devel/pear-File_Iterator \
pear-Log>=1.2.1:${PORTSDIR}/sysutils/pear-Log
+USES= pear
USE_PHP= dom
PEAR_CHANNEL= phpunit
-PEAR_AUTOINSTALL= yes
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear/bsd.pear.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/pear-PHP_CodeCoverage/Makefile b/devel/pear-PHP_CodeCoverage/Makefile
index 9dffdf48b026..a723e5fa0dd1 100644
--- a/devel/pear-PHP_CodeCoverage/Makefile
+++ b/devel/pear-PHP_CodeCoverage/Makefile
@@ -12,34 +12,23 @@ COMMENT= Library that provides PHP code coverage information
LICENSE= BSD
-BUILD_DEPENDS= pear>=1.9.4:${PORTSDIR}/devel/pear \
- pear-File_Iterator>=1.3.0:${PORTSDIR}/devel/pear-File_Iterator \
+BUILD_DEPENDS= pear-File_Iterator>=1.3.0:${PORTSDIR}/devel/pear-File_Iterator \
pear-PHP_TokenStream>=1.1.3:${PORTSDIR}/devel/pear-PHP_TokenStream \
pear-Text_Template>=1.1.1:${PORTSDIR}/textproc/pear-Text_Template \
${PEARDIR}/.channels/pear.phpunit.de.reg:${PORTSDIR}/devel/pear-channel-phpunit
-RUN_DEPENDS= pear>=1.9.4:${PORTSDIR}/devel/pear \
- pear-File_Iterator>=1.3.0:${PORTSDIR}/devel/pear-File_Iterator \
+RUN_DEPENDS= pear-File_Iterator>=1.3.0:${PORTSDIR}/devel/pear-File_Iterator \
pear-PHP_TokenStream>=1.1.3:${PORTSDIR}/devel/pear-PHP_TokenStream \
pear-Text_Template>=1.1.1:${PORTSDIR}/textproc/pear-Text_Template \
${PEARDIR}/.channels/pear.phpunit.de.reg:${PORTSDIR}/devel/pear-channel-phpunit
+USES= pear
PEAR_CHANNEL= phpunit
-PEAR_AUTOINSTALL= yes
OPTIONS_DEFINE= DOM XDEBUG
DOM_DESC= Enable DOM support
XDEBUG_DESC= Enable Xdebug support
-.include <bsd.port.options.mk>
+DOM_USE= PHP=dom
+XDEBUG_RUN_DEPENDS= ${LOCALBASE}/lib/php/${PHP_EXT_DIR}/xdebug.so:${PORTSDIR}/devel/php-xdebug
-.if ${PORT_OPTIONS:MDOM}
-USE_PHP+= dom
-.endif
-
-.if ${PORT_OPTIONS:MXDEBUG}
-RUN_DEPENDS+= ${LOCALBASE}/lib/php/${PHP_EXT_DIR}/xdebug.so:${PORTSDIR}/devel/php-xdebug
-.endif
-
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear/bsd.pear.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/pear-PHP_CodeSniffer/Makefile b/devel/pear-PHP_CodeSniffer/Makefile
index 56770f9ea4eb..88f7c3615c98 100644
--- a/devel/pear-PHP_CodeSniffer/Makefile
+++ b/devel/pear-PHP_CodeSniffer/Makefile
@@ -10,11 +10,6 @@ COMMENT= PHP Script Tokenises and Sniffs PHP and JavaScript code
LICENSE= BSD3CLAUSE
-BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
-RUN_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
+USES= pear
-PEAR_AUTOINSTALL= yes
-
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear/bsd.pear.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/pear-PHP_Compat/Makefile b/devel/pear-PHP_Compat/Makefile
index d15177d5348e..0ff04e749665 100644
--- a/devel/pear-PHP_Compat/Makefile
+++ b/devel/pear-PHP_Compat/Makefile
@@ -8,12 +8,7 @@ CATEGORIES= devel www pear
MAINTAINER= miwi@FreeBSD.org
COMMENT= Provides missing functionality for older versions of PHP
-BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
-RUN_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
-
PORTSCOUT= skipv:1.6.0a1,1.6.0a2
-PEAR_AUTOINSTALL= yes
+USES= pear
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear/bsd.pear.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/pear-PHP_CompatInfo/Makefile b/devel/pear-PHP_CompatInfo/Makefile
index ac5db893cd27..1bcf223b199e 100644
--- a/devel/pear-PHP_CompatInfo/Makefile
+++ b/devel/pear-PHP_CompatInfo/Makefile
@@ -9,19 +9,15 @@ CATEGORIES= devel pear
MAINTAINER= miwi@FreeBSD.org
COMMENT= PEAR class to find out the minimum version and extensions required
-BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
-RUN_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear \
- ${PEARDIR}/Console/Table.php:${PORTSDIR}/devel/pear-Console_Table \
+RUN_DEPENDS= ${PEARDIR}/Console/Table.php:${PORTSDIR}/devel/pear-Console_Table \
${PEARDIR}/Console/Getargs.php:${PORTSDIR}/devel/pear-Console_Getargs \
${PEARDIR}/File/Find.php:${PORTSDIR}/sysutils/pear-File_Find \
${PEARDIR}/Event/Dispatcher.php:${PORTSDIR}/devel/pear-Event_Dispatcher
PORTSCOUT= skipv:1.9.0a1,1.9.0b1,1.9.0b2
USE_PHP= tokenizer
-USES= dos2unix
-PEAR_AUTOINSTALL= yes
+USES= dos2unix pear
-LATEST_LINK= pear-PHP_CompatInfo
OPTIONS_DEFINE= PEAR_XML_BEAUTIFIER PEAR_VAR_DUMP PEAR_PHPUNIT PEAR_XML_UTIL PEAR_HTML_TABLE
OPTIONS_DEFAULT= PEAR_PHPUNIT PEAR_XML_UTIL
PEAR_XML_BEAUTIFIER_DESC= PEAR::XML_Beautifier support
@@ -30,27 +26,10 @@ PEAR_PHPUNIT_DESC= PEAR::PHPUnit support
PEAR_XML_UTIL_DESC= PEAR::XML_Util support
PEAR_HTML_TABLE_DESC= PEAR::HTML_Table
-.include <bsd.port.options.mk>
+PEAR_XML_BEAUTIFIER_RUN_DEPENDS= ${PEARDIR}/XML/Beautifier.php:${PORTSDIR}/textproc/pear-XML_Beautifier
+PEAR_VAR_DUMP_RUN_DEPENDS= ${PEARDIR}/Var/Dump.php:${PORTSDIR}/devel/pear-Var_Dump
+PEAR_PHPUNIT_RUN_DEPENDS= ${PEARDIR}/PHPUnit/Autoload.php:${PORTSDIR}/devel/pear-PHPUnit3
+PEAR_XML_UTIL_RUN_DEPENDS= ${PEARDIR}/XML/Util.php:${PORTSDIR}/devel/pear-XML_Util
+PEAR_HTML_TABLE_RUN_DEPENDS= ${PEARDIR}/HTML/Table.php:${PORTSDIR}/devel/pear-HTML_Table
-.if ${PORT_OPTIONS:MPEAR_XML_BEAUTIFIER}
-RUN_DEPENDS+= ${PEARDIR}/XML/Beautifier.php:${PORTSDIR}/textproc/pear-XML_Beautifier
-.endif
-
-.if ${PORT_OPTIONS:MPEAR_VAR_DUMP}
-RUN_DEPENDS+= ${PEARDIR}/Var/Dump.php:${PORTSDIR}/devel/pear-Var_Dump
-.endif
-
-.if ${PORT_OPTIONS:MPEAR_PHPUNIT}
-RUN_DEPENDS+= ${PEARDIR}/PHPUnit/Autoload.php:${PORTSDIR}/devel/pear-PHPUnit3
-.endif
-
-.if ${PORT_OPTIONS:MPEAR_XML_UTIL}
-RUN_DEPENDS+= ${PEARDIR}/XML/Util.php:${PORTSDIR}/devel/pear-XML_Util
-.endif
-
-.if ${PORT_OPTIONS:MPEAR_HTML_TABLE}
-RUN_DEPENDS+=${PEARDIR}/HTML/Table.php:${PORTSDIR}/devel/pear-HTML_Table
-.endif
-
-.include "${PORTSDIR}/devel/pear/bsd.pear.mk"
.include <bsd.port.mk>
diff --git a/devel/pear-PHP_Depend/Makefile b/devel/pear-PHP_Depend/Makefile
index 9d22a9218106..b49d638d5b7b 100644
--- a/devel/pear-PHP_Depend/Makefile
+++ b/devel/pear-PHP_Depend/Makefile
@@ -12,15 +12,11 @@ COMMENT= PHP_Depend design quality metrics for PHP packages
LICENSE= BSD
-BUILD_DEPENDS= pear>=1.6.0:${PORTSDIR}/devel/pear \
- ${PEARDIR}/.channels/pear.pdepend.org.reg:${PORTSDIR}/devel/pear-channel-pdepend
-RUN_DEPENDS= pear>=1.6.0:${PORTSDIR}/devel/pear \
- ${PEARDIR}/.channels/pear.pdepend.org.reg:${PORTSDIR}/devel/pear-channel-pdepend
+BUILD_DEPENDS= ${PEARDIR}/.channels/pear.pdepend.org.reg:${PORTSDIR}/devel/pear-channel-pdepend
+RUN_DEPENDS= ${PEARDIR}/.channels/pear.pdepend.org.reg:${PORTSDIR}/devel/pear-channel-pdepend
+USES= pear
PEAR_CHANNEL= pdepend
-PEAR_AUTOINSTALL= yes
USE_PHP= dom tokenizer simplexml
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear/bsd.pear.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/pear-PHP_PMD/Makefile b/devel/pear-PHP_PMD/Makefile
index e4207331468a..a5bc99d81bd1 100644
--- a/devel/pear-PHP_PMD/Makefile
+++ b/devel/pear-PHP_PMD/Makefile
@@ -12,15 +12,11 @@ COMMENT= PHP Mess Detector
LICENSE= BSD
-BUILD_DEPENDS= pear>=1.6.0:${PORTSDIR}/devel/pear \
- ${PEARDIR}/.channels/pear.phpmd.org.reg:${PORTSDIR}/devel/pear-channel-phpmd
-RUN_DEPENDS= pear>=1.6.0:${PORTSDIR}/devel/pear \
- ${PEARDIR}/.channels/pear.phpmd.org.reg:${PORTSDIR}/devel/pear-channel-phpmd
+BUILD_DEPENDS= ${PEARDIR}/.channels/pear.phpmd.org.reg:${PORTSDIR}/devel/pear-channel-phpmd
+RUN_DEPENDS= ${PEARDIR}/.channels/pear.phpmd.org.reg:${PORTSDIR}/devel/pear-channel-phpmd
+USES= pear
PEAR_CHANNEL= phpmd
-PEAR_AUTOINSTALL= yes
USE_PHP= dom simplexml
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear/bsd.pear.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/pear-PHP_Parser/Makefile b/devel/pear-PHP_Parser/Makefile
index 1b64697fc4fa..22ee7b61cd48 100644
--- a/devel/pear-PHP_Parser/Makefile
+++ b/devel/pear-PHP_Parser/Makefile
@@ -8,11 +8,6 @@ CATEGORIES= devel www pear
MAINTAINER= miwi@FreeBSD.org
COMMENT= PHP Grammar Parser
-BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
-RUN_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
+USES= pear
-PEAR_AUTOINSTALL= yes
-
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear/bsd.pear.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/pear-PHP_ParserGenerator/Makefile b/devel/pear-PHP_ParserGenerator/Makefile
index 8cf0759c29dd..126096f98b81 100644
--- a/devel/pear-PHP_ParserGenerator/Makefile
+++ b/devel/pear-PHP_ParserGenerator/Makefile
@@ -8,11 +8,6 @@ CATEGORIES= devel www pear
MAINTAINER= miwi@FreeBSD.org
COMMENT= Convert files from lemon parser to php5
-BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
-RUN_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
+USES= pear
-PEAR_AUTOINSTALL= yes
-
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear/bsd.pear.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/pear-PHP_Timer/Makefile b/devel/pear-PHP_Timer/Makefile
index 37f9857d9eb0..c97af5a6047b 100644
--- a/devel/pear-PHP_Timer/Makefile
+++ b/devel/pear-PHP_Timer/Makefile
@@ -10,17 +10,10 @@ PKGNAMEPREFIX= pear-
MAINTAINER= gasol.wu@gmail.com
COMMENT= Utility class for timing
-BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear \
- ${PEARDIR}/.channels/pear.phpunit.de.reg:${PORTSDIR}/devel/pear-channel-phpunit
-RUN_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear \
- ${PEARDIR}/.channels/pear.phpunit.de.reg:${PORTSDIR}/devel/pear-channel-phpunit
+BUILD_DEPENDS= ${PEARDIR}/.channels/pear.phpunit.de.reg:${PORTSDIR}/devel/pear-channel-phpunit
+RUN_DEPENDS= ${PEARDIR}/.channels/pear.phpunit.de.reg:${PORTSDIR}/devel/pear-channel-phpunit
+USES= pear
PEAR_CHANNEL= phpunit
-PEAR_AUTOINSTALL= yes
-DEFAULT_PHP_VER=5
-IGNORE_WITH_PHP=52
-
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear/bsd.pear.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/pear-PHP_TokenStream/Makefile b/devel/pear-PHP_TokenStream/Makefile
index 6b12f9395812..7cbc296c9b70 100644
--- a/devel/pear-PHP_TokenStream/Makefile
+++ b/devel/pear-PHP_TokenStream/Makefile
@@ -12,14 +12,10 @@ COMMENT= Wrapper around PHP tokenizer extension
LICENSE= BSD
-BUILD_DEPENDS= pear>=1.9.4:${PORTSDIR}/devel/pear \
- ${PEARDIR}/.channels/pear.phpunit.de.reg:${PORTSDIR}/devel/pear-channel-phpunit
-RUN_DEPENDS= pear>=1.9.4:${PORTSDIR}/devel/pear \
- ${PEARDIR}/.channels/pear.phpunit.de.reg:${PORTSDIR}/devel/pear-channel-phpunit
+BUILD_DEPENDS= ${PEARDIR}/.channels/pear.phpunit.de.reg:${PORTSDIR}/devel/pear-channel-phpunit
+RUN_DEPENDS= ${PEARDIR}/.channels/pear.phpunit.de.reg:${PORTSDIR}/devel/pear-channel-phpunit
+USES= pear
PEAR_CHANNEL= phpunit
-PEAR_AUTOINSTALL= yes
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear/bsd.pear.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/pear-PHP_UML/Makefile b/devel/pear-PHP_UML/Makefile
index 8a4558816430..d2d38718f2a2 100644
--- a/devel/pear-PHP_UML/Makefile
+++ b/devel/pear-PHP_UML/Makefile
@@ -12,10 +12,7 @@ BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear \
${PEARDIR}/Console/CommandLine.php:${PORTSDIR}/devel/pear-Console_CommandLine
RUN_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
-PEAR_AUTOINSTALL= yes
-DEFAULT_PHP_VER= 5
+USES= pear
USE_PHP= spl xsl
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear/bsd.pear.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/pear-PPW/Makefile b/devel/pear-PPW/Makefile
index 694e8de9e1cd..bdbf7c6e30d0 100644
--- a/devel/pear-PPW/Makefile
+++ b/devel/pear-PPW/Makefile
@@ -21,9 +21,6 @@ RUN_DEPENDS= pear>=1.9.4:${PORTSDIR}/devel/pear \
pear-Text_Template>=1.1.0:${PORTSDIR}/textproc/pear-Text_Template
PEAR_CHANNEL= phpunit
-PEAR_AUTOINSTALL= yes
-IGNORE_WITH_PHP=52
+USES= pear
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear/bsd.pear.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/pear-Pager/Makefile b/devel/pear-Pager/Makefile
index b94f27fc4273..5f7b0e2b4c59 100644
--- a/devel/pear-Pager/Makefile
+++ b/devel/pear-Pager/Makefile
@@ -8,11 +8,6 @@ CATEGORIES= devel www pear
MAINTAINER= miwi@FreeBSD.org
COMMENT= PEAR data paging class
-BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
-RUN_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
+USES= pear
-PEAR_AUTOINSTALL= yes
-
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear/bsd.pear.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/pear-PhpDocumentor/Makefile b/devel/pear-PhpDocumentor/Makefile
index b7bcd072c55d..8e5c6762dccf 100644
--- a/devel/pear-PhpDocumentor/Makefile
+++ b/devel/pear-PhpDocumentor/Makefile
@@ -13,31 +13,15 @@ RUN_DEPENDS:= ${BUILD_DEPENDS}
CONFLICTS= pear-PHPDoc-[0-9]*
-LATEST_LINK= pear-${PORTNAME}
+USES= pear
OPTIONS_DEFINE= XML_BEAUTIFIER
XML_BEAUTIFIER_DESC= XML_Beautifier support
-PEAR_AUTOINSTALL= yes
-
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear/bsd.pear.mk"
-
-.if ${PORT_OPTIONS:MXML_BEAUTIFIER}
-RUN_DEPENDS+= ${PEARDIR}/XML/Beautifier.php:${PORTSDIR}/textproc/pear-XML_Beautifier
-.endif
-
-post-patch:
-.for file in ${SUBFILES}
- @${REINPLACE_CMD} -e 's|@VER@|${PORTVERSION}|g ; \
- s|@PEAR-DIR@|${PEARDIR}|g ; \
- s|@DATA-DIR@|${DATADIR:S,/${PORTNAME}$,,}|g ; \
- s|@WEB-DIR@|${DATADIR:S,/${PORTNAME}$,,}|g ; \
- s|@DOC-DIR@|${DOCSDIR:S,/${PORTNAME}$,,}|g' ${WRKSRC}/${file}
-.endfor
+XML_BEAUTIFIER_RUN_DEPENDS= ${PEARDIR}/XML/Beautifier.php:${PORTSDIR}/textproc/pear-XML_Beautifier
post-extract:
.for dir in ${DUMMYDIRS}
${TOUCH} ${WRKSRC}/${dir}/.peardummy
.endfor
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/pear-Pirum/Makefile b/devel/pear-Pirum/Makefile
index a50a6b465ddb..c4c4b10c0453 100644
--- a/devel/pear-Pirum/Makefile
+++ b/devel/pear-Pirum/Makefile
@@ -12,16 +12,10 @@ COMMENT= Simple PEAR channel server manager
LICENSE= MIT
-BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear \
- ${PEARDIR}/.channels/pear.pirum-project.org.reg:${PORTSDIR}/devel/pear-channel-pirum
-RUN_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear \
- ${PEARDIR}/.channels/pear.pirum-project.org.reg:${PORTSDIR}/devel/pear-channel-pirum
+BUILD_DEPENDS= ${PEARDIR}/.channels/pear.pirum-project.org.reg:${PORTSDIR}/devel/pear-channel-pirum
+RUN_DEPENDS= ${PEARDIR}/.channels/pear.pirum-project.org.reg:${PORTSDIR}/devel/pear-channel-pirum
PEAR_CHANNEL= pirum
-PEAR_AUTOINSTALL= yes
+USES= pear
-DEFAULT_PHP_VER=5
-
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear/bsd.pear.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/pear-SebastianBergmann_FinderFacade/Makefile b/devel/pear-SebastianBergmann_FinderFacade/Makefile
index 77b423d72400..22c2fb93b4e2 100644
--- a/devel/pear-SebastianBergmann_FinderFacade/Makefile
+++ b/devel/pear-SebastianBergmann_FinderFacade/Makefile
@@ -12,20 +12,14 @@ COMMENT= Convenience wrapper for Symfony's Finder component
LICENSE= BSD
-BUILD_DEPENDS= pear>=1.9.4:${PORTSDIR}/devel/pear \
- pear-TheSeer_fDOMDocument>=1.3.1:${PORTSDIR}/devel/pear-TheSeer_fDOMDocument \
+BUILD_DEPENDS= pear-TheSeer_fDOMDocument>=1.3.1:${PORTSDIR}/devel/pear-TheSeer_fDOMDocument \
pear-Symfony_Component_Finder>=2.2.0:${PORTSDIR}/devel/pear-Symfony_Component_Finder \
${PEARDIR}/.channels/pear.phpunit.de.reg:${PORTSDIR}/devel/pear-channel-phpunit
-RUN_DEPENDS= pear>=1.9.4:${PORTSDIR}/devel/pear \
- pear-TheSeer_fDOMDocument>=1.3.1:${PORTSDIR}/devel/pear-TheSeer_fDOMDocument \
+RUN_DEPENDS= pear-TheSeer_fDOMDocument>=1.3.1:${PORTSDIR}/devel/pear-TheSeer_fDOMDocument \
pear-Symfony_Component_Finder>=2.2.0:${PORTSDIR}/devel/pear-Symfony_Component_Finder \
${PEARDIR}/.channels/pear.phpunit.de.reg:${PORTSDIR}/devel/pear-channel-phpunit
PEAR_CHANNEL= phpunit
-PEAR_AUTOINSTALL= yes
+USES= pear
-IGNORE_WITH_PHP=52
-
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear/bsd.pear.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/pear-SebastianBergmann_Git/Makefile b/devel/pear-SebastianBergmann_Git/Makefile
index 9ec9cce54eda..2249d21a485e 100644
--- a/devel/pear-SebastianBergmann_Git/Makefile
+++ b/devel/pear-SebastianBergmann_Git/Makefile
@@ -17,11 +17,7 @@ BUILD_DEPENDS= pear>=1.9.4:${PORTSDIR}/devel/pear \
RUN_DEPENDS= pear>=1.9.4:${PORTSDIR}/devel/pear \
${PEARDIR}/.channels/pear.phpunit.de.reg:${PORTSDIR}/devel/pear-channel-phpunit
+USES= pear
PEAR_CHANNEL= phpunit
-PEAR_AUTOINSTALL= yes
-IGNORE_WITH_PHP=52
-
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear/bsd.pear.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/pear-SebastianBergmann_PHPCPD/Makefile b/devel/pear-SebastianBergmann_PHPCPD/Makefile
index f62328f4e184..44bc5f35873d 100644
--- a/devel/pear-SebastianBergmann_PHPCPD/Makefile
+++ b/devel/pear-SebastianBergmann_PHPCPD/Makefile
@@ -13,21 +13,17 @@ COMMENT= Copy/Paste Detector (CPD) for PHP code
LICENSE= BSD
-BUILD_DEPENDS= pear>=1.9.4:${PORTSDIR}/devel/pear \
- pear-ezc_ConsoleTools>=1.6:${PORTSDIR}/devel/pear-ezc_ConsoleTools \
+BUILD_DEPENDS= pear-ezc_ConsoleTools>=1.6:${PORTSDIR}/devel/pear-ezc_ConsoleTools \
pear-SebastianBergmann_FinderFacade>=1.0.4:${PORTSDIR}/devel/pear-SebastianBergmann_FinderFacade \
pear-PHP_Timer>=1.0.4:${PORTSDIR}/devel/pear-PHP_Timer \
${PEARDIR}/.channels/pear.phpunit.de.reg:${PORTSDIR}/devel/pear-channel-phpunit
-RUN_DEPENDS= pear>=1.9.4:${PORTSDIR}/devel/pear \
- pear-ezc_ConsoleTools>=1.6:${PORTSDIR}/devel/pear-ezc_ConsoleTools \
+RUN_DEPENDS= pear-ezc_ConsoleTools>=1.6:${PORTSDIR}/devel/pear-ezc_ConsoleTools \
pear-SebastianBergmann_FinderFacade>=1.0.4:${PORTSDIR}/devel/pear-SebastianBergmann_FinderFacade \
pear-PHP_Timer>=1.0.4:${PORTSDIR}/devel/pear-PHP_Timer \
${PEARDIR}/.channels/pear.phpunit.de.reg:${PORTSDIR}/devel/pear-channel-phpunit
USE_PHP= tokenizer
PEAR_CHANNEL= phpunit
-PEAR_AUTOINSTALL= yes
+USES= pear
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear/bsd.pear.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/pear-SebastianBergmann_PHPLOC/Makefile b/devel/pear-SebastianBergmann_PHPLOC/Makefile
index a4e35e9d2b65..d39539e5606e 100644
--- a/devel/pear-SebastianBergmann_PHPLOC/Makefile
+++ b/devel/pear-SebastianBergmann_PHPLOC/Makefile
@@ -13,8 +13,7 @@ COMMENT= Tool for quickly measuring the size of a PHP project
LICENSE= BSD
-BUILD_DEPENDS= pear>=1.9.4:${PORTSDIR}/devel/pear \
- pear-Symfony_Component_Console>=1.1.0:${PORTSDIR}/devel/pear-Symfony_Component_Console \
+BUILD_DEPENDS= pear-Symfony_Component_Console>=1.1.0:${PORTSDIR}/devel/pear-Symfony_Component_Console \
pear-SebastianBergmann_FinderFacade>=1.1.0:${PORTSDIR}/devel/pear-SebastianBergmann_FinderFacade \
pear-SebastianBergmann_Git>=1.0.0:${PORTSDIR}/devel/pear-SebastianBergmann_Git \
pear-SebastianBergmann_Version>=1.0.0:${PORTSDIR}/devel/pear-SebastianBergmann_Version \
@@ -23,8 +22,6 @@ RUN_DEPENDS:= ${BUILD_DEPENDS}
USE_PHP= tokenizer
PEAR_CHANNEL= phpunit
-PEAR_AUTOINSTALL= yes
+USES= pear
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear/bsd.pear.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/pear-SebastianBergmann_Version/Makefile b/devel/pear-SebastianBergmann_Version/Makefile
index 63aa88c25c18..530bdbcb23a4 100644
--- a/devel/pear-SebastianBergmann_Version/Makefile
+++ b/devel/pear-SebastianBergmann_Version/Makefile
@@ -12,16 +12,10 @@ COMMENT= Managing the version number of Git-hosted PHP projects
LICENSE= BSD
-BUILD_DEPENDS= pear>=1.9.4:${PORTSDIR}/devel/pear \
- ${PEARDIR}/.channels/pear.phpunit.de.reg:${PORTSDIR}/devel/pear-channel-phpunit
-RUN_DEPENDS= pear>=1.9.4:${PORTSDIR}/devel/pear \
- ${PEARDIR}/.channels/pear.phpunit.de.reg:${PORTSDIR}/devel/pear-channel-phpunit
+BUILD_DEPENDS= ${PEARDIR}/.channels/pear.phpunit.de.reg:${PORTSDIR}/devel/pear-channel-phpunit
+RUN_DEPENDS= ${PEARDIR}/.channels/pear.phpunit.de.reg:${PORTSDIR}/devel/pear-channel-phpunit
PEAR_CHANNEL= phpunit
-PEAR_AUTOINSTALL= yes
+USES= pear
-IGNORE_WITH_PHP=52
-
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear/bsd.pear.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/pear-Structure_LinkedList/Makefile b/devel/pear-Structure_LinkedList/Makefile
index f51abf20ca55..afaade9c06e5 100644
--- a/devel/pear-Structure_LinkedList/Makefile
+++ b/devel/pear-Structure_LinkedList/Makefile
@@ -8,8 +8,6 @@ CATEGORIES= devel pear
MAINTAINER= 5u623l20@gmail.com
COMMENT= Implements singly and doubly-linked lists
-PEAR_AUTOINSTALL= yes
+USES= pear
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear/bsd.pear.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/pear-Structures_DataGrid/Makefile b/devel/pear-Structures_DataGrid/Makefile
index 914a41e98461..66f6e18e47ef 100644
--- a/devel/pear-Structures_DataGrid/Makefile
+++ b/devel/pear-Structures_DataGrid/Makefile
@@ -8,11 +8,8 @@ CATEGORIES= devel www pear
MAINTAINER= miwi@FreeBSD.org
COMMENT= Full-featured tabular structured data management package
-BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
RUN_DEPENDS= ${PEARDIR}/Console/Table.php:${PORTSDIR}/devel/pear-Console_Table
-PEAR_AUTOINSTALL= yes
+USES= pear
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear/bsd.pear.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/pear-Structures_DataGrid_Renderer_Console/Makefile b/devel/pear-Structures_DataGrid_Renderer_Console/Makefile
index 1de321734777..12d4cf68da3b 100644
--- a/devel/pear-Structures_DataGrid_Renderer_Console/Makefile
+++ b/devel/pear-Structures_DataGrid_Renderer_Console/Makefile
@@ -8,12 +8,9 @@ CATEGORIES= devel www pear
MAINTAINER= miwi@FreeBSD.org
COMMENT= Console_Table Renderer for pear-Structures_DataGrid
-BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
RUN_DEPENDS= ${PEARDIR}/Structures/DataGrid.php:${PORTSDIR}/devel/pear-Structures_DataGrid \
${PEARDIR}/Console/Table.php:${PORTSDIR}/devel/pear-Console_Table
-PEAR_AUTOINSTALL= yes
+USES= pear
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear/bsd.pear.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/pear-Structures_DataGrid_Renderer_HTMLSortForm/Makefile b/devel/pear-Structures_DataGrid_Renderer_HTMLSortForm/Makefile
index a8a1c0b59a7a..faa89932d09e 100644
--- a/devel/pear-Structures_DataGrid_Renderer_HTMLSortForm/Makefile
+++ b/devel/pear-Structures_DataGrid_Renderer_HTMLSortForm/Makefile
@@ -8,12 +8,9 @@ CATEGORIES= devel www pear
MAINTAINER= miwi@FreeBSD.org
COMMENT= HTMLSortForm Renderer for pear-Structures_DataGrid
-BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
RUN_DEPENDS= ${PEARDIR}/Structures/DataGrid.php:${PORTSDIR}/devel/pear-Structures_DataGrid \
${PEARDIR}/HTML/QuickForm.php:${PORTSDIR}/devel/pear-HTML_QuickForm
-PEAR_AUTOINSTALL= yes
+USES= pear
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear/bsd.pear.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/pear-Structures_DataGrid_Renderer_HTMLTable/Makefile b/devel/pear-Structures_DataGrid_Renderer_HTMLTable/Makefile
index e34d0b823611..c2cf79dac752 100644
--- a/devel/pear-Structures_DataGrid_Renderer_HTMLTable/Makefile
+++ b/devel/pear-Structures_DataGrid_Renderer_HTMLTable/Makefile
@@ -8,13 +8,10 @@ CATEGORIES= devel www pear
MAINTAINER= miwi@FreeBSD.org
COMMENT= HTML_Table Renderer for pear-Structures_DataGrid
-BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
RUN_DEPENDS= ${PEARDIR}/Structures/DataGrid.php:${PORTSDIR}/devel/pear-Structures_DataGrid \
${PEARDIR}/HTML/Table.php:${PORTSDIR}/devel/pear-HTML_Table \
${PEARDIR}/Structures/DataGrid/Renderer/Pager.php:${PORTSDIR}/www/pear-Structures_DataGrid_Renderer_Pager
-PEAR_AUTOINSTALL= yes
+USES= pear
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear/bsd.pear.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/pear-Structures_DataGrid_Renderer_XUL/Makefile b/devel/pear-Structures_DataGrid_Renderer_XUL/Makefile
index 9efbf605b45c..0d122d0a5cdf 100644
--- a/devel/pear-Structures_DataGrid_Renderer_XUL/Makefile
+++ b/devel/pear-Structures_DataGrid_Renderer_XUL/Makefile
@@ -8,12 +8,9 @@ CATEGORIES= devel www pear
MAINTAINER= ports@FreeBSD.org
COMMENT= XUL Renderer for pear-Structures_DataGrid
-BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
RUN_DEPENDS= ${PEARDIR}/Structures/DataGrid.php:${PORTSDIR}/devel/pear-Structures_DataGrid \
${PEARDIR}/XML/Util.php:${PORTSDIR}/devel/pear-XML_Util
-PEAR_AUTOINSTALL= yes
+USES= pear
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear/bsd.pear.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/pear-System_Command/Makefile b/devel/pear-System_Command/Makefile
index 707870e57fd1..5a28a8831884 100644
--- a/devel/pear-System_Command/Makefile
+++ b/devel/pear-System_Command/Makefile
@@ -8,11 +8,6 @@ CATEGORIES= devel pear
MAINTAINER= miwi@FreeBSD.org
COMMENT= PEAR command line execution interface
-BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
-RUN_DEPENDS:= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
+USES= pear
-PEAR_AUTOINSTALL=yes
-
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear/bsd.pear.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/pear-Testing_Selenium/Makefile b/devel/pear-Testing_Selenium/Makefile
index 8c5ec6280e91..6e6688b714a4 100644
--- a/devel/pear-Testing_Selenium/Makefile
+++ b/devel/pear-Testing_Selenium/Makefile
@@ -8,11 +8,6 @@ CATEGORIES= devel pear
MAINTAINER= miwi@FreeBSD.org
COMMENT= PEAR Binding - Once more unto the breach
-BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
-RUN_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
+USES= pear
-PEAR_AUTOINSTALL= yes
-
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear/bsd.pear.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/pear-Text_Diff/Makefile b/devel/pear-Text_Diff/Makefile
index 611761a7069b..69d3835dd520 100644
--- a/devel/pear-Text_Diff/Makefile
+++ b/devel/pear-Text_Diff/Makefile
@@ -8,11 +8,6 @@ CATEGORIES= devel pear
MAINTAINER= joseph@randomnetworks.com
COMMENT= Engine for performing and rendering text diffs
-BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
-RUN_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
+USES= pear
-PEAR_AUTOINSTALL= yes
-
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear/bsd.pear.mk"
-.include <bsd.port.post.mk>
+.include <bsd.pear.mk>
diff --git a/devel/pear-TheSeer_DirectoryScanner/Makefile b/devel/pear-TheSeer_DirectoryScanner/Makefile
index 2600932e1777..345408b610eb 100644
--- a/devel/pear-TheSeer_DirectoryScanner/Makefile
+++ b/devel/pear-TheSeer_DirectoryScanner/Makefile
@@ -12,17 +12,11 @@ COMMENT= Recursive directory scanner and filter
LICENSE= BSD2CLAUSE
-BUILD_DEPENDS= pear>=1.8.1:${PORTSDIR}/devel/pear \
- ${PEARDIR}/.channels/pear.netpirates.net.reg:${PORTSDIR}/devel/pear-channel-theseer
-RUN_DEPENDS= pear>=1.8.1:${PORTSDIR}/devel/pear \
- ${PEARDIR}/.channels/pear.netpirates.net.reg:${PORTSDIR}/devel/pear-channel-theseer
+BUILD_DEPENDS= ${PEARDIR}/.channels/pear.netpirates.net.reg:${PORTSDIR}/devel/pear-channel-theseer
+RUN_DEPENDS= ${PEARDIR}/.channels/pear.netpirates.net.reg:${PORTSDIR}/devel/pear-channel-theseer
USE_PHP= fileinfo
PEAR_CHANNEL= theseer
-PEAR_AUTOINSTALL= yes
+USES= pear
-IGNORE_WITH_PHP= 52
-
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear/bsd.pear.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/pear-TheSeer_fDOMDocument/Makefile b/devel/pear-TheSeer_fDOMDocument/Makefile
index 29b0bdf31a90..37ae56d936ba 100644
--- a/devel/pear-TheSeer_fDOMDocument/Makefile
+++ b/devel/pear-TheSeer_fDOMDocument/Makefile
@@ -12,17 +12,11 @@ COMMENT= Extension to PHP's standard DOM
LICENSE= BSD3CLAUSE
-BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear \
- ${PEARDIR}/.channels/pear.netpirates.net.reg:${PORTSDIR}/devel/pear-channel-theseer
-RUN_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear \
- ${PEARDIR}/.channels/pear.netpirates.net.reg:${PORTSDIR}/devel/pear-channel-theseer
+BUILD_DEPENDS= ${PEARDIR}/.channels/pear.netpirates.net.reg:${PORTSDIR}/devel/pear-channel-theseer
+RUN_DEPENDS= ${PEARDIR}/.channels/pear.netpirates.net.reg:${PORTSDIR}/devel/pear-channel-theseer
USE_PHP= dom xml
PEAR_CHANNEL= theseer
-PEAR_AUTOINSTALL= yes
+USES= pear
-IGNORE_WITH_PHP= 52
-
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear/bsd.pear.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/pear-TheSeer_fXSL/Makefile b/devel/pear-TheSeer_fXSL/Makefile
index f1cbb7a7b03e..3a7036e26f60 100644
--- a/devel/pear-TheSeer_fXSL/Makefile
+++ b/devel/pear-TheSeer_fXSL/Makefile
@@ -13,17 +13,11 @@ COMMENT= XSL wrapper / extension to the PHP 5.x XSLTProcessor
LICENSE= BSD3CLAUSE
-BUILD_DEPENDS= pear>=1.9.1:${PORTSDIR}/devel/pear \
- ${PEARDIR}/.channels/pear.netpirates.net.reg:${PORTSDIR}/devel/pear-channel-theseer
-RUN_DEPENDS= pear>=1.9.1:${PORTSDIR}/devel/pear \
- ${PEARDIR}/.channels/pear.netpirates.net.reg:${PORTSDIR}/devel/pear-channel-theseer
+BUILD_DEPENDS= ${PEARDIR}/.channels/pear.netpirates.net.reg:${PORTSDIR}/devel/pear-channel-theseer
+RUN_DEPENDS= ${PEARDIR}/.channels/pear.netpirates.net.reg:${PORTSDIR}/devel/pear-channel-theseer
USE_PHP= dom xml xsl
PEAR_CHANNEL= theseer
-PEAR_AUTOINSTALL= yes
+USES= pear
-IGNORE_WITH_PHP=52
-
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear/bsd.pear.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/pear-TheSeer_phpDox/Makefile b/devel/pear-TheSeer_phpDox/Makefile
index a8d02ee5929e..33fedbcdb118 100644
--- a/devel/pear-TheSeer_phpDox/Makefile
+++ b/devel/pear-TheSeer_phpDox/Makefile
@@ -12,14 +12,12 @@ COMMENT= PHP Documentation generation framework and tool
LICENSE= BSD
-BUILD_DEPENDS= pear>=1.9.2:${PORTSDIR}/devel/pear \
- pear-TheSeer_DirectoryScanner>=1.1.0:${PORTSDIR}/devel/pear-TheSeer_DirectoryScanner \
+BUILD_DEPENDS= pear-TheSeer_DirectoryScanner>=1.1.0:${PORTSDIR}/devel/pear-TheSeer_DirectoryScanner \
pear-TheSeer_fDOMDocument>=1.2.3:${PORTSDIR}/devel/pear-TheSeer_fDOMDocument \
pear-TheSeer_fXSL>=1.0.4:${PORTSDIR}/devel/pear-TheSeer_fXSL \
pear-ezc_ConsoleTools>=1.6:${PORTSDIR}/devel/pear-ezc_ConsoleTools \
pear-pdepend_staticReflection>=0.2.1:${PORTSDIR}/devel/pear-pdepend-staticReflection
-RUN_DEPENDS= pear>=1.9.2:${PORTSDIR}/devel/pear \
- pear-TheSeer_DirectoryScanner>=1.1.0:${PORTSDIR}/devel/pear-TheSeer_DirectoryScanner \
+RUN_DEPENDS= pear-TheSeer_DirectoryScanner>=1.1.0:${PORTSDIR}/devel/pear-TheSeer_DirectoryScanner \
pear-TheSeer_fDOMDocument>=1.2.3:${PORTSDIR}/devel/pear-TheSeer_fDOMDocument \
pear-TheSeer_fXSL>=1.0.4:${PORTSDIR}/devel/pear-TheSeer_fXSL \
pear-ezc_ConsoleTools>=1.6:${PORTSDIR}/devel/pear-ezc_ConsoleTools \
@@ -27,10 +25,6 @@ RUN_DEPENDS= pear>=1.9.2:${PORTSDIR}/devel/pear \
USE_PHP= dom tokenizer xsl iconv
PEAR_CHANNEL= theseer
-PEAR_AUTOINSTALL= yes
+USES= pear
-IGNORE_WITH_PHP=52
-
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear/bsd.pear.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/pear-VFS/Makefile b/devel/pear-VFS/Makefile
index c923fe2907c0..4c379383a60d 100644
--- a/devel/pear-VFS/Makefile
+++ b/devel/pear-VFS/Makefile
@@ -8,14 +8,10 @@ CATEGORIES= devel pear
MAINTAINER= ports@FreeBSD.org
COMMENT= PEAR Virtual File System API
-BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear \
- ${PEARDIR}/Log/null.php:${PORTSDIR}/sysutils/pear-Log
-RUN_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear \
- ${PEARDIR}/Log/null.php:${PORTSDIR}/sysutils/pear-Log
+BUILD_DEPENDS= ${PEARDIR}/Log/null.php:${PORTSDIR}/sysutils/pear-Log
+RUN_DEPENDS= ${PEARDIR}/Log/null.php:${PORTSDIR}/sysutils/pear-Log
USE_PHP= gettext
-PEAR_AUTOINSTALL= yes
+USES= pear
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear/bsd.pear.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/pear-Validate/Makefile b/devel/pear-Validate/Makefile
index 8785166fde2f..ce504ef6f83d 100644
--- a/devel/pear-Validate/Makefile
+++ b/devel/pear-Validate/Makefile
@@ -8,11 +8,6 @@ CATEGORIES= devel www pear
MAINTAINER= miwi@FreeBSD.org
COMMENT= PEAR Validation class
-BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
-RUN_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
+USES= pear
-PEAR_AUTOINSTALL= yes
-
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear/bsd.pear.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/pear-Validate_AU/Makefile b/devel/pear-Validate_AU/Makefile
index 73f7df78638c..9a69a15a8cc7 100644
--- a/devel/pear-Validate_AU/Makefile
+++ b/devel/pear-Validate_AU/Makefile
@@ -9,11 +9,6 @@ CATEGORIES= devel www pear
MAINTAINER= miwi@FreeBSD.org
COMMENT= PEAR data validation class for Australia
-BUILD_DEPENDS= pear-Validate>=0.5.0:${PORTSDIR}/devel/pear-Validate
-RUN_DEPENDS= pear-Validate>=0.5.0:${PORTSDIR}/devel/pear-Validate
+USES= pear
-PEAR_AUTOINSTALL= yes
-
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear/bsd.pear.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/pear-Validate_Finance/Makefile b/devel/pear-Validate_Finance/Makefile
index c3df207c3e1c..a26be4ec3592 100644
--- a/devel/pear-Validate_Finance/Makefile
+++ b/devel/pear-Validate_Finance/Makefile
@@ -11,8 +11,6 @@ COMMENT= PEAR Finance Validation class
BUILD_DEPENDS= pear-Validate>=0.5.0:${PORTSDIR}/devel/pear-Validate
RUN_DEPENDS= pear-Validate>=0.5.0:${PORTSDIR}/devel/pear-Validate
-PEAR_AUTOINSTALL= yes
+USES= pear
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear/bsd.pear.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/pear-Validate_Finance_CreditCard/Makefile b/devel/pear-Validate_Finance_CreditCard/Makefile
index d076c7c581bc..13c4a34ca5c3 100644
--- a/devel/pear-Validate_Finance_CreditCard/Makefile
+++ b/devel/pear-Validate_Finance_CreditCard/Makefile
@@ -8,11 +8,6 @@ CATEGORIES= devel www pear
MAINTAINER= miwi@FreeBSD.org
COMMENT= PEAR CreditCard Validation class
-BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
-RUN_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
+USES= pear
-PEAR_AUTOINSTALL= yes
-
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear/bsd.pear.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/pear-Validate_US/Makefile b/devel/pear-Validate_US/Makefile
index 19e2b910bd1e..e2e0b514be09 100644
--- a/devel/pear-Validate_US/Makefile
+++ b/devel/pear-Validate_US/Makefile
@@ -11,8 +11,6 @@ COMMENT= PEAR data validation class for US
BUILD_DEPENDS= pear-Validate>=0.5.0:${PORTSDIR}/devel/pear-Validate
RUN_DEPENDS= pear-Validate>=0.5.0:${PORTSDIR}/devel/pear-Validate
-PEAR_AUTOINSTALL= yes
+USES= pear
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear/bsd.pear.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/pear-Var_Dump/Makefile b/devel/pear-Var_Dump/Makefile
index 683feee181f6..cb02d91f036f 100644
--- a/devel/pear-Var_Dump/Makefile
+++ b/devel/pear-Var_Dump/Makefile
@@ -8,11 +8,6 @@ CATEGORIES= devel www pear
MAINTAINER= ports@FreeBSD.org
COMMENT= Provides methods for dumping structured information about a variable
-BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
-RUN_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
+USES= pear
-PEAR_AUTOINSTALL= yes
-
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear/bsd.pear.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/pear-VersionControl_Git/Makefile b/devel/pear-VersionControl_Git/Makefile
index 30d54a9aadaf..f005819933bd 100644
--- a/devel/pear-VersionControl_Git/Makefile
+++ b/devel/pear-VersionControl_Git/Makefile
@@ -8,11 +8,6 @@ CATEGORIES= devel pear
MAINTAINER= miwi@FreeBSD.org
COMMENT= OO interface to handle Git repository
-BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
-RUN_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
+USES= pear
-PEAR_AUTOINSTALL= yes
-
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear/bsd.pear.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/pear-VersionControl_SVN/Makefile b/devel/pear-VersionControl_SVN/Makefile
index 44d91dfcec10..8205df61650d 100644
--- a/devel/pear-VersionControl_SVN/Makefile
+++ b/devel/pear-VersionControl_SVN/Makefile
@@ -10,14 +10,10 @@ COMMENT= Wrapper interface for the Subversion command-line client
LICENSE= BSD2CLAUSE
-BUILD_DEPENDS= pear>=1.9.4:${PORTSDIR}/devel/pear \
- pear-XML_Parser>=1.3.4:${PORTSDIR}/devel/pear-XML_Parser
-RUN_DEPENDS= pear>=1.9.4:${PORTSDIR}/devel/pear \
- pear-XML_Parser>=1.3.4:${PORTSDIR}/devel/pear-XML_Parser
+BUILD_DEPENDS= pear-XML_Parser>=1.3.4:${PORTSDIR}/devel/pear-XML_Parser
+RUN_DEPENDS= pear-XML_Parser>=1.3.4:${PORTSDIR}/devel/pear-XML_Parser
USE_PHP= yes
-PEAR_AUTOINSTALL= yes
+USES= pear
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear/bsd.pear.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/pear-XML_NITF/Makefile b/devel/pear-XML_NITF/Makefile
index 19dc2c2eea0c..2176f1569c50 100644
--- a/devel/pear-XML_NITF/Makefile
+++ b/devel/pear-XML_NITF/Makefile
@@ -11,8 +11,6 @@ COMMENT= PEAR NITF XML parser
BUILD_DEPENDS= ${PEARDIR}/XML/Parser.php:${PORTSDIR}/devel/pear-XML_Parser
RUN_DEPENDS= ${PEARDIR}/XML/Parser.php:${PORTSDIR}/devel/pear-XML_Parser
-PEAR_AUTOINSTALL= yes
+USES= pear
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear/bsd.pear.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/pear-XML_Parser/Makefile b/devel/pear-XML_Parser/Makefile
index 36e9ea3e3c26..64b3e520b47c 100644
--- a/devel/pear-XML_Parser/Makefile
+++ b/devel/pear-XML_Parser/Makefile
@@ -8,11 +8,6 @@ CATEGORIES= devel pear
MAINTAINER= miwi@FreeBSD.org
COMMENT= PEAR XML parsing class based on PHP's bundled expat
-BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
-RUN_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
+USES= pear
-PEAR_AUTOINSTALL= yes
-
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear/bsd.pear.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/pear-XML_RSS/Makefile b/devel/pear-XML_RSS/Makefile
index 9ea2d34dadfb..26b0e11eb2ba 100644
--- a/devel/pear-XML_RSS/Makefile
+++ b/devel/pear-XML_RSS/Makefile
@@ -8,12 +8,8 @@ CATEGORIES= devel www pear
MAINTAINER= miwi@FreeBSD.org
COMMENT= PEAR RSS parser
-BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
-RUN_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear \
- ${PEARDIR}/XML/Parser.php:${PORTSDIR}/devel/pear-XML_Parser
+RUN_DEPENDS= ${PEARDIR}/XML/Parser.php:${PORTSDIR}/devel/pear-XML_Parser
-PEAR_AUTOINSTALL= yes
+USES= pear
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear/bsd.pear.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/pear-XML_SVG/Makefile b/devel/pear-XML_SVG/Makefile
index 273a5cd38f49..0186ed7e7513 100644
--- a/devel/pear-XML_SVG/Makefile
+++ b/devel/pear-XML_SVG/Makefile
@@ -8,11 +8,6 @@ CATEGORIES= devel www pear
MAINTAINER= miwi@FreeBSD.org
COMMENT= PEAR object-oriented API for building SVG documents
-BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
-RUN_DEPENDS:= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
+USES= pear
-PEAR_AUTOINSTALL= yes
-
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear/bsd.pear.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/pear-XML_Serializer/Makefile b/devel/pear-XML_Serializer/Makefile
index 4468c160f797..8da7d367a7bd 100644
--- a/devel/pear-XML_Serializer/Makefile
+++ b/devel/pear-XML_Serializer/Makefile
@@ -13,8 +13,6 @@ BUILD_DEPENDS= ${PEARDIR}/XML/Parser.php:${PORTSDIR}/devel/pear-XML_Parser \
RUN_DEPENDS= ${PEARDIR}/XML/Parser.php:${PORTSDIR}/devel/pear-XML_Parser \
${PEARDIR}/XML/Util.php:${PORTSDIR}/devel/pear-XML_Util
-PEAR_AUTOINSTALL= yes
+USES= pear
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear/bsd.pear.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/pear-XML_Transformer/Makefile b/devel/pear-XML_Transformer/Makefile
index 3e26e6f96fe1..58bde05417d0 100644
--- a/devel/pear-XML_Transformer/Makefile
+++ b/devel/pear-XML_Transformer/Makefile
@@ -11,8 +11,6 @@ COMMENT= PEAR XML Transformations in PHP
BUILD_DEPENDS= ${PEARDIR}/XML/Util.php:${PORTSDIR}/devel/pear-XML_Util
RUN_DEPENDS:= ${PEARDIR}/XML/Util.php:${PORTSDIR}/devel/pear-XML_Util
-PEAR_AUTOINSTALL= yes
+USES= pear
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear/bsd.pear.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/pear-XML_Tree/Makefile b/devel/pear-XML_Tree/Makefile
index 81b11b3a9175..ad66fb3a897b 100644
--- a/devel/pear-XML_Tree/Makefile
+++ b/devel/pear-XML_Tree/Makefile
@@ -9,13 +9,9 @@ CATEGORIES= devel www pear
MAINTAINER= miwi@FreeBSD.org
COMMENT= PEAR class for representing XML data in a tree structure
-BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear \
- ${PEARDIR}/XML/Parser.php:${PORTSDIR}/devel/pear-XML_Parser
-RUN_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear \
- ${PEARDIR}/XML/Parser.php:${PORTSDIR}/devel/pear-XML_Parser
+BUILD_DEPENDS= ${PEARDIR}/XML/Parser.php:${PORTSDIR}/devel/pear-XML_Parser
+RUN_DEPENDS= ${PEARDIR}/XML/Parser.php:${PORTSDIR}/devel/pear-XML_Parser
-PEAR_AUTOINSTALL= yes
+USES= pear
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear/bsd.pear.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/pear-XML_Util/Makefile b/devel/pear-XML_Util/Makefile
index 66a343d9f461..311b3baa23f8 100644
--- a/devel/pear-XML_Util/Makefile
+++ b/devel/pear-XML_Util/Makefile
@@ -8,11 +8,6 @@ CATEGORIES= devel www pear
MAINTAINER= miwi@FreeBSD.org
COMMENT= PEAR XML utility class
-BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
-RUN_DEPENDS:= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
+USES= pear
-PEAR_AUTOINSTALL= yes
-
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear/bsd.pear.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/pear-codegen/Makefile b/devel/pear-codegen/Makefile
index bda059bde49f..e1909465bb54 100644
--- a/devel/pear-codegen/Makefile
+++ b/devel/pear-codegen/Makefile
@@ -9,11 +9,6 @@ DISTNAME= CodeGen-${PORTVERSION}
MAINTAINER= miwi@FreeBSD.org
COMMENT= Tool to create code generators that operate on XML descriptions
-BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
-RUN_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
+USES= pear
-PEAR_AUTOINSTALL= yes
-
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear/bsd.pear.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/pear-ezc_Base/Makefile b/devel/pear-ezc_Base/Makefile
index 651a5fb1321b..ffc947b13ee6 100644
--- a/devel/pear-ezc_Base/Makefile
+++ b/devel/pear-ezc_Base/Makefile
@@ -12,14 +12,10 @@ COMMENT= Base package that all ezc components packages rely on
LICENSE= BSD
-BUILD_DEPENDS= pear>=1.4.2:${PORTSDIR}/devel/pear \
- ${PEARDIR}/.channels/components.ez.no.reg:${PORTSDIR}/devel/pear-channel-ezc
-RUN_DEPENDS= pear>=1.4.2:${PORTSDIR}/devel/pear \
- ${PEARDIR}/.channels/components.ez.no.reg:${PORTSDIR}/devel/pear-channel-ezc
+BUILD_DEPENDS= ${PEARDIR}/.channels/components.ez.no.reg:${PORTSDIR}/devel/pear-channel-ezc
+RUN_DEPENDS= ${PEARDIR}/.channels/components.ez.no.reg:${PORTSDIR}/devel/pear-channel-ezc
PEAR_CHANNEL= ezc
-PEAR_AUTOINSTALL= yes
+USES= pear
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear/bsd.pear.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/pear-ezc_ConsoleTools/Makefile b/devel/pear-ezc_ConsoleTools/Makefile
index b3bcadfd4e7f..a3786f5522ca 100644
--- a/devel/pear-ezc_ConsoleTools/Makefile
+++ b/devel/pear-ezc_ConsoleTools/Makefile
@@ -12,16 +12,12 @@ COMMENT= Set of classes to do different actions with the console
LICENSE= BSD
-BUILD_DEPENDS= pear>=1.4.2:${PORTSDIR}/devel/pear \
- pear-ezc_Base>=1.8:${PORTSDIR}/devel/pear-ezc_Base \
+BUILD_DEPENDS= pear-ezc_Base>=1.8:${PORTSDIR}/devel/pear-ezc_Base \
${PEARDIR}/.channels/components.ez.no.reg:${PORTSDIR}/devel/pear-channel-ezc
-RUN_DEPENDS= pear>=1.4.2:${PORTSDIR}/devel/pear \
- pear-ezc_Base>=1.8:${PORTSDIR}/devel/pear-ezc_Base \
+RUN_DEPENDS= pear-ezc_Base>=1.8:${PORTSDIR}/devel/pear-ezc_Base \
${PEARDIR}/.channels/components.ez.no.reg:${PORTSDIR}/devel/pear-channel-ezc
PEAR_CHANNEL= ezc
-PEAR_AUTOINSTALL= yes
+USES= pear
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear/bsd.pear.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/pear-htmlpurifier/Makefile b/devel/pear-htmlpurifier/Makefile
index 109be64ae5a1..744d01d27a02 100644
--- a/devel/pear-htmlpurifier/Makefile
+++ b/devel/pear-htmlpurifier/Makefile
@@ -16,11 +16,9 @@ COMMENT= PHP HTML filter library
LICENSE= LGPL21
BUILD_DEPENDS= ${PEARDIR}/.channels/htmlpurifier.org.reg:${PORTSDIR}/devel/pear-channel-htmlpurifier
-RUN_DEPENDS:= ${BUILD_DEPENDS}
+RUN_DEPENDS= ${PEARDIR}/.channels/htmlpurifier.org.reg:${PORTSDIR}/devel/pear-channel-htmlpurifier
PEAR_CHANNEL= htmlpurifier.org
-PEAR_AUTOINSTALL= yes
+USES= pear
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear/bsd.pear.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/pear-pdepend-staticReflection/Makefile b/devel/pear-pdepend-staticReflection/Makefile
index 810c6cfe261e..62dbdb369ef4 100644
--- a/devel/pear-pdepend-staticReflection/Makefile
+++ b/devel/pear-pdepend-staticReflection/Makefile
@@ -12,16 +12,11 @@ COMMENT= staticReflection package for PHP
LICENSE= BSD
-BUILD_DEPENDS= pear>=1.6.0:${PORTSDIR}/devel/pear \
- ${PEARDIR}/.channels/pear.pdepend.org.reg:${PORTSDIR}/devel/pear-channel-pdepend
-RUN_DEPENDS= pear>=1.6.0:${PORTSDIR}/devel/pear \
- ${PEARDIR}/.channels/pear.pdepend.org.reg:${PORTSDIR}/devel/pear-channel-pdepend
+BUILD_DEPENDS= ${PEARDIR}/.channels/pear.pdepend.org.reg:${PORTSDIR}/devel/pear-channel-pdepend
+RUN_DEPENDS= ${PEARDIR}/.channels/pear.pdepend.org.reg:${PORTSDIR}/devel/pear-channel-pdepend
USE_PHP= tokenizer
PEAR_CHANNEL= pdepend
-PEAR_AUTOINSTALL= yes
-IGNORE_WITH_PHP=52
+USES= pear
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear/bsd.pear.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/pear-phing/Makefile b/devel/pear-phing/Makefile
index 7a7ec3470cdd..9481e456938f 100644
--- a/devel/pear-phing/Makefile
+++ b/devel/pear-phing/Makefile
@@ -12,12 +12,9 @@ COMMENT= PHP project build system based on Apache Ant
LICENSE= LGPL3
PEAR_CHANNEL= phing
-PEAR_AUTOINSTALL= yes
-IGNORE_WITH_PHP=52
+USES= pear
BUILD_DEPENDS+= ${PEARDIR}/.channels/pear.phing.info.reg:${PORTSDIR}/devel/pear-channel-phing
RUN_DEPENDS+= ${PEARDIR}/.channels/pear.phing.info.reg:${PORTSDIR}/devel/pear-channel-phing
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear/bsd.pear.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>