[72552] trunk/dports/_resources/port1.0/group

[michaelld at macports.org]

Revision: 72552
          http://trac.macports.org/changeset/72552
Author:   michaelld at macports.org
Date:     2010-10-20 12:38:18 -0700 (Wed, 20 Oct 2010)
Log Message:
-----------
Add editor coding info.
Augment 'qt_cmake_defines'.
Augment PATH in environment as necessary.

Modified Paths:
--------------
    trunk/dports/_resources/port1.0/group/cmake-1.0.tcl
    trunk/dports/_resources/port1.0/group/kde4-1.1.tcl
    trunk/dports/_resources/port1.0/group/qt4-1.0.tcl

Modified: trunk/dports/_resources/port1.0/group/cmake-1.0.tcl
===================================================================
--- trunk/dports/_resources/port1.0/group/cmake-1.0.tcl	2010-10-20 19:30:05 UTC (rev 72551)
+++ trunk/dports/_resources/port1.0/group/cmake-1.0.tcl	2010-10-20 19:38:18 UTC (rev 72552)
@@ -1,3 +1,4 @@
+# -*- coding: utf-8; mode: tcl; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 4; truncate-lines: t -*- vim:fenc=utf-8:et:sw=4:ts=4:sts=4
 # $Id$
 
 # Copyright (c) 2009 Orville Bennett <illogical1 at gmail.com>

Modified: trunk/dports/_resources/port1.0/group/kde4-1.1.tcl
===================================================================
--- trunk/dports/_resources/port1.0/group/kde4-1.1.tcl	2010-10-20 19:30:05 UTC (rev 72551)
+++ trunk/dports/_resources/port1.0/group/kde4-1.1.tcl	2010-10-20 19:38:18 UTC (rev 72552)
@@ -1,3 +1,4 @@
+# -*- coding: utf-8; mode: tcl; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 4; truncate-lines: t -*- vim:fenc=utf-8:et:sw=4:ts=4:sts=4
 # $Id$
 
 # Copyright (c) 2010 The MacPorts Project

Modified: trunk/dports/_resources/port1.0/group/qt4-1.0.tcl
===================================================================
--- trunk/dports/_resources/port1.0/group/qt4-1.0.tcl	2010-10-20 19:30:05 UTC (rev 72551)
+++ trunk/dports/_resources/port1.0/group/qt4-1.0.tcl	2010-10-20 19:38:18 UTC (rev 72552)
@@ -1,3 +1,4 @@
+# -*- coding: utf-8; mode: tcl; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 4; truncate-lines: t -*- vim:fenc=utf-8:et:sw=4:ts=4:sts=4
 # $Id: $
 
 # Copyright (c) 2010 The MacPorts Project
@@ -89,10 +90,12 @@
 set qt_lrelease_cmd     ${qt_dir}/bin/lrelease
 
 # standard cmake info for Qt4
-set qt_cmake_defines    "-DQT_QT_INCLUDE_DIR=${qt_includes_dir} \
-                         -DQT_LIBRARY_DIR=${qt_libs_dir} \
-                         -DQT_QMAKE_EXECUTABLE=${qt_qmake_cmd} \
-                         -DQT_ZLIB_LIBRARY:FILEPATH=${prefix}/lib/libz.dylib"
+set qt_cmake_defines    \
+    "-DQT_QT_INCLUDE_DIR=${qt_includes_dir} \
+     -DQT_LIBRARY_DIR=${qt_libs_dir} \
+     -DQT_QMAKE_EXECUTABLE=${qt_qmake_cmd} \
+     -DQT_ZLIB_LIBRARY=${prefix}/lib/libz.dylib \
+     -DQT_PNG_LIBRARY=${prefix}/lib/libpng.dylib"
 
 # allow for both qt4 and qt4 devel
 depends_lib-append      bin:qmake:qt4-mac
@@ -102,11 +105,19 @@
                         QMAKE=${qt_qmake_cmd} \
                         MOC=${qt_moc_cmd}
 
+if {${qt_dir} != ${prefix}} {
+    configure.env-append PATH=${qt_dir}/bin:$env(PATH)
+}
+
 # standard build environment
 build.env-append        QTDIR=${qt_dir} \
                         QMAKE=${qt_qmake_cmd} \
                         MOC=${qt_moc_cmd}
 
+if {${qt_dir} != ${prefix}} {
+    build.env-append    PATH=${qt_dir}/bin:$env(PATH)
+}
+
 # use PKGCONFIG for Qt discovery in configure scripts
 depends_build-append    bin:pkg-config:pkgconfig
 
@@ -119,6 +130,9 @@
                         MOC=${qt_moc_cmd} \
                         INSTALL_ROOT=${destroot} \
                         DESTDIR=${destroot}
+if {${qt_dir} != ${prefix}} {
+    destroot.env-append PATH=${qt_dir}/bin:$env(PATH)
+}
 
 # append Qt's PKGCONFIG path to whatever is there now.
 set qt_pkg_config_path ${qt_dir}/lib/pkgconfig
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20101020/a9df937e/attachment.html>