[57246] trunk/dports
ryandesign at macports.org
ryandesign at macports.org
Mon Sep 7 20:23:52 PDT 2009
Revision: 57246
http://trac.macports.org/changeset/57246
Author: ryandesign at macports.org
Date: 2009-09-07 20:23:46 -0700 (Mon, 07 Sep 2009)
Log Message:
-----------
Mark conflicting ports
Modified Paths:
--------------
trunk/dports/databases/mysql4/Portfile
trunk/dports/databases/mysql5/Portfile
trunk/dports/databases/mysql5-devel/Portfile
trunk/dports/devel/glib2/Portfile
trunk/dports/devel/glib2-devel/Portfile
trunk/dports/emulators/minivmac/Portfile
trunk/dports/emulators/minivmac-devel/Portfile
trunk/dports/graphics/cairo/Portfile
trunk/dports/graphics/cairo-devel/Portfile
trunk/dports/graphics/graphviz/Portfile
trunk/dports/graphics/graphviz-devel/Portfile
trunk/dports/graphics/graphviz-gui/Portfile
trunk/dports/graphics/graphviz-gui-devel/Portfile
trunk/dports/graphics/graphviz-oldgui/Portfile
trunk/dports/graphics/libpixman/Portfile
trunk/dports/graphics/libpixman-devel/Portfile
trunk/dports/lang/php5/Portfile
trunk/dports/lang/php5-devel/Portfile
trunk/dports/lang/php52/Portfile
trunk/dports/lang/pure/Portfile
trunk/dports/lang/pure-devel/Portfile
trunk/dports/x11/pango/Portfile
trunk/dports/x11/pango-devel/Portfile
trunk/dports/x11/wine/Portfile
trunk/dports/x11/wine-devel/Portfile
Modified: trunk/dports/databases/mysql4/Portfile
===================================================================
--- trunk/dports/databases/mysql4/Portfile 2009-09-08 03:13:29 UTC (rev 57245)
+++ trunk/dports/databases/mysql4/Portfile 2009-09-08 03:23:46 UTC (rev 57246)
@@ -3,6 +3,7 @@
PortSystem 1.0
name mysql4
+conflicts mysql5 mysql5-devel
version 4.1.22
homepage http://www.mysql.com/
categories databases
Modified: trunk/dports/databases/mysql5/Portfile
===================================================================
--- trunk/dports/databases/mysql5/Portfile 2009-09-08 03:13:29 UTC (rev 57245)
+++ trunk/dports/databases/mysql5/Portfile 2009-09-08 03:23:46 UTC (rev 57246)
@@ -3,6 +3,7 @@
PortSystem 1.0
name mysql5
+conflicts mysql5-devel mysql4
version 5.0.85
set branch [join [lrange [split ${version} .] 0 1] .]
homepage http://www.mysql.com/
Modified: trunk/dports/databases/mysql5-devel/Portfile
===================================================================
--- trunk/dports/databases/mysql5-devel/Portfile 2009-09-08 03:13:29 UTC (rev 57245)
+++ trunk/dports/databases/mysql5-devel/Portfile 2009-09-08 03:23:46 UTC (rev 57246)
@@ -3,6 +3,7 @@
PortSystem 1.0
name mysql5-devel
+conflicts mysql5 mysql4
version 5.1.38
set branch [join [lrange [split ${version} .] 0 1] .]
homepage http://www.mysql.com/
Modified: trunk/dports/devel/glib2/Portfile
===================================================================
--- trunk/dports/devel/glib2/Portfile 2009-09-08 03:13:29 UTC (rev 57245)
+++ trunk/dports/devel/glib2/Portfile 2009-09-08 03:23:46 UTC (rev 57246)
@@ -4,6 +4,7 @@
PortGroup muniversal 1.0
name glib2
+conflicts glib2-devel
set my_name glib
version 2.20.4
set branch [join [lrange [split ${version} .] 0 1] .]
Modified: trunk/dports/devel/glib2-devel/Portfile
===================================================================
--- trunk/dports/devel/glib2-devel/Portfile 2009-09-08 03:13:29 UTC (rev 57245)
+++ trunk/dports/devel/glib2-devel/Portfile 2009-09-08 03:23:46 UTC (rev 57246)
@@ -4,6 +4,7 @@
PortGroup muniversal 1.0
name glib2-devel
+conflicts glib2
set my_name glib
version 2.21.4
set branch [join [lrange [split ${version} .] 0 1] .]
Modified: trunk/dports/emulators/minivmac/Portfile
===================================================================
--- trunk/dports/emulators/minivmac/Portfile 2009-09-08 03:13:29 UTC (rev 57245)
+++ trunk/dports/emulators/minivmac/Portfile 2009-09-08 03:23:46 UTC (rev 57246)
@@ -3,6 +3,7 @@
PortSystem 1.0
name minivmac
+conflicts minivmac-devel
version 2.8.2
revision 2
categories emulators aqua
Modified: trunk/dports/emulators/minivmac-devel/Portfile
===================================================================
--- trunk/dports/emulators/minivmac-devel/Portfile 2009-09-08 03:13:29 UTC (rev 57245)
+++ trunk/dports/emulators/minivmac-devel/Portfile 2009-09-08 03:23:46 UTC (rev 57246)
@@ -3,6 +3,7 @@
PortSystem 1.0
name minivmac-devel
+conflicts minivmac
set my_name minivmac
version 3.1.0-20090402
revision 5
Modified: trunk/dports/graphics/cairo/Portfile
===================================================================
--- trunk/dports/graphics/cairo/Portfile 2009-09-08 03:13:29 UTC (rev 57245)
+++ trunk/dports/graphics/cairo/Portfile 2009-09-08 03:23:46 UTC (rev 57246)
@@ -4,6 +4,7 @@
PortGroup muniversal 1.0
name cairo
+conflicts cairo-devel
set my_name cairo
version 1.8.8
categories graphics
Modified: trunk/dports/graphics/cairo-devel/Portfile
===================================================================
--- trunk/dports/graphics/cairo-devel/Portfile 2009-09-08 03:13:29 UTC (rev 57245)
+++ trunk/dports/graphics/cairo-devel/Portfile 2009-09-08 03:23:46 UTC (rev 57246)
@@ -4,6 +4,7 @@
PortGroup muniversal 1.0
name cairo-devel
+conflicts cairo
set my_name cairo
version 1.9.2
categories graphics
Modified: trunk/dports/graphics/graphviz/Portfile
===================================================================
--- trunk/dports/graphics/graphviz/Portfile 2009-09-08 03:13:29 UTC (rev 57245)
+++ trunk/dports/graphics/graphviz/Portfile 2009-09-08 03:23:46 UTC (rev 57246)
@@ -3,6 +3,7 @@
PortSystem 1.0
name graphviz
+conflicts graphviz-devel
set my_name graphviz
# keep version in sync between graphviz and graphviz-gui
version 2.24.0
Modified: trunk/dports/graphics/graphviz-devel/Portfile
===================================================================
--- trunk/dports/graphics/graphviz-devel/Portfile 2009-09-08 03:13:29 UTC (rev 57245)
+++ trunk/dports/graphics/graphviz-devel/Portfile 2009-09-08 03:23:46 UTC (rev 57246)
@@ -3,6 +3,7 @@
PortSystem 1.0
name graphviz-devel
+conflicts graphviz
set my_name graphviz
# keep version in sync between graphviz-devel and graphviz-gui-devel
version 2.25.20090906.0445
Modified: trunk/dports/graphics/graphviz-gui/Portfile
===================================================================
--- trunk/dports/graphics/graphviz-gui/Portfile 2009-09-08 03:13:29 UTC (rev 57245)
+++ trunk/dports/graphics/graphviz-gui/Portfile 2009-09-08 03:23:46 UTC (rev 57246)
@@ -4,6 +4,7 @@
PortGroup xcode 1.0
name graphviz-gui
+conflicts graphviz-gui-devel graphviz-oldgui
set my_name graphviz
# keep version in sync between graphviz and graphviz-gui
version 2.24.0
Modified: trunk/dports/graphics/graphviz-gui-devel/Portfile
===================================================================
--- trunk/dports/graphics/graphviz-gui-devel/Portfile 2009-09-08 03:13:29 UTC (rev 57245)
+++ trunk/dports/graphics/graphviz-gui-devel/Portfile 2009-09-08 03:23:46 UTC (rev 57246)
@@ -4,6 +4,7 @@
PortGroup xcode 1.0
name graphviz-gui-devel
+conflicts graphviz-gui graphviz-oldgui
set my_name graphviz
# keep version in sync between graphviz-devel and graphviz-gui-devel
version 2.25.20090906.0445
Modified: trunk/dports/graphics/graphviz-oldgui/Portfile
===================================================================
--- trunk/dports/graphics/graphviz-oldgui/Portfile 2009-09-08 03:13:29 UTC (rev 57245)
+++ trunk/dports/graphics/graphviz-oldgui/Portfile 2009-09-08 03:23:46 UTC (rev 57246)
@@ -3,6 +3,7 @@
PortSystem 1.0
name graphviz-oldgui
+conflicts graphviz-gui graphviz-gui-devel
version 16
categories graphics
maintainers ryandesign
Modified: trunk/dports/graphics/libpixman/Portfile
===================================================================
--- trunk/dports/graphics/libpixman/Portfile 2009-09-08 03:13:29 UTC (rev 57245)
+++ trunk/dports/graphics/libpixman/Portfile 2009-09-08 03:23:46 UTC (rev 57246)
@@ -4,6 +4,7 @@
PortGroup muniversal 1.0
name libpixman
+conflicts libpixman-devel
set my_name pixman
version 0.16.0
categories graphics
Modified: trunk/dports/graphics/libpixman-devel/Portfile
===================================================================
--- trunk/dports/graphics/libpixman-devel/Portfile 2009-09-08 03:13:29 UTC (rev 57245)
+++ trunk/dports/graphics/libpixman-devel/Portfile 2009-09-08 03:23:46 UTC (rev 57246)
@@ -4,6 +4,7 @@
PortGroup muniversal 1.0
name libpixman-devel
+conflicts libpixman
set my_name pixman
version 0.15.20
categories graphics
Modified: trunk/dports/lang/php5/Portfile
===================================================================
--- trunk/dports/lang/php5/Portfile 2009-09-08 03:13:29 UTC (rev 57245)
+++ trunk/dports/lang/php5/Portfile 2009-09-08 03:23:46 UTC (rev 57246)
@@ -3,6 +3,7 @@
PortSystem 1.0
name php5
+conflicts php5-devel php52
epoch 1
version 5.3.0
revision 2
Modified: trunk/dports/lang/php5-devel/Portfile
===================================================================
--- trunk/dports/lang/php5-devel/Portfile 2009-09-08 03:13:29 UTC (rev 57245)
+++ trunk/dports/lang/php5-devel/Portfile 2009-09-08 03:23:46 UTC (rev 57246)
@@ -3,6 +3,7 @@
PortSystem 1.0
name php5-devel
+conflicts php5 php52
epoch 1
version 5.3.1RC1
set major [lindex [split ${version} .] 0]
Modified: trunk/dports/lang/php52/Portfile
===================================================================
--- trunk/dports/lang/php52/Portfile 2009-09-08 03:13:29 UTC (rev 57245)
+++ trunk/dports/lang/php52/Portfile 2009-09-08 03:23:46 UTC (rev 57246)
@@ -3,6 +3,7 @@
PortSystem 1.0
name php52
+conflicts php5 php5-devel
version 5.2.10
set major [lindex [split ${version} .] 0]
set my_name php${major}
Modified: trunk/dports/lang/pure/Portfile
===================================================================
--- trunk/dports/lang/pure/Portfile 2009-09-08 03:13:29 UTC (rev 57245)
+++ trunk/dports/lang/pure/Portfile 2009-09-08 03:23:46 UTC (rev 57246)
@@ -3,6 +3,7 @@
PortSystem 1.0
name pure
+conflicts pure-devel
version 0.34
set branch [join [lrange [split ${version} .] 0 1] .]
categories lang
Modified: trunk/dports/lang/pure-devel/Portfile
===================================================================
--- trunk/dports/lang/pure-devel/Portfile 2009-09-08 03:13:29 UTC (rev 57245)
+++ trunk/dports/lang/pure-devel/Portfile 2009-09-08 03:23:46 UTC (rev 57246)
@@ -3,6 +3,7 @@
PortSystem 1.0
name pure-devel
+conflicts pure
version 0.34.0.r2195
set branch [join [lrange [split ${version} .] 0 1] .]
categories lang
Modified: trunk/dports/x11/pango/Portfile
===================================================================
--- trunk/dports/x11/pango/Portfile 2009-09-08 03:13:29 UTC (rev 57245)
+++ trunk/dports/x11/pango/Portfile 2009-09-08 03:23:46 UTC (rev 57246)
@@ -4,6 +4,7 @@
PortGroup muniversal 1.0
name pango
+conflicts pango-devel
version 1.24.5
set branch [join [lrange [split ${version} .] 0 1] .]
categories x11
Modified: trunk/dports/x11/pango-devel/Portfile
===================================================================
--- trunk/dports/x11/pango-devel/Portfile 2009-09-08 03:13:29 UTC (rev 57245)
+++ trunk/dports/x11/pango-devel/Portfile 2009-09-08 03:23:46 UTC (rev 57246)
@@ -4,6 +4,7 @@
PortGroup muniversal 1.0
name pango-devel
+conflicts pango
set my_name pango
version 1.25.5
set branch [join [lrange [split ${version} .] 0 1] .]
Modified: trunk/dports/x11/wine/Portfile
===================================================================
--- trunk/dports/x11/wine/Portfile 2009-09-08 03:13:29 UTC (rev 57245)
+++ trunk/dports/x11/wine/Portfile 2009-09-08 03:23:46 UTC (rev 57246)
@@ -3,6 +3,7 @@
PortSystem 1.0
name wine
+conflicts wine-devel
version 1.0.1
revision 3
categories x11
Modified: trunk/dports/x11/wine-devel/Portfile
===================================================================
--- trunk/dports/x11/wine-devel/Portfile 2009-09-08 03:13:29 UTC (rev 57245)
+++ trunk/dports/x11/wine-devel/Portfile 2009-09-08 03:23:46 UTC (rev 57246)
@@ -3,6 +3,7 @@
PortSystem 1.0
name wine-devel
+conflicts wine
set my_name wine
version 1.1.29
categories x11
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090907/f69caf68/attachment.html>
More information about the macports-changes
mailing list