[112292] trunk/dports/graphics/libQGLViewer/Portfile

[ryandesign at macports.org]

Revision: 112292
          https://trac.macports.org/changeset/112292
Author:   ryandesign at macports.org
Date:     2013-10-16 20:12:28 -0700 (Wed, 16 Oct 2013)
Log Message:
-----------
libQGLViewer: remove x11 variant, since it uses qt4-x11 which hasn't been updated in years; add conflict with new libPyQGLViewer port

Modified Paths:
--------------
    trunk/dports/graphics/libQGLViewer/Portfile

Modified: trunk/dports/graphics/libQGLViewer/Portfile
===================================================================
--- trunk/dports/graphics/libQGLViewer/Portfile	2013-10-17 03:02:36 UTC (rev 112291)
+++ trunk/dports/graphics/libQGLViewer/Portfile	2013-10-17 03:12:28 UTC (rev 112292)
@@ -2,9 +2,11 @@
 # $Id$
 
 PortSystem                      1.0
+PortGroup                       qmake 1.0
 
 name                            libQGLViewer
 version                         2.4.0
+revision                        1
 platforms                       darwin
 maintainers                     raphael openmaintainer
 license                         {GPL-2+ Commercial}
@@ -22,6 +24,8 @@
                                 to create complex applications, being fully customizable and \
                                 easy to extend.
 
+conflicts                       libPyQGLViewer
+
 master_sites                    ${homepage}src/
 
 checksums                       rmd160  2283aefd96b8c20aa890899d19f869883fef612c \
@@ -36,18 +40,6 @@
 
 variant universal {}
 
-variant x11 {}
-
-if {![variant_isset x11]} {
-    PortGroup                   qmake 1.0
-} else {
-    depends_lib-append          port:qt4-x11
-    configure.cmd               ${prefix}/libexec/qt4-x11/bin/qmake
-    configure.pre_args          PREFIX=${prefix}
-    configure.universal_args
-    set qt_plugins_dir          ${prefix}/libexec/qt4-x11/plugins/designer
-}
-
 post-patch {
     reinplace "s|@@QT_PLUGINS_DIR@@|${qt_plugins_dir}|g" ${worksrcpath}/designerPlugin/designerPlugin.pro
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20131016/d291bd9a/attachment.html>