From owner-svn-ports-all@FreeBSD.ORG Tue Sep 30 22:15:17 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 397E17B2; Tue, 30 Sep 2014 22:15:17 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 22CB1BE0; Tue, 30 Sep 2014 22:15:17 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s8UMFH8b053572; Tue, 30 Sep 2014 22:15:17 GMT (envelope-from bapt@FreeBSD.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s8UMF0xX053464; Tue, 30 Sep 2014 22:15:00 GMT (envelope-from bapt@FreeBSD.org) Message-Id: <201409302215.s8UMF0xX053464@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: bapt set sender to bapt@FreeBSD.org using -f From: Baptiste Daroussin Date: Tue, 30 Sep 2014 22:15:00 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r369674 - in head: archivers/pear-Horde_Compress archivers/pear-Horde_Compress_Fast archivers/pear-Horde_Pack comms/pear-Horde_ActiveSync comms/pear-Horde_SyncMl databases/pear-Horde_Db... 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.18-1 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: Tue, 30 Sep 2014 22:15:17 -0000 Author: bapt Date: Tue Sep 30 22:14:59 2014 New Revision: 369674 URL: http://svnweb.freebsd.org/changeset/ports/369674 QAT: https://qat.redports.org/buildarchive/r369674/ Log: Convert to USES=horde Fix pear-Horde_core options Use options helpers where possible Modified: head/archivers/pear-Horde_Compress/Makefile head/archivers/pear-Horde_Compress_Fast/Makefile head/archivers/pear-Horde_Pack/Makefile head/comms/pear-Horde_ActiveSync/Makefile head/comms/pear-Horde_SyncMl/Makefile head/databases/pear-Horde_Db/Makefile head/databases/pear-Horde_HashTable/Makefile head/databases/pear-Horde_Imsp/Makefile head/databases/pear-Horde_Memcache/Makefile head/databases/pear-Horde_Mongo/Makefile head/devel/pear-Horde_Alarm/Makefile head/devel/pear-Horde_Argv/Makefile head/devel/pear-Horde_Autoloader/Makefile head/devel/pear-Horde_Autoloader_Cache/Makefile head/devel/pear-Horde_Cache/Makefile head/devel/pear-Horde_Cli/Makefile head/devel/pear-Horde_Constraint/Makefile head/devel/pear-Horde_Controller/Makefile head/devel/pear-Horde_Core/Makefile head/devel/pear-Horde_Data/Makefile head/devel/pear-Horde_Date/Makefile head/devel/pear-Horde_Date_Parser/Makefile head/devel/pear-Horde_Exception/Makefile head/devel/pear-Horde_History/Makefile head/devel/pear-Horde_Icalendar/Makefile head/devel/pear-Horde_Injector/Makefile head/devel/pear-Horde_Itip/Makefile head/devel/pear-Horde_Lock/Makefile head/devel/pear-Horde_LoginTasks/Makefile head/devel/pear-Horde_Nls/Makefile head/devel/pear-Horde_Notification/Makefile head/devel/pear-Horde_Prefs/Makefile head/devel/pear-Horde_Queue/Makefile head/devel/pear-Horde_Rdo/Makefile head/devel/pear-Horde_Role/Makefile head/devel/pear-Horde_Scheduler/Makefile head/devel/pear-Horde_Serialize/Makefile head/devel/pear-Horde_Stream/Makefile head/devel/pear-Horde_Stream_Filter/Makefile head/devel/pear-Horde_Stream_Wrapper/Makefile head/devel/pear-Horde_Support/Makefile head/devel/pear-Horde_Thrift/Makefile head/devel/pear-Horde_Timezone/Makefile head/devel/pear-Horde_Token/Makefile head/devel/pear-Horde_Translation/Makefile head/devel/pear-Horde_Tree/Makefile head/devel/pear-Horde_Util/Makefile head/devel/pear-Horde_View/Makefile head/graphics/pear-Horde_Image/Makefile head/mail/pear-Horde_Imap_Client/Makefile head/mail/pear-Horde_Kolab_Storage/Makefile head/mail/pear-Horde_ListHeaders/Makefile head/mail/pear-Horde_Mail/Makefile head/mail/pear-Horde_Mapi/Makefile head/mail/pear-Horde_Mime/Makefile head/mail/pear-Horde_Mime_Viewer/Makefile head/mail/pear-Horde_Smtp/Makefile head/net/pear-Horde_Kolab_Server/Makefile head/net/pear-Horde_Kolab_Session/Makefile head/net/pear-Horde_Ldap/Makefile head/net/pear-Horde_Rpc/Makefile head/net/pear-Horde_Scribe/Makefile head/net/pear-Horde_Socket_Client/Makefile head/net/pear-Horde_Url/Makefile head/security/pear-Horde_Auth/Makefile head/security/pear-Horde_Crypt/Makefile head/security/pear-Horde_Crypt_Blowfish/Makefile head/security/pear-Horde_Group/Makefile head/security/pear-Horde_Oauth/Makefile head/security/pear-Horde_Perms/Makefile head/security/pear-Horde_Secret/Makefile head/security/pear-Horde_Share/Makefile head/sysutils/pear-Horde_Log/Makefile head/sysutils/pear-Horde_Vfs/Makefile head/textproc/pear-Horde_CssMinify/Makefile head/textproc/pear-Horde_JavascriptMinify/Makefile head/textproc/pear-Horde_Kolab_Format/Makefile head/textproc/pear-Horde_Pdf/Makefile head/textproc/pear-Horde_SpellChecker/Makefile head/textproc/pear-Horde_Text_Diff/Makefile head/textproc/pear-Horde_Text_Filter/Makefile head/textproc/pear-Horde_Text_Filter_Csstidy/Makefile head/textproc/pear-Horde_Text_Flowed/Makefile head/textproc/pear-Horde_Xml_Element/Makefile head/textproc/pear-Horde_Xml_Wbxml/Makefile head/www/pear-Horde_Browser/Makefile head/www/pear-Horde_Css_Parser/Makefile head/www/pear-Horde_Dav/Makefile head/www/pear-Horde_Editor/Makefile head/www/pear-Horde_Feed/Makefile head/www/pear-Horde_Form/Makefile head/www/pear-Horde_Http/Makefile head/www/pear-Horde_Routes/Makefile head/www/pear-Horde_Service_Facebook/Makefile head/www/pear-Horde_Service_Twitter/Makefile head/www/pear-Horde_Service_UrlShortener/Makefile head/www/pear-Horde_Service_Weather/Makefile head/www/pear-Horde_SessionHandler/Makefile head/www/pear-Horde_Template/Makefile Modified: head/archivers/pear-Horde_Compress/Makefile ============================================================================== --- head/archivers/pear-Horde_Compress/Makefile Tue Sep 30 21:50:43 2014 (r369673) +++ head/archivers/pear-Horde_Compress/Makefile Tue Sep 30 22:14:59 2014 (r369674) @@ -12,6 +12,7 @@ OPTIONS_DEFAULT= ZLIB OPTIONS_DEFINE= ZLIB ZLIB_DESC= Depend on PHP zlib extension +USES= horde USE_HORDE_RUN= Horde_Exception \ Horde_Translation \ Horde_Util \ @@ -19,6 +20,4 @@ USE_HORDE_RUN= Horde_Exception \ ZLIP_USE= PHP=zlib -.include -.include "${PORTSDIR}/devel/pear-channel-horde/bsd.horde.mk" -.include +.include Modified: head/archivers/pear-Horde_Compress_Fast/Makefile ============================================================================== --- head/archivers/pear-Horde_Compress_Fast/Makefile Tue Sep 30 21:50:43 2014 (r369673) +++ head/archivers/pear-Horde_Compress_Fast/Makefile Tue Sep 30 22:14:59 2014 (r369674) @@ -8,8 +8,6 @@ PKGNAMEPREFIX= pear- MAINTAINER= horde@FreeBSD.org COMMENT= Horde Fast Compression Library -USE_HORDE_RUN= Horde_Exception +USES= horde -.include -.include "${PORTSDIR}/devel/pear-channel-horde/bsd.horde.mk" -.include +.include Modified: head/archivers/pear-Horde_Pack/Makefile ============================================================================== --- head/archivers/pear-Horde_Pack/Makefile Tue Sep 30 21:50:43 2014 (r369673) +++ head/archivers/pear-Horde_Pack/Makefile Tue Sep 30 22:14:59 2014 (r369674) @@ -9,9 +9,8 @@ PKGNAMEPREFIX= pear- MAINTAINER= horde@FreeBSD.org COMMENT= Horde Pack Utility +USES= horde USE_HORDE_RUN= Horde_Compress_Fast \ Horde_Exception -.include -.include "${PORTSDIR}/devel/pear-channel-horde/bsd.horde.mk" -.include +.include Modified: head/comms/pear-Horde_ActiveSync/Makefile ============================================================================== --- head/comms/pear-Horde_ActiveSync/Makefile Tue Sep 30 21:50:43 2014 (r369673) +++ head/comms/pear-Horde_ActiveSync/Makefile Tue Sep 30 22:14:59 2014 (r369674) @@ -7,6 +7,7 @@ CATEGORIES= comms www pear MAINTAINER= horde@FreeBSD.org COMMENT= Horde ActiveSync Server Library +USES= horde USE_HORDE_RUN= Horde_Compress \ Horde_Date \ Horde_Exception \ @@ -17,6 +18,4 @@ USE_HORDE_RUN= Horde_Compress \ Horde_Support \ Horde_Util -.include -.include "${PORTSDIR}/devel/pear-channel-horde/bsd.horde.mk" -.include +.include Modified: head/comms/pear-Horde_SyncMl/Makefile ============================================================================== --- head/comms/pear-Horde_SyncMl/Makefile Tue Sep 30 21:50:43 2014 (r369673) +++ head/comms/pear-Horde_SyncMl/Makefile Tue Sep 30 22:14:59 2014 (r369674) @@ -8,6 +8,7 @@ CATEGORIES= comms www pear MAINTAINER= horde@FreeBSD.org COMMENT= Horde API for processing SyncML requests +USES= horde USE_HORDE_RUN= Horde_Date \ Horde_Icalendar \ Horde_Log \ @@ -20,6 +21,4 @@ USE_HORDE_RUN= Horde_Date \ USE_HORDE_RUN+= Horde_Auth \ Horde_Core -.include -.include "${PORTSDIR}/devel/pear-channel-horde/bsd.horde.mk" -.include +.include Modified: head/databases/pear-Horde_Db/Makefile ============================================================================== --- head/databases/pear-Horde_Db/Makefile Tue Sep 30 21:50:43 2014 (r369673) +++ head/databases/pear-Horde_Db/Makefile Tue Sep 30 22:14:59 2014 (r369674) @@ -14,23 +14,13 @@ MYSQL_DESC= Depend on mysql PHP extensi MYSQLI_DESC= Depend on mysqli PHP extension PDO_DESC= Depend on PDO PHP extension +USES= horde USE_HORDE_RUN= Horde_Date \ Horde_Exception \ Horde_Support -.include +MYSQL_USE= PHP=mysql +MYSQLI_USE= PHP=mysqli +PDO_USE= PHP=pdo -.if ${PORT_OPTIONS:MMYSQL} -USE_PHP+= mysql -.endif - -.if ${PORT_OPTIONS:MMYSQLI} -USE_PHP+= mysqli -.endif - -.if ${PORT_OPTIONS:MPDO} -USE_PHP+= pdo -.endif - -.include "${PORTSDIR}/devel/pear-channel-horde/bsd.horde.mk" -.include +.include Modified: head/databases/pear-Horde_HashTable/Makefile ============================================================================== --- head/databases/pear-Horde_HashTable/Makefile Tue Sep 30 21:50:43 2014 (r369673) +++ head/databases/pear-Horde_HashTable/Makefile Tue Sep 30 22:14:59 2014 (r369674) @@ -9,13 +9,9 @@ MAINTAINER= horde@FreeBSD.org COMMENT= Horde Hash Table Interface OPTIONS_DEFINE= MEMCACHE +USES= horde USE_HORDE_RUN= Horde_Exception -.include +MEMCACHE_USE= HORDE_RUN=Horde_Memcache -.if ${PORT_OPTIONS:MMEMCACHE} -USE_HORDE_RUN+= Horde_Memcache -.endif - -.include "${PORTSDIR}/devel/pear-channel-horde/bsd.horde.mk" -.include +.include Modified: head/databases/pear-Horde_Imsp/Makefile ============================================================================== --- head/databases/pear-Horde_Imsp/Makefile Tue Sep 30 21:50:43 2014 (r369673) +++ head/databases/pear-Horde_Imsp/Makefile Tue Sep 30 22:14:59 2014 (r369674) @@ -8,8 +8,7 @@ CATEGORIES= databases www pear MAINTAINER= horde@FreeBSD.org COMMENT= Horde IMSP API +USES= horde USE_HORDE_RUN= Horde_Translation -.include -.include "${PORTSDIR}/devel/pear-channel-horde/bsd.horde.mk" -.include +.include Modified: head/databases/pear-Horde_Memcache/Makefile ============================================================================== --- head/databases/pear-Horde_Memcache/Makefile Tue Sep 30 21:50:43 2014 (r369673) +++ head/databases/pear-Horde_Memcache/Makefile Tue Sep 30 22:14:59 2014 (r369674) @@ -7,9 +7,8 @@ CATEGORIES= databases www pear MAINTAINER= horde@FreeBSD.org COMMENT= Horde Memcache API +USES= horde USE_PHP= memcache hash USE_HORDE_RUN= Horde_Exception -.include -.include "${PORTSDIR}/devel/pear-channel-horde/bsd.horde.mk" -.include +.include Modified: head/databases/pear-Horde_Mongo/Makefile ============================================================================== --- head/databases/pear-Horde_Mongo/Makefile Tue Sep 30 21:50:43 2014 (r369673) +++ head/databases/pear-Horde_Mongo/Makefile Tue Sep 30 22:14:59 2014 (r369674) @@ -8,8 +8,7 @@ PKGNAMEPREFIX= pear- MAINTAINER= horde@FreeBSD.org COMMENT= Horde Mongo Configuration +USES= horde #RUN_DEPENDS= ${PHPBASE}/lib/php/${PHP_EXT_DIR}/mongo.so:${PORTSDIR}/databases/pecl-mongo -.include -.include "${PORTSDIR}/devel/pear-channel-horde/bsd.horde.mk" -.include +.include Modified: head/devel/pear-Horde_Alarm/Makefile ============================================================================== --- head/devel/pear-Horde_Alarm/Makefile Tue Sep 30 21:50:43 2014 (r369673) +++ head/devel/pear-Horde_Alarm/Makefile Tue Sep 30 22:14:59 2014 (r369674) @@ -8,8 +8,7 @@ CATEGORIES= devel www pear MAINTAINER= horde@FreeBSD.org COMMENT= PEAR Horde alarm libraries +USES= horde USE_HORDE_RUN= Horde_Date Horde_Exception Horde_Translation -.include -.include "${PORTSDIR}/devel/pear-channel-horde/bsd.horde.mk" -.include +.include Modified: head/devel/pear-Horde_Argv/Makefile ============================================================================== --- head/devel/pear-Horde_Argv/Makefile Tue Sep 30 21:50:43 2014 (r369673) +++ head/devel/pear-Horde_Argv/Makefile Tue Sep 30 22:14:59 2014 (r369674) @@ -8,8 +8,7 @@ CATEGORIES= devel www pear MAINTAINER= horde@FreeBSD.org COMMENT= Horde command-line argument parsing package +USES= horde USE_HORDE_RUN= Horde_Exception Horde_Translation -.include -.include "${PORTSDIR}/devel/pear-channel-horde/bsd.horde.mk" -.include +.include Modified: head/devel/pear-Horde_Autoloader/Makefile ============================================================================== --- head/devel/pear-Horde_Autoloader/Makefile Tue Sep 30 21:50:43 2014 (r369673) +++ head/devel/pear-Horde_Autoloader/Makefile Tue Sep 30 22:14:59 2014 (r369674) @@ -8,6 +8,6 @@ CATEGORIES= devel www pear MAINTAINER= horde@FreeBSD.org COMMENT= Horde Autoloader -.include -.include "${PORTSDIR}/devel/pear-channel-horde/bsd.horde.mk" -.include +USES= horde + +.include Modified: head/devel/pear-Horde_Autoloader_Cache/Makefile ============================================================================== --- head/devel/pear-Horde_Autoloader_Cache/Makefile Tue Sep 30 21:50:43 2014 (r369673) +++ head/devel/pear-Horde_Autoloader_Cache/Makefile Tue Sep 30 22:14:59 2014 (r369674) @@ -8,9 +8,8 @@ CATEGORIES= devel www pear MAINTAINER= horde@FreeBSD.org COMMENT= Horde Autoloader Cache +USES= horde USE_HORDE_RUN= Horde_Autoloader USE_PHP= json -.include -.include "${PORTSDIR}/devel/pear-channel-horde/bsd.horde.mk" -.include +.include Modified: head/devel/pear-Horde_Cache/Makefile ============================================================================== --- head/devel/pear-Horde_Cache/Makefile Tue Sep 30 21:50:43 2014 (r369673) +++ head/devel/pear-Horde_Cache/Makefile Tue Sep 30 22:14:59 2014 (r369674) @@ -10,18 +10,14 @@ COMMENT= Horde Caching API OPTIONS_DEFINE= APC APC_DESC= Require APC PHP extension - + +USES= horde USE_HORDE_RUN= Horde_Compress_Fast \ Horde_Exception \ Horde_HashTable \ Horde_Util USE_PHP= hash -.include - -.if ${PORT_OPTIONS:MAPC} -USE_PHP+= apc -.endif +APC_USE= PHP=apc -.include "${PORTSDIR}/devel/pear-channel-horde/bsd.horde.mk" -.include +.include Modified: head/devel/pear-Horde_Cli/Makefile ============================================================================== --- head/devel/pear-Horde_Cli/Makefile Tue Sep 30 21:50:43 2014 (r369673) +++ head/devel/pear-Horde_Cli/Makefile Tue Sep 30 22:14:59 2014 (r369674) @@ -7,8 +7,7 @@ CATEGORIES= devel www pear MAINTAINER= horde@FreeBSD.org COMMENT= Horde Command Line Interface API +USES= horde USE_HORDE_RUN= Horde_Support Horde_Translation -.include -.include "${PORTSDIR}/devel/pear-channel-horde/bsd.horde.mk" -.include +.include Modified: head/devel/pear-Horde_Constraint/Makefile ============================================================================== --- head/devel/pear-Horde_Constraint/Makefile Tue Sep 30 21:50:43 2014 (r369673) +++ head/devel/pear-Horde_Constraint/Makefile Tue Sep 30 22:14:59 2014 (r369674) @@ -8,6 +8,6 @@ CATEGORIES= devel www pear MAINTAINER= horde@FreeBSD.org COMMENT= Horde Constraint library -.include -.include "${PORTSDIR}/devel/pear-channel-horde/bsd.horde.mk" -.include +USES= horde + +.include Modified: head/devel/pear-Horde_Controller/Makefile ============================================================================== --- head/devel/pear-Horde_Controller/Makefile Tue Sep 30 21:50:43 2014 (r369673) +++ head/devel/pear-Horde_Controller/Makefile Tue Sep 30 22:14:59 2014 (r369674) @@ -8,12 +8,11 @@ CATEGORIES= devel www pear MAINTAINER= horde@FreeBSD.org COMMENT= Horde Controller libraries +USES= horde USE_HORDE_RUN= Horde_Exception \ Horde_Injector \ Horde_Log \ Horde_Support \ Horde_Util -.include -.include "${PORTSDIR}/devel/pear-channel-horde/bsd.horde.mk" -.include +.include Modified: head/devel/pear-Horde_Core/Makefile ============================================================================== --- head/devel/pear-Horde_Core/Makefile Tue Sep 30 21:50:43 2014 (r369673) +++ head/devel/pear-Horde_Core/Makefile Tue Sep 30 22:14:59 2014 (r369674) @@ -11,11 +11,12 @@ COMMENT= Horde Core Framework libraries CONFLICTS= horde-3* -OPTONS_DEFINE= KOLAB LZF SOCKETS +OPTIONS_DEFINE= KOLAB LZF SOCKETS KOLAB_DESC= Enable Kolab server support LZF_DESC= Depend on lzf PHP extension SOCKETS_DESC= Depend on sockets PHP extension +USES= horde USE_PHP= session USE_HORDE_BUILD= Horde_Role @@ -66,21 +67,8 @@ USE_HORDE_RUN= Horde_Role \ # Not required but wanted USE_HORDE_RUN+= Horde_Routes -.include +KOLAB_USE= HORDE_RUN=Horde_Kolab_Server,Horde_Kolab_Session,Horde_Kolab_Storage +LZF_RUN_DEPENDS= ${PHPBASE}/lib/php/${PHP_EXT_DIR}/lzf.so:${PORTSDIR}/archivers/pecl-lzf +SOCKETS_USE= PHP=sockets -.if defined(WITH_KOLAB) -USE_HORDE_RUN+= Horde_Kolab_Server \ - Horde_Kolab_Session \ - Horde_Kolab_Storage -.endif - -.if ${PORT_OPTIONS:MLZF} -RUN_DEPENDS+= ${PHPBASE}/lib/php/${PHP_EXT_DIR}/lzf.so:${PORTSDIR}/archivers/pecl-lzf -.endif - -.if ${PORT_OPTIONS:MSOCKETS} -USE_PHP+= sockets -.endif - -.include "${PORTSDIR}/devel/pear-channel-horde/bsd.horde.mk" -.include +.include Modified: head/devel/pear-Horde_Data/Makefile ============================================================================== --- head/devel/pear-Horde_Data/Makefile Tue Sep 30 21:50:43 2014 (r369673) +++ head/devel/pear-Horde_Data/Makefile Tue Sep 30 22:14:59 2014 (r369674) @@ -8,6 +8,7 @@ CATEGORIES= devel www pear MAINTAINER= horde@FreeBSD.org COMMENT= Horde Data API +USES= horde USE_HORDE_RUN= Horde_Browser \ Horde_Exception \ Horde_Icalendar \ @@ -16,6 +17,4 @@ USE_HORDE_RUN= Horde_Browser \ Horde_Translation \ Horde_Util -.include -.include "${PORTSDIR}/devel/pear-channel-horde/bsd.horde.mk" -.include +.include Modified: head/devel/pear-Horde_Date/Makefile ============================================================================== --- head/devel/pear-Horde_Date/Makefile Tue Sep 30 21:50:43 2014 (r369673) +++ head/devel/pear-Horde_Date/Makefile Tue Sep 30 22:14:59 2014 (r369674) @@ -8,10 +8,9 @@ CATEGORIES= devel www pear MAINTAINER= horde@FreeBSD.org COMMENT= Horde Date package +USES= horde USE_HORDE_RUN= Horde_Exception \ Horde_Nls \ Horde_Translation -.include -.include "${PORTSDIR}/devel/pear-channel-horde/bsd.horde.mk" -.include +.include Modified: head/devel/pear-Horde_Date_Parser/Makefile ============================================================================== --- head/devel/pear-Horde_Date_Parser/Makefile Tue Sep 30 21:50:43 2014 (r369673) +++ head/devel/pear-Horde_Date_Parser/Makefile Tue Sep 30 22:14:59 2014 (r369674) @@ -8,9 +8,8 @@ CATEGORIES= devel www pear MAINTAINER= horde@FreeBSD.org COMMENT= Horde Date Parser +USES= horde USE_HORDE_RUN= Horde_Date \ Horde_Support -.include -.include "${PORTSDIR}/devel/pear-channel-horde/bsd.horde.mk" -.include +.include Modified: head/devel/pear-Horde_Exception/Makefile ============================================================================== --- head/devel/pear-Horde_Exception/Makefile Tue Sep 30 21:50:43 2014 (r369673) +++ head/devel/pear-Horde_Exception/Makefile Tue Sep 30 22:14:59 2014 (r369674) @@ -8,8 +8,7 @@ CATEGORIES= devel www pear MAINTAINER= horde@FreeBSD.org COMMENT= Horde Exception Handler +USES= horde USE_HORDE_RUN= Horde_Translation -.include -.include "${PORTSDIR}/devel/pear-channel-horde/bsd.horde.mk" -.include +.include Modified: head/devel/pear-Horde_History/Makefile ============================================================================== --- head/devel/pear-Horde_History/Makefile Tue Sep 30 21:50:43 2014 (r369673) +++ head/devel/pear-Horde_History/Makefile Tue Sep 30 22:14:59 2014 (r369674) @@ -8,9 +8,8 @@ CATEGORIES= devel www pear MAINTAINER= horde@FreeBSD.org COMMENT= Horde API for tracking the history of an object +USES= horde USE_HORDE_RUN= Horde_Db \ Horde_Exception -.include -.include "${PORTSDIR}/devel/pear-channel-horde/bsd.horde.mk" -.include +.include Modified: head/devel/pear-Horde_Icalendar/Makefile ============================================================================== --- head/devel/pear-Horde_Icalendar/Makefile Tue Sep 30 21:50:43 2014 (r369673) +++ head/devel/pear-Horde_Icalendar/Makefile Tue Sep 30 22:14:59 2014 (r369674) @@ -7,6 +7,7 @@ CATEGORIES= devel www pear MAINTAINER= horde@FreeBSD.org COMMENT= Horde iCalendar API +USES= horde USE_HORDE_RUN= Horde_Date \ Horde_Exception \ Horde_Mail \ @@ -15,6 +16,4 @@ USE_HORDE_RUN= Horde_Date \ Horde_Translation \ Horde_Util -.include -.include "${PORTSDIR}/devel/pear-channel-horde/bsd.horde.mk" -.include +.include Modified: head/devel/pear-Horde_Injector/Makefile ============================================================================== --- head/devel/pear-Horde_Injector/Makefile Tue Sep 30 21:50:43 2014 (r369673) +++ head/devel/pear-Horde_Injector/Makefile Tue Sep 30 22:14:59 2014 (r369674) @@ -8,8 +8,7 @@ CATEGORIES= devel www pear MAINTAINER= horde@FreeBSD.org COMMENT= Horde dependency injection container +USES= horde USE_HORDE_RUN= Horde_Exception -.include -.include "${PORTSDIR}/devel/pear-channel-horde/bsd.horde.mk" -.include +.include Modified: head/devel/pear-Horde_Itip/Makefile ============================================================================== --- head/devel/pear-Horde_Itip/Makefile Tue Sep 30 21:50:43 2014 (r369673) +++ head/devel/pear-Horde_Itip/Makefile Tue Sep 30 22:14:59 2014 (r369674) @@ -8,9 +8,8 @@ CATEGORIES= devel www pear MAINTAINER= horde@FreeBSD.org COMMENT= Horde iTip invitation response handling +USES= horde USE_HORDE_RUN= Horde_Icalendar \ Horde_Mime -.include -.include "${PORTSDIR}/devel/pear-channel-horde/bsd.horde.mk" -.include +.include Modified: head/devel/pear-Horde_Lock/Makefile ============================================================================== --- head/devel/pear-Horde_Lock/Makefile Tue Sep 30 21:50:43 2014 (r369673) +++ head/devel/pear-Horde_Lock/Makefile Tue Sep 30 22:14:59 2014 (r369674) @@ -8,9 +8,8 @@ CATEGORIES= devel www pear MAINTAINER= horde@FreeBSD.org COMMENT= Horde Resource Locking System +USES= horde USE_HORDE_RUN= Horde_Exception \ Horde_Support -.include -.include "${PORTSDIR}/devel/pear-channel-horde/bsd.horde.mk" -.include +.include Modified: head/devel/pear-Horde_LoginTasks/Makefile ============================================================================== --- head/devel/pear-Horde_LoginTasks/Makefile Tue Sep 30 21:50:43 2014 (r369673) +++ head/devel/pear-Horde_LoginTasks/Makefile Tue Sep 30 22:14:59 2014 (r369674) @@ -8,8 +8,7 @@ CATEGORIES= devel www pear MAINTAINER= horde@FreeBSD.org COMMENT= Horde Login Tasks System +USES= horde USE_HORDE_RUN= Horde_Translation -.include -.include "${PORTSDIR}/devel/pear-channel-horde/bsd.horde.mk" -.include +.include Modified: head/devel/pear-Horde_Nls/Makefile ============================================================================== --- head/devel/pear-Horde_Nls/Makefile Tue Sep 30 21:50:43 2014 (r369673) +++ head/devel/pear-Horde_Nls/Makefile Tue Sep 30 22:14:59 2014 (r369674) @@ -16,17 +16,7 @@ USE_HORDE_RUN= Horde_Translation \ OPTIONS_DEFINE= GEOIP GEOIP_DESC= Depend on geoip PHP extension -.include +GEOIP_USE= PHP=yes +GEOIP_RUN_DEPENDS= ${PHPBASE}/lib/php/${PHP_EXT_DIR}/geoip.so:${PORTSDIR}/net/pecl-geoip -.if ${PORT_OPTIONS:MGEOIP} -USE_PHP= yes -.endif - -.include - -.if ${PORT_OPTIONS:MGEOIP} -RUN_DEPENDS+= ${PHPBASE}/lib/php/${PHP_EXT_DIR}/geoip.so:${PORTSDIR}/net/pecl-geoip -.endif - -.include "${PORTSDIR}/devel/pear-channel-horde/bsd.horde.mk" -.include +.include Modified: head/devel/pear-Horde_Notification/Makefile ============================================================================== --- head/devel/pear-Horde_Notification/Makefile Tue Sep 30 21:50:43 2014 (r369673) +++ head/devel/pear-Horde_Notification/Makefile Tue Sep 30 22:14:59 2014 (r369674) @@ -8,10 +8,9 @@ CATEGORIES= devel www pear MAINTAINER= horde@FreeBSD.org COMMENT= Horde Notification System +USES= horde USE_HORDE_RUN= Horde_Exception \ Horde_Util USE_PHP= gettext -.include -.include "${PORTSDIR}/devel/pear-channel-horde/bsd.horde.mk" -.include +.include Modified: head/devel/pear-Horde_Prefs/Makefile ============================================================================== --- head/devel/pear-Horde_Prefs/Makefile Tue Sep 30 21:50:43 2014 (r369673) +++ head/devel/pear-Horde_Prefs/Makefile Tue Sep 30 22:14:59 2014 (r369674) @@ -7,6 +7,7 @@ CATEGORIES= devel www pear MAINTAINER= horde@FreeBSD.org COMMENT= Horde Preferences API +USES= horde USE_HORDE_RUN= Horde_Exception \ Horde_Mail \ Horde_Mime \ @@ -14,6 +15,4 @@ USE_HORDE_RUN= Horde_Exception \ Horde_Util USE_PHP= json -.include -.include "${PORTSDIR}/devel/pear-channel-horde/bsd.horde.mk" -.include +.include Modified: head/devel/pear-Horde_Queue/Makefile ============================================================================== --- head/devel/pear-Horde_Queue/Makefile Tue Sep 30 21:50:43 2014 (r369673) +++ head/devel/pear-Horde_Queue/Makefile Tue Sep 30 22:14:59 2014 (r369674) @@ -8,6 +8,6 @@ PKGNAMEPREFIX= pear- MAINTAINER= horde@FreeBSD.org COMMENT= Horde Queue -.include -.include "${PORTSDIR}/devel/pear-channel-horde/bsd.horde.mk" -.include +USES= horde + +.include Modified: head/devel/pear-Horde_Rdo/Makefile ============================================================================== --- head/devel/pear-Horde_Rdo/Makefile Tue Sep 30 21:50:43 2014 (r369673) +++ head/devel/pear-Horde_Rdo/Makefile Tue Sep 30 22:14:59 2014 (r369674) @@ -9,9 +9,8 @@ MASTER_SITES= http://pear.horde.org/get/ MAINTAINER= horde@FreeBSD.org COMMENT= Horde Rampage Data Objects +USES= horde USE_HORDE_RUN= Horde_Db \ Horde_Exception -.include -.include "${PORTSDIR}/devel/pear-channel-horde/bsd.horde.mk" -.include +.include Modified: head/devel/pear-Horde_Role/Makefile ============================================================================== --- head/devel/pear-Horde_Role/Makefile Tue Sep 30 21:50:43 2014 (r369673) +++ head/devel/pear-Horde_Role/Makefile Tue Sep 30 22:14:59 2014 (r369674) @@ -10,8 +10,7 @@ COMMENT= PEAR installer role for Horde c PATCH_WRKSRC= ${WRKDIR} -.include -.include "${PORTSDIR}/devel/pear-channel-horde/bsd.horde.mk" +USES= horde post-install: @${MKDIR} ${STAGEDIR}${PREFIX}/${HORDE_DIR} @@ -20,4 +19,4 @@ post-install: @${ECHO_CMD} "@unexec rmdir %D/${HORDE_DIR} 2>/dev/null || true" >> \ ${TMPPLIST} -.include +.include Modified: head/devel/pear-Horde_Scheduler/Makefile ============================================================================== --- head/devel/pear-Horde_Scheduler/Makefile Tue Sep 30 21:50:43 2014 (r369673) +++ head/devel/pear-Horde_Scheduler/Makefile Tue Sep 30 22:14:59 2014 (r369674) @@ -8,10 +8,9 @@ CATEGORIES= devel www pear MAINTAINER= horde@FreeBSD.org COMMENT= Horde Scheduler System +USES= horde USE_HORDE_RUN= Horde_Core \ Horde_Util \ Horde_Vfs -.include -.include "${PORTSDIR}/devel/pear-channel-horde/bsd.horde.mk" -.include +.include Modified: head/devel/pear-Horde_Serialize/Makefile ============================================================================== --- head/devel/pear-Horde_Serialize/Makefile Tue Sep 30 21:50:43 2014 (r369673) +++ head/devel/pear-Horde_Serialize/Makefile Tue Sep 30 22:14:59 2014 (r369674) @@ -8,9 +8,8 @@ CATEGORIES= devel www pear MAINTAINER= horde@FreeBSD.org COMMENT= Horde Data Encapulation API +USES= horde USE_HORDE_RUN= Horde_Exception \ Horde_Util -.include -.include "${PORTSDIR}/devel/pear-channel-horde/bsd.horde.mk" -.include +.include Modified: head/devel/pear-Horde_Stream/Makefile ============================================================================== --- head/devel/pear-Horde_Stream/Makefile Tue Sep 30 21:50:43 2014 (r369673) +++ head/devel/pear-Horde_Stream/Makefile Tue Sep 30 22:14:59 2014 (r369674) @@ -8,8 +8,7 @@ CATEGORIES= devel www pear MAINTAINER= horde@FreeBSD.org COMMENT= Horde stream handler +USES= horde USE_HORDE_RUN= Horde_Exception -.include -.include "${PORTSDIR}/devel/pear-channel-horde/bsd.horde.mk" -.include +.include Modified: head/devel/pear-Horde_Stream_Filter/Makefile ============================================================================== --- head/devel/pear-Horde_Stream_Filter/Makefile Tue Sep 30 21:50:43 2014 (r369673) +++ head/devel/pear-Horde_Stream_Filter/Makefile Tue Sep 30 22:14:59 2014 (r369674) @@ -8,6 +8,6 @@ CATEGORIES= devel www pear MAINTAINER= horde@FreeBSD.org COMMENT= Horde Stream filters -.include -.include "${PORTSDIR}/devel/pear-channel-horde/bsd.horde.mk" -.include +USES= horde + +.include Modified: head/devel/pear-Horde_Stream_Wrapper/Makefile ============================================================================== --- head/devel/pear-Horde_Stream_Wrapper/Makefile Tue Sep 30 21:50:43 2014 (r369673) +++ head/devel/pear-Horde_Stream_Wrapper/Makefile Tue Sep 30 22:14:59 2014 (r369674) @@ -8,6 +8,6 @@ CATEGORIES= devel www pear MAINTAINER= horde@FreeBSD.org COMMENT= Horde Stream wrappers -.include -.include "${PORTSDIR}/devel/pear-channel-horde/bsd.horde.mk" -.include +USES= horde + +.include Modified: head/devel/pear-Horde_Support/Makefile ============================================================================== --- head/devel/pear-Horde_Support/Makefile Tue Sep 30 21:50:43 2014 (r369673) +++ head/devel/pear-Horde_Support/Makefile Tue Sep 30 22:14:59 2014 (r369674) @@ -8,9 +8,8 @@ CATEGORIES= devel www pear MAINTAINER= horde@FreeBSD.org COMMENT= Horde support package +USES= horde USE_HORDE_RUN= Horde_Exception \ Horde_Stream_Wrapper -.include -.include "${PORTSDIR}/devel/pear-channel-horde/bsd.horde.mk" -.include +.include Modified: head/devel/pear-Horde_Thrift/Makefile ============================================================================== --- head/devel/pear-Horde_Thrift/Makefile Tue Sep 30 21:50:43 2014 (r369673) +++ head/devel/pear-Horde_Thrift/Makefile Tue Sep 30 22:14:59 2014 (r369674) @@ -8,6 +8,6 @@ CATEGORIES= devel www pear MAINTAINER= horde@FreeBSD.org COMMENT= Horde Thrift Client -.include -.include "${PORTSDIR}/devel/pear-channel-horde/bsd.horde.mk" -.include +USES= horde + +.include Modified: head/devel/pear-Horde_Timezone/Makefile ============================================================================== --- head/devel/pear-Horde_Timezone/Makefile Tue Sep 30 21:50:43 2014 (r369673) +++ head/devel/pear-Horde_Timezone/Makefile Tue Sep 30 22:14:59 2014 (r369674) @@ -8,10 +8,9 @@ CATEGORIES= devel www pear MAINTAINER= horde@FreeBSD.org COMMENT= Horde timezone library +USES= horde USE_HORDE_RUN= Horde_Date \ Horde_Icalendar \ Horde_Vfs -.include -.include "${PORTSDIR}/devel/pear-channel-horde/bsd.horde.mk" -.include +.include Modified: head/devel/pear-Horde_Token/Makefile ============================================================================== --- head/devel/pear-Horde_Token/Makefile Tue Sep 30 21:50:43 2014 (r369673) +++ head/devel/pear-Horde_Token/Makefile Tue Sep 30 22:14:59 2014 (r369674) @@ -8,12 +8,11 @@ CATEGORIES= devel www pear MAINTAINER= horde@FreeBSD.org COMMENT= Horde Token API +USES= horde USE_HORDE_RUN= Horde_Exception \ Horde_Translation \ Horde_Url \ Horde_Util USE_PHP= hash -.include -.include "${PORTSDIR}/devel/pear-channel-horde/bsd.horde.mk" -.include +.include Modified: head/devel/pear-Horde_Translation/Makefile ============================================================================== --- head/devel/pear-Horde_Translation/Makefile Tue Sep 30 21:50:43 2014 (r369673) +++ head/devel/pear-Horde_Translation/Makefile Tue Sep 30 22:14:59 2014 (r369674) @@ -8,6 +8,6 @@ CATEGORIES= devel www pear MAINTAINER= horde@FreeBSD.org COMMENT= Horde translation library -.include -.include "${PORTSDIR}/devel/pear-channel-horde/bsd.horde.mk" -.include +USES= horde + +.include Modified: head/devel/pear-Horde_Tree/Makefile ============================================================================== --- head/devel/pear-Horde_Tree/Makefile Tue Sep 30 21:50:43 2014 (r369673) +++ head/devel/pear-Horde_Tree/Makefile Tue Sep 30 22:14:59 2014 (r369674) @@ -8,10 +8,9 @@ CATEGORIES= devel www pear MAINTAINER= horde@FreeBSD.org COMMENT= Horde Tree API +USES= horde USE_HORDE_RUN= Horde_Exception \ Horde_Url \ Horde_Util -.include -.include "${PORTSDIR}/devel/pear-channel-horde/bsd.horde.mk" -.include +.include Modified: head/devel/pear-Horde_Util/Makefile ============================================================================== --- head/devel/pear-Horde_Util/Makefile Tue Sep 30 21:50:43 2014 (r369673) +++ head/devel/pear-Horde_Util/Makefile Tue Sep 30 22:14:59 2014 (r369674) @@ -6,8 +6,7 @@ CATEGORIES= devel www pear MAINTAINER= horde@FreeBSD.org COMMENT= Horde Utility Libraries +USES= horde USE_PHP= dom -.include -.include "${PORTSDIR}/devel/pear-channel-horde/bsd.horde.mk" -.include +.include Modified: head/devel/pear-Horde_View/Makefile ============================================================================== --- head/devel/pear-Horde_View/Makefile Tue Sep 30 21:50:43 2014 (r369673) +++ head/devel/pear-Horde_View/Makefile Tue Sep 30 22:14:59 2014 (r369674) @@ -7,10 +7,9 @@ CATEGORIES= devel www pear MAINTAINER= horde@FreeBSD.org COMMENT= Horde View API +USES= horde USE_HORDE_RUN= Horde_Exception \ Horde_Support \ Horde_Util -.include -.include "${PORTSDIR}/devel/pear-channel-horde/bsd.horde.mk" -.include +.include Modified: head/graphics/pear-Horde_Image/Makefile ============================================================================== --- head/graphics/pear-Horde_Image/Makefile Tue Sep 30 21:50:43 2014 (r369673) +++ head/graphics/pear-Horde_Image/Makefile Tue Sep 30 22:14:59 2014 (r369674) @@ -8,6 +8,7 @@ PKGNAMEPREFIX= pear- MAINTAINER= horde@FreeBSD.org COMMENT= Horde Image API +USES= horde USE_HORDE_RUN= Horde_Exception \ Horde_Support \ Horde_Translation \ @@ -16,11 +17,6 @@ USE_HORDE_RUN= Horde_Exception \ OPTIONS_DEFINE= GD GD_DESC= Depend on PHP gd extension -.include +GD_USE= PHP=gd -.if ${PORT_OPTIONS:MGD} -USE_PHP+= gd -.endif - -.include "${PORTSDIR}/devel/pear-channel-horde/bsd.horde.mk" -.include +.include Modified: head/mail/pear-Horde_Imap_Client/Makefile ============================================================================== --- head/mail/pear-Horde_Imap_Client/Makefile Tue Sep 30 21:50:43 2014 (r369673) +++ head/mail/pear-Horde_Imap_Client/Makefile Tue Sep 30 22:14:59 2014 (r369674) @@ -8,6 +8,7 @@ PKGNAMEPREFIX= pear- MAINTAINER= horde@FreeBSD.org COMMENT= Horde IMAP abstraction interface +USES= horde USE_PHP= hash USE_HORDE_RUN= Horde_Exception \ Horde_Mail \ @@ -21,19 +22,8 @@ IMAP_DESC= Require PHP imap extension MBSTRING_DESC= Require PHP mbstring extension SASL_DESC= Support SASL Authentication -.include +IMAP_USE= PHP=imap +MBSTRING_USE= PHP=mbstring +SASL_RUN_DEPENDS= ${PEARDIR}/Auth/SASL.php:${PORTSDIR}/security/pear-Auth_SASL -.if ${PORT_OPTIONS:MIMAP} -USE_PHP+= imap -.endif - -.if ${PORT_OPTIONS:MMBSTRING} -USE_PHP+= mbstring -.endif - -.if ${PORT_OPTIONS:MSASL} -RUN_DEPENDS+= ${PEARDIR}/Auth/SASL.php:${PORTSDIR}/security/pear-Auth_SASL -.endif - -.include "${PORTSDIR}/devel/pear-channel-horde/bsd.horde.mk" -.include +.include Modified: head/mail/pear-Horde_Kolab_Storage/Makefile ============================================================================== --- head/mail/pear-Horde_Kolab_Storage/Makefile Tue Sep 30 21:50:43 2014 (r369673) +++ head/mail/pear-Horde_Kolab_Storage/Makefile Tue Sep 30 22:14:59 2014 (r369674) @@ -8,6 +8,7 @@ CATEGORIES= mail www pear MAINTAINER= horde@FreeBSD.org COMMENT= Horde library for handling Kolab data stored on an IMAP server +USES= horde USE_HORDE_RUN= Horde_Cache \ Horde_Exception \ Horde_Kolab_Format \ @@ -20,6 +21,4 @@ USE_HORDE_RUN= Horde_Cache \ USE_PHP+= imap USE_HORDE_RUN+= Horde_Imap_Client -.include -.include "${PORTSDIR}/devel/pear-channel-horde/bsd.horde.mk" -.include +.include Modified: head/mail/pear-Horde_ListHeaders/Makefile ============================================================================== --- head/mail/pear-Horde_ListHeaders/Makefile Tue Sep 30 21:50:43 2014 (r369673) +++ head/mail/pear-Horde_ListHeaders/Makefile Tue Sep 30 22:14:59 2014 (r369674) @@ -8,8 +8,7 @@ CATEGORIES= mail www pear MAINTAINER= horde@FreeBSD.org COMMENT= Horde List Headers Parsing Library +USES= horde USE_HORDE_RUN= Horde_Mail -.include -.include "${PORTSDIR}/devel/pear-channel-horde/bsd.horde.mk" -.include +.include Modified: head/mail/pear-Horde_Mail/Makefile ============================================================================== --- head/mail/pear-Horde_Mail/Makefile Tue Sep 30 21:50:43 2014 (r369673) +++ head/mail/pear-Horde_Mail/Makefile Tue Sep 30 22:14:59 2014 (r369674) @@ -7,6 +7,7 @@ CATEGORIES= mail www pear MAINTAINER= horde@FreeBSD.org COMMENT= Horde Mail Library +USES= horde USE_HORDE_RUN= Horde_Exception \ Horde_Stream_Filter @@ -16,6 +17,4 @@ USE_HORDE_RUN= Horde_Exception \ # Optional but we want it RUN_DEPENDS+= ${PEARDIR}/Net/SMTP.php:${PORTSDIR}/net/pear-Net_SMTP -.include -.include "${PORTSDIR}/devel/pear-channel-horde/bsd.horde.mk" -.include +.include Modified: head/mail/pear-Horde_Mapi/Makefile ============================================================================== --- head/mail/pear-Horde_Mapi/Makefile Tue Sep 30 21:50:43 2014 (r369673) +++ head/mail/pear-Horde_Mapi/Makefile Tue Sep 30 22:14:59 2014 (r369674) @@ -8,11 +8,10 @@ PKGNAMEPREFIX= pear- MAINTAINER= horde@FreeBSD.org COMMENT= Horde MAPI utility library +USES= horde USE_HORDE_RUN= Horde_Date \ Horde_Exception USE_PHP+= bcmath -.include -.include "${PORTSDIR}/devel/pear-channel-horde/bsd.horde.mk" -.include +.include Modified: head/mail/pear-Horde_Mime/Makefile ============================================================================== --- head/mail/pear-Horde_Mime/Makefile Tue Sep 30 21:50:43 2014 (r369673) +++ head/mail/pear-Horde_Mime/Makefile Tue Sep 30 22:14:59 2014 (r369674) @@ -7,6 +7,7 @@ CATEGORIES= mail www pear MAINTAINER= horde@FreeBSD.org COMMENT= Horde MIME Library +USES= horde USE_HORDE_RUN= Horde_Exception \ Horde_Mail \ Horde_Stream_Filter \ @@ -15,6 +16,4 @@ USE_HORDE_RUN= Horde_Exception \ Horde_Translation \ Horde_Util -.include -.include "${PORTSDIR}/devel/pear-channel-horde/bsd.horde.mk" -.include +.include Modified: head/mail/pear-Horde_Mime_Viewer/Makefile ============================================================================== --- head/mail/pear-Horde_Mime_Viewer/Makefile Tue Sep 30 21:50:43 2014 (r369673) +++ head/mail/pear-Horde_Mime_Viewer/Makefile Tue Sep 30 22:14:59 2014 (r369674) @@ -12,6 +12,7 @@ CONFLICTS= horde-3* USE_HORDE_BUILD= Horde_Role +USES= horde USE_HORDE_RUN= Horde_Role \ Horde_Browser \ Horde_Compress \ @@ -24,6 +25,4 @@ USE_HORDE_RUN= Horde_Role \ USE_PHP= xml -.include -.include "${PORTSDIR}/devel/pear-channel-horde/bsd.horde.mk" -.include +.include Modified: head/mail/pear-Horde_Smtp/Makefile ============================================================================== --- head/mail/pear-Horde_Smtp/Makefile Tue Sep 30 21:50:43 2014 (r369673) +++ head/mail/pear-Horde_Smtp/Makefile Tue Sep 30 22:14:59 2014 (r369674) @@ -8,12 +8,11 @@ PKGNAMEPREFIX= pear- MAINTAINER= horde@FreeBSD.org COMMENT= Horde SMTP Client +USES= horde USE_HORDE_RUN= Horde_Exception \ Horde_Mail \ Horde_Socket_Client \ Horde_Support \ Horde_Translation -.include -.include "${PORTSDIR}/devel/pear-channel-horde/bsd.horde.mk" -.include +.include Modified: head/net/pear-Horde_Kolab_Server/Makefile ============================================================================== --- head/net/pear-Horde_Kolab_Server/Makefile Tue Sep 30 21:50:43 2014 (r369673) +++ head/net/pear-Horde_Kolab_Server/Makefile Tue Sep 30 22:14:59 2014 (r369674) @@ -9,6 +9,7 @@ PKGNAMEPREFIX= pear- MAINTAINER= horde@FreeBSD.org COMMENT= Horde library for manipulating the Kolab user database +USES= horde USE_PHP= hash USE_HORDE_RUN= Horde_Auth \ Horde_Exception @@ -20,11 +21,6 @@ LDAP_DESC= Enable LDAP support # Not required but we want it USE_HORDE_RUN+= Horde_Date -.include +LDAP_USE= HORDE_RUN=Horde_Ldap -.if ${PORT_OPTIONS:MLDAP} -USE_HORDE_RUN+= Horde_Ldap -.endif - -.include "${PORTSDIR}/devel/pear-channel-horde/bsd.horde.mk" -.include +.include Modified: head/net/pear-Horde_Kolab_Session/Makefile ============================================================================== --- head/net/pear-Horde_Kolab_Session/Makefile Tue Sep 30 21:50:43 2014 (r369673) +++ head/net/pear-Horde_Kolab_Session/Makefile Tue Sep 30 22:14:59 2014 (r369674) @@ -8,12 +8,11 @@ CATEGORIES= net www pear MAINTAINER= horde@FreeBSD.org COMMENT= Horde library for managing an active Kolab session +USES= horde USE_HORDE_RUN= Horde_Exception # Optional but we want it USE_HORDE_RUN+= Horde_Kolab_Server \ Horde_Log -.include -.include "${PORTSDIR}/devel/pear-channel-horde/bsd.horde.mk" -.include +.include Modified: head/net/pear-Horde_Ldap/Makefile ============================================================================== --- head/net/pear-Horde_Ldap/Makefile Tue Sep 30 21:50:43 2014 (r369673) +++ head/net/pear-Horde_Ldap/Makefile Tue Sep 30 22:14:59 2014 (r369674) @@ -8,10 +8,9 @@ CATEGORIES= net www pear MAINTAINER= horde@FreeBSD.org COMMENT= Horde LDAP libraries +USES= horde USE_PHP= ldap USE_HORDE_RUN= Horde_Exception \ Horde_Util -.include -.include "${PORTSDIR}/devel/pear-channel-horde/bsd.horde.mk" -.include +.include Modified: head/net/pear-Horde_Rpc/Makefile ============================================================================== --- head/net/pear-Horde_Rpc/Makefile Tue Sep 30 21:50:43 2014 (r369673) +++ head/net/pear-Horde_Rpc/Makefile Tue Sep 30 22:14:59 2014 (r369674) @@ -7,6 +7,7 @@ CATEGORIES= net www pear MAINTAINER= horde@FreeBSD.org COMMENT= Horde RPC API +USES= horde USE_HORDE_RUN= Horde_Core \ Horde_Dav \ Horde_Exception \ @@ -23,6 +24,4 @@ USE_HORDE_RUN+= Horde_ActiveSync \ *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***