Skip to content
Permalink
Browse files

security/pinentry: correctly update to 1.1.0. Revbump.

Changes:
  - Adds a new FLTK variant and disables opportunistic usage.
  - Adds a new, but commented-out tqt variant and disables opportunistic
    usage. We do not have Trinity-Qt ports.
  - Removes obsolete commented-out code. Nobody reported new problems with
    this, so likely useless.
  • Loading branch information
Ionic committed Mar 5, 2018
1 parent 612efa1 commit b7ca0a8c3b328f208519a2f869eb5f79c538c282
Showing with 18 additions and 7 deletions.
  1. +18 −7 security/pinentry/Portfile
@@ -4,6 +4,7 @@ PortSystem 1.0

name pinentry
version 1.1.0
revision 1
categories security
license GPL-2+
maintainers {ionic @ionic} openmaintainer
@@ -28,8 +29,10 @@ configure.args --with-libiconv-prefix=${prefix} \
--disable-pinentry-gtk2 \
--disable-pinentry-gnome3 \
--disable-libsecret \
--disable-pinentry-tqt \
--disable-pinentry-qt \
--disable-pinentry-qt5
--disable-pinentry-qt5 \
--disable-pinentry-fltk

# Fix picking up the correct assuan version.
# -isystem has the added benefit of moving the include
@@ -62,6 +65,13 @@ variant gnome3 description {Enable GNOME3/gtk3-based pinentry tool} {
--enable-libsecret
}

#variant tqt conflicts qt5 qt4 description {Enable tqt-based pinentry tool} {
# PortGroup tqt 1.0
# configure.args-delete --disable-pinentry-tqt
# configure.args-append --enable-pinentry-tqt \
# --enable-fallback-curses
#}

variant qt4 conflicts qt5 description {Enable qt4-based pinentry tool} {
PortGroup qt4 1.0
configure.args-delete --disable-pinentry-qt
@@ -82,12 +92,13 @@ variant qt5 conflicts qt4 description {Enable qt5-based pinentry tool} {
--enable-fallback-curses
}

# This must have been a very old workaround for some unknown issue.
# Assume that it's not longer necessary. Can turn it back on if needed,
# or completely remove it.
#platform darwin {
# configure.args-append --disable-rpath
#}
variant fltk description {Enable FLTK-based pinentry tool} {
# fltk-devel is currently unsupported, only version 1.3.x.
depends_lib-append port:fltk

configure.args-replace --disable-pinentry-fltk \
--enable-pinentry-fltk
}

livecheck.type regex
livecheck.url https://gnupg.org/ftp/gcrypt/pinentry/

0 comments on commit b7ca0a8

Please sign in to comment.
You can’t perform that action at this time.