Date: Fri, 17 Jul 2015 18:08:23 +0200 From: Koop Mast <kwm@rainbow-runner.nl> To: Max Brazhnikov <makc@FreeBSD.org>, ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: Re: svn commit: r392382 - in head/security: . pinentry pinentry-gnome3 Message-ID: <55A92877.6070409@rainbow-runner.nl> In-Reply-To: <201507171549.t6HFnAku053331@repo.freebsd.org> References: <201507171549.t6HFnAku053331@repo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On 17-7-2015 17:49, Max Brazhnikov wrote: > Author: makc > Date: Fri Jul 17 15:49:09 2015 > New Revision: 392382 > URL: https://svnweb.freebsd.org/changeset/ports/392382 > > Log: > security/pinentry: > - Add GNOME 3 pinentry dialog > > Added: > head/security/pinentry-gnome3/ > head/security/pinentry-gnome3/Makefile (contents, props changed) > Modified: > head/security/Makefile > head/security/pinentry/Makefile > > Modified: head/security/Makefile > ============================================================================== > --- head/security/Makefile Fri Jul 17 15:42:29 2015 (r392381) > +++ head/security/Makefile Fri Jul 17 15:49:09 2015 (r392382) > @@ -743,6 +743,7 @@ > SUBDIR += pidgin-otr > SUBDIR += pinentry > SUBDIR += pinentry-curses > + SUBDIR += pinentry-gnome3 > SUBDIR += pinentry-gtk2 > SUBDIR += pinentry-qt4 > SUBDIR += pinentry-tty > > Added: head/security/pinentry-gnome3/Makefile > ============================================================================== > --- /dev/null 00:00:00 1970 (empty, because file is newly added) > +++ head/security/pinentry-gnome3/Makefile Fri Jul 17 15:49:09 2015 (r392382) > @@ -0,0 +1,12 @@ > +# $FreeBSD$ > + > +PORTNAME= pinentry > +PORTREVISION= 0 > + > +COMMENT= GNOME 3 version of the GnuPG password dialog > + > +PINENTRY_GUI= gnome3 > + > +MASTERDIR= ${.CURDIR}/../pinentry > + > +.include "${MASTERDIR}/Makefile" > > Modified: head/security/pinentry/Makefile > ============================================================================== > --- head/security/pinentry/Makefile Fri Jul 17 15:42:29 2015 (r392381) > +++ head/security/pinentry/Makefile Fri Jul 17 15:49:09 2015 (r392382) > @@ -19,7 +19,7 @@ NO_BUILD= yes > PLIST_FILES= bin/pinentry > > OPTIONS_SINGLE= FRONTEND > -OPTIONS_SINGLE_FRONTEND= TTY NCURSES GTK2 QT4 > +OPTIONS_SINGLE_FRONTEND= TTY NCURSES GTK2 QT4 GNOME3 > OPTIONS_DEFAULT= TTY > > FRONTEND_DESC= Default frontend > @@ -44,6 +44,10 @@ QT4_DESC= Qt 4 frontend > PINENTRY_QT4= pinentry-qt4 > QT4_RUN_DEPENDS= ${PINENTRY_QT4}:${PORTSDIR}/security/pinentry-qt4 > > +GNOME3_DESC= GNOME 3 frontend > +PINENTRY_GNOME3= pinentry-gnome3 > +GNOME3_RUN_DEPENDS= ${PINENTRY_GNOME3}:${PORTSDIR}/security/pinentry-gnome3 > + > .include <bsd.port.options.mk> > > .for gui in ${OPTIONS_SINGLE_FRONTEND} > @@ -64,8 +68,7 @@ LIB_DEPENDS= libassuan.so:${PORTSDIR}/se > > USES+= iconv gmake pkgconfig > GNU_CONFIGURE= yes > -CONFIGURE_ARGS= --disable-pinentry-emacs \ > - --disable-pinentry-gnome3 > +CONFIGURE_ARGS= --disable-pinentry-emacs > > CFLAGS+= -I${LOCALBASE}/include > LDFLAGS+= -L${LOCALBASE}/lib > @@ -76,6 +79,14 @@ LIBSECRET_DESC= Saving the passphrase wi > LIBSECRET_CONFIGURE_ENABLE= libsecret > LIBSECRET_LIB_DEPENDS= libsecret-1.so:${PORTSDIR}/security/libsecret > > +.if ${PINENTRY_GUI} == "gnome3" > +USE_GNOME+= gtk20 > +LIB_DEPENDS+= libgcr-base-3.so:${PORTSDIR}/security/gcr > +PLIST_FILES= bin/pinentry-gnome3 > +.else > +CONFIGURE_ARGS+=--disable-pinentry-gnome3 > +.endif Gcr is gtk30 based so the gtk20 doesn't make sense here. Are you sure this is correct? -Koop
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?55A92877.6070409>