From owner-svn-ports-head@FreeBSD.ORG Thu May 7 09:06:45 2015 Return-Path: Delivered-To: svn-ports-head@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 B38B2371; Thu, 7 May 2015 09:06:45 +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 A22351349; Thu, 7 May 2015 09:06:45 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t4796jvX093401; Thu, 7 May 2015 09:06:45 GMT (envelope-from madpilot@FreeBSD.org) Received: (from madpilot@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t4796jFA093400; Thu, 7 May 2015 09:06:45 GMT (envelope-from madpilot@FreeBSD.org) Message-Id: <201505070906.t4796jFA093400@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: madpilot set sender to madpilot@FreeBSD.org using -f From: Guido Falsi Date: Thu, 7 May 2015 09:06:45 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r385601 - head X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 07 May 2015 09:06:45 -0000 Author: madpilot Date: Thu May 7 09:06:44 2015 New Revision: 385601 URL: https://svnweb.freebsd.org/changeset/ports/385601 Log: Simplify UPDATING entry. Thanks to adamw@ for suggesting me this wording. Modified: head/UPDATING Modified: head/UPDATING ============================================================================== --- head/UPDATING Thu May 7 08:48:24 2015 (r385600) +++ head/UPDATING Thu May 7 09:06:44 2015 (r385601) @@ -9,24 +9,16 @@ you update your ports collection, before AFFECTS: users of net/asterisk13 with PJSIP (default on) and SRTP (default off) options enabled AUTHOR: madpilot@FreeBSD.org - Due to asterisk13 requiring conflicting port options for the net/pjsip - dependency when the SRTP option is enabled together with the PJSIP - one I have created a new slave port to pjsip to enforce the - required option so asterisk can enforce that option with a - conditional dependency. - - Users building custom packages with poudriere should have no - problems, since pkgng is able to handle the change automatically. - - For users compiling from ports a simple update of asterisk will - keep it working because the already installed pjsip port will - satisfy the dependency. They anyway should, when convenient, - disinstall the pjsip port(this will also disinstall asterisk13) - and rebuild asterisk13 to force it to grab the correct dependency - to avoid problems with future updates. + This applies ONLY TO USERS COMPILING FROM PORTS: + To avoid dependency problems, you must remove the pjsip port + before upgrading asterisk13. - Please check the 20150323 entry in this file which has some - background about this problem. + # pkg delete pjsip + # portmaster -a + + These steps are unnecessary for those using binary packages. + + Please see the 20150323 entry for background about this problem. 20150501: AFFECTS: users of graphics/qgis