Revision: 79973 http://trac.macports.org/changeset/79973 Author: jmr@macports.org Date: 2011-06-30 20:59:12 -0700 (Thu, 30 Jun 2011) Log Message: ----------- dbus-glib: remove unnecessary muniversal (fixes #25581) Modified Paths: -------------- trunk/dports/devel/dbus-glib/Portfile Modified: trunk/dports/devel/dbus-glib/Portfile =================================================================== --- trunk/dports/devel/dbus-glib/Portfile 2011-07-01 02:19:11 UTC (rev 79972) +++ trunk/dports/devel/dbus-glib/Portfile 2011-07-01 03:59:12 UTC (rev 79973) @@ -2,7 +2,6 @@ # $Id$ PortSystem 1.0 -PortGroup muniversal 1.0 name dbus-glib version 0.94 @@ -44,56 +43,9 @@ } variant test description {Enable building of test code} { - if { ! [variant_isset universal] } { - configure.args-append --enable-tests - } else { - # Do not enable test when cross-compiling. - foreach arch ${cross_archs} { - lappend merger_configure_args(${arch}) --enable-tests - } - } + configure.args-append --enable-tests } -if { [variant_isset universal] } { - # Find architectures which will not run on build platform. - if { ${os.arch}=="i386" } { - if { ${os.major} >= 10 } { - set cross_archs "ppc ppc64" - } else { - set cross_archs "ppc64" - } - } else { - set cross_archs "i386 x86_64" - } - - set run_arch [lindex ${universal_archs} 0] - if { [variant_isset universal] && [lsearch ${cross_archs} ${run_arch}] >= 0 } { - ui_msg "When building a universal binary of ${name}, make sure none of {${cross_archs}} is first in universal_archs in ${prefix}/etc/macports/macports.conf" - error "incompatible universal_archs value" - } - - foreach arch ${cross_archs} { - if {[lsearch ${universal_archs} ${arch}] >= 0} { - lappend merger_configure_env(${arch}) \ - ac_cv_func_posix_getpwnam_r=yes \ - ac_cv_have_abstract_sockets=no - } - } - - post-configure { - foreach arch ${cross_archs} { - if {[lsearch ${universal_archs} ${arch}] >= 0} { - reinplace "s|--mode=execute \$(top_builddir)/dbus/dbus-binding-tool|--mode=execute ${worksrcpath}-${run_arch}/dbus/dbus-binding-tool|" \ - ${worksrcpath}-${arch}/dbus/examples/Makefile \ - ${worksrcpath}-${arch}/dbus/examples/statemachine/Makefile - - reinplace "s|\$(top_builddir)/dbus/dbus-binding-tool --mode=glib-client|${worksrcpath}-${run_arch}/dbus/dbus-binding-tool --mode=glib-client|" \ - ${worksrcpath}-${arch}/tools/Makefile - } - } - } -} - livecheck.type regex livecheck.url http://www.freedesktop.org/wiki/Software/DBusBindings livecheck.regex ${name}-(\\d+(?:\\.\\d+)*)