From owner-svn-ports-head@freebsd.org Mon Jan 25 14:43:49 2016 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id E961EA46EAB; Mon, 25 Jan 2016 14:43:48 +0000 (UTC) (envelope-from koobs.freebsd@gmail.com) Received: from mail-pa0-x231.google.com (mail-pa0-x231.google.com [IPv6:2607:f8b0:400e:c03::231]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id C36EC6C2; Mon, 25 Jan 2016 14:43:48 +0000 (UTC) (envelope-from koobs.freebsd@gmail.com) Received: by mail-pa0-x231.google.com with SMTP id yy13so81605969pab.3; Mon, 25 Jan 2016 06:43:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:reply-to:subject:references:to:from:message-id:date :user-agent:mime-version:in-reply-to:content-type :content-transfer-encoding; bh=hptoTzBGln2LcVAmztg3i/BH1TzFkTvGETtKyDywA+w=; b=H22Wx+NNGD7L0iCJ311zgq4f0zd0FEheMZLkSUAaD6fylFcq4EOb+R/XABcHdrTvIF fxC/cNmg+updQQ+f7xYrKkoI0poKFMfO2zR7jiKn0C6kEMtEVQhhRiN8+Ey42iuyfgUB Z0ejkv+ywH5paWiN4w00VM+fI8jppr4z0W7grn3gLK4s5oMSOfWr0oYd8MnEwojxYBr9 ZQdjmSsz1nE2EmY6D8bBkAkeyEg6+PpOjNhxPDHZKuuPDWd4iybZoOeSyfCOpNw16SEX yV+q9bjE1xKkTS46Q90NGgDVBQUujvbTGE7Pi/Xs8Tqua6j+/ei+fJO8siGFERXZYbep nqCg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:reply-to:subject:references:to:from :message-id:date:user-agent:mime-version:in-reply-to:content-type :content-transfer-encoding; bh=hptoTzBGln2LcVAmztg3i/BH1TzFkTvGETtKyDywA+w=; b=ldZB5Kb6Kp56XRTII7VhfbSXhAveNOdrNiSkn9+SFIgSJnngRV+oq1CeBu9EotcVVP BZ9wpObEwN0KchqE5jxeN4pTGy+blFHCQ8PIoXDMtGLNSZEgGA/5omJMfdRPCmZRfXJq GAfBRUhRtMdCdTtKH3PA9yuYrrREiXuT28Of6Wz9wIVh/WzPUslKPGMCzlvYmaoSHa84 5Rr1+PxLpk+pumW03MFRWMy0dgfLaFPeTWmow2cF+AMGiZb6B7wT/8ueONBJiYsooVWf ZfLr+dyC7aH+buS5/kNF3mxYwTW7YZQKFuAb5MKW2ozTVaKULDigkBBYBkWEXElEWhJi WynA== X-Gm-Message-State: AG10YORCVIZsQBe2Uj4w6c9F6MQUJ6oc6zihZBYahgNeE5BlztvJJDQCeffTnkZ5A+/HXA== X-Received: by 10.67.3.170 with SMTP id bx10mr26516223pad.34.1453733028410; Mon, 25 Jan 2016 06:43:48 -0800 (PST) Received: from ?IPv6:2001:44b8:31ae:7b01:e955:70fa:3edd:219e? (2001-44b8-31ae-7b01-e955-70fa-3edd-219e.static.ipv6.internode.on.net. [2001:44b8:31ae:7b01:e955:70fa:3edd:219e]) by smtp.gmail.com with ESMTPSA id s13sm29275172pfi.12.2016.01.25.06.43.45 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 25 Jan 2016 06:43:47 -0800 (PST) Sender: Kubilay Kocak Reply-To: koobs@FreeBSD.org Subject: Re: svn commit: r407217 - head/net/py-ldap References: <201601251439.u0PEdcSQ022505@repo.freebsd.org> To: Ruslan Makhmatkhanov , ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org From: Kubilay Kocak Message-ID: <56A6349D.20304@FreeBSD.org> Date: Tue, 26 Jan 2016 01:43:41 +1100 User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:44.0) Gecko/20100101 Thunderbird/44.0 MIME-Version: 1.0 In-Reply-To: <201601251439.u0PEdcSQ022505@repo.freebsd.org> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit 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: Mon, 25 Jan 2016 14:43:49 -0000 On 26/01/2016 1:39 AM, Ruslan Makhmatkhanov wrote: > Author: rm > Date: Mon Jan 25 14:39:37 2016 > New Revision: 407217 > URL: https://svnweb.freebsd.org/changeset/ports/407217 > > Log: > net/py-ldap: sync with py-ldap > > - convert to option helpers > - add conflicts with py27-pyldap: they install files into the same place > > These changes are non-functional, so no PORTREVISION bump. What about in order for pkg to register the new conflict? I'm not 100% sure, but I thought I'd ask the question Btw, *awesome* use of Python setopt/saveopts > Modified: > head/net/py-ldap/Makefile > > Modified: head/net/py-ldap/Makefile > ============================================================================== > --- head/net/py-ldap/Makefile Mon Jan 25 14:36:14 2016 (r407216) > +++ head/net/py-ldap/Makefile Mon Jan 25 14:39:37 2016 (r407217) > @@ -15,25 +15,23 @@ LICENSE_FILE= ${WRKSRC}/LICENCE > > RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyasn1-modules>0:${PORTSDIR}/devel/py-pyasn1-modules > > +CONFLICTS_INSTALL= py27-pyldap > USES= python:2 > USE_PYTHON= autoplist distutils > -USE_OPENLDAP= yes > +USE_OPENLDAP= yes > WANT_OPENLDAP_VER= 24 > -OPTIONS_DEFINE= SASL > > -.include > +OPTIONS_DEFINE= SASL > > -.if ${PORT_OPTIONS:MSASL} > -WANT_OPENLDAP_SASL= yes > -CONFLICTS+= openldap24-client-2.* > -.endif > +SASL_VARS= WANT_OPENLDAP_SASL=yes > +SASL_CONFLICTS= openldap24-client-2.* > > do-configure: > @${REINPLACE_CMD} -e 's,/usr/local,${LOCALBASE},' ${WRKSRC}/setup.cfg > -.if ! ${PORT_OPTIONS:MSASL} > + > +do-configure-SASL-off: > @cd ${WRKSRC} && ${PYTHON_CMD} setup.py -q setopt -c _ldap -s HAVE_TLS -o defines > @cd ${WRKSRC} && ${PYTHON_CMD} setup.py -q saveopts > -.endif > > post-install: > ${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/_ldap.so >