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

[ryandesign at macports.org]

Revision: 64505
          http://trac.macports.org/changeset/64505
Author:   ryandesign at macports.org
Date:     2010-03-07 14:50:59 -0800 (Sun, 07 Mar 2010)
Log Message:
-----------
pinentry:

 * append to, don't overwrite, depends_lib in variants
 * delete conflicting configure.args in variants
 * use port:-style dependencies instead of lib:-style to ensure MacPorts versions of these dependencies are used

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

Modified: trunk/dports/security/pinentry/Portfile
===================================================================
--- trunk/dports/security/pinentry/Portfile	2010-03-07 21:54:09 UTC (rev 64504)
+++ trunk/dports/security/pinentry/Portfile	2010-03-07 22:50:59 UTC (rev 64505)
@@ -5,6 +5,7 @@
 
 name                        pinentry
 version                     0.7.6
+revision                    1
 categories                  security
 maintainers                 nomaintainer
 homepage                    http://www.gnupg.org/aegypten2
@@ -34,21 +35,24 @@
                             port:ncurses
 
 variant gtk1 description {Enable gtk1 pinentry} {
-    depends_lib             port:gtk1
+    depends_lib-append      port:gtk1
+    configure.args-delete   --disable-pinentry-gtk
     configure.args-append   --enable-pinentry-gtk \
                             --enable-fallback-curses
 }
 
 variant gtk2 description {Enable gtk2 pinentry} {
-    depends_lib             lib:libgtk-x11-2.0:gtk2
+    depends_lib-append      port:gtk2
+    configure.args-delete   --disable-pinentry-gtk2
     configure.args-append   --enable-pinentry-gtk2 \
                             --enable-fallback-curses
 }
 
 variant qt3 description {Enable qt3 pinentry} {
-    depends_lib             lib:libqt-mt.3:qt3
+    depends_lib-append      port:qt3
     configure.env-append    QTDIR=${prefix}/lib \
                             MOC=${prefix}/bin/moc
+    configure.args-delete   --disable-pinentry-qt
     configure.args-append   --enable-pinentry-qt \
                             --enable-fallback-curses \
                             --with-qt-includes=${prefix}/include/qt3 \
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100307/094796f2/attachment.html>