Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 23 Sep 2014 15:15:05 +0000 (UTC)
From:      Baptiste Daroussin <bapt@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r369068 - in head: devel/pear-Config devel/pear-Console_Color devel/pear-Console_CommandLine devel/pear-Console_Getargs devel/pear-Console_Table devel/pear-Date devel/pear-Date_Holidays...
Message-ID:  <201409231515.s8NFF5MO041866@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: bapt
Date: Tue Sep 23 15:15:04 2014
New Revision: 369068
URL: http://svnweb.freebsd.org/changeset/ports/369068
QAT: https://qat.redports.org/buildarchive/r369068/

Log:
  Convert to USES=pear

Modified:
  head/devel/pear-Config/Makefile
  head/devel/pear-Console_Color/Makefile
  head/devel/pear-Console_CommandLine/Makefile
  head/devel/pear-Console_Getargs/Makefile
  head/devel/pear-Console_Table/Makefile
  head/devel/pear-Date/Makefile
  head/devel/pear-Date_Holidays/Makefile
  head/devel/pear-Date_Holidays_Austria/Makefile
  head/devel/pear-Date_Holidays_Brazil/Makefile
  head/devel/pear-Date_Holidays_Denmark/Makefile
  head/devel/pear-Date_Holidays_Discordian/Makefile
  head/devel/pear-Date_Holidays_EnglandWales/Makefile
  head/devel/pear-Date_Holidays_Germany/Makefile
  head/devel/pear-Date_Holidays_Iceland/Makefile
  head/devel/pear-Date_Holidays_Ireland/Makefile
  head/devel/pear-Date_Holidays_Italy/Makefile
  head/devel/pear-Date_Holidays_Italy/pkg-plist
  head/devel/pear-Date_Holidays_Japan/Makefile
  head/devel/pear-Date_Holidays_Netherlands/Makefile
  head/devel/pear-Date_Holidays_Norway/Makefile
  head/devel/pear-Date_Holidays_Norway/pkg-plist
  head/devel/pear-Date_Holidays_PHPdotNet/Makefile
  head/devel/pear-Date_Holidays_PHPdotNet/pkg-plist
  head/devel/pear-Date_Holidays_Romania/Makefile
  head/devel/pear-Date_Holidays_Slovenia/Makefile
  head/devel/pear-Date_Holidays_Sweden/Makefile
  head/devel/pear-Date_Holidays_UNO/Makefile
  head/devel/pear-Date_Holidays_USA/Makefile
  head/devel/pear-Date_Holidays_Ukraine/Makefile
  head/devel/pear-Event_Dispatcher/Makefile
  head/devel/pear-FSM/Makefile
  head/devel/pear-File_Iterator/Makefile
  head/devel/pear-HTML_BBCodeParser/Makefile
  head/devel/pear-HTML_CSS/Makefile
  head/devel/pear-HTML_Common/Makefile
  head/devel/pear-HTML_Common2/Makefile
  head/devel/pear-HTML_Form/Makefile
  head/devel/pear-HTML_Javascript/Makefile
  head/devel/pear-HTML_Page2/Makefile
  head/devel/pear-HTML_QuickForm/Makefile
  head/devel/pear-HTML_QuickForm2/Makefile
  head/devel/pear-HTML_QuickForm_Controller/Makefile
  head/devel/pear-HTML_QuickForm_Livesearch/Makefile
  head/devel/pear-HTML_QuickForm_Renderer_Tableless/Makefile
  head/devel/pear-HTML_QuickForm_SelectFilter/Makefile
  head/devel/pear-HTML_QuickForm_advmultiselect/Makefile
  head/devel/pear-HTML_Select/Makefile
  head/devel/pear-HTML_Select_Common/Makefile
  head/devel/pear-HTML_Table/Makefile
  head/devel/pear-HTML_Template_Flexy/Makefile
  head/devel/pear-HTML_Template_IT/Makefile
  head/devel/pear-HTML_Template_PHPLIB/Makefile
  head/devel/pear-HTML_Template_Sigma/Makefile
  head/devel/pear-HTML_TreeMenu/Makefile
  head/devel/pear-I18N/Makefile
  head/devel/pear-IO_Bit/Makefile
  head/devel/pear-Math_Fraction/Makefile
  head/devel/pear-Net_Gearman/Makefile
  head/devel/pear-OLE/Makefile
  head/devel/pear-PEAR_Info/Makefile
  head/devel/pear-PEAR_PackageFileManager/Makefile
  head/devel/pear-PEAR_PackageFileManager2/Makefile
  head/devel/pear-PEAR_PackageFileManager_Plugins/Makefile
  head/devel/pear-PHPDoc/Makefile
  head/devel/pear-PHPTAL/Makefile
  head/devel/pear-PHPUnit3/Makefile
  head/devel/pear-PHPUnit_MockObject/Makefile
  head/devel/pear-PHP_ArrayOf/Makefile
  head/devel/pear-PHP_Beautifier/Makefile
  head/devel/pear-PHP_CodeBrowser/Makefile
  head/devel/pear-PHP_CodeCoverage/Makefile
  head/devel/pear-PHP_CodeSniffer/Makefile
  head/devel/pear-PHP_Compat/Makefile
  head/devel/pear-PHP_CompatInfo/Makefile
  head/devel/pear-PHP_Depend/Makefile
  head/devel/pear-PHP_PMD/Makefile
  head/devel/pear-PHP_Parser/Makefile
  head/devel/pear-PHP_ParserGenerator/Makefile
  head/devel/pear-PHP_Timer/Makefile
  head/devel/pear-PHP_TokenStream/Makefile
  head/devel/pear-PHP_UML/Makefile
  head/devel/pear-PPW/Makefile
  head/devel/pear-Pager/Makefile
  head/devel/pear-PhpDocumentor/Makefile
  head/devel/pear-Pirum/Makefile
  head/devel/pear-SebastianBergmann_FinderFacade/Makefile
  head/devel/pear-SebastianBergmann_Git/Makefile
  head/devel/pear-SebastianBergmann_PHPCPD/Makefile
  head/devel/pear-SebastianBergmann_PHPLOC/Makefile
  head/devel/pear-SebastianBergmann_Version/Makefile
  head/devel/pear-Structure_LinkedList/Makefile
  head/devel/pear-Structures_DataGrid/Makefile
  head/devel/pear-Structures_DataGrid_Renderer_Console/Makefile
  head/devel/pear-Structures_DataGrid_Renderer_HTMLSortForm/Makefile
  head/devel/pear-Structures_DataGrid_Renderer_HTMLTable/Makefile
  head/devel/pear-Structures_DataGrid_Renderer_XUL/Makefile
  head/devel/pear-System_Command/Makefile
  head/devel/pear-Testing_Selenium/Makefile
  head/devel/pear-Text_Diff/Makefile
  head/devel/pear-TheSeer_DirectoryScanner/Makefile
  head/devel/pear-TheSeer_fDOMDocument/Makefile
  head/devel/pear-TheSeer_fXSL/Makefile
  head/devel/pear-TheSeer_phpDox/Makefile
  head/devel/pear-VFS/Makefile
  head/devel/pear-Validate/Makefile
  head/devel/pear-Validate_AU/Makefile
  head/devel/pear-Validate_Finance/Makefile
  head/devel/pear-Validate_Finance_CreditCard/Makefile
  head/devel/pear-Validate_US/Makefile
  head/devel/pear-Var_Dump/Makefile
  head/devel/pear-VersionControl_Git/Makefile
  head/devel/pear-VersionControl_SVN/Makefile
  head/devel/pear-XML_NITF/Makefile
  head/devel/pear-XML_Parser/Makefile
  head/devel/pear-XML_RSS/Makefile
  head/devel/pear-XML_SVG/Makefile
  head/devel/pear-XML_Serializer/Makefile
  head/devel/pear-XML_Transformer/Makefile
  head/devel/pear-XML_Tree/Makefile
  head/devel/pear-XML_Util/Makefile
  head/devel/pear-codegen/Makefile
  head/devel/pear-ezc_Base/Makefile
  head/devel/pear-ezc_ConsoleTools/Makefile
  head/devel/pear-htmlpurifier/Makefile
  head/devel/pear-pdepend-staticReflection/Makefile
  head/devel/pear-phing/Makefile
  head/dns/pear-File_DNS/Makefile
  head/dns/pear-Net_DNS/Makefile
  head/dns/pear-Net_DNS2/Makefile

