Update security/pinentry* to 1.1.0 [1]

Add security/pinentry-fltk, fltk frontend [2]

PR:		225190 [1], 225191 [2]
Submitted by:	Dmitri Goutnik <dg@syrec.org>

6 files changed, 54 insertions, 35 deletions

diff --git a/security/Makefile b/security/Makefile
index 4194e034e10b..e725dd40af3e 100644
--- a/security/Makefile
+++ b/security/Makefile
@@ -838,6 +838,7 @@
     SUBDIR += pidgin-otr
     SUBDIR += pinentry
     SUBDIR += pinentry-curses
+    SUBDIR += pinentry-fltk
     SUBDIR += pinentry-gnome3
     SUBDIR += pinentry-gtk2
     SUBDIR += pinentry-qt4
diff --git a/security/pinentry-fltk/Makefile b/security/pinentry-fltk/Makefile
new file mode 100644
index 000000000000..ded8276ea0a4
--- /dev/null
+++ b/security/pinentry-fltk/Makefile
@@ -0,0 +1,12 @@
+# $FreeBSD$
+
+PORTNAME=	pinentry
+PORTREVISION=	0
+
+COMMENT=	FLTK version of the GnuPG password dialog
+
+PINENTRY_GUI=	fltk
+
+MASTERDIR=	${.CURDIR}/../pinentry
+
+.include "${MASTERDIR}/Makefile"
diff --git a/security/pinentry/Makefile b/security/pinentry/Makefile
index d7b230cb5886..e707f757c8e1 100644
--- a/security/pinentry/Makefile
+++ b/security/pinentry/Makefile
@@ -2,8 +2,8 @@
 # $FreeBSD$
 
 PORTNAME=	pinentry
-PORTVERSION=	1.0.0
-PORTREVISION?=	3
+PORTVERSION=	1.1.0
+PORTREVISION?=	0
 CATEGORIES=	security
 MASTER_SITES=	GNUPG/pinentry
 
@@ -22,7 +22,7 @@ NO_BUILD=	yes
 PLIST_FILES=	bin/pinentry
 
 OPTIONS_SINGLE=	FRONTEND
-OPTIONS_SINGLE_FRONTEND=	TTY NCURSES GTK2 QT4 QT5 GNOME3
+OPTIONS_SINGLE_FRONTEND=	TTY NCURSES FLTK GTK2 QT4 QT5 GNOME3
 OPTIONS_DEFAULT=	TTY
 
 FRONTEND_DESC=	Default frontend
@@ -35,6 +35,10 @@ NCURSES_DESC=	Curses frontend
 PINENTRY_NCURSES=	pinentry-curses
 NCURSES_RUN_DEPENDS=	${PINENTRY_NCURSES}:security/pinentry-curses
 
+FLTK_DESC=	FLTK frontend
+PINENTRY_FLTK=	pinentry-fltk
+FLTK_RUN_DEPENDS=	${PINENTRY_FLTK}:security/pinentry-fltk
+
 GTK2_DESC=	Gtk+ 2 frontend
 PINENTRY_GTK2=	pinentry-gtk-2
 GTK2_RUN_DEPENDS=	${PINENTRY_GTK2}:security/pinentry-gtk2
@@ -112,6 +116,14 @@ PLIST_FILES=	bin/pinentry-gtk-2
 CONFIGURE_ARGS+=--disable-pinentry-gtk2
 .endif
 
+.if ${PINENTRY_GUI} == "fltk"
+USES+=		compiler:c++11-lib
+LIB_DEPENDS+=	libfltk.so:x11-toolkits/fltk
+PLIST_FILES=	bin/pinentry-fltk
+.else
+CONFIGURE_ARGS+=--disable-pinentry-fltk
+.endif
+
 .if ${PINENTRY_GUI} == "curses"
 PLIST_FILES=	bin/pinentry-curses
 .else
