Date: Tue, 4 Sep 2007 09:26:41 +0400 From: Roman Bogorodskiy <novel@FreeBSD.org> To: Doug Barton <dougb@freebsd.org> Cc: cvs-ports@freebsd.org, linimon@freebsd.org, lofi@freebsd.org, cvs-all@freebsd.org, ports-committers@freebsd.org Subject: Re: cvs commit: ports/security/gnupg Makefile Message-ID: <20070904052641.GB64263@underworld.novel.ru> In-Reply-To: <alpine.BSF.0.9999.0709031352120.31928@ync.qbhto.arg> References: <200709021108.l82B8Axp085777@repoman.freebsd.org> <alpine.BSF.0.9999.0709021304590.54479@ync.qbhto.arg> <20070903051037.GA27386@underworld.novel.ru> <alpine.BSF.0.9999.0709031352120.31928@ync.qbhto.arg>
next in thread | previous in thread | raw e-mail | index | archive | help
--Md/poaVZ8hnGTzuv
Content-Type: multipart/mixed; boundary="U+BazGySraz5kW0T"
Content-Disposition: inline
--U+BazGySraz5kW0T
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable
Doug Barton wrote:
> On Mon, 3 Sep 2007, Roman Bogorodskiy wrote:
>=20
>> Doug Barton wrote:
>>=20
>>> I don't think this is a good idea for a few reasons. First off, the gnu=
pg
>>> port already has a pkg-message that is pretty clear about the fact that=
=20
>>> you
>>> need to pick a pinentry dialog.
>>=20
>> To be honest, I don't think that reporting about dependencies via
>> pkg-message is a sane way of doing things.
>=20
> Reasonable minds can differ on that topic. :)
>=20
>> Our ports system is mature enough to handle dependencies on its own,=20
>> without requiring users to install dependencies by hand.
>=20
> While in general I agree, in this case, given that the "right" choice isn=
't=20
> obvious I think it's reasonable. However ...
>=20
>>> I sort of think that this might be reasonable if the pinentry port grew
>>> OPTIONS, which I would even be willing to work on if lofi thought it wa=
s=20
>>> a
>>> good idea. But I don't think the overhead of drawing all of the dialogs=
=20
>>> in
>>> is worth it, and I don't see an easy way of guessing which one the user
>>> would want by default.
>>=20
>> OPTIONS would be reasonable in this case. We can enable ncurses backend
>> by default and user will be able to configure the port to make it use
>> other backends he/she wants.
>=20
> That is basically what I had in mind. I'd like to hear from lofi, but my=
=20
> offer to help with that is still good.
>=20
>>> Can this change be backed out till there has been a little discussion?
>>=20
>> Backed out.
>=20
> I appreciate the prompt response, as do our users (one of whom was alread=
y=20
> bitten by this).
Attached a proof-of-concept patch with OPTIONS support for pinentry.
However, portlint seems to complain about using USE_QT_VER after
including pre.mk, though I'm not quite sure it's really not allowed.
Slave ports could also be adjusted/removed.
Roman Bogorodskiy
--U+BazGySraz5kW0T
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="pinentry_options.diff"
Content-Transfer-Encoding: quoted-printable
Index: 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
RCS file: /home/ncvs/ports/security/pinentry/Makefile,v
retrieving revision 1.37
diff -u -r1.37 Makefile
--- Makefile 19 May 2007 20:22:48 -0000 1.37
+++ Makefile 4 Sep 2007 05:13:15 -0000
@@ -25,13 +25,19 @@
WANT_GNOME=3D yes
GNU_CONFIGURE=3D yes
USE_GMAKE=3D yes
-INSTALLS_SHLIB=3D yes
+USE_LDCONFIG=3D yes
INFO=3D pinentry
=20
CONFIGURE_ARGS+=3D--with-libiconv-prefix=3D${LOCALBASE}
=20
-.if defined(PINENTRY_QT) || defined(PINENTRY_GTK) || defined(PINENTRY_GTK2=
) || defined(PINENTRY_CURSES)
-.if defined(PINENTRY_QT)
+OPTIONS=3D QT "Enable QT GUI" off \
+ GTK "Enable gtk1 GUI" off \
+ GTK2 "Enable gtk2 GUI" off \
+ CURSES "Enable ncurser GUI" on
+
+.include <bsd.port.pre.mk>
+
+.if defined(WITH_QT)
USE_QT_VER=3D 3
PLIST_SUB+=3D WITH_QT=3D""
=20
@@ -44,7 +50,7 @@
PLIST_SUB+=3D WITH_QT=3D"@comment "
.endif
=20
-.if defined(PINENTRY_GTK)
+.if defined(WITH_GTK)
USE_GNOME+=3D gtk12
PLIST_SUB+=3D WITH_GTK=3D""
CONFIGURE_ENV+=3D CFLAGS=3D-I${LOCALBASE}/include
@@ -53,7 +59,7 @@
PLIST_SUB+=3D WITH_GTK=3D"@comment "
.endif
=20
-.if defined(PINENTRY_GTK2)
+.if defined(WITH_GTK2)
USE_GNOME+=3D gtk20
PLIST_SUB+=3D WITH_GTK2=3D""
CONFIGURE_ENV+=3D CFLAGS=3D-I${LOCALBASE}/include
@@ -62,20 +68,12 @@
PLIST_SUB+=3D WITH_GTK2=3D"@comment "
.endif
=20
-.if defined(PINENTRY_CURSES)
+.if defined(WITH_CURSES)
PLIST_SUB+=3D WITH_CURSES=3D""
CONFIGURE_ENV+=3D CFLAGS=3D-I${LOCALBASE}/include LDFLAGS=3D-L${LOCALBASE}=
/lib
.else
CONFIGURE_ARGS+=3D--disable-pinentry-curses
PLIST_SUB+=3D WITH_CURSES=3D"@comment "
.endif
-.else
-USE_QT_VER=3D 3
-USE_GNOME+=3D gtk12 gtk20
-PLIST_SUB+=3D WITH_QT=3D""
-PLIST_SUB+=3D WITH_GTK=3D""
-PLIST_SUB+=3D WITH_GTK2=3D""
-PLIST_SUB+=3D WITH_CURSES=3D""
-.endif
=20
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
--U+BazGySraz5kW0T--
--Md/poaVZ8hnGTzuv
Content-Type: application/pgp-signature
Content-Disposition: inline
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.4 (FreeBSD)
iQCVAwUBRtzskYB0WzgdqspGAQKEygP+IjNVIvR4+73ykiJyskC+draciNVKFWo5
UykIyT/taZ/JLIrO0EHkfZZgNSLmFZvNh14HhZNZxUwx7C65xrJYNRUgFAcCsT7Q
VNPSYRb2aOgSqkOwnM2D7tpWJntW/bjhirNwVLalF+x8WOkQHXQFHx/Ghzy5Fsbj
Bi60BIBXX9U=
=C1u0
-----END PGP SIGNATURE-----
--Md/poaVZ8hnGTzuv--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20070904052641.GB64263>