Modified: head/devel/pear-Config/Makefile
==============================================================================
--- head/devel/pear-Config/Makefile	Tue Sep 23 15:03:22 2014	(r369067)
+++ head/devel/pear-Config/Makefile	Tue Sep 23 15:15:04 2014	(r369068)
@@ -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>

Modified: head/devel/pear-Console_Color/Makefile
==============================================================================
--- head/devel/pear-Console_Color/Makefile	Tue Sep 23 15:03:22 2014	(r369067)
+++ head/devel/pear-Console_Color/Makefile	Tue Sep 23 15:15:04 2014	(r369068)
@@ -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>

Modified: head/devel/pear-Console_CommandLine/Makefile
==============================================================================
--- head/devel/pear-Console_CommandLine/Makefile	Tue Sep 23 15:03:22 2014	(r369067)
+++ head/devel/pear-Console_CommandLine/Makefile	Tue Sep 23 15:15:04 2014	(r369068)
@@ -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>

Modified: head/devel/pear-Console_Getargs/Makefile
==============================================================================
--- head/devel/pear-Console_Getargs/Makefile	Tue Sep 23 15:03:22 2014	(r369067)
+++ head/devel/pear-Console_Getargs/Makefile	Tue Sep 23 15:15:04 2014	(r369068)
@@ -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>

