Date: Tue, 4 Apr 2017 12:00:42 +0200 From: Mathieu Arnold <mat@FreeBSD.org> To: Ben Woods <woodsb02@FreeBSD.org>, ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: Re: svn commit: r437548 - head/print/hplip Message-ID: <0b7881ec-c547-c69b-e420-78dde5ba6694@FreeBSD.org> In-Reply-To: <201704021034.v32AY77a032794@repo.freebsd.org> References: <201704021034.v32AY77a032794@repo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --2JAT1LKw9TBllNAjLa33uI6UHs9SQ23q6 Content-Type: multipart/mixed; boundary="9qE674TeF9vsHquvk8O49XGHpKInWNvUc"; protected-headers="v1" From: Mathieu Arnold <mat@FreeBSD.org> To: Ben Woods <woodsb02@FreeBSD.org>, ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Message-ID: <0b7881ec-c547-c69b-e420-78dde5ba6694@FreeBSD.org> Subject: Re: svn commit: r437548 - head/print/hplip References: <201704021034.v32AY77a032794@repo.freebsd.org> In-Reply-To: <201704021034.v32AY77a032794@repo.freebsd.org> --9qE674TeF9vsHquvk8O49XGHpKInWNvUc Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Le 02/04/2017 =C3=A0 12:34, Ben Woods a =C3=A9crit : > Author: woodsb02 > Date: Sun Apr 2 10:34:06 2017 > New Revision: 437548 > URL: https://svnweb.freebsd.org/changeset/ports/437548 > > Log: > print/hplip: Improve option logic for X11, QT4, QT5 > =20 > If X11 option is disabled, the configure args should not enable > QT4 or QT5, and their dependencies should not be added. > =20 > PR: 218213 > Reported by: Tom Francis <thomas.francis.jr@pobox.com> > Reviewed by: Kevin Oberman <rkoberman@gmail.com> > > Modified: > head/print/hplip/Makefile > > Modified: head/print/hplip/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/print/hplip/Makefile Sun Apr 2 10:32:22 2017 (r437547) > +++ head/print/hplip/Makefile Sun Apr 2 10:34:06 2017 (r437548) > @@ -62,22 +62,34 @@ SCAN_CONFIGURE_ENABLE=3D scan-build > X11_DESC=3D Graphical User Interface (Qt) > X11_CONFIGURE_ENABLE=3D gui-build > =20 > -QT4_USES=3D pyqt:4 > -QT4_USE=3D PYQT=3Dcore_run,dbussupport_run,gui_run > -QT4_CONFIGURE_ENABLE=3D qt4 > -QT4_IMPLIES=3D X11 > - > -QT5_USES=3D pyqt:5 > -QT5_USE=3D PYQT=3Dcore_run,dbussupport_run,gui_run,widgets_run > -QT5_CONFIGURE_ENABLE=3D qt5 > -QT5_IMPLIES=3D X11 > - > XSANE_DESC=3D Install XSane for scanning (implies SCAN) > XSANE_IMPLIES=3D SCAN > XSANE_RUN_DEPENDS=3D xsane:graphics/xsane > =20 > DOCS_CONFIGURE_ENABLE=3D doc-build > =20 > +.include <bsd.port.options.mk> > + > +.if ${PORT_OPTIONS:MQT4} && ${PORT_OPTIONS:MX11} > +USES+=3D pyqt:4 > +USE_PYQT=3D core_run dbussupport_run gui_run > +CONFIGURE_ARGS+=3D --enable-qt4 > +.else > +CONFIGURE_ARGS+=3D --disable-qt4 > +.endif > + > +.if ${PORT_OPTIONS:MQT5} && ${PORT_OPTIONS:MX11} > +USES+=3D pyqt:5 > +USE_PYQT=3D core_run dbussupport_run gui_run widgets_run > +CONFIGURE_ARGS+=3D --enable-qt5 > +.else > +CONFIGURE_ARGS+=3D --disable-qt5 > +.endif > + > +.if ${PORT_OPTIONS:MX11} && ! ${PORT_OPTIONS:MQT4} && ! ${PORT_OPTIONS= :MQT5} > +BROKEN=3D The X11 option requires one of the QT4 or QT5 options > +.endif All those changes seem dubious, a simple QT4_IMPLIES=3DX11 and QT5_IMPLIES=3DX11 would have been enough to express all of this. Also, it seems X11 is not really an option, as it cannot be used alone, maybe it should be folded into the QT4 and QT5 options. --=20 Mathieu Arnold --9qE674TeF9vsHquvk8O49XGHpKInWNvUc-- --2JAT1LKw9TBllNAjLa33uI6UHs9SQ23q6 Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQJ8BAEBCgBmBQJY427NXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzQUI2OTc4OUQyRUQxMjEwNjQ0MEJBNUIz QTQ1MTZGMzUxODNDRTQ4AAoJEDpFFvNRg85IgEkQALjguwTEKYtwtLZ1ORqEdNWR Cm/C+CM9DwvVNba8qaKS0XOLyU8vYhQaSNDtIhVE58qiHWk3cbBzB37c4PYJpJJV 4QJa70LoAssnwRdvuCBrdLi11fpV6SpWMvolrwHpMyCqgsS93nrjydLdXuwSUGoP g//hQp2ulV3tLpkpiiICXEucQk2eJaT0YeUZn0g+1OdKm6fYfVNWxLACKs6a5WHT t1iXpEwj4zC6SeI9yey3g/Es90VD9C+SyeBtp8s5LJyfzdeq2oc4wOQ0oxwKr+iY FilGQNYLO0q07kGkUcL8kAG4XZmFDaoSt7BiuX82EEnQHCEwsTbpStQqdtH84VdI Z1ROOnG4+0uxyNNgFLYVjilo4OLQQW8hTqJoY/v7s6NwIuLkaJVhQNfO3OAnck1Y lMLTi4qUN7JNMVT6mrdttH/Vu8wk5jilDKPrsqdgRYRZ92XtL489xOCl4S3GREyz c1gM8R/nmN+pywnz2Op73hyBzP+MFIISYDRgtTm/xfQfvF9VCNdp79Jwxq4o98SB CHUfpqmsiaKspJo3bx/ik9IMV1Yj/dZjBZxqOUAkao/w8dBLtu68zH8iEgiuryiY yeIWREhs5sGBOEgwsGtoVUfSSwZCpdInxQJ5VxA5zWuOtTNgLBFHizA4GVCq8wuQ 1hepy4OirHhPZgJ457RQ =iAyC -----END PGP SIGNATURE----- --2JAT1LKw9TBllNAjLa33uI6UHs9SQ23q6--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?0b7881ec-c547-c69b-e420-78dde5ba6694>