[69253] trunk/dports/graphics/libQGLViewer

[michaelld at macports.org]

Revision: 69253
          http://trac.macports.org/changeset/69253
Author:   michaelld at macports.org
Date:     2010-06-28 23:51:35 -0700 (Mon, 28 Jun 2010)
Log Message:
-----------
Correct use of qt4-mac dependency and use of it; correct install
location of designer plugins.

Modified Paths:
--------------
    trunk/dports/graphics/libQGLViewer/Portfile
    trunk/dports/graphics/libQGLViewer/files/patch-designerPlugin.pro.diff

Modified: trunk/dports/graphics/libQGLViewer/Portfile
===================================================================
--- trunk/dports/graphics/libQGLViewer/Portfile	2010-06-29 06:50:30 UTC (rev 69252)
+++ trunk/dports/graphics/libQGLViewer/Portfile	2010-06-29 06:51:35 UTC (rev 69253)
@@ -28,7 +28,7 @@
                                 rmd160  62beedc09e4905b11063d16d3f062c72c4cc6647
 
 depends_build                   port:libicns
-depends_lib                     path:bin/qmake-mac:qt4-mac
+depends_lib                     port:qt4-mac
 
 post-extract {                  system "/usr/bin/sips -p 128 128 \
                                             ${worksrcpath}/doc/images/qglviewer.small.png \
@@ -46,7 +46,7 @@
                                 }
 }
 
-configure.cmd                   qmake-mac
+configure.cmd                   ${prefix}/libexec/qt4-mac/bin/qmake
 configure.pre_args              PREFIX=${destroot}${prefix} \
                                 DOC_DIR=${destroot}${prefix}/share/doc/${name} \
                                 -after QMAKE_POST_LINK=
@@ -65,9 +65,9 @@
 }
 
 variant x11 description {Use X11 for visualization} {
-depends_lib-delete              path:bin/qmake-mac:qt4-mac
+depends_lib-delete              port:qt4-mac
 depends_lib-append              port:qt4-x11
-configure.cmd                   qmake-x11
+configure.cmd                   ${prefix}/libexec/qt4-x11/bin/qmake
 }
 
 livecheck.type                  regex

Modified: trunk/dports/graphics/libQGLViewer/files/patch-designerPlugin.pro.diff
===================================================================
--- trunk/dports/graphics/libQGLViewer/files/patch-designerPlugin.pro.diff	2010-06-29 06:50:30 UTC (rev 69252)
+++ trunk/dports/graphics/libQGLViewer/files/patch-designerPlugin.pro.diff	2010-06-29 06:51:35 UTC (rev 69253)
@@ -5,7 +5,7 @@
  }
  
 -target.path = $${PREFIX}/designer
-+target.path = $${PREFIX}/libexec/qt4-mac/designer
++target.path = $${PREFIX}/libexec/qt4-mac/plugins/designer
  INSTALLS += target
  
  contains( QT_VERSION, "^4.*" ) {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100628/a27cf1f1/attachment.html>