From owner-svn-ports-all@FreeBSD.ORG Mon Dec 17 02:15:18 2012 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id BCC62700; Mon, 17 Dec 2012 02:15:18 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 9DC968FC13; Mon, 17 Dec 2012 02:15:18 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBH2FIOT096894; Mon, 17 Dec 2012 02:15:18 GMT (envelope-from bapt@svn.freebsd.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBH2FE3r096865; Mon, 17 Dec 2012 02:15:14 GMT (envelope-from bapt@svn.freebsd.org) Message-Id: <201212170215.qBH2FE3r096865@svn.freebsd.org> From: Baptiste Daroussin Date: Mon, 17 Dec 2012 02:15:14 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r309053 - in head: audio/shntool databases/pear-DB_DataObject_FormBuilder databases/pear-DB_Table databases/pear-XML_Query2XML devel/pear-Config devel/pear-Date_Holidays devel/pear-FSM ... X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 17 Dec 2012 02:15:18 -0000 Author: bapt Date: Mon Dec 17 02:15:13 2012 New Revision: 309053 URL: http://svnweb.freebsd.org/changeset/ports/309053 Log: 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) Modified: head/audio/shntool/Makefile head/databases/pear-DB_DataObject_FormBuilder/Makefile head/databases/pear-DB_Table/Makefile head/databases/pear-XML_Query2XML/Makefile head/devel/pear-Config/Makefile head/devel/pear-Date_Holidays/Makefile head/devel/pear-FSM/Makefile head/devel/pear-HTML_Template_Flexy/Makefile head/devel/pear-PEAR_Info/Makefile head/devel/pear-PEAR_PackageFileManager/Makefile head/devel/pear-PHP_CompatInfo/Makefile head/irc/irssi-devel/Makefile head/irc/pisg/Makefile head/mail/pear-MIME_Type/Makefile head/mail/pear-Mail/Makefile head/mail/pear-Mail_Queue/Makefile head/mail/pecl-esmtp/Makefile head/misc/pear-Services_Weather/Makefile head/net/icpld/Makefile head/net/ipsumdump/Makefile head/net/pear-SOAP/Makefile head/security/base/Makefile head/security/pear-Auth/Makefile head/security/pear-Crypt_RSA/Makefile head/security/pear-LiveUser/Makefile head/security/pear-LiveUser_Admin/Makefile head/sysutils/pear-Log/Makefile head/sysutils/pear-Translation2/Makefile head/www/pear-HTTP_FloodControl/Makefile head/www/pear-HTTP_Request2/Makefile Modified: head/audio/shntool/Makefile ============================================================================== --- head/audio/shntool/Makefile Mon Dec 17 00:45:39 2012 (r309052) +++ head/audio/shntool/Makefile Mon Dec 17 02:15:13 2012 (r309053) @@ -1,9 +1,5 @@ -# New ports collection makefile for: shntool -# Date created: 2 November 2000 -# Whom: Bill Fenner -# +# Created by: Bill Fenner # $FreeBSD$ -# PORTNAME= shntool PORTVERSION= 3.0.10 @@ -19,27 +15,27 @@ SHN_ALIASES= tool len fix hash pad join 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 +.include .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 +.include Modified: head/databases/pear-DB_DataObject_FormBuilder/Makefile ============================================================================== --- head/databases/pear-DB_DataObject_FormBuilder/Makefile Mon Dec 17 00:45:39 2012 (r309052) +++ head/databases/pear-DB_DataObject_FormBuilder/Makefile Mon Dec 17 02:15:13 2012 (r309053) @@ -1,9 +1,5 @@ -# New ports collection makefile for: pear-DB_DataObject_FormBuilder -# Date created: 24 August 2004 -# Whom: Antonio Carlos Venancio Junior () -# +# Created by: Antonio Carlos Venancio Junior () # $FreeBSD$ -# PORTNAME= DB_DataObject_FormBuilder PORTVERSION= 1.0.2 @@ -18,20 +14,21 @@ RUN_DEPENDS:= ${PEARDIR}/HTML/QuickForm. ${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 +.include -.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 +.include Modified: head/databases/pear-DB_Table/Makefile ============================================================================== --- head/databases/pear-DB_Table/Makefile Mon Dec 17 00:45:39 2012 (r309052) +++ head/databases/pear-DB_Table/Makefile Mon Dec 17 02:15:13 2012 (r309053) @@ -1,9 +1,5 @@ -# Ports collection makefile for: pear-DB_Table -# Date created: 08 March 2005 -# Whom: Antonio Carlos Venancio Junior () -# +# Created by: Antonio Carlos Venancio Junior () # $FreeBSD$ -# PORTNAME= DB_Table PORTVERSION= 1.5.6 @@ -17,9 +13,10 @@ BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${POR 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 +.include -.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 +.include Modified: head/databases/pear-XML_Query2XML/Makefile ============================================================================== --- head/databases/pear-XML_Query2XML/Makefile Mon Dec 17 00:45:39 2012 (r309052) +++ head/databases/pear-XML_Query2XML/Makefile Mon Dec 17 02:15:13 2012 (r309053) @@ -1,9 +1,5 @@ -# Ports collection makefile for: pear-XML_Query2xml -# Date created: 23 March 2008 -# Whom: wenheping -# +# Created by: wenheping # $FreeBSD$ -# PORTNAME= XML_Query2XML PORTVERSION= 1.7.2 @@ -16,8 +12,9 @@ BUILD_DEPENDS= ${PEARDIR}/DB.php:${PORTS 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 +.include -.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 +.include Modified: head/devel/pear-Config/Makefile ============================================================================== --- head/devel/pear-Config/Makefile Mon Dec 17 00:45:39 2012 (r309052) +++ head/devel/pear-Config/Makefile Mon Dec 17 02:15:13 2012 (r309053) @@ -1,9 +1,5 @@ -# Ports collection makefile for: pear-Config -# Date created: 02 September 2003 -# Whom: Alex Miller () -# +# Created by: Alex Miller () # $FreeBSD$ -# PORTNAME= Config PORTVERSION= 1.10.12 @@ -16,8 +12,9 @@ BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${POR 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 bug10010.phpt bug10185.phpt phpt_test.php.inc setup.php.inc _TESTSDIR= test -.include +.include -.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 +.include Modified: head/devel/pear-Date_Holidays/Makefile ============================================================================== --- head/devel/pear-Date_Holidays/Makefile Mon Dec 17 00:45:39 2012 (r309052) +++ head/devel/pear-Date_Holidays/Makefile Mon Dec 17 02:15:13 2012 (r309053) @@ -1,9 +1,5 @@ -# New ports collection makefile for: pear-Date_Holidays -# Date created: 2006-06-16 -# Whom: Thomas Abthorpe -# +# Created by: Thomas Abthorpe # $FreeBSD$ -# PORTNAME= Date_Holidays PORTVERSION= 0.21.6 @@ -20,13 +16,14 @@ RUN_DEPENDS= ${PEARDIR}/Date.php:${PORTS 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 +.include -.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 +.include Modified: head/devel/pear-FSM/Makefile ============================================================================== --- head/devel/pear-FSM/Makefile Mon Dec 17 00:45:39 2012 (r309052) +++ head/devel/pear-FSM/Makefile Mon Dec 17 02:15:13 2012 (r309053) @@ -1,9 +1,5 @@ -# Ports collection makefile for: pear-FSM -# Date created: 10 January 2005 -# Whom: Antonio Carlos Venancio Junior () -# +# Created by: Antonio Carlos Venancio Junior () # $FreeBSD$ -# PORTNAME= FSM PORTVERSION= 1.3.1 @@ -21,13 +17,14 @@ TESTS= addTransitionsArray.phpt transit 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 +.include -.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 +.include Modified: head/devel/pear-HTML_Template_Flexy/Makefile ============================================================================== --- head/devel/pear-HTML_Template_Flexy/Makefile Mon Dec 17 00:45:39 2012 (r309052) +++ head/devel/pear-HTML_Template_Flexy/Makefile Mon Dec 17 02:15:13 2012 (r309053) @@ -1,9 +1,5 @@ -# Ports collection makefile for: pear-HTML_Template_Flexy -# Date created: 04 January 2005 -# Whom: Antonio Carlos Venancio Junior () -# +# Created by: Antonio Carlos Venancio Junior () # $FreeBSD$ -# PORTNAME= HTML_Template_Flexy PORTVERSION= 1.3.12 @@ -16,25 +12,26 @@ BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${POR 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 +.include -.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 +.include Modified: head/devel/pear-PEAR_Info/Makefile ============================================================================== --- head/devel/pear-PEAR_Info/Makefile Mon Dec 17 00:45:39 2012 (r309052) +++ head/devel/pear-PEAR_Info/Makefile Mon Dec 17 02:15:13 2012 (r309053) @@ -1,9 +1,5 @@ -# Ports collection makefile for: pear-PEAR_Info -# Date created: 2006/07/31 -# Whom: chinsan -# +# Created by: chinsan # $FreeBSD$ -# PORTNAME= PEAR_Info PORTVERSION= 1.9.2 @@ -17,7 +13,9 @@ BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${POR 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 pea pear_info3.php pear_info4.php pear_info5.php pear_info6.php \ pear_info7.php -.include +.include -.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 +.include Modified: head/devel/pear-PEAR_PackageFileManager/Makefile ============================================================================== --- head/devel/pear-PEAR_PackageFileManager/Makefile Mon Dec 17 00:45:39 2012 (r309052) +++ head/devel/pear-PEAR_PackageFileManager/Makefile Mon Dec 17 02:15:13 2012 (r309053) @@ -1,9 +1,5 @@ -# Ports collection makefile for: pear-PEAR_PackageFileManager -# Date created: 23 May 2005 -# Whom: Antonio Carlos Venancio Junior () -# +# Created by: Antonio Carlos Venancio Junior () # $FreeBSD$ -# PORTNAME= PEAR_PackageFileManager PORTVERSION= 1.7.0 @@ -16,8 +12,9 @@ BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${POR 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_ Bad_file.php phpt_test.php.inc setup.php.inc test1_package.xml \ Test_file.php -.include +.include -.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 +.include Modified: head/devel/pear-PHP_CompatInfo/Makefile ============================================================================== --- head/devel/pear-PHP_CompatInfo/Makefile Mon Dec 17 00:45:39 2012 (r309052) +++ head/devel/pear-PHP_CompatInfo/Makefile Mon Dec 17 02:15:13 2012 (r309053) @@ -1,9 +1,5 @@ -# Ports collection makefile for: pear-PHP_CompatInfo -# Date created: 15 March 2005 -# Whom: Antonio Carlos Venancio Junior () -# +# Created by: Antonio Carlos Venancio Junior () # $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 +.include -.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 +.include Modified: head/irc/irssi-devel/Makefile ============================================================================== --- head/irc/irssi-devel/Makefile Mon Dec 17 00:45:39 2012 (r309052) +++ head/irc/irssi-devel/Makefile Mon Dec 17 02:15:13 2012 (r309053) @@ -1,9 +1,5 @@ -# New ports collection makefile for: irssi-devel -# Date created: 03 Mar 2005 -# Whom: Vsevolod Stakhov -# +# Created by: Vsevolod Stakhov # $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 -.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 - -# 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 +.include Modified: head/irc/pisg/Makefile ============================================================================== --- head/irc/pisg/Makefile Mon Dec 17 00:45:39 2012 (r309052) +++ head/irc/pisg/Makefile Mon Dec 17 02:15:13 2012 (r309053) @@ -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 +.include -.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 +.include Modified: head/mail/pear-MIME_Type/Makefile ============================================================================== --- head/mail/pear-MIME_Type/Makefile Mon Dec 17 00:45:39 2012 (r309052) +++ head/mail/pear-MIME_Type/Makefile Mon Dec 17 02:15:13 2012 (r309053) @@ -1,9 +1,5 @@ -# Ports collection makefile for: pear-MIME_Type -# Date created: 18 April 2005 -# Whom: Antonio Carlos Venancio Junior () -# +# Created by: Antonio Carlos Venancio Junior () # $FreeBSD$ -# PORTNAME= MIME_Type PORTVERSION= 1.3.1 @@ -16,15 +12,16 @@ BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${POR 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 +.include -.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 +.include Modified: head/mail/pear-Mail/Makefile ============================================================================== --- head/mail/pear-Mail/Makefile Mon Dec 17 00:45:39 2012 (r309052) +++ head/mail/pear-Mail/Makefile Mon Dec 17 02:15:13 2012 (r309053) @@ -1,9 +1,5 @@ -# Ports collection makefile for: pear-Mail -# Date created: 26 November 2002 -# Whom: Thierry Thomas () -# +# Created by: Thierry Thomas () # $FreeBSD$ -# PORTNAME= Mail DISTVERSION= 1.2.0 @@ -21,13 +17,14 @@ FILES= Mail.php Mail/mail.php Mail/null 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 +.include -.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 +.include Modified: head/mail/pear-Mail_Queue/Makefile ============================================================================== --- head/mail/pear-Mail_Queue/Makefile Mon Dec 17 00:45:39 2012 (r309052) +++ head/mail/pear-Mail_Queue/Makefile Mon Dec 17 02:15:13 2012 (r309053) @@ -1,9 +1,5 @@ -# Ports collection makefile for: pear-Mail_Queue -# Date created: 05 November 2004 -# Whom: Antonio Carlos Venancio Junior () -# +# Created by: Antonio Carlos Venancio Junior () # $FreeBSD$ -# PORTNAME= Mail_Queue PORTVERSION= 1.2.7 @@ -19,23 +15,24 @@ RUN_DEPENDS= ${PEARDIR}/Mail.php:${PORTS 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 +.include -.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 +.include Modified: head/mail/pecl-esmtp/Makefile ============================================================================== --- head/mail/pecl-esmtp/Makefile Mon Dec 17 00:45:39 2012 (r309052) +++ head/mail/pecl-esmtp/Makefile Mon Dec 17 02:15:13 2012 (r309053) @@ -1,9 +1,5 @@ -# Ports collection makefile for: pecl-esmtp -# Date created: 2006/08/01 -# Whom: chinsan -# +# Created by: chinsan # $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 +.include -.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 +.include Modified: head/misc/pear-Services_Weather/Makefile ============================================================================== --- head/misc/pear-Services_Weather/Makefile Mon Dec 17 00:45:39 2012 (r309052) +++ head/misc/pear-Services_Weather/Makefile Mon Dec 17 02:15:13 2012 (r309053) @@ -15,35 +15,36 @@ RUN_DEPENDS:= ${PEARDIR}/PEAR.php:${PORT 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 +.include -.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 +.include Modified: head/net/icpld/Makefile ============================================================================== --- head/net/icpld/Makefile Mon Dec 17 00:45:39 2012 (r309052) +++ head/net/icpld/Makefile Mon Dec 17 02:15:13 2012 (r309053) @@ -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 +.include -.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 +.include Modified: head/net/ipsumdump/Makefile ============================================================================== --- head/net/ipsumdump/Makefile Mon Dec 17 00:45:39 2012 (r309052) +++ head/net/ipsumdump/Makefile Mon Dec 17 02:15:13 2012 (r309053) @@ -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 ipagg PORTDOCS= README PLIST_FILES= bin/ipaggcreate bin/ipsumdump bin/ipaggmanip -OPTIONS= IPV6 "IPv6 internet support" off \ +OPTIONS_DEFINE= IPV6 DOCS -.include +.include +.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 +.include Modified: head/net/pear-SOAP/Makefile ============================================================================== --- head/net/pear-SOAP/Makefile Mon Dec 17 00:45:39 2012 (r309052) +++ head/net/pear-SOAP/Makefile Mon Dec 17 02:15:13 2012 (r309053) @@ -1,9 +1,5 @@ -# Ports collection makefile for: pear-SOAP -# Date created: 05 April 2004 -# Whom: Thierry Thomas () -# +# Created by: Thierry Thomas () # $FreeBSD$ -# PORTNAME= SOAP PORTVERSION= 0.13.0 @@ -18,25 +14,26 @@ RUN_DEPENDS:= ${PEARDIR}/PEAR.php:${PORT ${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 +.include -.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 +.include Modified: head/security/base/Makefile ============================================================================== --- head/security/base/Makefile Mon Dec 17 00:45:39 2012 (r309052) +++ head/security/base/Makefile Mon Dec 17 02:15:13 2012 (r309053) @@ -1,9 +1,5 @@ -# New ports collection makefile for: base -# Date created: 2004-11-29 -# Whom: Linh Pham -# +# Created by: Linh Pham # $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 +.include *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***