Convert miwi's ports to new Options framework

While here fix some consistency in PEAR options name
bumped revision of net/icpld and net/ipsumdump because IPV6 is now on

Approved by:	miwi (maintainer)

7 files changed, 60 insertions, 79 deletions

diff --git a/devel/pear-Config/Makefile b/devel/pear-Config/Makefile
index 1c648350c514..8664362ccd77 100644
--- a/devel/pear-Config/Makefile
+++ b/devel/pear-Config/Makefile
@@ -1,9 +1,5 @@
-# Ports collection makefile for:  pear-Config
-# Date created:			  02 September 2003
-# Whom:				  Alex Miller (<asm@asm.kiev.ua>)
-#
+# Created by: Alex Miller (<asm@asm.kiev.ua>)
 # $FreeBSD$
-#
 
 PORTNAME=	Config
 PORTVERSION=	1.10.12
@@ -16,8 +12,9 @@ BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 LATEST_LINK=	pear-${PORTNAME}
-OPTIONS=	PEAR_XML_PARSER "PEAR::XML_Parser support" off \
-		PEAR_XML_UTIL "PEAR::XML_Util support" off
+OPTIONS_DEFINE=	PEAR_XML_PARSER PEAR_XML_UTIL
+PEAR_XML_PARSER_DESC=	PEAR::XML_Parser support
+PEAR_XML_UTIL_DESC=	PEAR::XML_Util support
 
 FILES=		Config/Container/Apache.php Config/Container/GenericConf.php \
 		Config/Container/IniCommented.php Config/Container/IniFile.php \
@@ -33,15 +30,15 @@ TESTS=		bug2742.ini bug2742.phpt bug2780.phpt bug3051.phpt bug3051.xml \
 		bug10010.phpt bug10185.phpt phpt_test.php.inc setup.php.inc
 _TESTSDIR=	test
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if defined(WITH_PEAR_XML_PARSER)
+.if ${PORT_OPTIONS:MPEAR_XML_PARSER}
 RUN_DEPENDS+=	${PEARDIR}/XML/Parser.php:${PORTSDIR}/devel/pear-XML_Parser
 .endif
 
-.if defined(WITH_PEAR_XML_UTIL)
+.if ${PORT_OPTIONS:MPEAR_XML_UTIL}
 RUN_DEPENDS+=	${PEARDIR}/XML/Util.php:${PORTSDIR}/devel/pear-XML_Util
 .endif
 
 .include "${PORTSDIR}/devel/pear/bsd.pear.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/pear-Date_Holidays/Makefile b/devel/pear-Date_Holidays/Makefile
index b725d2ad1b65..895de631a1f5 100644
--- a/devel/pear-Date_Holidays/Makefile
+++ b/devel/pear-Date_Holidays/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	pear-Date_Holidays
-# Date created:		2006-06-16
-# Whom:			Thomas Abthorpe <thomas@goodking.ca>
-#
+# Created by: Thomas Abthorpe <thomas@goodking.ca>
 # $FreeBSD$
-#
 
 PORTNAME=	Date_Holidays
 PORTVERSION=	0.21.6
@@ -20,13 +16,14 @@ RUN_DEPENDS=	${PEARDIR}/Date.php:${PORTSDIR}/devel/pear-Date \
 PEAR_AUTOINSTALL=	yes
 
 LATEST_LINK=	pear-Date_Holidays
