Index: head/security/pinentry/Makefile
===================================================================
--- head/security/pinentry/Makefile	(revision 386716)
+++ head/security/pinentry/Makefile	(revision 386717)
@@ -1,117 +1,124 @@
 # Created by: Michael Nottebrock <lofi@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	pinentry
-PORTVERSION=	0.9.1
+PORTVERSION=	0.9.2
 PORTREVISION?=	0
 CATEGORIES=	security
 MASTER_SITES=	GNUPG/pinentry
 
 MAINTAINER=	makc@FreeBSD.org
 COMMENT?=	Collection of simple PIN or passphrase entry dialogs
 
 USES=		tar:bzip2
 
 .if !defined(PINENTRY_GUI)
 INFO=		pinentry
 NO_ARCH=	yes
 NO_BUILD=	yes
 PLIST_FILES=	bin/pinentry
 
 OPTIONS_SINGLE=	FRONTEND
 OPTIONS_SINGLE_FRONTEND=	TTY NCURSES GTK2 QT4
 OPTIONS_DEFAULT=	TTY
 
 FRONTEND_DESC=	Default frontend
 
 TTY_DESC=	Console version
 PINENTRY_TTY=	pinentry-tty
 TTY_RUN_DEPENDS=	${PINENTRY_TTY}:${PORTSDIR}/security/pinentry-tty
 
 NCURSES_DESC=	Curses frontend
 PINENTRY_NCURSES=	pinentry-curses
 NCURSES_RUN_DEPENDS=	${PINENTRY_NCURSES}:${PORTSDIR}/security/pinentry-curses
 
 GTK2_DESC=	Gtk+ 2 frontend
 PINENTRY_GTK2=	pinentry-gtk-2
 GTK2_RUN_DEPENDS=	${PINENTRY_GTK2}:${PORTSDIR}/security/pinentry-gtk2
 
 .if exists(/usr/lib/libc++.so)
 QT4_DESC=	Qt 4 frontend (broken)
 .else
 QT4_DESC=	Qt 4 frontend
 .endif
 PINENTRY_QT4=	pinentry-qt4
 QT4_RUN_DEPENDS=	${PINENTRY_QT4}:${PORTSDIR}/security/pinentry-qt4
 
 .include <bsd.port.options.mk>
 
 .for gui in ${OPTIONS_SINGLE_FRONTEND}
 . if ${PORT_OPTIONS:M${gui}}
 PINENTRY_BIN=	${PINENTRY_${gui}}
 . endif
 .endfor
 
 do-install:
 	${LN} -sf ${PINENTRY_BIN} ${STAGEDIR}${PREFIX}/bin/pinentry
 	${INSTALL_DATA} ${WRKSRC}/doc/pinentry.info ${STAGEDIR}${PREFIX}/${INFO_PATH}
 
 .else # !defined(PINENTRY_GUI)
 PKGNAMESUFFIX=	-${PINENTRY_GUI}
 LIB_DEPENDS=	libgcrypt.so:${PORTSDIR}/security/libgcrypt \
 		libksba.so:${PORTSDIR}/security/libksba
 
 USES+=		iconv gmake pkgconfig
 GNU_CONFIGURE=	yes
 
 CFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
+OPTIONS_DEFINE=	LIBSECRET
+
+LIBSECRET_DESC=	Saving the passphrase with libsecret
+LIBSECRET_CONFIGURE_ENABLE=	libsecret
+LIBSECRET_LIB_DEPENDS=	libsecret-1.so:${PORTSDIR}/security/libsecret
+
 .if ${PINENTRY_GUI} == "qt4"
 USES+=		compiler:c++11-lib
 USE_CXXSTD=	c++11
 . if exists(/usr/lib/libc++.so)
 IGNORE=		does not compile with libc++
 . endif
 USE_QT4=	gui moc_build
 PLIST_FILES=	bin/pinentry-qt4
 .else
 CONFIGURE_ARGS+=--disable-pinentry-qt4
 .endif
 
 .if ${PINENTRY_GUI} == "gtk2"
+OPTIONS_DEFAULT+=	LIBSECRET
 USE_GNOME+=	gtk20
 PLIST_FILES=	bin/pinentry-gtk-2
 .else
 CONFIGURE_ARGS+=--disable-pinentry-gtk2
 .endif
 
 .if ${PINENTRY_GUI} == "curses"
 USES+=		ncurses
 PLIST_FILES=	bin/pinentry-curses
 .else
 CONFIGURE_ARGS+=--disable-pinentry-curses
 .endif
 
 .if ${PINENTRY_GUI} == "tty"
 PLIST_FILES=	bin/pinentry-tty
 CONFIGURE_ARGS+=--enable-pinentry-tty
 .else
 CONFIGURE_ARGS+=--disable-pinentry-tty
 .endif
 
 pre-configure:
 .if ${PINENTRY_GUI} == "qt4"
 	cd ${WRKSRC}/qt4 && \
 		${MOC} pinentrydialog.h > pinentrydialog.moc && \
 		${MOC} qsecurelineedit.h > qsecurelineedit.moc && \
 		${MOC} pinentryconfirm.h > pinentryconfirm.moc
 .endif
 
 post-install:
 	${RM} ${STAGEDIR}${PREFIX}/bin/pinentry \
 		${STAGEDIR}${PREFIX}/info/pinentry.info
 
 .endif # !defined(PINENTRY_GUI)
 
 .include <bsd.port.mk>
Index: head/security/pinentry/distinfo
===================================================================
--- head/security/pinentry/distinfo	(revision 386716)
+++ head/security/pinentry/distinfo	(revision 386717)
@@ -1,2 +1,2 @@
-SHA256 (pinentry-0.9.1.tar.bz2) = 9cd08e856b395df3adc7124170b53f77c6d5c8bf88e899e818648ec70d3e9695
-SIZE (pinentry-0.9.1.tar.bz2) = 482295
+SHA256 (pinentry-0.9.2.tar.bz2) = fd8bc1592ceb22bb492b07cb29b1b140bb882c859e6503b974254c0a4b4134d1
+SIZE (pinentry-0.9.2.tar.bz2) = 495742
Index: head/security/pinentry/files/patch-pinentry_Makefile.in
===================================================================
--- head/security/pinentry/files/patch-pinentry_Makefile.in	(nonexistent)
+++ head/security/pinentry/files/patch-pinentry_Makefile.in	(revision 386717)
@@ -0,0 +1,13 @@
+# Rearrange includes to prevent picking up libassuan headers from LOCALBASE
+
+--- pinentry/Makefile.in.orig	2015-05-11 13:32:13 UTC
++++ pinentry/Makefile.in
+@@ -311,7 +311,7 @@ EXTRA_DIST = 
+ @BUILD_LIBPINENTRY_CURSES_TRUE@pinentry_curses = libpinentry-curses.a
+ noinst_LIBRARIES = libpinentry.a $(pinentry_curses)
+ LDADD = $(COMMON_LIBS)
+-AM_CPPFLAGS = $(COMMON_CFLAGS) -I$(top_srcdir)/assuan -I$(top_srcdir)/secmem
++AM_CPPFLAGS = -I$(top_srcdir)/assuan -I$(top_srcdir)/secmem $(COMMON_CFLAGS)
+ libpinentry_a_SOURCES = pinentry.h pinentry.c argparse.c argparse.h \
+ 	password-cache.h password-cache.c
+ 

Property changes on: head/security/pinentry/files/patch-pinentry_Makefile.in
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property