Date: Thu, 4 Oct 2012 00:04:36 +0200 From: Baptiste Daroussin <bapt@FreeBSD.org> To: Ruslan Mahmatkhanov <rm@FreeBSD.org> Cc: svn-ports-head@FreeBSD.org, svn-ports-all@FreeBSD.org, ports-committers@FreeBSD.org Subject: Re: svn commit: r305051 - head/dns/py-dnspython Message-ID: <20121003220436.GA81976@ithaqua.etoilebsd.net> In-Reply-To: <201209292019.q8TKJqa6087700@svn.freebsd.org> References: <201209292019.q8TKJqa6087700@svn.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--6c2NcOVqGQ03X4Wi Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Sat, Sep 29, 2012 at 08:19:52PM +0000, Ruslan Mahmatkhanov wrote: > Author: rm > Date: Sat Sep 29 20:19:52 2012 > New Revision: 305051 > URL: http://svn.freebsd.org/changeset/ports/305051 >=20 > Log: > - update to 1.10.0 > - convert to optionsng > =20 > while here: > - limit python version to 2.x only > - remove deprecated attribution in pkg-descr > =20 > PR: 171786 > Submitted by: William Grzybowski <william88 at gmail dot com> > Approved by: Andy Greenwood <greenwood.andy at gmail dot com> (prev mai= ntainer) >=20 > Modified: > head/dns/py-dnspython/Makefile > head/dns/py-dnspython/distinfo > head/dns/py-dnspython/pkg-descr > head/dns/py-dnspython/pkg-plist >=20 > Modified: head/dns/py-dnspython/Makefile > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/dns/py-dnspython/Makefile Sat Sep 29 19:53:11 2012 (r305050) > +++ head/dns/py-dnspython/Makefile Sat Sep 29 20:19:52 2012 (r305051) > @@ -2,7 +2,7 @@ > # $FreeBSD$ > =20 > PORTNAME=3D dnspython > -PORTVERSION=3D 1.9.4 > +PORTVERSION=3D 1.10.0 > CATEGORIES=3D dns python > MASTER_SITES=3D http://www.dnspython.org/kits/${PORTVERSION}/ > PKGNAMEPREFIX=3D ${PYTHON_PKGNAMEPREFIX} > @@ -10,35 +10,28 @@ PKGNAMEPREFIX=3D ${PYTHON_PKGNAMEPREFIX} > MAINTAINER=3D rm@FreeBSD.org > COMMENT=3D A DNS toolkit for Python > =20 > -USE_PYTHON=3D yes > -USE_PYDISTUTILS=3D yes > +USE_PYTHON=3D -2.7 > +USE_PYDISTUTILS=3Dyes > =20 > -OPTIONS=3D PYCRYPTO "Enable pycrypto (part of dnssec needs it)" off > +OPTIONS_DEFINE=3D PYCRYPTO > +PYCRYPTO_DESC=3D Enable pycrypto (part of dnssec needs it) > =20 > -PORTDOCS=3D \ > - ChangeLog \ > - README \ > - TODO > -EXAMPLE_FILES=3D \ > - ddns.py \ > - e164.py \ > - mx.py \ > - name.py \ > - reverse.py \ > - reverse_name.py \ > - xfr.py \ > +PORTDOCS=3D ChangeLog README > +EXAMPLE_FILES=3D ddns.py e164.py mx.py name.py reverse.py reverse_name.p= y xfr.py \ > zonediff.py > =20 > +.include <bsd.port.options.mk> > + > post-install: > # docs > -.if !defined(NOPORTDOCS) > +.if ${PORT_OPTIONS:MDOCS} > @${MKDIR} ${DOCSDIR} > .for file in ${PORTDOCS} > @${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR} > .endfor > .endif > # examples > -.if !defined(NOPORTEXAMPLES) > +.if ${PORT_OPTIONS:MEXAMPLES} > @${MKDIR} ${EXAMPLESDIR} > .for file in ${EXAMPLE_FILES} > @${INSTALL_DATA} ${WRKSRC}/examples/${file} ${EXAMPLESDIR} > @@ -48,10 +41,8 @@ post-install: > @${CHMOD} -R ${SHAREMODE} ${PYTHONPREFIX_SITELIBDIR}/dns/* > @${CHMOD} -R a+X ${PYTHONPREFIX_SITELIBDIR}/dns/* > =20 > -.include <bsd.port.pre.mk> > - > -.if defined(WITH_PYCRYPTO) > -RUN_DEPENDS+=3D ${PYTHON_SITELIBDIR}/Crypto/__init__.py:${PORTSDIR}/secu= rity/py-pycrypto > +.if ${PORT_OPTIONS:MPYCRYPTO} > +RUN_DEPENDS+=3D ${PYTHON_PKGNAMEPREFIX}crypto>0:${PORTSDIR}/security/py-= pycrypto > .endif > =20 > -.include <bsd.port.post.mk> > +.include <bsd.port.mk> >=20 > Modified: head/dns/py-dnspython/distinfo > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/dns/py-dnspython/distinfo Sat Sep 29 19:53:11 2012 (r305050) > +++ head/dns/py-dnspython/distinfo Sat Sep 29 20:19:52 2012 (r305051) > @@ -1,2 +1,2 @@ > -SHA256 (dnspython-1.9.4.tar.gz) =3D ab23f93b8ea33c7b2780d6093344a13c95a3= 71e1d2c22f74ba5d076cc15d1918 > -SIZE (dnspython-1.9.4.tar.gz) =3D 120126 > +SHA256 (dnspython-1.10.0.tar.gz) =3D 4dc21450ec6ac94dd105b4e5f39a75b404a= d45a30869ff73acb6fd4d9974f857 > +SIZE (dnspython-1.10.0.tar.gz) =3D 124416 >=20 > Modified: head/dns/py-dnspython/pkg-descr > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/dns/py-dnspython/pkg-descr Sat Sep 29 19:53:11 2012 (r305050) > +++ head/dns/py-dnspython/pkg-descr Sat Sep 29 20:19:52 2012 (r305051) > @@ -1,5 +1,3 @@ > -[ excerpt with modifications from developer's site ] > - > dnspython is a DNS toolkit for Python. It supports almost all record > types. It can be used for queries, zone transfers, and dynamic > updates. It supports TSIG authenticated messages and EDNS0. > @@ -9,5 +7,4 @@ level classes perform queries for data o > class, and return an answer set. The low level classes allow direct > manipulation of DNS zones, messages, names, and records. > =20 > -Author: Bob Halley <halley@dnspython.org> > WWW: http://www.dnspython.org/ >=20 > Modified: head/dns/py-dnspython/pkg-plist > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/dns/py-dnspython/pkg-plist Sat Sep 29 19:53:11 2012 (r305050) > +++ head/dns/py-dnspython/pkg-plist Sat Sep 29 20:19:52 2012 (r305051) > @@ -97,9 +97,6 @@ > %%PYTHON_SITELIBDIR%%/dns/rdtypes/ANY/ISDN.py > %%PYTHON_SITELIBDIR%%/dns/rdtypes/ANY/ISDN.pyc > %%PYTHON_SITELIBDIR%%/dns/rdtypes/ANY/ISDN.pyo > -%%PYTHON_SITELIBDIR%%/dns/rdtypes/ANY/KEY.py > -%%PYTHON_SITELIBDIR%%/dns/rdtypes/ANY/KEY.pyc > -%%PYTHON_SITELIBDIR%%/dns/rdtypes/ANY/KEY.pyo > %%PYTHON_SITELIBDIR%%/dns/rdtypes/ANY/LOC.py > %%PYTHON_SITELIBDIR%%/dns/rdtypes/ANY/LOC.pyc > %%PYTHON_SITELIBDIR%%/dns/rdtypes/ANY/LOC.pyo > @@ -118,9 +115,6 @@ > %%PYTHON_SITELIBDIR%%/dns/rdtypes/ANY/NSEC3PARAM.py > %%PYTHON_SITELIBDIR%%/dns/rdtypes/ANY/NSEC3PARAM.pyc > %%PYTHON_SITELIBDIR%%/dns/rdtypes/ANY/NSEC3PARAM.pyo > -%%PYTHON_SITELIBDIR%%/dns/rdtypes/ANY/NXT.py > -%%PYTHON_SITELIBDIR%%/dns/rdtypes/ANY/NXT.pyc > -%%PYTHON_SITELIBDIR%%/dns/rdtypes/ANY/NXT.pyo > %%PYTHON_SITELIBDIR%%/dns/rdtypes/ANY/PTR.py > %%PYTHON_SITELIBDIR%%/dns/rdtypes/ANY/PTR.pyc > %%PYTHON_SITELIBDIR%%/dns/rdtypes/ANY/PTR.pyo > @@ -133,9 +127,6 @@ > %%PYTHON_SITELIBDIR%%/dns/rdtypes/ANY/RT.py > %%PYTHON_SITELIBDIR%%/dns/rdtypes/ANY/RT.pyc > %%PYTHON_SITELIBDIR%%/dns/rdtypes/ANY/RT.pyo > -%%PYTHON_SITELIBDIR%%/dns/rdtypes/ANY/SIG.py > -%%PYTHON_SITELIBDIR%%/dns/rdtypes/ANY/SIG.pyc > -%%PYTHON_SITELIBDIR%%/dns/rdtypes/ANY/SIG.pyo > %%PYTHON_SITELIBDIR%%/dns/rdtypes/ANY/SOA.py > %%PYTHON_SITELIBDIR%%/dns/rdtypes/ANY/SOA.pyc > %%PYTHON_SITELIBDIR%%/dns/rdtypes/ANY/SOA.pyo > @@ -199,18 +190,12 @@ > %%PYTHON_SITELIBDIR%%/dns/rdtypes/dsbase.py > %%PYTHON_SITELIBDIR%%/dns/rdtypes/dsbase.pyc > %%PYTHON_SITELIBDIR%%/dns/rdtypes/dsbase.pyo > -%%PYTHON_SITELIBDIR%%/dns/rdtypes/keybase.py > -%%PYTHON_SITELIBDIR%%/dns/rdtypes/keybase.pyc > -%%PYTHON_SITELIBDIR%%/dns/rdtypes/keybase.pyo > %%PYTHON_SITELIBDIR%%/dns/rdtypes/mxbase.py > %%PYTHON_SITELIBDIR%%/dns/rdtypes/mxbase.pyc > %%PYTHON_SITELIBDIR%%/dns/rdtypes/mxbase.pyo > %%PYTHON_SITELIBDIR%%/dns/rdtypes/nsbase.py > %%PYTHON_SITELIBDIR%%/dns/rdtypes/nsbase.pyc > %%PYTHON_SITELIBDIR%%/dns/rdtypes/nsbase.pyo > -%%PYTHON_SITELIBDIR%%/dns/rdtypes/sigbase.py > -%%PYTHON_SITELIBDIR%%/dns/rdtypes/sigbase.pyc > -%%PYTHON_SITELIBDIR%%/dns/rdtypes/sigbase.pyo > %%PYTHON_SITELIBDIR%%/dns/rdtypes/txtbase.py > %%PYTHON_SITELIBDIR%%/dns/rdtypes/txtbase.pyc > %%PYTHON_SITELIBDIR%%/dns/rdtypes/txtbase.pyo > @@ -247,6 +232,9 @@ > %%PYTHON_SITELIBDIR%%/dns/version.py > %%PYTHON_SITELIBDIR%%/dns/version.pyc > %%PYTHON_SITELIBDIR%%/dns/version.pyo > +%%PYTHON_SITELIBDIR%%/dns/wiredata.py > +%%PYTHON_SITELIBDIR%%/dns/wiredata.pyc > +%%PYTHON_SITELIBDIR%%/dns/wiredata.pyo > %%PYTHON_SITELIBDIR%%/dns/zone.py > %%PYTHON_SITELIBDIR%%/dns/zone.pyc > %%PYTHON_SITELIBDIR%%/dns/zone.pyo There is a problem here which will lead for users to endless see the dialog= in make config-conditional The bug affects every single ports using framework modifier prefixes: python rubygem, apache modules and many more for ages. The bug is the optionsfile is base on UNIQUENAME which is not the same when= make first reads the the makefile and what it becomes after inclusion of bsd.port.pre.mk or bsd.port.options.mk, which means the optionsfiles read (config-conditional or more) and the one written is not the same! the workaround for edges is to set OPTIONSFILE manually in the ports, lots = of python ports already do that. This is a long standing bug, if someone has a smart idea on how to fix easi= ly please step up, currently the only solution being worked on is trying to en= force UNIQUENAME to be really unique. But this has a huge impact :) any the subje= ct of the mail was just to say here the options won't work as expected for the us= ers and never have in the past (prior to optionsng conversion :)) regards, Bapt --6c2NcOVqGQ03X4Wi Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (FreeBSD) iEYEARECAAYFAlBstnQACgkQ8kTtMUmk6ExM8QCfXBQjaNj2JmDb+ULABVQnCGMA F2sAn3QH83UQP+nhl2D7hNRL/lkZv9Lt =SBVL -----END PGP SIGNATURE----- --6c2NcOVqGQ03X4Wi--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20121003220436.GA81976>