[114858] trunk/dports/gnome

[ryandesign at macports.org]

Revision: 114858
          https://trac.macports.org/changeset/114858
Author:   ryandesign at macports.org
Date:     2013-12-17 19:26:54 -0800 (Tue, 17 Dec 2013)
Log Message:
-----------
gstreamer1, gstreamer010: use conflicts_build portgroup instead of reimplementing the functionality

Modified Paths:
--------------
    trunk/dports/gnome/gstreamer010/Portfile
    trunk/dports/gnome/gstreamer1/Portfile

Modified: trunk/dports/gnome/gstreamer010/Portfile
===================================================================
--- trunk/dports/gnome/gstreamer010/Portfile	2013-12-17 22:39:53 UTC (rev 114857)
+++ trunk/dports/gnome/gstreamer010/Portfile	2013-12-18 03:26:54 UTC (rev 114858)
@@ -2,6 +2,7 @@
 # $Id$
 
 PortSystem          1.0
+PortGroup           conflicts_build 1.0
 
 # https://bugzilla.gnome.org/show_bug.cgi?id=636134
 PortGroup   muniversal 1.0
@@ -44,6 +45,8 @@
 
 use_bzip2           yes
 
+conflicts_build         check
+
 build.env-append        CC=${configure.cc}
 configure.env-append    PERL_PATH=${prefix}/bin/perl
 configure.cflags-append -funroll-loops -fstrict-aliasing -fno-common
@@ -66,13 +69,4 @@
         --build=${build_arch}-apple-${os.platform}${os.major}
 }
 
-pre-build	{
-    if {[file exists ${prefix}/lib/libcheck.dylib]} {
-        ui_msg "Gstreamer will fail to build because the 'check' port is active. Deactivate"
-        ui_msg "'check' by running 'port deactivate check' and try again. You may reactivate"
-        ui_msg "'check' after installing gstreamer by running 'port activate check'."
-        return -code error "check is installed"
-    }
-}
-
 livecheck.type      none

Modified: trunk/dports/gnome/gstreamer1/Portfile
===================================================================
--- trunk/dports/gnome/gstreamer1/Portfile	2013-12-17 22:39:53 UTC (rev 114857)
+++ trunk/dports/gnome/gstreamer1/Portfile	2013-12-18 03:26:54 UTC (rev 114858)
@@ -2,6 +2,7 @@
 # $Id$
 
 PortSystem          1.0
+PortGroup           conflicts_build 1.0
 
 # https://bugzilla.gnome.org/show_bug.cgi?id=636134
 PortGroup   muniversal 1.0
@@ -43,6 +44,8 @@
 
 use_xz           yes
 
+conflicts_build         check
+
 configure.env-append    PERL_PATH=${prefix}/bin/perl
 configure.cflags-append -funroll-loops -fstrict-aliasing -fno-common
 
@@ -73,14 +76,5 @@
     destroot.args-append    CC="${configure.cc} ${configure.cc_archflags}"
 }
 
-pre-build	{
-    if {[file exists ${prefix}/lib/libcheck.dylib]} {
-        ui_msg "Gstreamer will fail to build because the 'check' port is active. Deactivate"
-        ui_msg "'check' by running 'port deactivate check' and try again. You may reactivate"
-        ui_msg "'check' after installing gstreamer by running 'port activate check'."
-        return -code error "check is installed"
-    }
-}
-
 livecheck.type      gnome
 livecheck.name      ${my_name}
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20131217/4f9e7c58/attachment.html>