[Midnightbsd-cvs] mports [20399] trunk/security/pinentry: update

[laffer1 at midnightbsd.org]

Revision: 20399
          http://svnweb.midnightbsd.org/mports/?rev=20399
Author:   laffer1
Date:     2015-10-03 00:44:32 -0400 (Sat, 03 Oct 2015)
Log Message:
-----------
update

Modified Paths:
--------------
    trunk/security/pinentry/Makefile
    trunk/security/pinentry/distinfo

Removed Paths:
-------------
    trunk/security/pinentry/files/patch-qt4__Makefile.in
    trunk/security/pinentry/pkg-plist

Modified: trunk/security/pinentry/Makefile
===================================================================
--- trunk/security/pinentry/Makefile	2015-10-03 04:42:56 UTC (rev 20398)
+++ trunk/security/pinentry/Makefile	2015-10-03 04:44:32 UTC (rev 20399)
@@ -1,7 +1,7 @@
 # $MidnightBSD$
 
 PORTNAME=	pinentry
-PORTVERSION=	0.9.0
+PORTVERSION=	0.9.5
 CATEGORIES=	security
 MASTER_SITES=	GNUPG/pinentry
 
@@ -19,7 +19,7 @@
 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 @@
 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.mport.options.mk>
 
 .for gui in ${OPTIONS_SINGLE_FRONTEND}
@@ -58,16 +62,35 @@
 
 .else # !defined(PINENTRY_GUI)
 PKGNAMESUFFIX=	-${PINENTRY_GUI}
-LIB_DEPENDS=	libgcrypt.so:${PORTSDIR}/security/libgcrypt \
+LIB_DEPENDS=	libassuan.so:${PORTSDIR}/security/libassuan \
+		libgcrypt.so:${PORTSDIR}/security/libgcrypt \
 		libksba.so:${PORTSDIR}/security/libksba
 
 USES+=		iconv gmake pkgconfig
 GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--disable-pinentry-emacs
 
 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} == "gnome3"
+OPTIONS_DEFAULT=	LIBSECRET
+USE_GNOME+=	gtk20
+LIB_DEPENDS+=	libgcr-base-3.so:${PORTSDIR}/security/gcr
+PLIST_FILES=	bin/pinentry-gnome3
+.else
+CONFIGURE_ARGS+=--disable-pinentry-gnome3
+.endif
+
 .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

Modified: trunk/security/pinentry/distinfo
===================================================================
--- trunk/security/pinentry/distinfo	2015-10-03 04:42:56 UTC (rev 20398)
+++ trunk/security/pinentry/distinfo	2015-10-03 04:44:32 UTC (rev 20399)
@@ -1,2 +1,2 @@
-SHA256 (pinentry-0.9.0.tar.bz2) = 90045a07ab8e1a8e1ecf5d19b51691f195525e579fa5d71d7e92c120b05490ab
-SIZE (pinentry-0.9.0.tar.bz2) = 464272
+SHA256 (pinentry-0.9.5.tar.bz2) = 6a57fd3afc0d8aaa5599ffcb3ea4e7c42c113a181e8870122203ea018384688c
+SIZE (pinentry-0.9.5.tar.bz2) = 514677

Deleted: trunk/security/pinentry/files/patch-qt4__Makefile.in
===================================================================
--- trunk/security/pinentry/files/patch-qt4__Makefile.in	2015-10-03 04:42:56 UTC (rev 20398)
+++ trunk/security/pinentry/files/patch-qt4__Makefile.in	2015-10-03 04:44:32 UTC (rev 20399)
@@ -1,11 +0,0 @@
---- ./qt4/Makefile.in.orig	2009-06-19 04:57:52.000000000 +0400
-+++ ./qt4/Makefile.in	2009-06-23 23:09:45.000000000 +0400
-@@ -84,7 +84,7 @@
- depcomp = $(SHELL) $(top_srcdir)/depcomp
- am__depfiles_maybe = depfiles
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
--	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-+	$(AM_CXXFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS)
- CXXLD = $(CXX)
- CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
- 	-o $@

Deleted: trunk/security/pinentry/pkg-plist
===================================================================
--- trunk/security/pinentry/pkg-plist	2015-10-03 04:42:56 UTC (rev 20398)
+++ trunk/security/pinentry/pkg-plist	2015-10-03 04:44:32 UTC (rev 20399)
@@ -1,6 +0,0 @@
-bin/pinentry
-%%WITH_NCURSES%%bin/pinentry-curses
-%%WITH_GTK%%bin/pinentry-gtk
-%%WITH_GTK2%%bin/pinentry-gtk-2
-%%WITH_QT3%%bin/pinentry-qt
-%%WITH_QT4%%bin/pinentry-qt4