diff --git a/security/pinentry/distinfo b/security/pinentry/distinfo
index 8dcc0d992a05..0204c67cb896 100644
--- a/security/pinentry/distinfo
+++ b/security/pinentry/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1481880660
-SHA256 (pinentry-1.0.0.tar.bz2) = 1672c2edc1feb036075b187c0773787b2afd0544f55025c645a71b4c2f79275a
-SIZE (pinentry-1.0.0.tar.bz2) = 436930
+TIMESTAMP = 1516041715
+SHA256 (pinentry-1.1.0.tar.bz2) = 68076686fa724a290ea49cdf0d1c0c1500907d1b759a3bcbfbec0293e8f56570
+SIZE (pinentry-1.1.0.tar.bz2) = 467702
diff --git a/security/pinentry/files/patch-configure b/security/pinentry/files/patch-configure
deleted file mode 100644
index e5e1f924912d..000000000000
--- a/security/pinentry/files/patch-configure
+++ /dev/null
@@ -1,29 +0,0 @@
---- configure.orig	2016-11-22 08:01:14 UTC
-+++ configure
-@@ -9948,7 +9948,7 @@ fi
-     { $as_echo "$as_me:${as_lineno-$LINENO}: checking moc version" >&5
- $as_echo_n "checking moc version... " >&6; }
-     mocversion=`$MOC -v 2>&1`
--    mocversiongrep=`echo $mocversion | grep "Qt 5\|moc 5"`
-+    mocversiongrep=`echo $mocversion | grep -E "Qt 5|moc 5"`
-     if test x"$mocversiongrep" != x"$mocversion"; then
-       { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
-@@ -10046,7 +10046,7 @@ else
- fi
- 
-       mocversion=`$MOC2 -v 2>&1`
--      mocversiongrep=`echo $mocversion | grep "Qt 5\|moc-qt5 5\|moc 5"`
-+      mocversiongrep=`echo $mocversion | grep -E "Qt 5|moc-qt5 5|moc 5"`
-       if test x"$mocversiongrep" != x"$mocversion"; then
-         if test -n "$ac_tool_prefix"; then
-   # Extract the first word of "${ac_tool_prefix}qtchooser", so it can be a program name with args.
-@@ -10142,7 +10142,7 @@ fi
- 
-         qt5tooldir=`QT_SELECT=qt5 qtchooser -print-env | grep QTTOOLDIR | cut -d '=' -f 2 | cut -d \" -f 2`
-         mocversion=`$qt5tooldir/moc -v 2>&1`
--        mocversiongrep=`echo $mocversion | grep "Qt 5\|moc 5"`
-+        mocversiongrep=`echo $mocversion | grep -E "Qt 5|moc 5"`
-         if test x"$mocversiongrep" != x"$mocversion"; then
-           # no valid moc found
-           have_qt5_libs="no";
diff --git a/security/pinentry/files/patch-fltk_pinwindow.cxx b/security/pinentry/files/patch-fltk_pinwindow.cxx
new file mode 100644
index 000000000000..5f6d12d361ad
--- /dev/null
+++ b/security/pinentry/files/patch-fltk_pinwindow.cxx
@@ -0,0 +1,23 @@
+Rename encrypt to encrypt_pixmap to avoid namespace conflict with
+unistd.h encrypt() on FreeBSD 10.4
+
+--- fltk/pinwindow.cxx.orig	2018-01-15 23:08:38 UTC
++++ fltk/pinwindow.cxx
+@@ -46,7 +46,7 @@ const char *PinWindow::PROMPT		= "Passph
+ 
+ static const char *timeout_format = "%s(%d)";
+ 
+-static Fl_Pixmap encrypt(encrypt_xpm);
++static Fl_Pixmap encrypt_pixmap(encrypt_xpm);
+ static Fl_Pixmap icon(icon_xpm);
+ 
+ PinWindow::PinWindow() : window_(NULL)
+@@ -147,7 +147,7 @@ int PinWindow::init(const int cx, const 
+ 	window_->icon(&app);
+ 
+ 	icon_ = new Fl_Box(10, 10, 64, 64);
+-	icon_->image(encrypt);
++	icon_->image(encrypt_pixmap);
+ 
+     message_ = new Fl_Box(79, 5, cx-99, 44, PROMPT);
+ 	message_->align(Fl_Align(FL_ALIGN_LEFT_TOP | FL_ALIGN_WRAP | FL_ALIGN_INSIDE)); // left