[141178] trunk/dports/security/pinentry/Portfile

[ionic at macports.org]

Revision: 141178
          https://trac.macports.org/changeset/141178
Author:   ionic at macports.org
Date:     2015-10-11 13:17:59 -0700 (Sun, 11 Oct 2015)
Log Message:
-----------
pinentry: update to 0.9.6. Add new qt5 variant - conflicting with the legacy qt3 and normal qt4 variants. Fixes: #41144.

Modified Paths:
--------------
    trunk/dports/security/pinentry/Portfile

Modified: trunk/dports/security/pinentry/Portfile
===================================================================
--- trunk/dports/security/pinentry/Portfile	2015-10-11 19:01:52 UTC (rev 141177)
+++ trunk/dports/security/pinentry/Portfile	2015-10-11 20:17:59 UTC (rev 141178)
@@ -4,8 +4,8 @@
 PortSystem                  1.0
 
 name                        pinentry
-version                     0.9.5
-revision                    1
+version                     0.9.6
+revision                    0
 categories                  security
 license                     GPL-2+
 maintainers                 ionic openmaintainer
@@ -21,14 +21,14 @@
 
 use_bzip2                   yes
 
-checksums                   rmd160  526cce33b4178fe86d64a6f48b01e90ec964dd10 \
-                            sha256  6a57fd3afc0d8aaa5599ffcb3ea4e7c42c113a181e8870122203ea018384688c
+checksums                   rmd160  1f2eb6ececac9c952ffb46b85b869300a4b27cd3 \
+                            sha256  2a1124e9097f24f866cab7982610677e222cea71be0a71a5566f223177e01e66
 
 configure.args              --with-libiconv-prefix=${prefix} \
                             --with-ncurses-include-dir=${prefix}/include/ncurses \
                             --enable-pinentry-curses \
                             --disable-pinentry-gtk2 \
-                            --disable-pinentry-qt4
+                            --disable-pinentry-qt
 
 # Fix picking up the correct assuan version.
 # -isystem has the added benefit of moving the include
@@ -56,18 +56,27 @@
 }
 
 # Remove after 11-14-2015.
-variant qt3 requires qt4 description {Legacy compatibility variant for qt4. Will be removed soon.} {
+variant qt3 requires qt4 conflicts qt5 description {Legacy compatibility variant for qt4. Will be removed soon.} {
 }
 
-variant qt4 description {Enable qt4-based pinentry tool} {
+
+# We actually must select the Qt version somehow.
+# autotools do an "auto-detection" trick that is non-reproducible...
+# FIXME: revisit this...
+variant qt4 conflicts qt5 description {Enable qt4-based pinentry tool} {
     PortGroup               qt4 1.0
-    configure.args-delete   --disable-pinentry-qt4
-    configure.args-append   --enable-pinentry-qt4 \
-                            --enable-fallback-curses \
-                            --with-qt-includes=${qt_includes_dir} \
-                            --with-qt-libraries=${qt_libs_dir}
+    configure.args-delete   --disable-pinentry-qt
+    configure.args-append   --enable-pinentry-qt \
+                            --enable-fallback-curses
 }
 
+variant qt5 conflicts qt4 description {Enable qt5-based pinentry tool} {
+    PortGroup               qt5 1.0
+    configure.args-delete   --disable-pinentry-qt
+    configure.args-append   --enable-pinentry-qt \
+                            --enable-fallback-curses
+}
+
 platform darwin {
     configure.args-append   --disable-rpath
 }
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20151011/96382dcc/attachment.html>