Date: Sat, 29 Sep 2018 09:27:39 +0200 From: Mathieu Arnold <mat@FreeBSD.org> To: Yuri Victorovich <yuri@FreeBSD.org> Cc: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: Re: svn commit: r480838 - in head: science/paraview textproc/py-pygments Message-ID: <20180929072739.klfeo6zi3twfc532@atuin.in.mat.cc> In-Reply-To: <201809280241.w8S2fQ9g021039@repo.freebsd.org> References: <201809280241.w8S2fQ9g021039@repo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--jenku52ehqneu3vj Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Fri, Sep 28, 2018 at 02:41:26AM +0000, Yuri Victorovich wrote: > Author: yuri > Date: Fri Sep 28 02:41:25 2018 > New Revision: 480838 > URL: https://svnweb.freebsd.org/changeset/ports/480838 >=20 > Log: > textproc/py-pygments and science/paraview conflict each other > =20 > Approved by: portmgr blanket >=20 > Modified: > head/science/paraview/Makefile > head/textproc/py-pygments/Makefile >=20 > Modified: head/science/paraview/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/science/paraview/Makefile Fri Sep 28 00:12:48 2018 (r480837) > +++ head/science/paraview/Makefile Fri Sep 28 02:41:25 2018 (r480838) > @@ -42,6 +42,8 @@ USE_XORG=3D x11 xt xext ice xdmcp xau xcb xfixes xdamage > USE_LDCONFIG=3D yes > USE_GSTREAMER=3D yes > =20 > +CONFLICTS_INSTALL=3D ${PYTHON_PKGNAMEPREFIX}pygments > + > CMAKE_ARGS+=3D -DBUILD_SHARED_LIBS=3D"ON" \ > -DVTK_USE_SYSTEM_PNG=3D"ON" \ > -DVTK_USE_SYSTEM_JPEG=3D"ON" \ >=20 > Modified: head/textproc/py-pygments/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/textproc/py-pygments/Makefile Fri Sep 28 00:12:48 2018 (r480837) > +++ head/textproc/py-pygments/Makefile Fri Sep 28 02:41:25 2018 (r480838) > @@ -17,4 +17,10 @@ USES=3D python > USE_PYTHON=3D distutils concurrent autoplist > NO_ARCH=3D yes > =20 > -.include <bsd.port.mk> > +.include <bsd.port.pre.mk> > + > +.if ${PYTHON_VER} =3D=3D 2.7 > +CONFLICTS_INSTALL=3D paraview > +.endif > + > +.include <bsd.port.post.mk> Without knowing why the two ports conflict, it is a bit hard to say, but it feels like the PYTHON_VER =3D=3D 2.7 is wrong and should be PYTHON_VER = =3D=3D PYTHON_DEFAULT or the other conflict should be py27-pygments. --=20 Mathieu Arnold --jenku52ehqneu3vj Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQKTBAABCgB9FiEEOraXidLtEhBkQLpbOkUW81GDzkgFAluvKWpfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDNB QjY5Nzg5RDJFRDEyMTA2NDQwQkE1QjNBNDUxNkYzNTE4M0NFNDgACgkQOkUW81GD zkgvww/+L1KQL/cNYQbhgIZPg7a1EV39C1NxNbtPnA4eUCsLRyeFbRoafu+hUG/J Po6QM2Xnz/bzL2piUY7EQRD3yoDhaiOPdWmKPqH/5Hqjtfxj92N12r9RDuIhNUDm hvRE2zwwdKELDugst/wggpGs2+l63e/oPMEai2iw8719B+ou6S7L9ZBlAVDmQjMI gBwxp9WYR9wBO5NWi0b37wOEVang2WVl/J9o5mmklTXc1PsaRUF9+rJeXfIt6wUa b6M9P/mGTcBbYHSs9Jo85xNfFTmqXUgLUeqkAh6JixUfailzuhG6kVB50BOsRKN1 ydqiwA5sKiEFQfXssoTMTOXuPz43G9L9YB80ekeqL6y9/bJb10ou0Qjr7CsBJZWX lAb3rWR873z25Fqn/0BHMqwUocRS3XoVEkgifIEqKmTkGhZ2FMUw4H+S+7agUR33 W/jrREDlyU9RA9iH9B6GdOwoXD7OPFovtywfTE1qZoKB2o5pAE8RmYoOqYw3qXGZ ONpZta4JwAE/+Q0ZAeR7UI0AyO7r4czWIaJHN3CQjjAmHBRAGhs2phNcpG3xlIJF mVuOUKdBtyR37oOCXPgdqZx9+RY8yHLSIiz6gDaQFnx/1M61MXQ9DJzo+ojIWHCr L6wk4Utc1ruAJwXJaExkQYtUeUzneahQfmZv7BEBwZFLe99vjn8= =CfB+ -----END PGP SIGNATURE----- --jenku52ehqneu3vj--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20180929072739.klfeo6zi3twfc532>