diff options
Diffstat (limited to 'devel')
69 files changed, 88 insertions, 600 deletions
diff --git a/devel/Makefile b/devel/Makefile index cdfdee2abcbf..69bfe5c354cf 100644 --- a/devel/Makefile +++ b/devel/Makefile @@ -1241,7 +1241,6 @@ SUBDIR += pear SUBDIR += pear-Config SUBDIR += pear-Console_Getargs - SUBDIR += pear-Console_Getopt SUBDIR += pear-Console_Table SUBDIR += pear-Date SUBDIR += pear-Event_Dispatcher @@ -1266,7 +1265,6 @@ SUBDIR += pear-HTML_TreeMenu SUBDIR += pear-I18N SUBDIR += pear-OLE - SUBDIR += pear-PEAR SUBDIR += pear-PEAR_PackageFileManager SUBDIR += pear-PHPDoc SUBDIR += pear-PHPUnit @@ -1283,7 +1281,6 @@ SUBDIR += pear-Var_Dump SUBDIR += pear-XML_NITF SUBDIR += pear-XML_Parser - SUBDIR += pear-XML_RPC SUBDIR += pear-XML_RSS SUBDIR += pear-XML_SVG SUBDIR += pear-XML_Serializer @@ -1306,7 +1303,6 @@ SUBDIR += php4-ncurses SUBDIR += php4-pcntl SUBDIR += php4-pcre - SUBDIR += php4-pear SUBDIR += php4-readline SUBDIR += php4-shmop SUBDIR += php4-sysvmsg @@ -1319,7 +1315,6 @@ SUBDIR += php5-ncurses SUBDIR += php5-pcntl SUBDIR += php5-pcre - SUBDIR += php5-pear SUBDIR += php5-readline SUBDIR += php5-shmop SUBDIR += php5-sysvmsg diff --git a/devel/beautifyphp/Makefile b/devel/beautifyphp/Makefile index 31cec47bae6f..7f3fe4ea7657 100644 --- a/devel/beautifyphp/Makefile +++ b/devel/beautifyphp/Makefile @@ -15,7 +15,7 @@ DISTNAME= beautify_php_${PORTVERSION} MAINTAINER= leeym@FreeBSD.org COMMENT= PEAR beautifier for PHP4 -RUN_DEPENDS= ${LOCALBASE}/share/pear/System.php:${PORTSDIR}/devel/pear-PEAR +RUN_DEPENDS= ${LOCALBASE}/share/pear/System.php:${PORTSDIR}/devel/pear USE_REINPLACE= yes NO_BUILD= yes diff --git a/devel/pear-Config/Makefile b/devel/pear-Config/Makefile index 44e4aeba22c4..30cd8e6f1168 100644 --- a/devel/pear-Config/Makefile +++ b/devel/pear-Config/Makefile @@ -12,7 +12,7 @@ CATEGORIES= devel www pear MAINTAINER= antonio@php.net COMMENT= Your configurations swiss-army knife -BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR +BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear RUN_DEPENDS= ${PEARDIR}/XML/Parser.php:${PORTSDIR}/devel/pear-XML_Parser \ ${PEARDIR}/XML/Util.php:${PORTSDIR}/devel/pear-XML_Util @@ -23,5 +23,5 @@ FILES= Config.php Config/Container.php Config/Container/Apache.php \ DOCS= Apache.php IniCommented.php IniFromScratch.php .include <bsd.port.pre.mk> -.include "${PORTSDIR}/devel/pear-PEAR/Makefile.common" +.include "${PORTSDIR}/devel/pear/bsd.pear.mk" .include <bsd.port.post.mk> diff --git a/devel/pear-Console_Getargs/Makefile b/devel/pear-Console_Getargs/Makefile index a0f39fab3737..b89e3b82742a 100644 --- a/devel/pear-Console_Getargs/Makefile +++ b/devel/pear-Console_Getargs/Makefile @@ -12,7 +12,7 @@ CATEGORIES= devel www pear MAINTAINER= antonio@php.net COMMENT= PEAR command-line arguments parser -BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR +BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear RUN_DEPENDS= ${BUILD_DEPENDS} CATEGORY= Console @@ -22,5 +22,5 @@ TESTS= Console_TestListener.php Getargs_basic_testcase.php \ Getargs_getValues_testcase.php test.php .include <bsd.port.pre.mk> -.include "${PORTSDIR}/devel/pear-PEAR/Makefile.common" +.include "${PORTSDIR}/devel/pear/bsd.pear.mk" .include <bsd.port.post.mk> diff --git a/devel/pear-Console_Getopt/Makefile b/devel/pear-Console_Getopt/Makefile deleted file mode 100644 index a213ba681e8f..000000000000 --- a/devel/pear-Console_Getopt/Makefile +++ /dev/null @@ -1,22 +0,0 @@ -# Ports collection makefile for: pear-Console_Getopt -# Date created: 23 October 2002 -# Whom: Thierry Thomas (<thierry@pompo.net>) -# -# $FreeBSD$ -# - -PORTNAME= Console_Getopt -PORTVERSION= 1.2 -CATEGORIES= devel www pear - -MAINTAINER= ports@FreeBSD.org -COMMENT= PEAR command-line option parser - -WANT_PHP_PEAR= yes -USE_PHP= yes - -FILES= Console/Getopt.php - -.include <bsd.port.pre.mk> -.include "${PORTSDIR}/devel/pear-PEAR/Makefile.common" -.include <bsd.port.post.mk> diff --git a/devel/pear-Console_Getopt/distinfo b/devel/pear-Console_Getopt/distinfo deleted file mode 100644 index 9d078b2267f8..000000000000 --- a/devel/pear-Console_Getopt/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -MD5 (PEAR/Console_Getopt-1.2.tgz) = 8f9ec8253c04350bc01ee7ca941e24b6 -SHA256 (PEAR/Console_Getopt-1.2.tgz) = 90bc64b35832af79625ccd7a1cd981ae26adbe58e1296a052cc3947d9c959e0c -SIZE (PEAR/Console_Getopt-1.2.tgz) = 3370 diff --git a/devel/pear-Console_Getopt/pkg-descr b/devel/pear-Console_Getopt/pkg-descr deleted file mode 100644 index d198cccb852b..000000000000 --- a/devel/pear-Console_Getopt/pkg-descr +++ /dev/null @@ -1,4 +0,0 @@ -This is a PHP implementation of "getopt" supporting both short and long -options. - -WWW: http://pear.php.net/manual/en/package.console.php diff --git a/devel/pear-Console_Table/Makefile b/devel/pear-Console_Table/Makefile index 43bba5ffd3d9..9a9f7e157307 100644 --- a/devel/pear-Console_Table/Makefile +++ b/devel/pear-Console_Table/Makefile @@ -12,12 +12,12 @@ CATEGORIES= devel pear MAINTAINER= ports@FreeBSD.org COMMENT= PHP class that makes it easy to build console style tables -BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR +BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear RUN_DEPENDS= ${BUILD_DEPENDS} CATEGORY= Console FILES= Table.php .include <bsd.port.pre.mk> -.include "${PORTSDIR}/devel/pear-PEAR/Makefile.common" +.include "${PORTSDIR}/devel/pear/bsd.pear.mk" .include <bsd.port.post.mk> diff --git a/devel/pear-Date/Makefile b/devel/pear-Date/Makefile index bb812d851007..1bdea5cb3545 100644 --- a/devel/pear-Date/Makefile +++ b/devel/pear-Date/Makefile @@ -12,7 +12,7 @@ CATEGORIES= devel www pear MAINTAINER= antonio@php.net COMMENT= PEAR Date and Time Zone Classes -BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR +BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear RUN_DEPENDS= ${BUILD_DEPENDS} FILES= Date.php Date/Calc.php Date/Human.php Date/Span.php \ @@ -27,5 +27,5 @@ DOCS= TODO _DOCSDIR= . .include <bsd.port.pre.mk> -.include "${PORTSDIR}/devel/pear-PEAR/Makefile.common" +.include "${PORTSDIR}/devel/pear/bsd.pear.mk" .include <bsd.port.post.mk> diff --git a/devel/pear-Event_Dispatcher/Makefile b/devel/pear-Event_Dispatcher/Makefile index 9f0c1c51a52a..d0f020524180 100644 --- a/devel/pear-Event_Dispatcher/Makefile +++ b/devel/pear-Event_Dispatcher/Makefile @@ -12,7 +12,7 @@ CATEGORIES= devel pear MAINTAINER= antonio@php.net COMMENT= PEAR dispatch notifications using PHP callbacks -BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR +BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear RUN_DEPENDS= ${BUILD_DEPENDS} USE_REINPLACE= yes @@ -28,5 +28,5 @@ post-extract: .endfor .include <bsd.port.pre.mk> -.include "${PORTSDIR}/devel/pear-PEAR/Makefile.common" +.include "${PORTSDIR}/devel/pear/bsd.pear.mk" .include <bsd.port.post.mk> diff --git a/devel/pear-FSM/Makefile b/devel/pear-FSM/Makefile index 346b82458e22..49ad15356a7d 100644 --- a/devel/pear-FSM/Makefile +++ b/devel/pear-FSM/Makefile @@ -12,7 +12,7 @@ CATEGORIES= devel www pear MAINTAINER= antonio@php.net COMMENT= PEAR Finite State Machine -BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR +BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear RUN_DEPENDS= ${BUILD_DEPENDS} FILES= FSM.php @@ -22,5 +22,5 @@ EXAMPLES= rpn.php _EXAMPLESDIR= docs/examples .include <bsd.port.pre.mk> -.include "${PORTSDIR}/devel/pear-PEAR/Makefile.common" +.include "${PORTSDIR}/devel/pear/bsd.pear.mk" .include <bsd.port.post.mk> diff --git a/devel/pear-HTML_BBCodeParser/Makefile b/devel/pear-HTML_BBCodeParser/Makefile index 9794a4dc403b..be600104beeb 100644 --- a/devel/pear-HTML_BBCodeParser/Makefile +++ b/devel/pear-HTML_BBCodeParser/Makefile @@ -27,5 +27,5 @@ EXAMPLES= BBCodeParser.ini parser.php _EXAMPLESDIR= BBCodeParser/example .include <bsd.port.pre.mk> -.include "${PORTSDIR}/devel/pear-PEAR/Makefile.common" +.include "${PORTSDIR}/devel/pear/bsd.pear.mk" .include <bsd.port.post.mk> diff --git a/devel/pear-HTML_CSS/Makefile b/devel/pear-HTML_CSS/Makefile index 3725b312a352..c4485b1ace7d 100644 --- a/devel/pear-HTML_CSS/Makefile +++ b/devel/pear-HTML_CSS/Makefile @@ -20,5 +20,5 @@ FILES= CSS.php EXAMPLES= CSS_InHeader.php CSS_Inline.php CSS_Stylesheet.php .include <bsd.port.pre.mk> -.include "${PORTSDIR}/devel/pear-PEAR/Makefile.common" +.include "${PORTSDIR}/devel/pear/bsd.pear.mk" .include <bsd.port.post.mk> diff --git a/devel/pear-HTML_Common/Makefile b/devel/pear-HTML_Common/Makefile index f42011b50641..cc3c82946fb0 100644 --- a/devel/pear-HTML_Common/Makefile +++ b/devel/pear-HTML_Common/Makefile @@ -12,12 +12,12 @@ CATEGORIES= devel www pear MAINTAINER= ports@FreeBSD.org COMMENT= PEAR::HTML_Common is a base class for other HTML classes -BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR +BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear RUN_DEPENDS= ${BUILD_DEPENDS} CATEGORY= HTML FILES= Common.php .include <bsd.port.pre.mk> -.include "${PORTSDIR}/devel/pear-PEAR/Makefile.common" +.include "${PORTSDIR}/devel/pear/bsd.pear.mk" .include <bsd.port.post.mk> diff --git a/devel/pear-HTML_Form/Makefile b/devel/pear-HTML_Form/Makefile index d6f76c605208..52df200f3c8a 100644 --- a/devel/pear-HTML_Form/Makefile +++ b/devel/pear-HTML_Form/Makefile @@ -12,7 +12,7 @@ CATEGORIES= devel pear MAINTAINER= antonio@php.net COMMENT= PEAR simple HTML form package -BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR +BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear RUN_DEPENDS= ${BUILD_DEPENDS} USE_REINPLACE= yes @@ -25,7 +25,7 @@ post-extract: @${MV} ${WRKSRC}/HTML/* ${WRKSRC} .include <bsd.port.pre.mk> -.include "${PORTSDIR}/devel/pear-PEAR/Makefile.common" +.include "${PORTSDIR}/devel/pear/bsd.pear.mk" post-patch: @${REINPLACE_CMD} -e "s|@include_path@|${PREFIX}/${LPEARDIR}|g" \ diff --git a/devel/pear-HTML_Javascript/Makefile b/devel/pear-HTML_Javascript/Makefile index 8009e8dec9ed..27c832519fc4 100644 --- a/devel/pear-HTML_Javascript/Makefile +++ b/devel/pear-HTML_Javascript/Makefile @@ -12,7 +12,7 @@ CATEGORIES= devel www pear MAINTAINER= antonio@php.net COMMENT= Provides an interface for creating simple JS scripts -BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR +BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear RUN_DEPENDS= ${BUILD_DEPENDS} CATEGORY= HTML @@ -21,5 +21,5 @@ EXAMPLES= javascript.php js.php TESTS= js.php output.php .include <bsd.port.pre.mk> -.include "${PORTSDIR}/devel/pear-PEAR/Makefile.common" +.include "${PORTSDIR}/devel/pear/bsd.pear.mk" .include <bsd.port.post.mk> diff --git a/devel/pear-HTML_Page2/Makefile b/devel/pear-HTML_Page2/Makefile index f69885559a2d..9ecf84ca0c9b 100644 --- a/devel/pear-HTML_Page2/Makefile +++ b/devel/pear-HTML_Page2/Makefile @@ -26,5 +26,5 @@ post-patch: @${REINPLACE_CMD} -e "s#
##g" ${WRKSRC}/Page2.php .include <bsd.port.pre.mk> -.include "${PORTSDIR}/devel/pear-PEAR/Makefile.common" +.include "${PORTSDIR}/devel/pear/bsd.pear.mk" .include <bsd.port.post.mk> diff --git a/devel/pear-HTML_QuickForm/Makefile b/devel/pear-HTML_QuickForm/Makefile index 8192dfea1581..541f0f818641 100644 --- a/devel/pear-HTML_QuickForm/Makefile +++ b/devel/pear-HTML_QuickForm/Makefile @@ -49,5 +49,5 @@ DOCS= elements.php filters.php formrule.php groups.php rules-builtin.php rules- renderers/templates/styles/fancygroup.html .include <bsd.port.pre.mk> -.include "${PORTSDIR}/devel/pear-PEAR/Makefile.common" +.include "${PORTSDIR}/devel/pear/bsd.pear.mk" .include <bsd.port.post.mk> diff --git a/devel/pear-HTML_QuickForm2/Makefile b/devel/pear-HTML_QuickForm2/Makefile index 8192dfea1581..541f0f818641 100644 --- a/devel/pear-HTML_QuickForm2/Makefile +++ b/devel/pear-HTML_QuickForm2/Makefile @@ -49,5 +49,5 @@ DOCS= elements.php filters.php formrule.php groups.php rules-builtin.php rules- renderers/templates/styles/fancygroup.html .include <bsd.port.pre.mk> -.include "${PORTSDIR}/devel/pear-PEAR/Makefile.common" +.include "${PORTSDIR}/devel/pear/bsd.pear.mk" .include <bsd.port.post.mk> diff --git a/devel/pear-HTML_QuickForm_Controller/Makefile b/devel/pear-HTML_QuickForm_Controller/Makefile index a072f8d6ed69..eae4e2543c20 100644 --- a/devel/pear-HTML_QuickForm_Controller/Makefile +++ b/devel/pear-HTML_QuickForm_Controller/Makefile @@ -22,5 +22,5 @@ EXAMPLES= simple.php tabbed.php wizard.php regWizard.php upload.php \ templates/upload.html statemachine.php .include <bsd.port.pre.mk> -.include "${PORTSDIR}/devel/pear-PEAR/Makefile.common" +.include "${PORTSDIR}/devel/pear/bsd.pear.mk" .include <bsd.port.post.mk> diff --git a/devel/pear-HTML_QuickForm_SelectFilter/Makefile b/devel/pear-HTML_QuickForm_SelectFilter/Makefile index ef4a0f23d9f3..17315b96d2ca 100644 --- a/devel/pear-HTML_QuickForm_SelectFilter/Makefile +++ b/devel/pear-HTML_QuickForm_SelectFilter/Makefile @@ -20,5 +20,5 @@ CATEGORY= HTML/QuickForm FILES= SelectFilter.php .include <bsd.port.pre.mk> -.include "${PORTSDIR}/devel/pear-PEAR/Makefile.common" +.include "${PORTSDIR}/devel/pear/bsd.pear.mk" .include <bsd.port.post.mk> diff --git a/devel/pear-HTML_QuickForm_advmultiselect/Makefile b/devel/pear-HTML_QuickForm_advmultiselect/Makefile index 8fc13e16bcd5..cba480912440 100644 --- a/devel/pear-HTML_QuickForm_advmultiselect/Makefile +++ b/devel/pear-HTML_QuickForm_advmultiselect/Makefile @@ -20,5 +20,5 @@ CATEGORY= HTML/QuickForm FILES= advmultiselect.php .include <bsd.port.pre.mk> -.include "${PORTSDIR}/devel/pear-PEAR/Makefile.common" +.include "${PORTSDIR}/devel/pear/bsd.pear.mk" .include <bsd.port.post.mk> diff --git a/devel/pear-HTML_Select/Makefile b/devel/pear-HTML_Select/Makefile index edaf57dd4fd2..6269ab538368 100644 --- a/devel/pear-HTML_Select/Makefile +++ b/devel/pear-HTML_Select/Makefile @@ -19,5 +19,5 @@ CATEGORY= HTML FILES= Select.php .include <bsd.port.pre.mk> -.include "${PORTSDIR}/devel/pear-PEAR/Makefile.common" +.include "${PORTSDIR}/devel/pear/bsd.pear.mk" .include <bsd.port.post.mk> diff --git a/devel/pear-HTML_Select_Common/Makefile b/devel/pear-HTML_Select_Common/Makefile index 5f488cf06c16..5d6299d25a9e 100644 --- a/devel/pear-HTML_Select_Common/Makefile +++ b/devel/pear-HTML_Select_Common/Makefile @@ -25,5 +25,5 @@ EXAMPLES= Country.php FRDepartements.php UKCounty.php USState.php _EXAMPLESDIR= Select/Common/examples .include <bsd.port.pre.mk> -.include "${PORTSDIR}/devel/pear-PEAR/Makefile.common" +.include "${PORTSDIR}/devel/pear/bsd.pear.mk" .include <bsd.port.post.mk> diff --git a/devel/pear-HTML_Table/Makefile b/devel/pear-HTML_Table/Makefile index b3695323e92b..23074b88c566 100644 --- a/devel/pear-HTML_Table/Makefile +++ b/devel/pear-HTML_Table/Makefile @@ -21,5 +21,5 @@ EXAMPLES= Table_example1.php Table_example2.php _EXAMPLESDIR= docs .include <bsd.port.pre.mk> -.include "${PORTSDIR}/devel/pear-PEAR/Makefile.common" +.include "${PORTSDIR}/devel/pear/bsd.pear.mk" .include <bsd.port.post.mk> diff --git a/devel/pear-HTML_Template_Flexy/Makefile b/devel/pear-HTML_Template_Flexy/Makefile index d506a6a6649d..d1ab09c2eb04 100644 --- a/devel/pear-HTML_Template_Flexy/Makefile +++ b/devel/pear-HTML_Template_Flexy/Makefile @@ -12,7 +12,7 @@ CATEGORIES= devel www pear MAINTAINER= antonio@php.net COMMENT= An extremely powerful Tokenizer driven Template engine -BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR +BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear RUN_DEPENDS= ${BUILD_DEPENDS} LATEST_LINK= pear-HTML_Template_Flexy @@ -67,5 +67,5 @@ RUN_DEPENDS+= ${PEARDIR}/Translation2.php:${PORTSDIR}/sysutils/pear-Translation2 .endif .include <bsd.port.pre.mk> -.include "${PORTSDIR}/devel/pear-PEAR/Makefile.common" +.include "${PORTSDIR}/devel/pear/bsd.pear.mk" .include <bsd.port.post.mk> diff --git a/devel/pear-HTML_Template_IT/Makefile b/devel/pear-HTML_Template_IT/Makefile index b1544e9919a1..418f4c342e4c 100644 --- a/devel/pear-HTML_Template_IT/Makefile +++ b/devel/pear-HTML_Template_IT/Makefile @@ -13,7 +13,7 @@ CATEGORIES= devel www pear MAINTAINER= ports@FreeBSD.org COMMENT= PEAR template API -BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR +BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear RUN_DEPENDS= ${BUILD_DEPENDS} CATEGORY= HTML/Template @@ -30,5 +30,5 @@ do-install-tests-msg: .USE @${ECHO_MSG} " <http://pear.php.net/package-info.php?package=PHPUnit>;;)." .include <bsd.port.pre.mk> -.include "${PORTSDIR}/devel/pear-PEAR/Makefile.common" +.include "${PORTSDIR}/devel/pear/bsd.pear.mk" .include <bsd.port.post.mk> diff --git a/devel/pear-HTML_Template_PHPLIB/Makefile b/devel/pear-HTML_Template_PHPLIB/Makefile index b6c526c8a2be..6ec2f2b54a00 100644 --- a/devel/pear-HTML_Template_PHPLIB/Makefile +++ b/devel/pear-HTML_Template_PHPLIB/Makefile @@ -13,7 +13,7 @@ CATEGORIES= devel www pear MAINTAINER= ports@FreeBSD.org COMMENT= PEAR template API ported from PHPLIB -BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR +BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear RUN_DEPENDS= ${BUILD_DEPENDS} CATEGORY= HTML/Template @@ -27,5 +27,5 @@ do-install-tests-msg: .USE @${ECHO_MSG} " <http://pear.php.net/package-info.php?package=Benchmark>;;;)." .include <bsd.port.pre.mk> -.include "${PORTSDIR}/devel/pear-PEAR/Makefile.common" +.include "${PORTSDIR}/devel/pear/bsd.pear.mk" .include <bsd.port.post.mk> diff --git a/devel/pear-HTML_Template_Sigma/Makefile b/devel/pear-HTML_Template_Sigma/Makefile index 1573aa0a11bf..0145c5377442 100644 --- a/devel/pear-HTML_Template_Sigma/Makefile +++ b/devel/pear-HTML_Template_Sigma/Makefile @@ -12,7 +12,7 @@ CATEGORIES= devel www pear MAINTAINER= klammer@webonaut.com COMMENT= PEAR template API -BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR +BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear RUN_DEPENDS= ${BUILD_DEPENDS} CATEGORY= HTML/Template @@ -34,5 +34,5 @@ do-install-tests-msg: .USE @${ECHO_MSG} " <http://pear.php.net/package-info.php?package=PHPUnit>;;)." .include <bsd.port.pre.mk> -.include "${PORTSDIR}/devel/pear-PEAR/Makefile.common" +.include "${PORTSDIR}/devel/pear/bsd.pear.mk" .include <bsd.port.post.mk> diff --git a/devel/pear-HTML_TreeMenu/Makefile b/devel/pear-HTML_TreeMenu/Makefile index dbd667063e72..15c5469c80b7 100644 --- a/devel/pear-HTML_TreeMenu/Makefile +++ b/devel/pear-HTML_TreeMenu/Makefile @@ -12,7 +12,7 @@ CATEGORIES= devel www pear MAINTAINER= antonio@php.net COMMENT= Provides an API to create a HTML tree -BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR +BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear RUN_DEPENDS= ${BUILD_DEPENDS} CATEGORY= HTML @@ -36,5 +36,5 @@ DOCS= HTML_TreeMenu.doc HTML_TreeMenu.pdf example.php map_fs.php _DATADIR= . .include <bsd.port.pre.mk> -.include "${PORTSDIR}/devel/pear-PEAR/Makefile.common" +.include "${PORTSDIR}/devel/pear/bsd.pear.mk" .include <bsd.port.post.mk> diff --git a/devel/pear-I18N/Makefile b/devel/pear-I18N/Makefile index 35a00aea9062..e3b9dd2f9763 100644 --- a/devel/pear-I18N/Makefile +++ b/devel/pear-I18N/Makefile @@ -12,7 +12,7 @@ CATEGORIES= devel www pear MAINTAINER= ports@FreeBSD.org COMMENT= PEAR internationalization package -BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR +BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear RUN_DEPENDS= ${BUILD_DEPENDS} CATEGORY= I18N @@ -34,5 +34,5 @@ EXAMPLES= I18N_Currency.php I18N_DateTime.php I18N_Message.php \ _EXAMPLESDIR= docs .include <bsd.port.pre.mk> -.include "${PORTSDIR}/devel/pear-PEAR/Makefile.common" +.include "${PORTSDIR}/devel/pear/bsd.pear.mk" .include <bsd.port.post.mk> diff --git a/devel/pear-OLE/Makefile b/devel/pear-OLE/Makefile index 4d5c776f33da..c452936cf595 100644 --- a/devel/pear-OLE/Makefile +++ b/devel/pear-OLE/Makefile @@ -12,12 +12,12 @@ CATEGORIES= devel www pear MAINTAINER= pav@FreeBSD.org COMMENT= PEAR class for reading and writing OLE containers -BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR +BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear RUN_DEPENDS= ${BUILD_DEPENDS} CATEGORY= OLE FILES= OLE.php PPS.php PPS/File.php PPS/Root.php .include <bsd.port.pre.mk> -.include "${PORTSDIR}/devel/pear-PEAR/Makefile.common" +.include "${PORTSDIR}/devel/pear/bsd.pear.mk" .include <bsd.port.post.mk> diff --git a/devel/pear-PEAR/Makefile b/devel/pear-PEAR/Makefile deleted file mode 100644 index c6accc603eb3..000000000000 --- a/devel/pear-PEAR/Makefile +++ /dev/null @@ -1,79 +0,0 @@ -# Ports collection makefile for: pear-PEAR -# Date created: 22 October 2002 -# Whom: Thierry Thomas (<thierry@pompo.net>) -# -# $FreeBSD$ -# - -PORTNAME= PEAR -PORTVERSION= 1.4.4 -CATEGORIES= devel www pear - -MAINTAINER= antonio@php.net -COMMENT= PEAR Base System - -BUILD_DEPENDS= ${PEARDIR}/Archive/Tar.php:${PORTSDIR}/archivers/pear-Archive_Tar \ - ${PEARDIR}/Console/Getopt.php:${PORTSDIR}/devel/pear-Console_Getopt \ - ${PEARDIR}/XML/RPC.php:${PORTSDIR}/devel/pear-XML_RPC -RUN_DEPENDS= ${BUILD_DEPENDS} - -USE_REINPLACE= yes - -FILES= OS/Guess.php PEAR/ChannelFile/Parser.php PEAR/Command/Auth.xml \ - PEAR/Command/Auth.php PEAR/Command/Build.xml PEAR/Command/Build.php \ - PEAR/Command/Channels.xml PEAR/Command/Channels.php \ - PEAR/Command/Common.php PEAR/Command/Config.xml PEAR/Command/Config.php \ - PEAR/Command/Install.xml PEAR/Command/Install.php \ - PEAR/Command/Package.xml PEAR/Command/Package.php \ - PEAR/Command/Pickle.xml PEAR/Command/Pickle.php \ - PEAR/Command/Registry.xml PEAR/Command/Registry.php \ - PEAR/Command/Remote.xml PEAR/Command/Remote.php \ - PEAR/Command/Mirror.xml PEAR/Command/Mirror.php \ - PEAR/Command/Test.xml PEAR/Command/Test.php PEAR/Downloader/Package.php \ - PEAR/Frontend/CLI.php PEAR/Installer/Role/Common.php \ - PEAR/Installer/Role/Data.xml PEAR/Installer/Role/Data.php \ - PEAR/Installer/Role/Doc.xml PEAR/Installer/Role/Doc.php \ - PEAR/Installer/Role/Ext.xml PEAR/Installer/Role/Ext.php \ - PEAR/Installer/Role/Php.xml PEAR/Installer/Role/Php.php \ - PEAR/Installer/Role/Script.xml PEAR/Installer/Role/Script.php \ - PEAR/Installer/Role/Src.xml PEAR/Installer/Role/Src.php \ - PEAR/Installer/Role/Test.xml PEAR/Installer/Role/Test.php \ - PEAR/Installer/Role.php PEAR/PackageFile/Generator/v1.php \ - PEAR/PackageFile/Generator/v2.php PEAR/PackageFile/Parser/v1.php \ - PEAR/PackageFile/Parser/v2.php PEAR/PackageFile/v2/rw.php \ - PEAR/PackageFile/v2/Validator.php PEAR/PackageFile/v1.php \ - PEAR/PackageFile/v2.php PEAR/REST/10.php PEAR/REST/11.php \ - PEAR/Task/Postinstallscript/rw.php PEAR/Task/Replace/rw.php \ - PEAR/Task/Unixeol/rw.php PEAR/Task/Windowseol/rw.php \ - PEAR/Task/Common.php PEAR/Task/Postinstallscript.php \ - PEAR/Task/Replace.php PEAR/Task/Unixeol.php PEAR/Task/Windowseol.php \ - PEAR/Validator/PECL.php PEAR/Autoloader.php PEAR/Builder.php \ - PEAR/ChannelFile.php PEAR/Command.php PEAR/Common.php PEAR/Config.php \ - PEAR/Dependency.php PEAR/DependencyDB.php PEAR/Dependency2.php \ - PEAR/Downloader.php PEAR/ErrorStack.php PEAR/Exception.php \ - PEAR/Frontend.php PEAR/Installer.php PEAR/Packager.php \ - PEAR/PackageFile.php PEAR/Registry.php PEAR/Remote.php PEAR/REST.php \ - PEAR/RunTest.php PEAR/Validate.php PEAR/XMLParser.php package.dtd \ - template.spec PEAR.php System.php -SCRIPTFILES= pear2 - -.include <bsd.port.pre.mk> - -pre-patch: -.for dosfile in ${FILES} scripts/pearcmd.php - @${MV} ${WRKSRC}/${dosfile} ${WRKSRC}/${dosfile}.dos - @${TR} -d '\r' < ${WRKSRC}/${dosfile}.dos > ${WRKSRC}/${dosfile} -.endfor - -post-patch: -.for origfile in ${FILES} - @${REINPLACE_CMD} -e 's|@pear_version@|${PORTVERSION}|g' \ - -e 's|@PEAR-VER@|${PORTVERSION}|g' \ - -e 's|@DATA-DIR@|${PEARDIR}|g' \ - ${WRKSRC}/${origfile} -.endfor - @${SED} "s|@pear_version@|${PORTVERSION}|g" \ - ${WRKSRC}/scripts/pearcmd.php > ${WRKSRC}/pear-${SCRIPTFILES} - -.include "${PORTSDIR}/devel/pear-PEAR/Makefile.common" -.include <bsd.port.post.mk> diff --git a/devel/pear-PEAR/Makefile.common b/devel/pear-PEAR/Makefile.common deleted file mode 100644 index 9271f7afa218..000000000000 --- a/devel/pear-PEAR/Makefile.common +++ /dev/null @@ -1,239 +0,0 @@ -# $FreeBSD$ - -# Common code for pear- ports. - -MASTER_SITES= http://pear.php.net/get/ -PKGNAMEPREFIX= pear- -EXTRACT_SUFX= .tgz -DIST_SUBDIR= PEAR - -USE_REINPLACE= yes - -.if !defined(USE_PHPIZE) -NO_BUILD= yes -.endif - -.if exists(${LOCALBASE}/bin/php-config) -PHP_BASE!= ${LOCALBASE}/bin/php-config --prefix -.else -PHP_BASE= ${LOCALBASE} -.endif -LPEARDIR= share/pear -LPKGREGDIR= ${LPEARDIR}/packages/${PKGNAME} -LDATADIR= ${LPEARDIR}/data/${PORTNAME} -LDOCSDIR= share/doc/pear/${PORTNAME} -LEXAMPLESDIR= share/examples/pear/${PORTNAME} -LSQLSDIR= ${LPEARDIR}/sql/${PORTNAME} -LSCRIPTSDIR= bin -LTESTSDIR= ${LPEARDIR}/tests/${PORTNAME} -PEARDIR= ${PHP_BASE}/${LPEARDIR} -PKGREGDIR= ${PHP_BASE}/${LPKGREGDIR} -DATADIR= ${PHP_BASE}/${LDATADIR} -DOCSDIR= ${PHP_BASE}/${LDOCSDIR} -EXAMPLESDIR= ${PHP_BASE}/${LEXAMPLESDIR} -SQLSDIR= ${PHP_BASE}/${LSQLSDIR} -SCRIPTFILESDIR= ${LOCALBASE}/bin -TESTSDIR= ${PHP_BASE}/${LTESTSDIR} -.if defined(CATEGORY) && !empty(CATEGORY) -LINSTDIR= ${LPEARDIR}/${CATEGORY} -.else -LINSTDIR= ${LPEARDIR} -.endif -INSTDIR= ${PHP_BASE}/${LINSTDIR} - -.if !defined(USE_PHPIZE) && !exists(${.CURDIR}/pkg-plist) -PLIST= ${WRKDIR}/PLIST -.endif -PLIST_SUB= PEARDIR=${LPEARDIR} PKGREGDIR=${LPKGREGDIR} \ - TESTSDIR=${LTESTSDIR} INSTDIR=${LINSTDIR} SQLSDIR=${LSQLSDIR} \ - SCRIPTFILESDIR=${LCRIPTSDIR} - -PKGINSTALL= ${PORTSDIR}/devel/pear-PEAR/pkg-install -PKGDEINSTALL= ${PORTSDIR}/devel/pear-PEAR/pkg-deinstall - -FILES?= -DATA?= -DOCS?= -EXAMPLES?= -SQLS?= -SCRIPTFILES?= -TESTS?= -_DATADIR?= data -_DOCSDIR?= docs -_EXAMPLESDIR?= examples -_SQLSDIR?= sql -_TESTSDIR?= tests - -# this is an easy way to eliminate duplicate entries in a variable :) -# if someone knows how to achieve the result without this terrible -# hack, please tell me! -.for v in FILES DOCS TESTS EXAMPLES SQLS SCRIPTFILES DATA -X${v}DIRS= ${${v}:M*/*:C;/[^/]+$;;} -. for XD in ${X${v}DIRS} -ALREADYTHERE= 0 -. for D in ${${v}DIRS} -DD= ${D} -. if ${DD} == ${XD} -ALREADYTHERE= 1 -. endif -. endfor -. if ${ALREADYTHERE} == 0 -${v}DIRS+= ${XD} -. endif -. endfor -.endfor - -pre-install: -.if exists(${LOCALBASE}/lib/php.DIST_PHP) \ - || exists(${PHP_BASE}/lib/php.DIST_PHP) \ - || exists(${LOCALBASE}/.PEAR.pkg) \ - || exists(${PHP_BASE}/.PEAR.pkg) - @${ECHO_MSG} "" - @${ECHO_MSG} " Sorry, the PEAR structure has been modified;" - @${ECHO_MSG} " Please deinstall your installed pear- ports." - @${ECHO_MSG} "" - @${FALSE} -.endif - -DIRFILTER= ${SED} -En '\:^.*/[^/]*$$:s:^(.+)/[^/]*$$:\1:p' | ${SORT} -ru - -.if !defined(USE_PHPIZE) -do-generate-plist: -. if !exists(${.CURDIR}/pkg-plist) - @${ECHO_MSG} "===> Generating packing list"; \ - (for file in ${FILES}; do echo "${LINSTDIR}/$${file}"; done; \ - for file in ${TESTS}; do echo "${LTESTSDIR}/$${file}"; done; \ - for file in ${DATA}; do echo "${LDATADIR}/$${file}"; done; \ - for file in ${SQLS}; do echo "${LSQLSDIR}/$${file}"; done; \ - for file in ${SCRIPTFILES}; do echo "${LSCRIPTSDIR}/$${file}"; done; \ - for file in ${DOCS}; do echo "%%PORTDOCS%%${LDOCSDIR}/$${file}"; done; \ - for file in ${EXAMPLES}; do echo "%%PORTDOCS%%${LEXAMPLESDIR}/$${file}"; done; \ - echo "${LPKGREGDIR}/package.xml"; \ - for d in ${FILES} ${FILES:H}; do echo $${d}; done | ${DIRFILTER} | \ - while read dir; do echo "@dirrm ${LINSTDIR}/$${dir}"; done; \ - for d in ${TESTS}; do echo $${d}; done | ${DIRFILTER} | \ - while read dir; do echo "@dirrm ${LTESTSDIR}/$${dir}"; done; \ - for d in ${DATA}; do echo $${d}; done | ${DIRFILTER} | \ - while read dir; do echo "@dirrm ${LDATADIR}/$${dir}"; done; \ - for d in ${SQLS}; do echo $${d}; done | ${DIRFILTER} | \ - while read dir; do echo "@dirrm ${LSQLSDIR}/$${dir}"; done; \ - for d in ${DOCS}; do echo $${d}; done | ${DIRFILTER} | \ - while read dir; do echo "%%PORTDOCS%%@dirrm ${LDOCSDIR}/$${dir}"; done; \ - for d in ${EXAMPLES}; do echo $${d}; done | ${DIRFILTER} | \ - while read dir; do echo "%%PORTDOCS%%@dirrm ${LEXAMPLESDIR}/$${dir}"; done; \ - if [ -n "${TESTS}" ]; then echo "@dirrm ${LTESTSDIR}"; fi; \ - if [ -n "${DATA}" ]; then echo "@dirrm ${LDATADIR}"; fi; \ - if [ -n "${SQLS}" ]; then echo "@dirrm ${LSQLSDIR}"; fi; \ - if [ -n "${DOCS}" ]; then echo "%%PORTDOCS%%@dirrm ${LDOCSDIR}"; fi; \ - if [ -n "${EXAMPLES}" ]; then echo "%%PORTDOCS%%@dirrm ${LEXAMPLESDIR}"; fi; \ - echo "@dirrm ${LPKGREGDIR}"; \ - echo "@unexec rmdir %D/${LINSTDIR} 2> /dev/null || true"; \ - echo "@unexec rmdir %D/${LINSTDIR:H} 2> /dev/null || true"; \ - echo "@unexec rmdir %D/${LPEARDIR}/.registry 2> /dev/null || true"; \ - echo "@unexec rmdir %D/${LPEARDIR}/packages 2> /dev/null || true"; \ - echo "@unexec rmdir %D/${LPEARDIR} 2> /dev/null || true"; \ - echo "@unexec rmdir %D/${LDOCSDIR:H} 2> /dev/null || true"; \ - echo "@unexec rmdir %D/${LEXAMPLESDIR:H} 2> /dev/null || true"; \ - echo "@unexec rmdir %D/${LTESTSDIR:H} 2> /dev/null || true"; \ - echo "@unexec rmdir %D/${LDATADIR:H} 2> /dev/null || true"; \ - echo "@unexec rmdir %D/${LSCRIPTSDIR:H} 2> /dev/null || true"; \ - echo "@unexec rmdir %D/${LSQLSDIR:H} 2> /dev/null || true") > ${PLIST} -. endif - -. for t in files docs tests sqls scriptfiles examples data -. if !target(do-install-${t}-msg) -do-install-${t}-msg: .USE -. endif -. endfor - -pre-install: do-generate-plist -do-install: do-install-files do-install-docs do-install-tests do-install-sqls \ - do-install-scriptfiles do-install-examples do-install-data - -do-install-files: do-install-files-msg - @${MKDIR} ${INSTDIR} -. for dir in ${FILESDIRS} - @${MKDIR} ${INSTDIR}/${dir} -. endfor -. for file in ${FILES} - @${INSTALL_DATA} ${WRKSRC}/${file} ${INSTDIR}/${file} -. endfor - -do-install-docs: do-install-docs-msg -. if !defined(NOPORTDOCS) && !empty(DOCS) - @${ECHO_MSG} "===> Installing documentation in ${DOCSDIR}." - @${MKDIR} ${DOCSDIR} -. for dir in ${DOCSDIRS} - @${MKDIR} ${DOCSDIR}/${dir} -. endfor -. for file in ${DOCS} - @${INSTALL_DATA} ${WRKSRC}/${_DOCSDIR}/${file} ${DOCSDIR}/${file} -. endfor -. endif - -do-install-tests: do-install-tests-msg -. if !empty(TESTS) - @${ECHO_MSG} "===> Installing tests in ${TESTSDIR}." - @${MKDIR} ${TESTSDIR} -. for dir in ${TESTSDIRS} - @${MKDIR} ${TESTSDIR}/${dir} -. endfor -. for file in ${TESTS} - @${INSTALL_DATA} ${WRKSRC}/${_TESTSDIR}/${file} ${TESTSDIR}/${file} -. endfor -. endif - -do-install-data: do-install-data-msg -. if !empty(DATA) - @${ECHO_MSG} "===> Installing data in ${DATADIR}." - @${MKDIR} ${DATADIR} -. for dir in ${DATADIRS} - @${MKDIR} ${DATADIR}/${dir} -. endfor -. for file in ${DATA} - @${INSTALL_DATA} ${WRKSRC}/${_DATADIR}/${file} ${DATADIR}/${file} -. endfor -. endif - -do-install-sqls: do-install-sqls-msg -. if !empty(SQLS) - @${ECHO_MSG} "===> Installing sqls in ${SQLSDIR}." - @${MKDIR} ${SQLSDIR} -. for dir in ${SQLSDIRS} - @${MKDIR} ${SQLSDIR}/${dir} -. endfor -. for file in ${SQLS} - @${INSTALL_DATA} ${WRKSRC}/${_SQLSDIR}/${file} ${SQLSDIR}/${file} -. endfor -. endif - -do-install-scriptfiles: do-install-scriptfiles-msg -. if !empty(SCRIPTFILES) - @${ECHO_MSG} "===> Installing scripts in ${SCRIPTFILESDIR}." -. for file in ${SCRIPTFILES} - @${CP} ${WRKSRC}/pear-${file} ${WRKSRC}/${file} - @${REINPLACE_CMD} -e "s|@php_bin@|${SCRIPTFILESDIR}/php|g" ${WRKSRC}/${file} - @${REINPLACE_CMD} -e "s|@php_dir@|${PREFIX}/lib/php|g" ${WRKSRC}/${file} - @${REINPLACE_CMD} -e "s|@include_path@|${PREFIX}/${LPEARDIR}|g" ${WRKSRC}/${file} - @${INSTALL_SCRIPT} ${WRKSRC}/${file} ${SCRIPTFILESDIR}/${file} -. endfor -. endif - -do-install-examples: do-install-examples-msg -. if !defined(NOPORTDOCS) && !empty(EXAMPLES) - @${ECHO_MSG} "===> Installing examples in ${EXAMPLESDIR}." - @${MKDIR} ${EXAMPLESDIR} -. for dir in ${EXAMPLESDIRS} - @${MKDIR} ${EXAMPLESDIR}/${dir} -. endfor -. for file in ${EXAMPLES} - @${INSTALL_DATA} ${WRKSRC}/${_EXAMPLESDIR}/${file} ${EXAMPLESDIR}/${file} -. endfor -. endif -.endif - -post-install: - @${MKDIR} ${PKGREGDIR} - @${INSTALL_DATA} ${WRKDIR}/package.xml ${PKGREGDIR} - @${SETENV} PKG_PREFIX=${PREFIX} \ - ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL diff --git a/devel/pear-PEAR/distinfo b/devel/pear-PEAR/distinfo deleted file mode 100644 index f6f6473d88ab..000000000000 --- a/devel/pear-PEAR/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -MD5 (PEAR/PEAR-1.4.4.tgz) = 20c5d38b16b364bbf5395e6890f048e4 -SIZE (PEAR/PEAR-1.4.4.tgz) = 276978 diff --git a/devel/pear-PEAR/files/patch-scripts::pearcmd.php b/devel/pear-PEAR/files/patch-scripts::pearcmd.php deleted file mode 100644 index 1d0c6d7f62a9..000000000000 --- a/devel/pear-PEAR/files/patch-scripts::pearcmd.php +++ /dev/null @@ -1,19 +0,0 @@ ---- scripts/pearcmd.php.orig Sun Nov 6 21:17:11 2005 -+++ scripts/pearcmd.php Sun Nov 6 21:19:20 2005 -@@ -1,3 +1,4 @@ -+#!@php_bin@ -nq - <?php - // - // +----------------------------------------------------------------------+ -@@ -29,8 +30,10 @@ - /** - * @nodep Gtk - */ -+dl('pcre.so'); -+dl('xml.so'); - if ('@include_path@' != '@'.'include_path'.'@') { -- ini_set('include_path', '@include_path@'); -+ ini_set('include_path', '@include_path@:@include_path@/bootstrap'); - $raw = false; - } else { - // this is a raw, uninstalled pear, either a cvs checkout, or php distro diff --git a/devel/pear-PEAR/pkg-deinstall b/devel/pear-PEAR/pkg-deinstall deleted file mode 100644 index 94de0bfd249e..000000000000 --- a/devel/pear-PEAR/pkg-deinstall +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/sh -# -# $FreeBSD$ -# -# Remove package declaration from PEAR's registry. - -if [ x$2 != xDEINSTALL ]; then - exit -fi -PKG_NAME=${1%%-[0-9._]*} -PACKAGE=$(echo $PKG_NAME | sed 's/pear-//') - -PEAR=${PKG_PREFIX}/bin/pear -PEAR2=${PKG_PREFIX}/bin/pear2 - -if [ ${PACKAGE} = "PEAR" ] \ -|| [ ${PACKAGE} = "Archive_Tar" ] \ -|| [ ${PACKAGE} = "Console_Getopt" ] \ -|| [ ${PACKAGE} = "XML_RPC" ]; then - PEAR_INSTALLER=${PEAR} -else - PEAR_INSTALLER=${PEAR2} -fi - -${PEAR_INSTALLER} uninstall -r -n ${PACKAGE} || true diff --git a/devel/pear-PEAR/pkg-descr b/devel/pear-PEAR/pkg-descr deleted file mode 100644 index bead70c52d2d..000000000000 --- a/devel/pear-PEAR/pkg-descr +++ /dev/null @@ -1,12 +0,0 @@ -The PEAR package contains: -* the PEAR installer, for creating, distributing and installing packages -* the alpha-quality PEAR_Exception php5-only exception class -* the beta-quality PEAR_ErrorStack advanced error handling mechanism -* the PEAR_Error error handling mechanism -* the OS_Guess class for retrieving info about the OS where PHP is - running on -* the System class for quick handling common operations with files and - directories -* the PEAR base class - -WWW: http://pear.php.net/package/PEAR/ diff --git a/devel/pear-PEAR/pkg-install b/devel/pear-PEAR/pkg-install deleted file mode 100644 index a27d7b6e1fdf..000000000000 --- a/devel/pear-PEAR/pkg-install +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/sh -# -# $FreeBSD$ -# -# Register the package $1 in the port registry - -PREFIX=${PKG_PREFIX:=%%PREFIX%%} -PEAR=${PREFIX}/bin/pear -PEAR2=${PREFIX}/bin/pear2 -PKGREGDIR=${PREFIX}/share/pear/packages/$1 - -if [ -f "${PEAR2}" ]; then - PEAR_INSTALLER=${PEAR2} -else - PEAR_INSTALLER=${PEAR} -fi - -[ "x$1" = "x" ] && exit 1 -if [ "x$2" = "xPOST-INSTALL" ]; then - ${PEAR_INSTALLER} install -r -n -f ${PKGREGDIR}/package.xml -fi diff --git a/devel/pear-PEAR_PackageFileManager/Makefile b/devel/pear-PEAR_PackageFileManager/Makefile index 89885aaf9068..f04c833cf505 100644 --- a/devel/pear-PEAR_PackageFileManager/Makefile +++ b/devel/pear-PEAR_PackageFileManager/Makefile @@ -12,7 +12,7 @@ CATEGORIES= devel www pear MAINTAINER= antonio@php.net COMMENT= PEAR class to maintain PEAR packages -BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR +BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear RUN_DEPENDS= ${BUILD_DEPENDS} LATEST_LINK= pear-${PORTNAME} @@ -140,5 +140,5 @@ RUN_DEPENDS+= ${PEARDIR}/PHP/CompatInfo.php:${PORTSDIR}/devel/pear-PHP_CompatInf RUN_DEPENDS+= ${PEARDIR}/XML/Tree.php:${PORTSDIR}/devel/pear-XML_Tree .endif -.include "${PORTSDIR}/devel/pear-PEAR/Makefile.common" +.include "${PORTSDIR}/devel/pear/bsd.pear.mk" .include <bsd.port.post.mk> diff --git a/devel/pear-PHPDoc/Makefile b/devel/pear-PHPDoc/Makefile index 79beebed9ad7..f517abc17bce 100644 --- a/devel/pear-PHPDoc/Makefile +++ b/devel/pear-PHPDoc/Makefile @@ -12,7 +12,7 @@ CATEGORIES= devel www pear MAINTAINER= tux@pinguru.net COMMENT= Tool to generate documentation from the source -BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR +BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear RUN_DEPENDS= ${BUILD_DEPENDS} CATEGORY= PHPDoc @@ -100,7 +100,7 @@ DATA= renderer/html/default/class.html \ SCRIPTFILES= phpdoc .include <bsd.port.pre.mk> -.include "${PORTSDIR}/devel/pear-PEAR/Makefile.common" +.include "${PORTSDIR}/devel/pear/bsd.pear.mk" post-patch: @${REINPLACE_CMD} -e "s,@php_dir@,${PEARDIR}," \ diff --git a/devel/pear-PHPUnit/Makefile b/devel/pear-PHPUnit/Makefile index bfd91e473913..b8b78a2995ec 100644 --- a/devel/pear-PHPUnit/Makefile +++ b/devel/pear-PHPUnit/Makefile @@ -12,7 +12,7 @@ CATEGORIES= devel www pear MAINTAINER= tux@pinguru.net COMMENT= PEAR regression testing framework for unit tests -BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR +BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear RUN_DEPENDS= ${BUILD_DEPENDS} FILES= PHPUnit.php PHPUnit/GUI/Gtk.php PHPUnit/GUI/HTML.php \ @@ -23,5 +23,5 @@ FILES= PHPUnit.php PHPUnit/GUI/Gtk.php PHPUnit/GUI/HTML.php \ PHPUnit/TestResult.php PHPUnit/TestSuite.php .include <bsd.port.pre.mk> -.include "${PORTSDIR}/devel/pear-PEAR/Makefile.common" +.include "${PORTSDIR}/devel/pear/bsd.pear.mk" .include <bsd.port.post.mk> diff --git a/devel/pear-PHPUnit2/Makefile b/devel/pear-PHPUnit2/Makefile index e6595000557b..664b9589347d 100644 --- a/devel/pear-PHPUnit2/Makefile +++ b/devel/pear-PHPUnit2/Makefile @@ -90,5 +90,5 @@ post-patch: RUN_DEPENDS+= ${PEARDIR}/Log.php:${PORTSDIR}/sysutils/pear-Log .endif -.include "${PORTSDIR}/devel/pear-PEAR/Makefile.common" +.include "${PORTSDIR}/devel/pear/bsd.pear.mk" .include <bsd.port.post.mk> diff --git a/devel/pear-PHPUnit3/Makefile b/devel/pear-PHPUnit3/Makefile index e6595000557b..664b9589347d 100644 --- a/devel/pear-PHPUnit3/Makefile +++ b/devel/pear-PHPUnit3/Makefile @@ -90,5 +90,5 @@ post-patch: RUN_DEPENDS+= ${PEARDIR}/Log.php:${PORTSDIR}/sysutils/pear-Log .endif -.include "${PORTSDIR}/devel/pear-PEAR/Makefile.common" +.include "${PORTSDIR}/devel/pear/bsd.pear.mk" .include <bsd.port.post.mk> diff --git a/devel/pear-PHP_Beautifier/Makefile b/devel/pear-PHP_Beautifier/Makefile index 806cde63d429..229bf668cb21 100644 --- a/devel/pear-PHP_Beautifier/Makefile +++ b/devel/pear-PHP_Beautifier/Makefile @@ -63,5 +63,5 @@ post-patch: . endfor .include <bsd.port.pre.mk> -.include "${PORTSDIR}/devel/pear-PEAR/Makefile.common" +.include "${PORTSDIR}/devel/pear/bsd.pear.mk" .include <bsd.port.post.mk> diff --git a/devel/pear-PHP_Compat/Makefile b/devel/pear-PHP_Compat/Makefile index f6bb3934f994..b0b4dd659e5d 100644 --- a/devel/pear-PHP_Compat/Makefile +++ b/devel/pear-PHP_Compat/Makefile @@ -12,7 +12,7 @@ CATEGORIES= devel www pear MAINTAINER= antonio@php.net COMMENT= Provides missing functionality for older versions of PHP -BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR +BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear RUN_DEPENDS= ${BUILD_DEPENDS} CATEGORY= PHP @@ -132,5 +132,5 @@ TESTS= loadconstant.phpt loadfunction.phpt loadversion.phpt \ function/vprintf.phpt function/vsprintf.phpt .include <bsd.port.pre.mk> -.include "${PORTSDIR}/devel/pear-PEAR/Makefile.common" +.include "${PORTSDIR}/devel/pear/bsd.pear.mk" .include <bsd.port.post.mk> diff --git a/devel/pear-PHP_CompatInfo/Makefile b/devel/pear-PHP_CompatInfo/Makefile index 5c98a8828f56..c3033307abd3 100644 --- a/devel/pear-PHP_CompatInfo/Makefile +++ b/devel/pear-PHP_CompatInfo/Makefile @@ -12,7 +12,7 @@ CATEGORIES= devel pear MAINTAINER= antonio@php.net COMMENT= PEAR class to find out the minimum version and extensions required -BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR +BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear RUN_DEPENDS= ${BUILD_DEPENDS} USE_PHP= tokenizer @@ -73,5 +73,5 @@ post-extract: RUN_DEPENDS+= ${PEARDIR}/Console/Table.php:${PORTSDIR}/devel/pear-Console_Table .endif -.include "${PORTSDIR}/devel/pear-PEAR/Makefile.common" +.include "${PORTSDIR}/devel/pear/bsd.pear.mk" .include <bsd.port.post.mk> diff --git a/devel/pear-Pager/Makefile b/devel/pear-Pager/Makefile index 9ed8880b3a80..71dcaf12c7c5 100644 --- a/devel/pear-Pager/Makefile +++ b/devel/pear-Pager/Makefile @@ -12,7 +12,7 @@ CATEGORIES= devel www pear MAINTAINER= antonio@php.net COMMENT= PEAR data paging class -BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR +BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear RUN_DEPENDS= ${BUILD_DEPENDS} CATEGORY= Pager @@ -27,5 +27,5 @@ TESTS= all_tests.php pager_include.php pager_jumping_noData_test.php \ pager_wrapper_test.php simple_include.php README .include <bsd.port.pre.mk> -.include "${PORTSDIR}/devel/pear-PEAR/Makefile.common" +.include "${PORTSDIR}/devel/pear/bsd.pear.mk" .include <bsd.port.post.mk> diff --git a/devel/pear-Structures_DataGrid/Makefile b/devel/pear-Structures_DataGrid/Makefile index f48730559307..e4649fb94680 100644 --- a/devel/pear-Structures_DataGrid/Makefile +++ b/devel/pear-Structures_DataGrid/Makefile @@ -12,7 +12,7 @@ CATEGORIES= devel www pear MAINTAINER= nick@foobar.org COMMENT= Simple HTML data structure package -BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR +BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear RUN_DEPENDS= ${PEARDIR}/HTML/Table.php:${PORTSDIR}/devel/pear-HTML_Table \ ${PEARDIR}/Pager/Pager.php:${PORTSDIR}/devel/pear-Pager \ ${PEARDIR}/Spreadsheet/Excel/Writer.php:${PORTSDIR}/textproc/pear-Spreadsheet_Excel_Writer \ @@ -35,5 +35,5 @@ FILES= DataGrid.php DataGrid/Core.php DataGrid/Column.php \ DataGrid/Record/DataObject.php .include <bsd.port.pre.mk> -.include "${PORTSDIR}/devel/pear-PEAR/Makefile.common" +.include "${PORTSDIR}/devel/pear/bsd.pear.mk" .include <bsd.port.post.mk> diff --git a/devel/pear-System_Command/Makefile b/devel/pear-System_Command/Makefile index e03166251f1e..dc2ca1af6211 100644 --- a/devel/pear-System_Command/Makefile +++ b/devel/pear-System_Command/Makefile @@ -12,12 +12,12 @@ CATEGORIES= devel pear MAINTAINER= antonio@php.net COMMENT= PEAR command line execution interface -BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR +BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear RUN_DEPENDS= ${BUILD_DEPENDS} CATEGORY= System FILES= Command.php .include <bsd.port.pre.mk> -.include "${PORTSDIR}/devel/pear-PEAR/Makefile.common" +.include "${PORTSDIR}/devel/pear/bsd.pear.mk" .include <bsd.port.post.mk> diff --git a/devel/pear-Text_Diff/Makefile b/devel/pear-Text_Diff/Makefile index 47c5da037277..9928c23f0cae 100644 --- a/devel/pear-Text_Diff/Makefile +++ b/devel/pear-Text_Diff/Makefile @@ -12,7 +12,7 @@ CATEGORIES= devel pear MAINTAINER= joseph@randomnetworks.com COMMENT= Engine for performing and rendering text diffs -BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR +BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear RUN_DEPENDS= ${BUILD_DEPENDS} CATEGORY= Text @@ -32,5 +32,5 @@ EXAMPLES= 1.txt \ _EXAMPLESDIR= docs/examples .include <bsd.port.pre.mk> -.include "${PORTSDIR}/devel/pear-PEAR/Makefile.common" +.include "${PORTSDIR}/devel/pear/bsd.pear.mk" .include <bsd.port.post.mk> diff --git a/devel/pear-VFS/Makefile b/devel/pear-VFS/Makefile index 14e6998e7b5a..a2a2ec7f9da2 100644 --- a/devel/pear-VFS/Makefile +++ b/devel/pear-VFS/Makefile @@ -12,7 +12,7 @@ CATEGORIES= devel pear MAINTAINER= ports@FreeBSD.org COMMENT= PEAR Virtual File System API -BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR \ +BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear \ ${PEARDIR}/Log.php:${PORTSDIR}/sysutils/pear-Log RUN_DEPENDS= ${BUILD_DEPENDS} @@ -28,5 +28,5 @@ post-patch: @${MV} ${WRKSRC}/scripts/vfs.php ${WRKSRC}/pear-vfs.php .include <bsd.port.pre.mk> -.include "${PORTSDIR}/devel/pear-PEAR/Makefile.common" +.include "${PORTSDIR}/devel/pear/bsd.pear.mk" .include <bsd.port.post.mk> diff --git a/devel/pear-Validate/Makefile b/devel/pear-Validate/Makefile index 5aad1694ec28..89f16b468e40 100644 --- a/devel/pear-Validate/Makefile +++ b/devel/pear-Validate/Makefile @@ -12,7 +12,7 @@ CATEGORIES= devel www pear MAINTAINER= antonio@php.net COMMENT= Validation class -BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR +BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear RUN_DEPENDS= ${BUILD_DEPENDS} FILES= Validate.php Validate/Finance.php \ @@ -34,7 +34,7 @@ USE_REINPLACE= yes REINPLACE_ARGS= -i "" .include <bsd.port.pre.mk> -.include "${PORTSDIR}/devel/pear-PEAR/Makefile.common" +.include "${PORTSDIR}/devel/pear/bsd.pear.mk" post-patch: .for f in ${DATAFILES} diff --git a/devel/pear-Var_Dump/Makefile b/devel/pear-Var_Dump/Makefile index 4384024a4330..0d088a9670a5 100644 --- a/devel/pear-Var_Dump/Makefile +++ b/devel/pear-Var_Dump/Makefile @@ -12,7 +12,7 @@ CATEGORIES= devel www pear MAINTAINER= antonio@php.net COMMENT= Provides methods for dumping structured information about a variable -BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR +BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear RUN_DEPENDS= ${BUILD_DEPENDS} FILES= Var_Dump.php Var_Dump/Renderer.php Var_Dump/Renderer/Common.php \ @@ -36,5 +36,5 @@ post-extract: ${MV} ${WRKSRC}/php/* ${WRKSRC} .include <bsd.port.pre.mk> -.include "${PORTSDIR}/devel/pear-PEAR/Makefile.common" +.include "${PORTSDIR}/devel/pear/bsd.pear.mk" .include <bsd.port.post.mk> diff --git a/devel/pear-XML_NITF/Makefile b/devel/pear-XML_NITF/Makefile index 0f1661608f57..37b28e15d75b 100644 --- a/devel/pear-XML_NITF/Makefile +++ b/devel/pear-XML_NITF/Makefile @@ -19,5 +19,5 @@ CATEGORY= XML FILES= NITF.php .include <bsd.port.pre.mk> -.include "${PORTSDIR}/devel/pear-PEAR/Makefile.common" +.include "${PORTSDIR}/devel/pear/bsd.pear.mk" .include <bsd.port.post.mk> diff --git a/devel/pear-XML_Parser/Makefile b/devel/pear-XML_Parser/Makefile index f972c5851260..680657438ebb 100644 --- a/devel/pear-XML_Parser/Makefile +++ b/devel/pear-XML_Parser/Makefile @@ -12,7 +12,7 @@ CATEGORIES= devel pear MAINTAINER= antonio@php.net COMMENT= PEAR XML parsing class based on PHP's bundled expat -BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR +BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear RUN_DEPENDS= ${BUILD_DEPENDS} CATEGORY= XML @@ -23,5 +23,5 @@ EXAMPLES= xml_parser_file.php xml_parser_file.xml xml_parser_handler.php \ xml_parser_simple2.xml xml_parser_simple_handler.php .include <bsd.port.pre.mk> -.include "${PORTSDIR}/devel/pear-PEAR/Makefile.common" +.include "${PORTSDIR}/devel/pear/bsd.pear.mk" .include <bsd.port.post.mk> diff --git a/devel/pear-XML_RPC/Makefile b/devel/pear-XML_RPC/Makefile deleted file mode 100644 index 8568186c262e..000000000000 --- a/devel/pear-XML_RPC/Makefile +++ /dev/null @@ -1,36 +0,0 @@ -# Ports collection makefile for: pear-XML_RPC -# Date created: 4 October 2003 -# Whom: Thierry Thomas (<thierry@pompo.net>) -# -# $FreeBSD$ -# - -PORTNAME= XML_RPC -PORTVERSION= 1.4.3 -CATEGORIES= devel www pear - -MAINTAINER= antonio@php.net -COMMENT= PHP implementation of the XML-RPC protocol - -USE_PHP= yes -WANT_PHP_PEAR= yes - -CATEGORY= XML -FILES= RPC.php RPC/Server.php RPC/Dump.php -TESTS= protoport.php test_Dump.php - -post-extract: - @${MKDIR} ${WRKSRC}/RPC - @${MV} ${WRKSRC}/Server.php ${WRKSRC}/Dump.php ${WRKSRC}/RPC - -post-patch: -.for file in ${FILES} - @${REINPLACE_CMD} -e "s|@package_version@|${PORTVERSION}|" ${WRKSRC}/${file} -.endfor -.for file in ${TESTS} - @${REINPLACE_CMD} -e "s|@package_version@|${PORTVERSION}|" ${WRKSRC}/tests/${file} -.endfor - -.include <bsd.port.pre.mk> -.include "${PORTSDIR}/devel/pear-PEAR/Makefile.common" -.include <bsd.port.post.mk> diff --git a/devel/pear-XML_RPC/distinfo b/devel/pear-XML_RPC/distinfo deleted file mode 100644 index 406b37c441cc..000000000000 --- a/devel/pear-XML_RPC/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -MD5 (PEAR/XML_RPC-1.4.3.tgz) = 83138a445e424102db17b3b9588dbfef -SIZE (PEAR/XML_RPC-1.4.3.tgz) = 27198 diff --git a/devel/pear-XML_RPC/pkg-descr b/devel/pear-XML_RPC/pkg-descr deleted file mode 100644 index 2df4a18b393a..000000000000 --- a/devel/pear-XML_RPC/pkg-descr +++ /dev/null @@ -1,5 +0,0 @@ -A PEAR-ified version of Useful Inc's XML-RPC for PHP. - -It has support for HTTP/HTTPS transport, proxies and authentication. - -WWW: http://pear.php.net/package/XML_RPC/ diff --git a/devel/pear-XML_RSS/Makefile b/devel/pear-XML_RSS/Makefile index 590f56bd2655..ca186fb97abb 100644 --- a/devel/pear-XML_RSS/Makefile +++ b/devel/pear-XML_RSS/Makefile @@ -13,7 +13,7 @@ CATEGORIES= devel www pear MAINTAINER= ports@FreeBSD.org COMMENT= PEAR RSS parser -BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR +BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear RUN_DEPENDS= ${BUILD_DEPENDS} \ ${PEARDIR}/XML/Tree.php:${PORTSDIR}/devel/pear-XML_Tree @@ -22,5 +22,5 @@ FILES= RSS.php TESTS= test.rss 01-parse.phpt .include <bsd.port.pre.mk> -.include "${PORTSDIR}/devel/pear-PEAR/Makefile.common" +.include "${PORTSDIR}/devel/pear/bsd.pear.mk" .include <bsd.port.post.mk> diff --git a/devel/pear-XML_SVG/Makefile b/devel/pear-XML_SVG/Makefile index 59d887b55f44..9cb7b4b499ed 100644 --- a/devel/pear-XML_SVG/Makefile +++ b/devel/pear-XML_SVG/Makefile @@ -12,12 +12,12 @@ CATEGORIES= devel www pear MAINTAINER= antonio@php.net COMMENT= PEAR object-oriented API for building SVG documents -BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR +BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear RUN_DEPENDS= ${BUILD_DEPENDS} CATEGORY= XML FILES= SVG.php .include <bsd.port.pre.mk> -.include "${PORTSDIR}/devel/pear-PEAR/Makefile.common" +.include "${PORTSDIR}/devel/pear/bsd.pear.mk" .include <bsd.port.post.mk> diff --git a/devel/pear-XML_Serializer/Makefile b/devel/pear-XML_Serializer/Makefile index 66e3b92400ac..770c3f69eac1 100644 --- a/devel/pear-XML_Serializer/Makefile +++ b/devel/pear-XML_Serializer/Makefile @@ -43,5 +43,5 @@ post-extract: .endfor .include <bsd.port.pre.mk> -.include "${PORTSDIR}/devel/pear-PEAR/Makefile.common" +.include "${PORTSDIR}/devel/pear/bsd.pear.mk" .include <bsd.port.post.mk> diff --git a/devel/pear-XML_Transformer/Makefile b/devel/pear-XML_Transformer/Makefile index cee195da8f81..8b27e802f78c 100644 --- a/devel/pear-XML_Transformer/Makefile +++ b/devel/pear-XML_Transformer/Makefile @@ -27,5 +27,5 @@ DOCS= README _DOCSDIR= . .include <bsd.port.pre.mk> -.include "${PORTSDIR}/devel/pear-PEAR/Makefile.common" +.include "${PORTSDIR}/devel/pear/bsd.pear.mk" .include <bsd.port.post.mk> diff --git a/devel/pear-XML_Tree/Makefile b/devel/pear-XML_Tree/Makefile index c6d5955f8182..b7c23967a3cd 100644 --- a/devel/pear-XML_Tree/Makefile +++ b/devel/pear-XML_Tree/Makefile @@ -13,12 +13,12 @@ CATEGORIES= devel www pear MAINTAINER= ports@FreeBSD.org COMMENT= PEAR class for representing XML data in a tree structure -BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR +BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear RUN_DEPENDS= ${BUILD_DEPENDS} CATEGORY= XML FILES= Tree.php Tree/Node.php .include <bsd.port.pre.mk> -.include "${PORTSDIR}/devel/pear-PEAR/Makefile.common" +.include "${PORTSDIR}/devel/pear/bsd.pear.mk" .include <bsd.port.post.mk> diff --git a/devel/pear-XML_Util/Makefile b/devel/pear-XML_Util/Makefile index d7e9da0a2a8b..199aa2141f47 100644 --- a/devel/pear-XML_Util/Makefile +++ b/devel/pear-XML_Util/Makefile @@ -12,7 +12,7 @@ CATEGORIES= devel www pear MAINTAINER= antonio@php.net COMMENT= PEAR XML utility class -BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR +BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear RUN_DEPENDS= ${BUILD_DEPENDS} CATEGORY= XML @@ -20,5 +20,5 @@ FILES= Util.php EXAMPLES= example.php example2.php .include <bsd.port.pre.mk> -.include "${PORTSDIR}/devel/pear-PEAR/Makefile.common" +.include "${PORTSDIR}/devel/pear/bsd.pear.mk" .include <bsd.port.post.mk> diff --git a/devel/pear-XML_XPath/Makefile b/devel/pear-XML_XPath/Makefile index e6ddbe425b49..66d6ceaabfa3 100644 --- a/devel/pear-XML_XPath/Makefile +++ b/devel/pear-XML_XPath/Makefile @@ -13,7 +13,7 @@ CATEGORIES= devel www pear MAINTAINER= ports@FreeBSD.org COMMENT= PEAR class provided an XPath/DOM XML manipulation -BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR +BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear RUN_DEPENDS= ${BUILD_DEPENDS} .if defined(PACKAGE_BUILDING) @@ -26,5 +26,5 @@ EXAMPLES= XML_XPath_example.php _EXAMPLESDIR= docs .include <bsd.port.pre.mk> -.include "${PORTSDIR}/devel/pear-PEAR/Makefile.common" +.include "${PORTSDIR}/devel/pear/bsd.pear.mk" .include <bsd.port.post.mk> diff --git a/devel/pear-apd/Makefile b/devel/pear-apd/Makefile index 9795ed7d7cfb..ae8fad4694b1 100644 --- a/devel/pear-apd/Makefile +++ b/devel/pear-apd/Makefile @@ -13,7 +13,7 @@ CATEGORIES= devel pear MAINTAINER= ports@FreeBSD.org COMMENT= A full-featured engine-level PHP profiler/debugger -BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR +BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear RUN_DEPENDS= ${BUILD_DEPENDS} USE_PHP= yes @@ -26,7 +26,7 @@ DUMP_DIR?= /var/tmp/apd PORTDOCS= README .include <bsd.port.pre.mk> -.include "${PORTSDIR}/devel/pear-PEAR/Makefile.common" +.include "${PORTSDIR}/devel/pear/bsd.pear.mk" .if ${PHP_VER} == 4 APD_VER= 0.9.2 diff --git a/devel/php4-pear/Makefile b/devel/php4-pear/Makefile deleted file mode 100644 index b40f00031dec..000000000000 --- a/devel/php4-pear/Makefile +++ /dev/null @@ -1,19 +0,0 @@ -# New ports collection makefile for: php4-pear -# Date created: 7 Jul 2004 -# Whom: Alex Dupre <ale@FreeBSD.org> -# -# $FreeBSD$ -# - -CATEGORIES= devel -PKGNAMESUFFIX= -pear - -MAINTAINER= ale@FreeBSD.org -COMMENT= PEAR framework for PHP - -MASTERDIR= ${.CURDIR}/../../lang/php4 - -PLIST= ${PKGDIR}/pkg-plist.pear -PKGMESSAGE= ${PKGDIR}/pkg-message.pear - -.include "${MASTERDIR}/Makefile" diff --git a/devel/php5-pear/Makefile b/devel/php5-pear/Makefile deleted file mode 100644 index 7fa0140aed0c..000000000000 --- a/devel/php5-pear/Makefile +++ /dev/null @@ -1,19 +0,0 @@ -# New ports collection makefile for: php5-pear -# Date created: 7 Jul 2004 -# Whom: Alex Dupre <ale@FreeBSD.org> -# -# $FreeBSD$ -# - -CATEGORIES= devel -PKGNAMESUFFIX= -pear - -MAINTAINER= ale@FreeBSD.org -COMMENT= PEAR framework for PHP - -MASTERDIR= ${.CURDIR}/../../lang/php5 - -PLIST= ${PKGDIR}/pkg-plist.pear -PKGMESSAGE= ${PKGDIR}/pkg-message.pear - -.include "${MASTERDIR}/Makefile" |