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)

30 files changed, 325 insertions, 413 deletions

diff --git a/audio/shntool/Makefile b/audio/shntool/Makefile
index 9e676b1885cd..c02659746f6f 100644
--- a/audio/shntool/Makefile
+++ b/audio/shntool/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	shntool
-# Date created:		2 November 2000
-# Whom:			Bill Fenner <fenner@FreeBSD.org>
-#
+# Created by: Bill Fenner <fenner@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	shntool
 PORTVERSION=	3.0.10
@@ -19,27 +15,27 @@ SHN_ALIASES=	tool len fix hash pad join split cat cmp cue conv info strip gen tr
 PLIST_FILES=	${SHN_ALIASES:S|^|bin/shn|}
 MAN1=		shntool.1
 
-OPTIONS=	AIFF "AIFF support via sox" off \
-		SHN "Shorten support" off \
-		FLAC "FLAC support" off \
-		APE "Monkey's Audio support" off \
-		OFR "OptimFROG support" off \
-		LPAC "LPAC support" off \
-		WV "WavPack support" off \
-		ALAC "Apple Lossless Audio support" off \
-		LA "Laudio support" off \
-		TTA "TTA Lossless Audio support" off \
-		BONK "Bonk lossy/lossless audio support" off \
-		KXS "Kexis support" off
-#		ALS "MPEG-4 Audio Lossless Coding support" off \
+OPTIONS_DEFINE=	AIFF SHN FLAC APE OFR LPAC WV ALAC LA TTA BONK KXS
+AIFF_DESC=	AIFF support via sox
+SHN_DESC=	Shorten support
+OFR_DESC=	OptimFROG support
+LPAC_DESC=	LPAC support
+WV_DESC=	WavPack support
+ALAC_DESC=	Apple Lossless Audio support
+LA_DESC=	Laudio support
+TTA_DESC=	TTA Lossless Audio support
+BONK_DESC=	Bonk lossy/lossless audio support
+KXS_DESC=	Kexis support
+ALS_DESC=	MPEG-4 Audio Lossless Coding support
+
 RDEP=	AIFF:sox SHN:shorten FLAC APE:mac OFR:ofr:optimfrog LPAC WV:wavpack \
 	ALAC:alac LA:laudio TTA:ttaenc:tta ALS:mp4als BONK KXS:kexis
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
 .for i in ${RDEP}
 o=	${i:C/:.*//}
-.	ifdef WITH_${o}
+.	if ${PORT_OPTIONS:M${o}}
 b=	${i:C/^[A-Z]*://:C/:.*//:L}
 p=	${i:C/^[A-Z]*://:C/.*://:L}
 RUN_DEPENDS+=	${b}:${PORTSDIR}/audio/${p}
@@ -47,4 +43,4 @@ RUN_DEPENDS:=	${RUN_DEPENDS}
 .	endif
 .endfor
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/databases/pear-DB_DataObject_FormBuilder/Makefile b/databases/pear-DB_DataObject_FormBuilder/Makefile
index 3925def2f272..af8b58d8232c 100644
--- a/databases/pear-DB_DataObject_FormBuilder/Makefile
+++ b/databases/pear-DB_DataObject_FormBuilder/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:   pear-DB_DataObject_FormBuilder
-# Date created:        24 August 2004
-# Whom:                Antonio Carlos Venancio Junior (<antonio@php.net>)
-#
+# Created by: Antonio Carlos Venancio Junior (<antonio@php.net>)
 # $FreeBSD$
-#
 
 PORTNAME=	DB_DataObject_FormBuilder
 PORTVERSION=	1.0.2
@@ -18,20 +14,21 @@ RUN_DEPENDS:=	${PEARDIR}/HTML/QuickForm.php:${PORTSDIR}/devel/pear-HTML_QuickFor
 		${PEARDIR}/DB/DataObject.php:${PORTSDIR}/databases/pear-DB_DataObject
 
 LATEST_LINK=	pear-DB_DataObject_FormBuilder
-OPTIONS=	PEAR_DATE "PEAR::Date support" off \
-		PEAR_HTML_TABLE "PEAR::HTML_Table support" off
+OPTIONS_DEFINE=	PEAR_DATE PEAR_HTML_TABLE
+PEAR_DATE_DESC=	PEAR::Date support
+PEAR_HTML_TABLE_DESC=	PEAR::HTML_Table support
 
 PEAR_AUTOINSTALL=yes
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if defined(WITH_PEAR_DATE)
+.if ${PORT_OPTIONS:MPEAR_DATE}
 RUN_DEPENDS+=	${PEARDIR}/Date.php:${PORTSDIR}/devel/pear-Date
 .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>
diff --git a/databases/pear-DB_Table/Makefile b/databases/pear-DB_Table/Makefile
index ec81481d165c..73bdab07e369 100644
--- a/databases/pear-DB_Table/Makefile
+++ b/databases/pear-DB_Table/Makefile
@@ -1,9 +1,5 @@
-# Ports collection makefile for:  pear-DB_Table
-# Date created:			  08 March 2005
-# Whom:				  Antonio Carlos Venancio Junior (<antonio@inf.ufsc.br>)
-#
+# Created by: Antonio Carlos Venancio Junior (<antonio@inf.ufsc.br>)
 # $FreeBSD$
-#
 
 PORTNAME=	DB_Table
 PORTVERSION=	1.5.6
@@ -17,9 +13,10 @@ BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 LATEST_LINK=	pear-DB_Table
-OPTIONS=	PEAR_HTML_QUICKFORM "PEAR::HTML_QuickForm support" off \
-		PEAR_DB "PEAR::DB support" off \
-		PEAR_MDB2 "PEAR::MDB2 support" off
+OPTIONS_DEFINE=	PEAR_HTML_QUICKFORM PEAR_DB PEAR_MDB2
+PEAR_HTML_QUICKFORM_DESC=	PEAR::HTML_QuickForm support
+PEAR_DB_DESC=	PEAR::DB support
+PEAR_MDB2_DESC=	PEAR::MDB2 support
 
 CATEGORY=	DB
 FILES=		Table.php Table/Manager/ibase.php Table/Manager/mysql.php \
@@ -73,19 +70,19 @@ post-extract:
 	@${REINPLACE_CMD} -e "s|@package_version@|${PORTVERSION}|" \
 		${WRKSRC}/Table.php
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if defined(WITH_PEAR_HTML_QUICKFORM)
+.if ${PORT_OPTIONS:MPEAR_HTML_QUICKFORM}
 RUN_DEPENDS+=	${PEARDIR}/HTML/QuickForm.php:${PORTSDIR}/devel/pear-HTML_QuickForm
 .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_MDB2)
+.if ${PORT_OPTIONS:MPEAR_MDB2}
 RUN_DEPENDS+=	${PEARDIR}/MDB2.php:${PORTSDIR}/databases/pear-MDB2
 .endif
 
 .include "${PORTSDIR}/devel/pear/bsd.pear.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/databases/pear-XML_Query2XML/Makefile b/databases/pear-XML_Query2XML/Makefile
index 34d82ea98cdf..91b52fa1e213 100644
--- a/databases/pear-XML_Query2XML/Makefile
+++ b/databases/pear-XML_Query2XML/Makefile
@@ -1,9 +1,5 @@
-# Ports collection makefile for:  pear-XML_Query2xml
-# Date created:			  23 March 2008
-# Whom:				  wenheping<wenheping@gmail.com>
-#
+# Created by: wenheping<wenheping@gmail.com>
 # $FreeBSD$
-#
 
 PORTNAME=	XML_Query2XML
 PORTVERSION=	1.7.2
@@ -16,8 +12,9 @@ BUILD_DEPENDS=	${PEARDIR}/DB.php:${PORTSDIR}/databases/pear-DB
 RUN_DEPENDS=	${PEARDIR}/DB.php:${PORTSDIR}/databases/pear-DB
 
 LATEST_LINK=	pear-XML_Query2xml
-OPTIONS=	PEAR_MDB2 "Add support for pear-MDB2" Off \
-		PEAR_Net_LDAP2 "Add support for pear-Net_LDAP2" Off
+OPTIONS_DEFINE=	PEAR_MDB2 PEAR_NET_LDAP2
+PEAR_MDB2_DESC=	Add support for pear-MDB2
+PEAR_NET_LDAP2_DESC=	Add support for pear-Net_LDAP2
 
 FILES=	XML/Query2XML.php XML/Query2XML/ISO9075Mapper.php \
 	XML/Query2XML/Callback.php \
@@ -316,15 +313,15 @@ TESTS=	Query2XML_Tests.psql \
 	XML_Query2XML_ISO9075Mapper/skipif.php
 _TESTSDIR=	tests
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if defined(WITH_PEAR_MDB2)
+.if ${PORT_OPTIONS:MPEAR_MDB2}
 BUILD_DEPENDS+=	${PEARDIR}/MDB2.php:${PORTSDIR}/databases/pear-MDB2
 .endif
 
-.if defined(WITH_PEAR_Net_LDAP2)
+.if ${PORT_OPTIONS:MPEAR_NET_LDAP2}
 BUILD_DEPENDS+=	${PEARDIR}/Net/LDAP2.php:${PORTSDIR}/net/pear-Net_LDAP2
 .endif
 
 .include "${PORTSDIR}/devel/pear/bsd.pear.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
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>
diff --git a/irc/irssi-devel/Makefile b/irc/irssi-devel/Makefile
index 1345e6313707..5be70a13e947 100644
--- a/irc/irssi-devel/Makefile
+++ b/irc/irssi-devel/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	irssi-devel
-# Date created:                 03 Mar 2005
-# Whom:                         Vsevolod Stakhov <vsevolod@highsecure.ru>
-#
+# Created by: Vsevolod Stakhov <vsevolod@highsecure.ru>
 # $FreeBSD$
-#
 
 PORTNAME=	irssi
 PORTVERSION=	20120624
@@ -26,28 +22,24 @@ MAKE_JOBS_SAFE=	yes
 
 MAN1=		irssi.1
 
-OPTIONS=	PERL "Enable Perl support" on \
-		PROXY "Enable proxy support" off \
-		SOCKS "Enable socks proxy support" off \
-		IPV6 "Enable IPv6" on \
-		BOT "Enable bot" off
+OPTIONS_DEFINE=	PERL PROXY SOCKS IPV6 BOT SSL
+SOCKS_DESC=	Socks proxy support
+BOT_DESC=	Bot support
+OPTIONS_DEFAULT=	PERL IPV6 SSL
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-0.8.15-svn
 
-# USE_OPENSSL must be defined before bsd.port.pre.mk so use old schema
-# for WITH_SSL option
+.include <bsd.port.options.mk>
 
-.if defined(WITHOUT_SSL)
-CONFIGURE_ARGS+=	--disable-ssl
-.else
+# Process options.
+
+.if ${PORT_OPTIONS:MSSL}
 USE_OPENSSL=	yes
+.else
+CONFIGURE_ARGS+=	--disable-ssl
 .endif
 
-.include <bsd.port.pre.mk>
-
-# Process options.
-
-.if !defined(WITHOUT_PERL)
+.if ${PORT_OPTIONS:MPERL}
 USE_PERL5=	yes
 CONFIGURE_ARGS+=	--with-perl-lib=site
 PLIST_SUB+=	WITH_PERL=""
@@ -56,23 +48,25 @@ CONFIGURE_ARGS+=	--without-perl
 PLIST_SUB+=	WITH_PERL="@comment "
 .endif
 
-.if defined(WITH_PROXY)
+.if ${PORT_OPTIONS:MPROXY}
 CONFIGURE_ARGS+=	--with-proxy
 PLIST_SUB+=	WITH_PROXY=""
 .else
 PLIST_SUB+=	WITH_PROXY="@comment "
 .endif
 
-.if defined(WITH_SOCKS)
+.if ${PORT_OPTIONS:MSOCKS}
 CONFIGURE_ARGS+=	--with-socks
 .endif
 
-.if !defined(WITHOUT_IPV6)
+.if ${PORT_OPTIONS:MIPV6}
 CONFIGURE_ARGS+=	--enable-ipv6
 CATEGORIES+=	ipv6
+.else
+CONFIGURE_ARGS+=	--disable-ipv6
 .endif
 
-.if defined(WITH_BOT)
+.if ${PORT_OPTIONS:MBOT}
 CONFIGURE_ARGS+=	--with-bot
 PLIST_SUB+=	WITH_BOT=""
 .else
@@ -93,4 +87,4 @@ post-install:
 		${INSTALL_DATA} ${WRKSRC}/irssi.conf.sample ${PREFIX}/etc/irssi.conf ; \
 	fi
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/irc/pisg/Makefile b/irc/pisg/Makefile
index 8940365cc665..52e450439f02 100644
--- a/irc/pisg/Makefile
+++ b/irc/pisg/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:   pisg
-# Date created:        Mon Feb 11 13:02:35 GMT 2002
-# Whom:                pgl@instinct.org
-#
+# Created by: pgl@instinct.org
 # $FreeBSD$
-#
 
 PORTNAME=	pisg
 PORTVERSION=	0.73
@@ -16,11 +12,12 @@ COMMENT=	A Perl IRC Statistics Generator
 USE_PERL5=	YES
 NO_BUILD=	YES
 
-OPTIONS=	LOGCHARSET "Character set for logfiles" off
+OPTIONS_DEFINE=	LOGCHARSET DOCS
+LOGCHARSET_DESC=	Character set for logfiles
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if defined(WITH_LOGCHARSET)
+.if ${PORT_OPTIONS:MLOGCHARSET}
 RUN_DEPENDS+=	p5-Text-Iconv>=0:${PORTSDIR}/converters/p5-Text-Iconv
 .endif
 
@@ -47,7 +44,7 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/modules/Pisg/Parser/Format/*.pm ${SITE_PERL}/Pisg/Parser/Format
 	${INSTALL_SCRIPT} ${WRKSRC}/pisg ${PREFIX}/bin
 
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/docs/pisg-doc.txt ${DOCSDIR}/pisg-doc.txt
 .endif
@@ -63,4 +60,4 @@ post-install:
 	@${ECHO_MSG}
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/mail/pear-MIME_Type/Makefile b/mail/pear-MIME_Type/Makefile
index 92504ec2d470..979ff5820dd3 100644
--- a/mail/pear-MIME_Type/Makefile
+++ b/mail/pear-MIME_Type/Makefile
@@ -1,9 +1,5 @@
-# Ports collection makefile for:  pear-MIME_Type
-# Date created:			  18 April 2005
-# Whom:				  Antonio Carlos Venancio Junior (<antonio@inf.ufsc.br>)
-#
+# Created by: Antonio Carlos Venancio Junior (<antonio@inf.ufsc.br>)
 # $FreeBSD$
-#
 
 PORTNAME=	MIME_Type
 PORTVERSION=	1.3.1
@@ -16,15 +12,16 @@ BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
 RUN_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
 
 LATEST_LINK=	pear-${PORTNAME}
-OPTIONS=	PEAR_SYSTEM_COMMAND "PEAR::System_Command support" off
+OPTIONS_DEFINE=	PEAR_SYSTEM_COMMAND
+PEAR_SYSTEM_COMMAND_DESC=	PEAR::System_Command support
 
 PEAR_AUTOINSTALL=yes
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if defined(WITH_PEAR_SYSTEM_COMMAND)
+.if ${PORT_OPTIONS:MPEAR_SYSTEM_COMMAND}
 RUN_DEPENDS+=	${PEARDIR}/System/Command.php:${PORTSDIR}/devel/pear-System_Command
 .endif
 
 .include "${PORTSDIR}/devel/pear/bsd.pear.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/mail/pear-Mail/Makefile b/mail/pear-Mail/Makefile
index 65a09b9c23c7..88962b817ffb 100644
--- a/mail/pear-Mail/Makefile
+++ b/mail/pear-Mail/Makefile
@@ -1,9 +1,5 @@
-# Ports collection makefile for:  pear-Mail
-# Date created:			  26 November 2002
-# Whom:				  Thierry Thomas (<thierry@pompo.net>)
-#
+# Created by: Thierry Thomas (<thierry@pompo.net>)
 # $FreeBSD$
-#
 
 PORTNAME=	Mail
 DISTVERSION=	1.2.0
@@ -21,13 +17,14 @@ FILES=		Mail.php Mail/mail.php Mail/null.php Mail/sendmail.php	\
 TESTS=		rfc822.phpt smtp_error.phpt
 
 LATEST_LINK=	pear-${PORTNAME}
-OPTIONS=	PEAR_NET_SMTP "PEAR::Net_SMTP support" off
+OPTIONS_DEFINE=	PEAR_NET_SMTP
+PEAR_NET_SMTP_DESC=	PEAR::Net_SMTP support
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if defined(WITH_PEAR_NET_SMTP)
+.if ${PORT_OPTIONS:MPEAR_NET_SMTP}
 RUN_DEPENDS+=	${PEARDIR}/Net/SMTP.php:${PORTSDIR}/net/pear-Net_SMTP
 .endif
 
 .include "${PORTSDIR}/devel/pear/bsd.pear.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/mail/pear-Mail_Queue/Makefile b/mail/pear-Mail_Queue/Makefile
index a8c84ec3fb11..0d795959539f 100644
--- a/mail/pear-Mail_Queue/Makefile
+++ b/mail/pear-Mail_Queue/Makefile
@@ -1,9 +1,5 @@
-# Ports collection makefile for:  pear-Mail_Queue
-# Date created:			  05 November 2004
-# Whom:				  Antonio Carlos Venancio Junior (<antonio@inf.ufsc.br>)
-#
+# Created by: Antonio Carlos Venancio Junior (<antonio@inf.ufsc.br>)
 # $FreeBSD$
-#
 
 PORTNAME=	Mail_Queue
 PORTVERSION=	1.2.7
@@ -19,23 +15,24 @@ RUN_DEPENDS=	${PEARDIR}/Mail.php:${PORTSDIR}/mail/pear-Mail \
 
 PEAR_AUTOINSTALL=	yes
 
-OPTIONS=	PEAR_DB "PEAR::DB support" off \
-		PEAR_MDB "PEAR::MDB support" off \
-		PEAR_MDB2 "PEAR::MDB2 support" off
+OPTIONS_DEFINE=	PEAR_DB PEAR_MDB PEAR_MDB2
+PEAR_DB_DESC=	PEAR::DB support
+PEAR_MDB_DESC=	PEAR::MDB support
+PEAR_MDB2_DESC=	PEAR::MDB2 support
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if defined(WITH_PEAR_DB)
+.if ${PORT_OPTIONS:MPEAR_DB}
 RUN_DEPENDS+=	${PEARDIR}/DB.php:${PORTSDIR}/databases/pear-DB
 .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
 
 .include "${PORTSDIR}/devel/pear/bsd.pear.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/mail/pecl-esmtp/Makefile b/mail/pecl-esmtp/Makefile
index cc99c9dff04b..55eb618bb645 100644
--- a/mail/pecl-esmtp/Makefile
+++ b/mail/pecl-esmtp/Makefile
@@ -1,9 +1,5 @@
-# Ports collection makefile for:  pecl-esmtp
-# Date created:			  2006/08/01
-# Whom:				  chinsan <chinsan.tw@gmail.com>
-#
+# Created by: chinsan <chinsan.tw@gmail.com>
 # $FreeBSD$
-#
 
 PORTNAME=	esmtp
 PORTVERSION=	0.3.1
@@ -23,15 +19,17 @@ USE_PHP=	yes
 USE_PHPEXT=	yes
 DEFAULT_PHP_VER=53
 
-OPTIONS=	RE2C	"Enable re2c to regenerate PHP parsers"	on
+OPTIONS_DEFINE=	RE2C
+OPTIONS_DEFAULT=	RE2C
+RE2C_DESC=	Use re2c to regenerate PHP parsers
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if defined(WITH_RE2C)
+.if ${PORT_OPTIONS:MRE2C}
 BUILD_DEPENDS+=	re2c:${PORTSDIR}/devel/re2c
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e '29,34 d; 45,50 d' ${WRKSRC}/config.m4
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/misc/pear-Services_Weather/Makefile b/misc/pear-Services_Weather/Makefile
index 4f603bab9d1e..26ee70c3817c 100644
--- a/misc/pear-Services_Weather/Makefile
+++ b/misc/pear-Services_Weather/Makefile
@@ -15,35 +15,36 @@ RUN_DEPENDS:=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear \
 USE_PHP=	ctype pcre
 
 LATEST_LINK=	pear-Services_Weather
-OPTIONS=	PEAR_NET_FTP "PEAR::Net::FTP support" off \
-		PEAR_CACHE "PEAR::Cache support" off \
-		PEAR_DB "PEAR::DB support" off \
-		PEAR_SOAP "PEAR::SOAP support" off \
-		PEAR_XML_SERIALIZER "PEAR::XML::Serializer support" off
+OPTIONS_DEFINE=	PEAR_NET_FTP PEAR_CACHE PEAR_DB PEAR_SOAP PEAR_XML_SERIALIZER
+PEAR_NET_FTP_DESC=	PEAR::Net::FTP support
+PEAR_CACHE_DESC=	PEAR::Cache support
+PEAR_DB_DESC=	PEAR::DB support
+PEAR_SOAP_DESC=	PEAR::SOAP support
+PEAR_XML_SERIALIZER_DESC=	PEAR::XML::Serializer support
 
 PEAR_AUTOINSTALL=	yes
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if defined(WITH_PEAR_NET_FTP)
+.if ${PORT_OPTIONS:MPEAR_NET_FTP}
 BUILD_DEPENDS+=	${PEARDIR}/Net/FTP.php:${PORTSDIR}/ftp/pear-Net_FTP
 .endif
 
-.if defined(WITH_PEAR_CACHE)
+.if ${PORT_OPTIONS:MPEAR_CACHE}
 BUILD_DEPENDS+=	${PEARDIR}/Cache.php:${PORTSDIR}/sysutils/pear-Cache
 .endif
 
-.if defined(WITH_PEAR_DB)
+.if ${PORT_OPTIONS:MPEAR_DB}
 BUILD_DEPENDS+=	${PEARDIR}/DB.php:${PORTSDIR}/databases/pear-DB
 .endif
 
-.if defined(WITH_PEAR_SOAP)
+.if ${PORT_OPTIONS:MPEAR_SOAP}
 BUILD_DEPENDS+=	${PEARDIR}/SOAP/Base.php:${PORTSDIR}/net/pear-SOAP
 .endif
 
-.if defined(WITH_PEAR_XML_SERIALIZER)
+.if ${PORT_OPTIONS:MPEAR_XML_SERIALIZER}
 BUILD_DEPENDS+=	${PEARDIR}/XML/Serializer.php:${PORTSDIR}/devel/pear-XML_Serializer
 .endif
 
 .include "${PORTSDIR}/devel/pear/bsd.pear.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/net/icpld/Makefile b/net/icpld/Makefile
index 1cd7eafe760a..cf8bbd49219f 100644
--- a/net/icpld/Makefile
+++ b/net/icpld/Makefile
@@ -1,12 +1,9 @@
-# New ports collection makefile for:	icpld
-# Date created:				04.01.2004
-# Whom:					krion@FreeBSD.org
-#
+# Created by: krion@FreeBSD.org
 # $FreeBSD$
-#
 
 PORTNAME=	icpld
 PORTVERSION=	1.1.5
+PORTREVISION=	1
 CATEGORIES=	net ipv6
 MASTER_SITES=	http://www.ibiblio.org/icpld/download/ \
 		http://freebsd.unixfreunde.de/sources/
@@ -23,11 +20,11 @@ MAN1=		${PORTNAME}.1
 PORTDOCS=	README
 PLIST_FILES=	bin/icpld etc/icpld.conf.sample etc/rc.d/icpld.sh.sample
 
-OPTIONS=	IPV6	"IPv6 internet support" off \
+OPTIONS_DEFINE=	IPV6 DOCS
 
-.include  <bsd.port.pre.mk>
+.include  <bsd.port.options.mk>
 
-.if defined(WITH_IPV6)
+.if ${PORT_OPTIONS:MIPV6}
 CONFIGURE_ARGS+=	--enable-ipv6
 .else
 CONFIGURE_ARGS+=	--disable-ipv6
@@ -42,11 +39,11 @@ do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/contrib/icpld.sh.sample ${PREFIX}/etc/rc.d
 
 post-install:
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}
 .for i in README
 	${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}
 .endfor
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/net/ipsumdump/Makefile b/net/ipsumdump/Makefile
index 59e97006643f..91567d322722 100644
--- a/net/ipsumdump/Makefile
+++ b/net/ipsumdump/Makefile
@@ -1,12 +1,9 @@
-# New ports collection makefile for:	ipsumdump
-# Date created:				12.01.2004
-# Whom:					krion@FreeBSD.org
-#
+# Created by: krion@FreeBSD.org
 # $FreeBSD$
-#
 
 PORTNAME=	ipsumdump
 PORTVERSION=	1.82
+PORTREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	http://www.cs.ucla.edu/~kohler/ipsumdump/
 
@@ -22,10 +19,11 @@ MAN1=		${PORTNAME}.1 ipaggcreate.1 ipaggmanip.1
 PORTDOCS=	README
 PLIST_FILES=	bin/ipaggcreate bin/ipsumdump bin/ipaggmanip
 
-OPTIONS=	 IPV6	"IPv6 internet support" off \
+OPTIONS_DEFINE=	IPV6 DOCS
 
-.include  <bsd.port.pre.mk>
+.include  <bsd.port.options.mk>
 
+.if ${PORT_OPTIONS:MIPV6}
 .if defined(WITH_IPV6)
 CONFIGURE_ARGS+=--enable-ipv6
 PLIST_SUB+=	IPV6=""
@@ -35,15 +33,11 @@ PLIST_SUB+=	IPV6="@comment "
 .endif
 
 post-install:
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}
 .for i in README
 	${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}
 .endfor
 .endif
 
-.if ${OSVERSION} < 700000
-IGNORE=		not supported
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/net/pear-SOAP/Makefile b/net/pear-SOAP/Makefile
index c36ca11e681e..fa99987fb872 100644
--- a/net/pear-SOAP/Makefile
+++ b/net/pear-SOAP/Makefile
@@ -1,9 +1,5 @@
-# Ports collection makefile for:  pear-SOAP
-# Date created:			  05 April 2004
-# Whom:				  Thierry Thomas (<thierry@FreeBSD.org>)
-#
+# Created by: Thierry Thomas (<thierry@FreeBSD.org>)
 # $FreeBSD$
-#
 
 PORTNAME=	SOAP
 PORTVERSION=	0.13.0
@@ -18,25 +14,26 @@ RUN_DEPENDS:=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear \
 		${PEARDIR}/HTTP/Request.php:${PORTSDIR}/www/pear-HTTP_Request
 
 LATEST_LINK=	pear-SOAP
-OPTIONS=	PEAR_MAIL "PEAR::Mail support" off \
-		PEAR_MAIL_MIME "PEAR::Mail::Mime support" off \
-		PEAR_NET_DIME "PEAR::Net::DIME support" off
+OPTIONS_DEFINE=	PEAR_MAIL PEAR_MAIL_MIME PEAR_NET_DIME
+PEAR_MAIL_DESC=	PEAR::Mail support
+PEAR_MAIL_MIME_DESC=	PEAR::Mail::Mime support
+PEAR_NET_DIME_DESC=	PEAR::Net::DIME support
 
 PEAR_AUTOINSTALL=yes
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if defined(WITH_PEAR_MAIL)
+.if ${PORT_OPTIONS:MPEAR_MAIL}
 BUILD_DEPENDS+=	${PEARDIR}/Mail.php:${PORTSDIR}/mail/pear-Mail
 .endif
 
-.if defined(WITH_PEAR_MAIL_MIME)
+.if ${PORT_OPTIONS:MPEAR_MAIL_MIME}
 BUILD_DEPENDS+=	${PEARDIR}/Mail/mime.php:${PORTSDIR}/mail/pear-Mail_Mime
 .endif
 
-.if defined(WITH_PEAR_NET_DIME)
+.if ${PORT_OPTIONS:MPEAR_NET_DIME}
 BUILD_DEPENDS+=	${PEARDIR}/Net/DIME.php:${PORTSDIR}/net/pear-Net_DIME
 .endif
 
 .include "${PORTSDIR}/devel/pear/bsd.pear.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/security/base/Makefile b/security/base/Makefile
index 2ae83077e36a..f877909b08dd 100644
--- a/security/base/Makefile
+++ b/security/base/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	base
-# Date created:		2004-11-29
-# Whom:			Linh Pham <question+fbsdports@closedsrc.org>
-#
+# Created by: Linh Pham <question+fbsdports@closedsrc.org>
 # $FreeBSD$
-#
 
 PORTNAME=	base
 PORTVERSION=	1.4.5
@@ -28,21 +24,19 @@ SUB_FILES=	pkg-message
 DOCS=		docs/CHANGELOG docs/CREDITS docs/README docs/README.mssql \
 		docs/TODO docs/UPGRADE docs/GPL docs/base_faq.rtf
 
-OPTIONS=	MYSQL "Enable MySQL support" off \
-		PGSQL "Enable PostgreSQL support" off \
-		PDF "Enable PDF support" off
+OPTIONS_DEFINE=	MYSQL PGSQL PDF DOCS
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if defined(WITH_MYSQL)
+.if ${PORT_OPTIONS:MMYSQL}
 USE_MYSQL=	yes
 USE_PHP+=	mysql
 .endif
-.if defined(WITH_PGSQL)
+.if ${PORT_OPTIONS:MPGSQL}
 USE_PGSQL=	yes
 USE_PHP+=	pgsql
 .endif
-.if defined(WITH_PDF)
+.if ${PORT_OPTIONS:MPDF}
 RUN_DEPENDS+=	${LOCALBASE}/share/fpdf/fpdf.php:${PORTSDIR}/print/fpdf
 .endif
 
@@ -63,10 +57,10 @@ do-install:
 .endfor
 
 post-install:
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${DOCSDIR}
 	cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${DOCSDIR}
 .endif
 	@${CAT} ${PKGMESSAGE}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/security/pear-Auth/Makefile b/security/pear-Auth/Makefile
index 0b02ea8d0999..6fa1fffc560b 100644
--- a/security/pear-Auth/Makefile
+++ b/security/pear-Auth/Makefile
@@ -1,9 +1,5 @@
-# Ports collection makefile for:  pear-Auth
-# Date created:			  2 February 2003
-# Whom:				  Thierry Thomas (<thierry@pompo.net>)
-#
+# Created by: Thierry Thomas (<thierry@pompo.net>)
 # $FreeBSD$
-#
 
 PORTNAME=	Auth
 PORTVERSION=	1.6.4
@@ -17,66 +13,69 @@ RUN_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
 
 PEAR_AUTOINSTALL=	yes
 LATEST_LINK=	pear-Auth
-OPTIONS=	PEAR_LOG "PEAR::Log support" off \
-		PEAR_FILE_PASSWD "PEAR::File_Passwd support" off \
-		PEAR_NET_POP3 "PEAR::Net_POP3 support" off \
-		PEAR_DB "PEAR::DB support" off \
-		PEAR_MDB "PEAR::MDB support" off \
-		PEAR_MDB2 "PEAR::MDB2 support" off \
-		PEAR_AUTH_RADIUS "PEAR::AUTH_RADIUS support" off \
-		PEAR_CRYPT_CHAP "PEAR::CRYPT_CHAP support" off \
-		PEAR_FILE_SMBPASSWD "PEAR::File_SMBPasswd support" off \
-		PEAR_SOAP "PEAR::SOAP support" off \
-		PEAR_NET_VPOPMAILD "PEAR::Net_Vpopmaild support" off
+OPTIONS_DEFINE=	PEAR_LOG PEAR_FILE_PASSWD PEAR_NET_POP3 PEAR_DB PEAR_MDB \
+		PEAR_MDB2 PEAR_AUTH_RADIUS PEAR_CRYPT_CHAP PEAR_FILE_SMBPASSWD \
+		PEAR_SOAP PEAR_NET_VPOPMAILD
+PEAR_LOG_DESC=	PEAR::Log support
+PEAR_FILE_PASSWD_DESC=	PEAR::File_Passwd support
+PEAR_NET_POP3_DESC=	PEAR::Net_POP3 support
+PEAR_DB_DESC=	PEAR::DB support
+PEAR_MDB_DESC=	PEAR::MDB support
+PEAR_MDB2_DESC=	PEAR::MDB2 support
+PEAR_AUTH_RADIUS_DESC=	PEAR::AUTH_RADIUS support
+PEAR_CRYPT_CHAP_DESC=	PEAR::CRYPT_CHAP support
+PEAR_FILE_SMBPASSWD_DESC=	PEAR::File_SMBPasswd support
+PEAR_SOAP_DESC=	PEAR::SOAP support
+PEAR_NET_VPOPMAILD_DESC=	PEAR::Net_Vpopmaild support
 
 post-extract:
 	@${REINPLACE_CMD} -e "s|@version@|${PORTVERSION}|" ${WRKSRC}/Auth.php
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if defined(WITH_PEAR_LOG)
+.if ${PORT_OPTIONS:MPEAR_LOG}
 RUN_DEPENDS+=	${PEARDIR}/Log/syslog.php:${PORTSDIR}/sysutils/pear-Log
 .endif
 
-.if defined(WITH_PEAR_FILE_PASSWD)
+.if ${PORT_OPTIONS:MPEAR_FILE_PASSWD}
 RUN_DEPENDS+=	${PEARDIR}/File/Passwd.php:${PORTSDIR}/security/pear-File_Passwd
 .endif
 
-.if defined(WITH_PEAR_CRYPT_CHAP)
+.if ${PORT_OPTIONS:MPEAR_CRYPT_CHAP}
 RUN_DEPENDS+=	${PEARDIR}/Crypt/CHAP.php:${PORTSDIR}/security/pear-Crypt_CHAP
 .endif
 
-.if defined(WITH_PEAR_NET_POP3)
+.if ${PORT_OPTIONS:MPEAR_NET_POP3}
 RUN_DEPENDS+=	${PEARDIR}/Net/POP3.php:${PORTSDIR}/net/pear-Net_POP3
 .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_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_AUTH_RADIUS)
+.if ${PORT_OPTIONS:MPEAR_AUTH_RADIUS}
 RUN_DEPENDS+=	${PEARDIR}/Auth/RADIUS.php:${PORTSDIR}/net/pear-Auth_RADIUS
 .endif
 
-.if defined(WITH_PEAR_FILE_SMBPASSWD)
+.if ${PORT_OPTIONS:MPEAR_FILE_SMBPASSWD}
 RUN_DEPENDS+=	${PEARDIR}/File/SMBPasswd.php:${PORTSDIR}/security/pear-File_SMBPasswd
 .endif
 
-.if defined(WITH_PEAR_SOAP)
+.if ${PORT_OPTIONS:MPEAR_SOAP}
 RUN_DEPENDS+=	${PEARDIR}/SOAP/Base.php:${PORTSDIR}/net/pear-SOAP
 .endif
 
-.if defined(WITH_PEAR_NET_VPOPMAILD)
+.if ${PORT_OPTIONS:MPEAR_NET_VPOPMAILD}
 RUN_DEPENDS+=	${PEARDIR}/Net/Vpopmaild.php:${PORTSDIR}/net/pear-Net_Vpopmaild
 .endif
 
 .include "${PORTSDIR}/devel/pear/bsd.pear.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/security/pear-Crypt_RSA/Makefile b/security/pear-Crypt_RSA/Makefile
index adab7fcdd4ff..84fcccb7b3ad 100644
--- a/security/pear-Crypt_RSA/Makefile
+++ b/security/pear-Crypt_RSA/Makefile
@@ -1,9 +1,5 @@
-# Ports collection makefile for:  pear-Crypt_RSA
-# Date created:			  12 May 2005
-# Whom:				  Antonio Carlos Venancio Junior (<antonio@inf.ufsc.br>)
-#
+# Created by: Antonio Carlos Venancio Junior (<antonio@inf.ufsc.br>)
 # $FreeBSD$
-#
 
 PORTNAME=	Crypt_RSA
 PORTVERSION=	1.2.1
@@ -15,15 +11,16 @@ COMMENT=	PEAR class allows you to use two-key strong cryptography
 BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
 RUN_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
 
-OPTIONS=	BCMATH "PHP BCMath extension support" off \
-		GMP "PHP GMP extension support" off
+OPTIONS_DEFINE=	BCMATH GMP
+BCMATH_DESC=	PHP BCMath extension support
+GMP_DESC=	PHP GMP extension support
 
 LATEST_LINK=	pear-${PORTNAME}
 
 .include <bsd.port.options.mk>
 
 .for opt in BCMATH GMP
-.    if defined(WITH_${opt})
+.    if ${PORT_OPTIONS:M${opt}}
 USE_PHP+=	${opt:L}
 .    endif
 .endfor
@@ -40,6 +37,5 @@ post-extract:
 	@${MV} ${WRKSRC}/CREDITS ${WRKSRC}/docs
 	@${MV} ${WRKSRC}/LICENSE ${WRKSRC}/docs
 
-.include <bsd.port.pre.mk>
 .include "${PORTSDIR}/devel/pear/bsd.pear.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/security/pear-LiveUser/Makefile b/security/pear-LiveUser/Makefile
index b9fd1ac8f35a..a34bf53174a0 100644
--- a/security/pear-LiveUser/Makefile
+++ b/security/pear-LiveUser/Makefile
@@ -1,9 +1,5 @@
-# Ports collection makefile for:  pear-LiveUser
-# Date created:			  29 November 2004
-# Whom:				  Antonio Carlos Venancio Junior (<antonio@inf.ufsc.br>)
-#
+# Created by: Antonio Carlos Venancio Junior (<antonio@inf.ufsc.br>)
 # $FreeBSD$
-#
 
 PORTNAME=	LiveUser
 PORTVERSION=	0.16.14
@@ -18,40 +14,42 @@ RUN_DEPENDS=	${PEARDIR}/Event/Dispatcher.php:${PORTSDIR}/devel/pear-Event_Dispat
 PORTSCOUT=	skipv:0.61
 
 LATEST_LINK=	pear-LiveUser
-OPTIONS=	PEAR_DB "PEAR::DB support" off \
-		PEAR_MDB "PEAR::MDB support" off \
-		PEAR_MDB2 "PEAR::MDB2 support" off \
-		PEAR_LOG "PEAR::Log support" off \
-		PEAR_XML_TREE "PEAR::XML_Tree support" off \
-		PEAR_CRYPT_RC4 "PEAR::Crypt_RC4 support" off
+OPTIONS_DEFINE=	PEAD_DB PEAR_MDB PEAR_MDB2 PEAR_LOG PEAR_XML_TREE PEAR_CRYPT_RC4
+
+PEAR_DB_DESC=	PEAR::DB support
+PEAR_MDB_DESC=	PEAR::MDB support
+PEAR_MDB2_DESC=	PEAR::MDB2 support
+PEAR_LOG_DESC=	PEAR::Log support
+PEAR_XML_TREE_DESC=	PEAR::XML_Tree support
+PEAR_CRYPT_RC4_DESC=	PEAR::Crypt_RC4 support
 
 PEAR_AUTOINSTALL=yes
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if defined(WITH_PEAR_DB)
+.if ${PORT_OPTIONS:MPEAR_DB}
 RUN_DEPENDS+=	${PEARDIR}/DB.php:${PORTSDIR}/databases/pear-DB
 .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_LOG)
+.if ${PORT_OPTIONS:MPEAR_LOG}
 RUN_DEPENDS+=	 ${PEARDIR}/Log/null.php:${PORTSDIR}/sysutils/pear-Log
 .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
 
-.if defined(WITH_PEAR_CRYPT_RC4)
+.if ${PORT_OPTIONS:MPEAR_CRYPT_RC4}
 RUN_DEPENDS+=	${PEARDIR}/Crypt/Rc4.php:${PORTSDIR}/security/pear-Crypt_RC4
 .endif
 
 .include "${PORTSDIR}/devel/pear/bsd.pear.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/security/pear-LiveUser_Admin/Makefile b/security/pear-LiveUser_Admin/Makefile
index 2174c279cd1f..052b01d80636 100644
--- a/security/pear-LiveUser_Admin/Makefile
+++ b/security/pear-LiveUser_Admin/Makefile
@@ -1,9 +1,5 @@
-# Ports collection makefile for:  pear-LiveUser_Admin
-# Date created:			  25 January 2005
-# Whom:				  Antonio Carlos Venancio Junior (<antonio@inf.ufsc.br>)
-#
+# Created by: Antonio Carlos Venancio Junior (<antonio@inf.ufsc.br>)
 # $FreeBSD$
-#
 
 PORTNAME=	LiveUser_Admin
 PORTVERSION=	0.4.0
@@ -17,40 +13,42 @@ BUILD_DEPENDS=	${PEARDIR}/LiveUser.php:${PORTSDIR}/security/pear-LiveUser
 RUN_DEPENDS=	${PEARDIR}/LiveUser.php:${PORTSDIR}/security/pear-LiveUser
 
 LATEST_LINK=	pear-LiveUser_Admin
-OPTIONS=	PEAR_DB "PEAR::DB support" off \
-		PEAR_MDB "PEAR::MDB support" off \
-		PEAR_MDB2 "PEAR::MDB2 support" off \
-		PEAR_LOG "PEAR::Log support" off \
-		PEAR_XML_TREE "PEAR::XML_Tree support" off \
-		PEAR_CRYPT_RC4 "PEAR::Crypt_RC4 support" off
+OPTIONS_DEFINE=	PEAR_DB PEAR_MDB PEAR_MDB2 PEAR_LOG PEAR_XML_TREE PEAR_CRYPT_RC4
+
+PEAR_DB_DESC=	PEAR::DB support
+PEAR_MDB_DESC=	PEAR::MDB support
+PEAR_MDB2_DESC=	PEAR::MDB2 support
+PEAR_LOG_DESC=	PEAR::Log support
+PEAR_XML_TREE_DESC=	PEAR::XML_Tree support
+PEAR_CRYPT_RC4_DESC=	PEAR::Crypt_RC4 support
 
 PEAR_AUTOINSTALL=	yes
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if defined(WITH_PEAR_DB)
+.if ${PORT_OPTIONS:MPEAR_DB}
 RUN_DEPENDS+=	${PEARDIR}/DB.php:${PORTSDIR}/databases/pear-DB
 .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_LOG)
+.if ${PORT_OPTIONS:MPEAR_LOG}
 RUN_DEPENDS+=	${PEARDIR}/Log.php:${PORTSDIR}/sysutils/pear-Log
 .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
 
-.if defined(WITH_PEAR_CRYPT_RC4)
+.if ${PORT_OPTIONS:MPEAR_CRYPT_RC4}
 RUN_DEPENDS+=	${PEARDIR}/Crypt/Rc4.php:${PORTSDIR}/security/pear-Crypt_RC4
 .endif
 
 .include "${PORTSDIR}/devel/pear/bsd.pear.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
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>
diff --git a/www/pear-HTTP_FloodControl/Makefile b/www/pear-HTTP_FloodControl/Makefile
index 6f308c277c4d..2976c81d8034 100644
--- a/www/pear-HTTP_FloodControl/Makefile
+++ b/www/pear-HTTP_FloodControl/Makefile
@@ -1,9 +1,5 @@
-# Ports collection makefile for:  pear-HTTP_FloodControl
-# Date created:			  22 Jan 2007
-# Whom:				  Ditesh Shashikant Gathani <ditesh@gathani.org>
-#
+# Created by: Ditesh Shashikant Gathani <ditesh@gathani.org>
 # $FreeBSD$
-#
 
 PORTNAME=	HTTP_FloodControl
 PORTVERSION=	0.1.1
@@ -22,28 +18,29 @@ FILES=		FloodControl.php FloodControl/Container.php \
 
 LATEST_LINK=	pear-HTTP_FloodControl
 DOCS=		README LICENSE
-OPTIONS=	DB "Enable PEAR::DB support" Off \
-		MDB "Enable PEAR::MDB support" Off \
-		MDB2 "Enable PEAR::MDB2 support" Off
+OPTIONS_DEFINE=	PEAR_DB PEAR_MDB PEAR_MDB2
+PEAR_DB_DESC=	PEAR::DB support
+PEAR_MDB_DESC=	PEAR::MDB support
+PEAR_MDB2_DESC=	PEAR::MDB2 support
 
 post-extract:
 	${MKDIR} ${WRKSRC}/docs
 	${MV} ${WRKSRC}/README ${WRKSRC}/LICENSE ${WRKSRC}/docs
 	${MV} ${WRKDIR}/package2.xml ${WRKDIR}/package.xml
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if defined(WITH_DB)
+.if ${PORT_OPTIONS:MPEAR_DB}
 RUN_DEPENDS+=	${PEARDIR}/DB.php:${PORTSDIR}/databases/pear-DB
 .endif
 
-.if defined(WITH_MDB)
+.if ${PORT_OPTIONS:MPEAR_MDB}
 RUN_DEPENDS+=	${PEARDIR}/MDB.php:${PORTSDIR}/databases/pear-MDB
 .endif
 
-.if defined(WITH_MDB2)
+.if ${PORT_OPTIONS:MPEAR_MDB2}
 RUN_DEPENDS+=	${PEARDIR}/MDB2.php:${PORTSDIR}/databases/pear-MDB2
 .endif
 
 .include "${PORTSDIR}/devel/pear/bsd.pear.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/www/pear-HTTP_Request2/Makefile b/www/pear-HTTP_Request2/Makefile
index 191dddc489c7..fadd1c698e8d 100644
--- a/www/pear-HTTP_Request2/Makefile
+++ b/www/pear-HTTP_Request2/Makefile
@@ -1,9 +1,5 @@
-# Ports collection makefile for:  pear-HTTP_Request2
-# Date created:			  08 Jan 2009
-# Whom:				  Wen Heping <wenheping@gmail.com>
-#
+# Created by: Wen Heping <wenheping@gmail.com>
 # $FreeBSD$
-#
 
 PORTNAME=	HTTP_Request2
 PORTVERSION=	2.1.1
@@ -16,25 +12,26 @@ COMMENT=	PEAR classes providing an easy way to perform HTTP requests
 BUILD_DEPENDS=	${PEARDIR}/Net/URL2.php:${PORTSDIR}/net/pear-Net_URL2
 RUN_DEPENDS=	${PEARDIR}/Net/URL2.php:${PORTSDIR}/net/pear-Net_URL2
 
-OPTIONS=	CURL "PHP CURL extension support" off \
-		FILEINFO "PHP FILEINFO extension support" off \
-		ZLIB "PECL ZLIB support" off
+OPTIONS_DEFINE=	CURL FILEINFO ZLIB
+CURL_DESC=	PHP CURL extension support
+FILEINF_DESC=	PHP FILEINFO extension support
+ZLI_DESC=	PECL ZLIB support
 
 PEAR_AUTOINSTALL=	yes
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if defined(WITH_CURL)
+.if ${PORT_OPTIONS:MCURL}
 USE_PHP+=	curl
 .endif
 
-.if defined(WITH_FILEINFO)
+.if ${PORT_OPTIONS:MFILEINFO}
 USE_PHP+=	fileinfo
 .endif
 
-.if defined(WITH_ZLIB)
+.if ${PORT_OPTIONS:MZLIB}
 USE_PHP+=	zlib
 .endif
 
 .include "${PORTSDIR}/devel/pear/bsd.pear.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>