Modified: head/devel/pear-Console_Table/Makefile
==============================================================================
--- head/devel/pear-Console_Table/Makefile	Tue Sep 23 15:03:22 2014	(r369067)
+++ head/devel/pear-Console_Table/Makefile	Tue Sep 23 15:15:04 2014	(r369068)
@@ -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>

Modified: head/devel/pear-Date/Makefile
==============================================================================
--- head/devel/pear-Date/Makefile	Tue Sep 23 15:03:22 2014	(r369067)
+++ head/devel/pear-Date/Makefile	Tue Sep 23 15:15:04 2014	(r369068)
@@ -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>

Modified: head/devel/pear-Date_Holidays/Makefile
==============================================================================
--- head/devel/pear-Date_Holidays/Makefile	Tue Sep 23 15:03:22 2014	(r369067)
+++ head/devel/pear-Date_Holidays/Makefile	Tue Sep 23 15:15:04 2014	(r369068)
@@ -13,17 +13,11 @@ BUILD_DEPENDS=	${PEARDIR}/Date.php:${POR
 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>

Modified: head/devel/pear-Date_Holidays_Austria/Makefile
==============================================================================
--- head/devel/pear-Date_Holidays_Austria/Makefile	Tue Sep 23 15:03:22 2014	(r369067)
+++ head/devel/pear-Date_Holidays_Austria/Makefile	Tue Sep 23 15:15:04 2014	(r369068)
@@ -10,8 +10,6 @@ COMMENT=	Driver based class to calculate
 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>

Modified: head/devel/pear-Date_Holidays_Brazil/Makefile
==============================================================================
--- head/devel/pear-Date_Holidays_Brazil/Makefile	Tue Sep 23 15:03:22 2014	(r369067)
+++ head/devel/pear-Date_Holidays_Brazil/Makefile	Tue Sep 23 15:15:04 2014	(r369068)
@@ -10,8 +10,6 @@ COMMENT=	Driver based class to calculate
 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>

Modified: head/devel/pear-Date_Holidays_Denmark/Makefile
==============================================================================
--- head/devel/pear-Date_Holidays_Denmark/Makefile	Tue Sep 23 15:03:22 2014	(r369067)
+++ head/devel/pear-Date_Holidays_Denmark/Makefile	Tue Sep 23 15:15:04 2014	(r369068)
@@ -10,8 +10,6 @@ COMMENT=	Driver based class to calculate
 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>

Modified: head/devel/pear-Date_Holidays_Discordian/Makefile
==============================================================================
--- head/devel/pear-Date_Holidays_Discordian/Makefile	Tue Sep 23 15:03:22 2014	(r369067)
+++ head/devel/pear-Date_Holidays_Discordian/Makefile	Tue Sep 23 15:15:04 2014	(r369068)
@@ -10,8 +10,6 @@ COMMENT=	Driver based class to calculate
 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>

Modified: head/devel/pear-Date_Holidays_EnglandWales/Makefile
==============================================================================
--- head/devel/pear-Date_Holidays_EnglandWales/Makefile	Tue Sep 23 15:03:22 2014	(r369067)
+++ head/devel/pear-Date_Holidays_EnglandWales/Makefile	Tue Sep 23 15:15:04 2014	(r369068)
@@ -10,8 +10,6 @@ COMMENT=	Driver based class to calculate
 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>

Modified: head/devel/pear-Date_Holidays_Germany/Makefile
==============================================================================
--- head/devel/pear-Date_Holidays_Germany/Makefile	Tue Sep 23 15:03:22 2014	(r369067)
+++ head/devel/pear-Date_Holidays_Germany/Makefile	Tue Sep 23 15:15:04 2014	(r369068)
@@ -11,8 +11,6 @@ COMMENT=	Driver based class to calculate
 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>

Modified: head/devel/pear-Date_Holidays_Iceland/Makefile
==============================================================================
--- head/devel/pear-Date_Holidays_Iceland/Makefile	Tue Sep 23 15:03:22 2014	(r369067)
+++ head/devel/pear-Date_Holidays_Iceland/Makefile	Tue Sep 23 15:15:04 2014	(r369068)
@@ -10,8 +10,6 @@ COMMENT=	Driver based class to calculate
 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>

Modified: head/devel/pear-Date_Holidays_Ireland/Makefile
==============================================================================
--- head/devel/pear-Date_Holidays_Ireland/Makefile	Tue Sep 23 15:03:22 2014	(r369067)
+++ head/devel/pear-Date_Holidays_Ireland/Makefile	Tue Sep 23 15:15:04 2014	(r369068)
@@ -10,8 +10,6 @@ COMMENT=	Driver based class to calculate
 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>

Modified: head/devel/pear-Date_Holidays_Italy/Makefile
==============================================================================
--- head/devel/pear-Date_Holidays_Italy/Makefile	Tue Sep 23 15:03:22 2014	(r369067)
+++ head/devel/pear-Date_Holidays_Italy/Makefile	Tue Sep 23 15:15:04 2014	(r369068)
@@ -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>

Modified: head/devel/pear-Date_Holidays_Italy/pkg-plist
==============================================================================
--- head/devel/pear-Date_Holidays_Italy/pkg-plist	Tue Sep 23 15:03:22 2014	(r369067)
+++ head/devel/pear-Date_Holidays_Italy/pkg-plist	Tue Sep 23 15:15:04 2014	(r369068)
@@ -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

Modified: head/devel/pear-Date_Holidays_Japan/Makefile
==============================================================================
--- head/devel/pear-Date_Holidays_Japan/Makefile	Tue Sep 23 15:03:22 2014	(r369067)
+++ head/devel/pear-Date_Holidays_Japan/Makefile	Tue Sep 23 15:15:04 2014	(r369068)
@@ -10,8 +10,6 @@ COMMENT=	Driver based class to calculate
 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>

Modified: head/devel/pear-Date_Holidays_Netherlands/Makefile
==============================================================================
--- head/devel/pear-Date_Holidays_Netherlands/Makefile	Tue Sep 23 15:03:22 2014	(r369067)
+++ head/devel/pear-Date_Holidays_Netherlands/Makefile	Tue Sep 23 15:15:04 2014	(r369068)
@@ -10,9 +10,6 @@ COMMENT=	Driver based class to calculate
 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>

Modified: head/devel/pear-Date_Holidays_Norway/Makefile
==============================================================================
--- head/devel/pear-Date_Holidays_Norway/Makefile	Tue Sep 23 15:03:22 2014	(r369067)
+++ head/devel/pear-Date_Holidays_Norway/Makefile	Tue Sep 23 15:15:04 2014	(r369068)
@@ -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>

Modified: head/devel/pear-Date_Holidays_Norway/pkg-plist
==============================================================================
--- head/devel/pear-Date_Holidays_Norway/pkg-plist	Tue Sep 23 15:03:22 2014	(r369067)
+++ head/devel/pear-Date_Holidays_Norway/pkg-plist	Tue Sep 23 15:15:04 2014	(r369068)
@@ -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

Modified: head/devel/pear-Date_Holidays_PHPdotNet/Makefile
==============================================================================
--- head/devel/pear-Date_Holidays_PHPdotNet/Makefile	Tue Sep 23 15:03:22 2014	(r369067)
+++ head/devel/pear-Date_Holidays_PHPdotNet/Makefile	Tue Sep 23 15:15:04 2014	(r369068)
@@ -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>

Modified: head/devel/pear-Date_Holidays_PHPdotNet/pkg-plist
==============================================================================
--- head/devel/pear-Date_Holidays_PHPdotNet/pkg-plist	Tue Sep 23 15:03:22 2014	(r369067)
+++ head/devel/pear-Date_Holidays_PHPdotNet/pkg-plist	Tue Sep 23 15:15:04 2014	(r369068)
@@ -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

Modified: head/devel/pear-Date_Holidays_Romania/Makefile
==============================================================================
--- head/devel/pear-Date_Holidays_Romania/Makefile	Tue Sep 23 15:03:22 2014	(r369067)
+++ head/devel/pear-Date_Holidays_Romania/Makefile	Tue Sep 23 15:15:04 2014	(r369068)
@@ -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>

Modified: head/devel/pear-Date_Holidays_Slovenia/Makefile
==============================================================================
--- head/devel/pear-Date_Holidays_Slovenia/Makefile	Tue Sep 23 15:03:22 2014	(r369067)
+++ head/devel/pear-Date_Holidays_Slovenia/Makefile	Tue Sep 23 15:15:04 2014	(r369068)
@@ -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>

Modified: head/devel/pear-Date_Holidays_Sweden/Makefile
==============================================================================
--- head/devel/pear-Date_Holidays_Sweden/Makefile	Tue Sep 23 15:03:22 2014	(r369067)
+++ head/devel/pear-Date_Holidays_Sweden/Makefile	Tue Sep 23 15:15:04 2014	(r369068)
@@ -10,8 +10,6 @@ COMMENT=	Driver based class to calculate
 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>

Modified: head/devel/pear-Date_Holidays_UNO/Makefile
==============================================================================
--- head/devel/pear-Date_Holidays_UNO/Makefile	Tue Sep 23 15:03:22 2014	(r369067)
+++ head/devel/pear-Date_Holidays_UNO/Makefile	Tue Sep 23 15:15:04 2014	(r369068)
@@ -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>

Modified: head/devel/pear-Date_Holidays_USA/Makefile
==============================================================================
--- head/devel/pear-Date_Holidays_USA/Makefile	Tue Sep 23 15:03:22 2014	(r369067)
+++ head/devel/pear-Date_Holidays_USA/Makefile	Tue Sep 23 15:15:04 2014	(r369068)
@@ -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>

Modified: head/devel/pear-Date_Holidays_Ukraine/Makefile
==============================================================================
--- head/devel/pear-Date_Holidays_Ukraine/Makefile	Tue Sep 23 15:03:22 2014	(r369067)
+++ head/devel/pear-Date_Holidays_Ukraine/Makefile	Tue Sep 23 15:15:04 2014	(r369068)
@@ -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>

Modified: head/devel/pear-Event_Dispatcher/Makefile
==============================================================================
--- head/devel/pear-Event_Dispatcher/Makefile	Tue Sep 23 15:03:22 2014	(r369067)
+++ head/devel/pear-Event_Dispatcher/Makefile	Tue Sep 23 15:15:04 2014	(r369068)
@@ -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>

Modified: head/devel/pear-FSM/Makefile
==============================================================================
--- head/devel/pear-FSM/Makefile	Tue Sep 23 15:03:22 2014	(r369067)
+++ head/devel/pear-FSM/Makefile	Tue Sep 23 15:15:04 2014	(r369068)
@@ -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>

Modified: head/devel/pear-File_Iterator/Makefile
==============================================================================
--- head/devel/pear-File_Iterator/Makefile	Tue Sep 23 15:03:22 2014	(r369067)
+++ head/devel/pear-File_Iterator/Makefile	Tue Sep 23 15:15:04 2014	(r369068)
@@ -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>

Modified: head/devel/pear-HTML_BBCodeParser/Makefile
==============================================================================
--- head/devel/pear-HTML_BBCodeParser/Makefile	Tue Sep 23 15:03:22 2014	(r369067)
+++ head/devel/pear-HTML_BBCodeParser/Makefile	Tue Sep 23 15:15:04 2014	(r369068)
@@ -11,8 +11,6 @@ COMMENT=	Parser to replace UBB style tag
 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>

Modified: head/devel/pear-HTML_CSS/Makefile
==============================================================================
--- head/devel/pear-HTML_CSS/Makefile	Tue Sep 23 15:03:22 2014	(r369067)
+++ head/devel/pear-HTML_CSS/Makefile	Tue Sep 23 15:15:04 2014	(r369068)
@@ -11,8 +11,6 @@ COMMENT=	PEAR class for generating CSS d
 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>

Modified: head/devel/pear-HTML_Common/Makefile
==============================================================================
--- head/devel/pear-HTML_Common/Makefile	Tue Sep 23 15:03:22 2014	(r369067)
+++ head/devel/pear-HTML_Common/Makefile	Tue Sep 23 15:15:04 2014	(r369068)
@@ -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>

Modified: head/devel/pear-HTML_Common2/Makefile
==============================================================================
--- head/devel/pear-HTML_Common2/Makefile	Tue Sep 23 15:03:22 2014	(r369067)
+++ head/devel/pear-HTML_Common2/Makefile	Tue Sep 23 15:15:04 2014	(r369068)
@@ -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>

Modified: head/devel/pear-HTML_Form/Makefile
==============================================================================
--- head/devel/pear-HTML_Form/Makefile	Tue Sep 23 15:03:22 2014	(r369067)
+++ head/devel/pear-HTML_Form/Makefile	Tue Sep 23 15:15:04 2014	(r369068)
@@ -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>

Modified: head/devel/pear-HTML_Javascript/Makefile
==============================================================================
--- head/devel/pear-HTML_Javascript/Makefile	Tue Sep 23 15:03:22 2014	(r369067)
+++ head/devel/pear-HTML_Javascript/Makefile	Tue Sep 23 15:15:04 2014	(r369068)
@@ -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>

Modified: head/devel/pear-HTML_Page2/Makefile
==============================================================================
--- head/devel/pear-HTML_Page2/Makefile	Tue Sep 23 15:03:22 2014	(r369067)
+++ head/devel/pear-HTML_Page2/Makefile	Tue Sep 23 15:15:04 2014	(r369068)
@@ -12,8 +12,6 @@ COMMENT=	PEAR base class for XHTML page 
 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>

Modified: head/devel/pear-HTML_QuickForm/Makefile
==============================================================================
--- head/devel/pear-HTML_QuickForm/Makefile	Tue Sep 23 15:03:22 2014	(r369067)
+++ head/devel/pear-HTML_QuickForm/Makefile	Tue Sep 23 15:15:04 2014	(r369068)
@@ -11,8 +11,6 @@ COMMENT=	Provide methods for creating, v
 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>

Modified: head/devel/pear-HTML_QuickForm2/Makefile
==============================================================================
--- head/devel/pear-HTML_QuickForm2/Makefile	Tue Sep 23 15:03:22 2014	(r369067)
+++ head/devel/pear-HTML_QuickForm2/Makefile	Tue Sep 23 15:15:04 2014	(r369068)
@@ -11,9 +11,6 @@ COMMENT=	PHP5 rewrite of the HTML_QuickF
 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>

Modified: head/devel/pear-HTML_QuickForm_Controller/Makefile
==============================================================================
--- head/devel/pear-HTML_QuickForm_Controller/Makefile	Tue Sep 23 15:03:22 2014	(r369067)
+++ head/devel/pear-HTML_QuickForm_Controller/Makefile	Tue Sep 23 15:15:04 2014	(r369068)
@@ -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>

Modified: head/devel/pear-HTML_QuickForm_Livesearch/Makefile
==============================================================================
--- head/devel/pear-HTML_QuickForm_Livesearch/Makefile	Tue Sep 23 15:03:22 2014	(r369067)
+++ head/devel/pear-HTML_QuickForm_Livesearch/Makefile	Tue Sep 23 15:15:04 2014	(r369068)
@@ -13,8 +13,6 @@ BUILD_DEPENDS=	${PEARDIR}/HTML/QuickForm
 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>

Modified: head/devel/pear-HTML_QuickForm_Renderer_Tableless/Makefile
==============================================================================
--- head/devel/pear-HTML_QuickForm_Renderer_Tableless/Makefile	Tue Sep 23 15:03:22 2014	(r369067)
+++ head/devel/pear-HTML_QuickForm_Renderer_Tableless/Makefile	Tue Sep 23 15:15:04 2014	(r369068)
@@ -11,8 +11,6 @@ COMMENT=	Implementation of Tableless Ren
 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>

Modified: head/devel/pear-HTML_QuickForm_SelectFilter/Makefile
==============================================================================
--- head/devel/pear-HTML_QuickForm_SelectFilter/Makefile	Tue Sep 23 15:03:22 2014	(r369067)
+++ head/devel/pear-HTML_QuickForm_SelectFilter/Makefile	Tue Sep 23 15:15:04 2014	(r369068)
@@ -12,8 +12,6 @@ COMMENT=	Element for PEAR::HTML_QuickFor
 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>

Modified: head/devel/pear-HTML_QuickForm_advmultiselect/Makefile
==============================================================================
--- head/devel/pear-HTML_QuickForm_advmultiselect/Makefile	Tue Sep 23 15:03:22 2014	(r369067)
+++ head/devel/pear-HTML_QuickForm_advmultiselect/Makefile	Tue Sep 23 15:15:04 2014	(r369068)
@@ -13,8 +13,6 @@ BUILD_DEPENDS=	${PEARDIR}/HTML/QuickForm
 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>

Modified: head/devel/pear-HTML_Select/Makefile
==============================================================================
--- head/devel/pear-HTML_Select/Makefile	Tue Sep 23 15:03:22 2014	(r369067)
+++ head/devel/pear-HTML_Select/Makefile	Tue Sep 23 15:15:04 2014	(r369068)
@@ -11,8 +11,6 @@ COMMENT=	PEAR::HTML_Select is a class fo
 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>

Modified: head/devel/pear-HTML_Select_Common/Makefile
==============================================================================
--- head/devel/pear-HTML_Select_Common/Makefile	Tue Sep 23 15:03:22 2014	(r369067)
+++ head/devel/pear-HTML_Select_Common/Makefile	Tue Sep 23 15:15:04 2014	(r369068)
@@ -13,8 +13,6 @@ BUILD_DEPENDS=	${PEARDIR}/HTML/Common.ph
 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>

Modified: head/devel/pear-HTML_Table/Makefile
==============================================================================
--- head/devel/pear-HTML_Table/Makefile	Tue Sep 23 15:03:22 2014	(r369067)
+++ head/devel/pear-HTML_Table/Makefile	Tue Sep 23 15:15:04 2014	(r369068)
@@ -11,8 +11,6 @@ COMMENT=	Makes the design of HTML tables
 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>

Modified: head/devel/pear-HTML_Template_Flexy/Makefile
==============================================================================
--- head/devel/pear-HTML_Template_Flexy/Makefile	Tue Sep 23 15:03:22 2014	(r369067)
+++ head/devel/pear-HTML_Template_Flexy/Makefile	Tue Sep 23 15:15:04 2014	(r369068)
@@ -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>

Modified: head/devel/pear-HTML_Template_IT/Makefile
==============================================================================
--- head/devel/pear-HTML_Template_IT/Makefile	Tue Sep 23 15:03:22 2014	(r369067)
+++ head/devel/pear-HTML_Template_IT/Makefile	Tue Sep 23 15:15:04 2014	(r369068)
@@ -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>

Modified: head/devel/pear-HTML_Template_PHPLIB/Makefile
==============================================================================
--- head/devel/pear-HTML_Template_PHPLIB/Makefile	Tue Sep 23 15:03:22 2014	(r369067)
+++ head/devel/pear-HTML_Template_PHPLIB/Makefile	Tue Sep 23 15:15:04 2014	(r369068)
@@ -11,17 +11,6 @@ COMMENT=	PEAR template API ported from P
 
 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>

Modified: head/devel/pear-HTML_Template_Sigma/Makefile
==============================================================================
--- head/devel/pear-HTML_Template_Sigma/Makefile	Tue Sep 23 15:03:22 2014	(r369067)
+++ head/devel/pear-HTML_Template_Sigma/Makefile	Tue Sep 23 15:15:04 2014	(r369068)
@@ -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>

Modified: head/devel/pear-HTML_TreeMenu/Makefile
==============================================================================
--- head/devel/pear-HTML_TreeMenu/Makefile	Tue Sep 23 15:03:22 2014	(r369067)
+++ head/devel/pear-HTML_TreeMenu/Makefile	Tue Sep 23 15:15:04 2014	(r369068)
@@ -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>

Modified: head/devel/pear-I18N/Makefile
==============================================================================
--- head/devel/pear-I18N/Makefile	Tue Sep 23 15:03:22 2014	(r369067)
+++ head/devel/pear-I18N/Makefile	Tue Sep 23 15:15:04 2014	(r369068)
@@ -11,8 +11,6 @@ COMMENT=	PEAR internationalization packa
 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>

Modified: head/devel/pear-IO_Bit/Makefile
==============================================================================
--- head/devel/pear-IO_Bit/Makefile	Tue Sep 23 15:03:22 2014	(r369067)
+++ head/devel/pear-IO_Bit/Makefile	Tue Sep 23 15:15:04 2014	(r369068)
@@ -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>

Modified: head/devel/pear-Math_Fraction/Makefile
==============================================================================
--- head/devel/pear-Math_Fraction/Makefile	Tue Sep 23 15:03:22 2014	(r369067)
+++ head/devel/pear-Math_Fraction/Makefile	Tue Sep 23 15:15:04 2014	(r369068)
@@ -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>

Modified: head/devel/pear-Net_Gearman/Makefile
==============================================================================
--- head/devel/pear-Net_Gearman/Makefile	Tue Sep 23 15:03:22 2014	(r369067)
+++ head/devel/pear-Net_Gearman/Makefile	Tue Sep 23 15:15:04 2014	(r369068)
@@ -15,8 +15,6 @@ BUILD_DEPENDS=	${LOCALBASE}/share/pear/P
 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>

Modified: head/devel/pear-OLE/Makefile
==============================================================================
--- head/devel/pear-OLE/Makefile	Tue Sep 23 15:03:22 2014	(r369067)
+++ head/devel/pear-OLE/Makefile	Tue Sep 23 15:15:04 2014	(r369068)
@@ -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>

Modified: head/devel/pear-PEAR_Info/Makefile
==============================================================================
--- head/devel/pear-PEAR_Info/Makefile	Tue Sep 23 15:03:22 2014	(r369067)
+++ head/devel/pear-PEAR_Info/Makefile	Tue Sep 23 15:15:04 2014	(r369068)
@@ -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>

Modified: head/devel/pear-PEAR_PackageFileManager/Makefile
==============================================================================
--- head/devel/pear-PEAR_PackageFileManager/Makefile	Tue Sep 23 15:03:22 2014	(r369067)
+++ head/devel/pear-PEAR_PackageFileManager/Makefile	Tue Sep 23 15:15:04 2014	(r369068)
@@ -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}

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201409231515.s8NFF5MO041866>