-OPTIONS=	PEAR_CONSOLE_GETARGS "devel/pear-Console_Getargs" off
+OPTIONS_DEFINE=	PEAR_CONSOLE_GETARGS
+PEAR_CONSOLE_GETARGS_DESC=	Console::Getargs support
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if defined(PEAR_CONSOLE_GETARGS) || defined(WITH_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.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/pear-FSM/Makefile b/devel/pear-FSM/Makefile
index 6b1e95845f26..9ba2a67d9339 100644
--- a/devel/pear-FSM/Makefile
+++ b/devel/pear-FSM/Makefile
@@ -1,9 +1,5 @@
-# Ports collection makefile for:  pear-FSM
-# Date created:			  10 January 2005
-# Whom:				  Antonio Carlos Venancio Junior (<antonio@inf.ufsc.br>)
-#
+# Created by: Antonio Carlos Venancio Junior (<antonio@inf.ufsc.br>)
 # $FreeBSD$
-#
 
 PORTNAME=	FSM
 PORTVERSION=	1.3.1
@@ -21,13 +17,14 @@ TESTS=		addTransitionsArray.phpt transitions.phpt graphviz.phpt
 EXAMPLES=	rpn.php graphviz.php
 
 LATEST_LINK=	pear-${PORTNAME}
-OPTIONS=	PEAR_GraphViz "PEAR::GraphViz support" off
+OPTIONS_DEFINE=	PEAR_GRAPGHVIZ
+PEAR_GRAPGHVIZ_DESC=	PEAR::GraphViz support
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if defined(WITH_PEAR_GraphViz)
+.if ${PORT_OPTIONS:MPEAR_GRAPHVIZ}
 RUN_DEPENDS+=	${PEARDIR}/GraphViz.php:${PORTSDIR}/graphics/pear-Image_GraphViz
 .endif
 
 .include "${PORTSDIR}/devel/pear/bsd.pear.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/pear-HTML_Template_Flexy/Makefile b/devel/pear-HTML_Template_Flexy/Makefile
index ddd95368e284..c955633f3a84 100644
--- a/devel/pear-HTML_Template_Flexy/Makefile
+++ b/devel/pear-HTML_Template_Flexy/Makefile
@@ -1,9 +1,5 @@
-# Ports collection makefile for:  pear-HTML_Template_Flexy
-# Date created:			  04 January 2005
-# Whom:				  Antonio Carlos Venancio Junior (<antonio@inf.ufsc.br>)
-#
+# Created by: Antonio Carlos Venancio Junior (<antonio@inf.ufsc.br>)
 # $FreeBSD$
-#
 
 PORTNAME=	HTML_Template_Flexy
 PORTVERSION=	1.3.12
@@ -16,25 +12,26 @@ BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
 RUN_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
 
 LATEST_LINK=	pear-HTML_Template_Flexy
-OPTIONS=	PEAR_HTML_JAVASCRIPT "PEAR::HTML_Javascript support" off \
-		PEAR_FILE_GETTEXT "PEAR::File_Gettext support" off \
-		PEAR_TRANSLATION2 "PEAR::Translation2 support" off
+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.pre.mk>
+.include <bsd.port.options.mk>
 
-.if defined(WITH_PEAR_HTML_JAVASCRIPT)
+.if ${PORT_OPTIONS:MPEAR_HTML_JAVASCRIPT}
 RUN_DEPENDS+=	${PEARDIR}/HTML/Javascript.php:${PORTSDIR}/devel/pear-HTML_Javascript
 .endif
 
-.if defined(WITH_PEAR_FILE_GETTEXT)
+.if ${PORT_OPTIONS:MPEAR_FILE_GETTEXT}
 RUN_DEPENDS+=	${PEARDIR}/File/Gettext.php:${PORTSDIR}/sysutils/pear-File_Gettext
 .endif
 
-.if defined(WITH_PEAR_TRANSLATION2)
+.if ${PORT_OPTIONS:MPEAR_TRANSLATION2}
 RUN_DEPENDS+=	${PEARDIR}/Translation2.php:${PORTSDIR}/sysutils/pear-Translation2
 .endif
 
 .include "${PORTSDIR}/devel/pear/bsd.pear.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/pear-PEAR_Info/Makefile b/devel/pear-PEAR_Info/Makefile
index cb7b90a37728..b9434516c721 100644
--- a/devel/pear-PEAR_Info/Makefile
+++ b/devel/pear-PEAR_Info/Makefile
@@ -1,9 +1,5 @@
-# Ports collection makefile for:  pear-PEAR_Info
-# Date created:		2006/07/31
-# Whom:			chinsan <chinsan.tw@gmail.com>
-#
+# Created by: chinsan <chinsan.tw@gmail.com>
 # $FreeBSD$
-#
 
 PORTNAME=	PEAR_Info
 PORTVERSION=	1.9.2
@@ -17,7 +13,9 @@ BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear \
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 LATEST_LINK=	pear-PEAR_Info
-OPTIONS=	PEAR_PHPUnit3 "PEAR::PHPUnit3 support" on
+OPTIONS_DEFINE=	PEAR_PHPUNIT3
+OPTIONS_DEFAULT=	PEAR_PHPUNIT3
+PEAR_PHPUNIT3_DESC=	PEAR::PHPUnit3 support
 
 CATEGORY=	PEAR
 FILES=		Info.php pearinfo.css Info/Cli.php scripts/pearinfo
@@ -30,11 +28,11 @@ EXAMPLES=	blueskin.css pearinfo3.css pear_info.php pear_info2.php \
 		pear_info3.php pear_info4.php pear_info5.php pear_info6.php \
 		pear_info7.php
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if defined(WITH_PEAR_PHPUnit3)
+.if ${PORT_OPTIONS:MPEAR_PHPUNIT3}
 RUN_DEPENDS+=	${PEARDIR}/PHPUnit/Framework.php:${PORTSDIR}/devel/pear-PHPUnit3
 .endif
 
 .include "${PORTSDIR}/devel/pear/bsd.pear.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/pear-PEAR_PackageFileManager/Makefile b/devel/pear-PEAR_PackageFileManager/Makefile
index e00d65f8306d..893d3a3a2e34 100644
--- a/devel/pear-PEAR_PackageFileManager/Makefile
+++ b/devel/pear-PEAR_PackageFileManager/Makefile
@@ -1,9 +1,5 @@
-# Ports collection makefile for:  pear-PEAR_PackageFileManager
-# Date created:			  23 May 2005
-# Whom:				  Antonio Carlos Venancio Junior (<antonio@inf.ufsc.br>)
-#
+# Created by: Antonio Carlos Venancio Junior (<antonio@inf.ufsc.br>)
 # $FreeBSD$
-#
 
 PORTNAME=	PEAR_PackageFileManager
 PORTVERSION=	1.7.0
@@ -16,8 +12,9 @@ BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 LATEST_LINK=	pear-${PORTNAME}
-OPTIONS=	PEAR_PHP_COMPATINFO "PEAR::PHP_CompatInfo support" off \
-		PEAR_XML_TREE "PEAR::XML_Tree support" off
+OPTIONS_DEFINE=	PEAR_PHP_COMPATINFO PEAR_XML_TREE
+PEAR_PHP_COMPATINFO_DESC=	PEAR::PHP_CompatInfo support
+PEAR_XML_TREE_DESC=	PEAR::XML_Tree support
 
 CATEGORY=	PEAR
 
@@ -70,15 +67,15 @@ TESTS=		addConfigureOption/test_invalid_nosetoptions.phpt \
 		Bad_file.php phpt_test.php.inc setup.php.inc test1_package.xml \
 		Test_file.php
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if defined(WITH_PEAR_PHP_COMPATINFO)
+.if ${PORT_OPTIONS:MPEAR_PHP_COMPATINFO}
 RUN_DEPENDS+=	${PEARDIR}/PHP/CompatInfo.php:${PORTSDIR}/devel/pear-PHP_CompatInfo
 .endif
 
-.if defined(WITH_PEAR_XML_TREE)
+.if ${PORT_OPTIONS:MPEAR_XML_TREE}
 RUN_DEPENDS+=	${PEARDIR}/XML/Tree.php:${PORTSDIR}/devel/pear-XML_Tree
 .endif
 
 .include "${PORTSDIR}/devel/pear/bsd.pear.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/pear-PHP_CompatInfo/Makefile b/devel/pear-PHP_CompatInfo/Makefile
index ec0111b9b7c7..bec408d64b45 100644
--- a/devel/pear-PHP_CompatInfo/Makefile
+++ b/devel/pear-PHP_CompatInfo/Makefile
@@ -1,9 +1,5 @@
-# Ports collection makefile for:  pear-PHP_CompatInfo
-# Date created:			  15 March 2005
-# Whom:				  Antonio Carlos Venancio Junior (<antonio@inf.ufsc.br>)
-#
+# Created by: Antonio Carlos Venancio Junior (<antonio@inf.ufsc.br>)
 # $FreeBSD$
-#
 
 PORTNAME=	PHP_CompatInfo
 PORTVERSION=	1.9.0
@@ -26,33 +22,35 @@ USE_DOS2UNIX=	yes
 PEAR_AUTOINSTALL=	yes
 
 LATEST_LINK=	pear-PHP_CompatInfo
-OPTIONS=	PEAR_XML_BEAUTIFIER "PEAR::XML_Beautifier support" off \
-		PEAR_VAR_DUMP "PEAR::Var_Dump support" off \
-		PEAR_PHPUNIT "PEAR::PHPUnit support" on \
-		PEAR_XML_UTIL "PEAR::XML_Util support" on \
-		PEAR_HTML_TABLE "PEAR::HTML_Table" off
+OPTIONS_DEFINE=	PEAR_XML_BEAUTIFIER PEAR_VAR_DUMP PEAR_PHPUNIT PEAR_XML_UTIL PEAR_HTML_TABLE
+OPTIONS_DEFAULT=	PEAR_PHPUNIT PEAR_XML_UTIL
+PEAR_XML_BEAUTIFIER_DESC=	PEAR::XML_Beautifier support
+PEAR_VAR_DUMP_DESC=	PEAR::Var_Dump support
+PEAR_PHPUNIT_DESC=	PEAR::PHPUnit support
+PEAR_XML_UTIL_DESC=	PEAR::XML_Util support
+PEAR_HTML_TABLE_DESC=	PEAR::HTML_Table
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if defined(WITH_PEAR_XML_BEAUTIFIER)
+.if ${PORT_OPTIONS:MPEAR_XML_BEAUTIFIER}
 RUN_DEPENDS+=	${PEARDIR}/XML/Beautifier.php:${PORTSDIR}/textproc/pear-XML_Beautifier
 .endif
 
-.if defined(WITH_PEAR_VAR_DUMP)
+.if ${PORT_OPTIONS:MPEAR_VAR_DUMP}
 RUN_DEPENDS+=	${PEARDIR}/Var/Dump.php:${PORTSDIR}/devel/pear-Var_Dump
 .endif
 
-.if defined(WITH_PEAR_PHPUNIT)
+.if ${PORT_OPTIONS:MPEAR_PHPUNIT}
 RUN_DEPENDS+=	${PEARDIR}/PHPUnit/Framework.php:${PORTSDIR}/devel/pear-PHPUnit3
 .endif
 
-.if defined(WITH_PEAR_XML_UTIL)
+.if ${PORT_OPTIONS:MPEAR_XML_UTIL}
 RUN_DEPENDS+=	${PEARDIR}/XML/Util.php:${PORTSDIR}/devel/pear-XML_Util
 .endif
 
-.if defined(WITH_PEAR_HTML_TABLE)
+.if ${PORT_OPTIONS:MPEAR_HTML_TABLE}
 RUN_DEPENDS+=${PEARDIR}/HTML/Table.php:${PORTSDIR}/devel/pear-HTML_Table
 .endif
 
 .include "${PORTSDIR}/devel/pear/bsd.pear.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>