[53505] trunk/dports

[illogic-al at macports.org]

Revision: 53505
          http://trac.macports.org/changeset/53505
Author:   illogic-al at macports.org
Date:     2009-07-07 00:39:47 -0700 (Tue, 07 Jul 2009)
Log Message:
-----------
Allow automoc to pick correct Qt version automatically by using kde4 PortGroup. Revision bump unnecessary.
Also drop maintainership of automoc

Modified Paths:
--------------
    trunk/dports/_resources/port1.0/group/kde4-1.0.tcl
    trunk/dports/devel/automoc/Portfile

Modified: trunk/dports/_resources/port1.0/group/kde4-1.0.tcl
===================================================================
--- trunk/dports/_resources/port1.0/group/kde4-1.0.tcl	2009-07-07 05:33:03 UTC (rev 53504)
+++ trunk/dports/_resources/port1.0/group/kde4-1.0.tcl	2009-07-07 07:39:47 UTC (rev 53505)
@@ -36,8 +36,6 @@
 # Use CMake Portgroup
 PortGroup               cmake 1.0
 
-depends_build-append    port:automoc
-
 use_parallel_build      yes
 
 worksrcdir              build
@@ -58,6 +56,11 @@
     }
 }
 
+# Automoc added as build dependency here as most, if not all kde programs 
+# currently need it. The automoc port, which includes this PortGroup 
+# overrides depends_build, removing "port:automoc" to prevent a
+# cyclic dependency
+depends_build-append    port:automoc
 depends_lib-append      port:${qt}
 
 platform darwin 8 {

Modified: trunk/dports/devel/automoc/Portfile
===================================================================
--- trunk/dports/devel/automoc/Portfile	2009-07-07 05:33:03 UTC (rev 53504)
+++ trunk/dports/devel/automoc/Portfile	2009-07-07 07:39:47 UTC (rev 53505)
@@ -1,13 +1,13 @@
 # $Id$
 
 PortSystem          1.0
-PortGroup           cmake   1.0
+PortGroup           kde4   1.0
 
 name                automoc
 version             0.9.88
 revision            1
 categories          devel kde kde4
-maintainers         illogic-al openmaintainer
+maintainers         nomaintainer
 description         A tool which automatically creates .moc files and compiles them in.
 long_description    ${description} Necessary for compiling KDE programs.
 platforms           darwin
@@ -19,21 +19,9 @@
                     sha1    d864c3dda99d8b5f625b9267acfa1d88ff617e3a \
                     rmd160  8545f159092c9237f8c0f0f14b0dca9bfeac5c19
 
-depends_lib         port:qt4-mac
+# depends_build, not depends_build-append should be used here. 
+# See dports/_resources/port1.0/group/kde4-1.0.tcl for reason.
+depends_build       port:cmake
 
-use_parallel_build  yes
-worksrcdir          build
-pre-configure       { file mkdir ${worksrcpath} }
+configure.args-append   ../${distname}
 
-platform darwin 8 {
-        depends_lib-append      port:apple-gcc42-devel
-        configure.compiler      apple-gcc-4.2
-}
-
-platform darwin 9 {
-        configure.compiler      gcc-4.2
-}
-
-configure.args-append   ../${distname} \
-                        -DQT_QMAKE_EXECUTABLE=${prefix}/libexec/qt4-mac/bin/qmake
-
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090707/b42f04ee/attachment.html>