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)

2 files changed, 34 insertions, 38 deletions

diff --git a/sysutils/pear-Log/Makefile b/sysutils/pear-Log/Makefile
index 808a119759c8..50a86dc3ff30 100644
--- a/sysutils/pear-Log/Makefile
+++ b/sysutils/pear-Log/Makefile
@@ -1,9 +1,5 @@
-# Ports collection makefile for:  pear-Log
-# Date created:			  22 October 2002
-# Whom:				  Thierry Thomas (<thierry@pompo.net>)
-#
+# Created by: Thierry Thomas (<thierry@pompo.net>)
 # $FreeBSD$
-#
 
 PORTNAME=	Log
 PORTVERSION=	1.12.7
@@ -20,28 +16,29 @@ IGNORE_WITH_PHP=	4
 PEAR_AUTOINSTALL=	yes
 
 LATEST_LINK=	pear-Log
-OPTIONS=	PEAR_DB "PEAR::DB support" off \
-		PEAR_MDB2 "PEAR::MDB2 support" off \
-		PEAR_Mail "PEAR::Mail support" off \
-		PHP_SQLITE "PHP sqlite support (php5 only)" off
+OPTIONS_DEFINE=	PEAR_DB PEAR_MDB2 PEAR_MAIL PEAR_SQLITE
+PEAR_DB_DESC=	PEAR::DB support
+PEAR_MDB2_DESC=	PEAR::MDB2 support
+PEAR_MAIL_DESC=	PEAR::Mail support
+PHP_SQLITE_DESC=	PHP sqlite support (php5 only)
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if defined(WITH_PEAR_DB)
+.if ${PORT_OPTIONS:MPEAR_DB}
 BUILD_DEPENDS+=	${PEARDIR}/DB.php:${PORTSDIR}/databases/pear-DB
 .endif
 
-.if defined(WITH_PEAR_MDB2)
+.if ${PORT_OPTIONS:MPEAR_MDB2}
 BUILD_DEPENDS+=	${PEARDIR}/MDB2.php:${PORTSDIR}/databases/pear-MDB2
 .endif
 
-.if defined(WITH_PEAR_Mail)
+.if ${PORT_OPTIONS:MPEAR_MAIL}
 BUILD_DEPENDS+=	${PEARDIR}/Mail.php:${PORTSDIR}/mail/pear-Mail
 .endif
 
-.if defined(WITH_PHP_SQLITE)
+.if ${PORT_OPTIONS:MPHP_SQLITE}
 USE_PHP+=	sqlite
 .endif
 
 .include "${PORTSDIR}/devel/pear/bsd.pear.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/sysutils/pear-Translation2/Makefile b/sysutils/pear-Translation2/Makefile
index 1ad6086e1fc0..4d3521d37d7f 100644
--- a/sysutils/pear-Translation2/Makefile
+++ b/sysutils/pear-Translation2/Makefile
@@ -1,9 +1,5 @@
-# Ports collection makefile for:  pear-Translation2
-# Date created:			  20 December 2004
-# Whom:				  Antonio Carlos Venancio Junior (<antonio@inf.ufsc.br>)
-#
+# Created by: Antonio Carlos Venancio Junior (<antonio@inf.ufsc.br>)
 # $FreeBSD$
-#
 
 PORTNAME=	Translation2
 DISTVERSION=	2.0.4
@@ -20,14 +16,16 @@ USE_PHP=	yes
 PEAR_CATSRC=	yes
 
 LATEST_LINK=	pear-Translation2
-OPTIONS=	PEAR_CACHE_LITE "PEAR::Cache_Lite support" off \
-		PEAR_DB "PEAR::DB support" off \
-		PEAR_DB_DATAOBJECT "PEAR::DB_DataObject support" off \
-		PEAR_MDB "PEAR::MDB support" off \
-		PEAR_MDB2 "PEAR::MDB2 support" off \
-		PEAR_FILE_GETTEXT "PEAR::File_Gettext support" off \
-		PEAR_I18NV2 "PEAR::I18Nv2 support" off \
-		PEAR_XML_SERIALIZER "PEAR::XML_Serializer support" off
+OPTIONS_DEFINE=	PEAR_CACHE_LITE PEAR_DB PEAR_DB_DATAOBJECT PEAR_MDB PEAR_MDB2 \
+		PEAR_FILE_GETTEXT PEAR_I18NV2 PEAR_XML_SERIALIZER
+PEAR_CACHE_LITE_DESC=	PEAR::Cache_Lite support
+PEAR_DB_DESC=	PEAR::DB support
+PEAR_DB_DATAOBJECT_DESC=	PEAR::DB_DataObject support
+PEAR_MDB_DESC=	PEAR::MDB support
+PEAR_MDB2_DESC=	PEAR::MDB2 support
+PEAR_FILE_GETTEXT_DESC=	PEAR::File_Gettext support
+PEAR_I18NV2_DESC=	PEAR::I18Nv2 support
+PEAR_XML_SERIALIZER_DESC=	PEAR::XML_Serializer support
 
 FILES=		Translation2.php Translation2/Admin.php Translation2/Container.php \
 		Translation2/Decorator.php Translation2/Admin/Decorator.php \
@@ -64,38 +62,39 @@ EXAMPLES=	gettext_admin.php gettext_domains.ini gettext_langs.ini \
 		Translation2_gettext_example.php Translation2_example_multitable.sql
 _EXAMPLESDIR=	docs/examples
 
-.if defined(WITH_PEAR_CACHE_LITE)
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MPEAR_CACHE_LITE}
 RUN_DEPENDS+=	${PEARDIR}/Cache/Lite.php:${PORTSDIR}/sysutils/pear-Cache_Lite
 .endif
 
-.if defined(WITH_PEAR_DB)
+.if ${PORT_OPTIONS:MPEAR_DB}
 RUN_DEPENDS+=	${PEARDIR}/DB.php:${PORTSDIR}/databases/pear-DB
 .endif
 
-.if defined(WITH_PEAR_DB_DATAOBJECT)
+.if ${PORT_OPTIONS:MPEAR_DB_DATAOBJECT}
 RUN_DEPENDS+=	${PEARDIR}/DB/DataObject.php:${PORTSDIR}/databases/pear-DB_DataObject
 .endif
 
-.if defined(WITH_PEAR_MDB)
+.if ${PORT_OPTIONS:MPEAR_MDB}
 RUN_DEPENDS+=	${PEARDIR}/MDB.php:${PORTSDIR}/databases/pear-MDB
 .endif
 
-.if defined(WITH_PEAR_MDB2)
+.if ${PORT_OPTIONS:MPEAR_MDB2}
 RUN_DEPENDS+=	${PEARDIR}/MDB2.php:${PORTSDIR}/databases/pear-MDB2
 .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_I18NV2)
+.if ${PORT_OPTIONS:MPEAR_I18NV2}
 RUN_DEPENDS+=	${PEARDIR}/File/I18Nv2.php:${PORTSDIR}/sysutils/pear-I18Nv2
 .endif
 
-.if defined(WITH_PEAR_XML_SERIALIZER)
+.if ${PORT_OPTIONS:MPEAR_XML_SERIALIZER}
 RUN_DEPENDS+=	${PEARDIR}/XML/Serializer.php:${PORTSDIR}/devel/pear-XML_Serializer
 .endif
 
-.include <bsd.port.pre.mk>
 .include "${PORTSDIR}/devel/pear/bsd.pear.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>