Index: Portfile
===================================================================
--- Portfile	(revision 33672)
+++ Portfile	(working copy)
@@ -15,25 +15,29 @@
 master_sites		sourceforge:mysql-python
 distname			MySQL-python-${version}
 checksums			md5 532268f02870bea18c1d465e88afff30
-patchfiles		patch-setup_posix.py patch-_mysql.c
+patchfiles			patch-_mysql.c.diff
 
-depends_lib-append	port:mysql5 port:py25-setuptools
+depends_lib-append		port:py25-setuptools
 
-variant mysql3	{
-	patchfiles-delete	patch-setup_posix.py
-	depends_lib-delete	port:mysql5
-	depends_lib-append	port:mysql
+variant mysql3 conflicts mysql4 mysql5 description {Build with MySQL 3} {
+	depends_lib-append	port:mysql3
 }
 
-variant mysql4	{
-	patchfiles-delete       patch-setup_posix.py
-	depends_lib-delete	port:mysql5
+variant mysql4 conflicts mysql3 mysql5 description {Build with MySQL 4} {
 	depends_lib-append	port:mysql4
 }
 
-variant mysql5-devel {
-	patchfiles-delete       patch-setup_posix.py
-	depends_lib-delete	port:mysql5
-	depends_lib-append	port:mysql5-devel
+variant mysql5 conflicts mysql3 mysql4 description {Build with MySQL 5 (default)} {
+	patchfiles-append	patch-setup_posix.py.diff
+	depends_lib-append	path:${prefix}/bin/mysql_config5:mysql5
 }
 
+if {![variant_isset mysql3] && ![variant_isset mysql4]} {
+	default_variants +mysql5
+}
+
+pre-fetch {
+	if {![variant_isset mysql3] && ![variant_isset mysql4] && ![variant_isset mysql5]} {
+		return -code error "you must select either mysql3, mysql4 or mysql5"
+	}
+}