[58230] trunk/dports

ryandesign at macports.org ryandesign at macports.org
Thu Sep 24 09:45:26 PDT 2009


Revision: 58230
          http://trac.macports.org/changeset/58230
Author:   ryandesign at macports.org
Date:     2009-09-24 09:45:22 -0700 (Thu, 24 Sep 2009)
Log Message:
-----------
rewrite mysql5 dependency so mysql5-devel can satisfy it

Modified Paths:
--------------
    trunk/dports/aqua/qt3-mac/Portfile
    trunk/dports/databases/libgda3/Portfile
    trunk/dports/databases/mysqltcl/Portfile
    trunk/dports/devel/bugzilla/Portfile
    trunk/dports/devel/radlib/Portfile
    trunk/dports/gis/grass/Portfile
    trunk/dports/gnome/libgda/Portfile
    trunk/dports/mail/sympa/Portfile
    trunk/dports/mail/vpopmail/Portfile
    trunk/dports/math/glpk/Portfile
    trunk/dports/math/octave-database/Portfile
    trunk/dports/multimedia/XBMC/Portfile
    trunk/dports/net/cacti/Portfile
    trunk/dports/net/mediatomb/Portfile
    trunk/dports/net/monarch/Portfile
    trunk/dports/net/nagios-plugins/Portfile
    trunk/dports/net/nedi/Portfile
    trunk/dports/net/netmrg/Portfile
    trunk/dports/net/proftpd/Portfile
    trunk/dports/net/snort/Portfile
    trunk/dports/net/zabbix/Portfile
    trunk/dports/python/py-mysql/Portfile
    trunk/dports/science/gdal/Portfile
    trunk/dports/science/wview/Portfile
    trunk/dports/security/libpreludedb/Portfile
    trunk/dports/www/drupal5/Portfile
    trunk/dports/www/drupal6/Portfile
    trunk/dports/www/gallery/Portfile
    trunk/dports/www/lighttpd/Portfile
    trunk/dports/www/lighttpd-devel/Portfile
    trunk/dports/www/midgard-core/Portfile
    trunk/dports/www/mnogosearch/Portfile
    trunk/dports/www/moodle/Portfile
    trunk/dports/www/phpbb/Portfile
    trunk/dports/www/redland/Portfile
    trunk/dports/www/wordpress/Portfile
    trunk/dports/x11/qt4-x11/Portfile

Modified: trunk/dports/aqua/qt3-mac/Portfile
===================================================================
--- trunk/dports/aqua/qt3-mac/Portfile	2009-09-24 16:33:33 UTC (rev 58229)
+++ trunk/dports/aqua/qt3-mac/Portfile	2009-09-24 16:45:22 UTC (rev 58230)
@@ -32,7 +32,7 @@
 }
 
 variant mysql5 {
-	depends_lib-append	port:mysql5
+	depends_lib-append	path:bin/mysql_config5:mysql5
 	configure.args-delete	-no-sql-mysql
 	configure.args-append	-qt-sql-mysql \
 					-L${prefix}/lib/mysql5/mysql \

Modified: trunk/dports/databases/libgda3/Portfile
===================================================================
--- trunk/dports/databases/libgda3/Portfile	2009-09-24 16:33:33 UTC (rev 58229)
+++ trunk/dports/databases/libgda3/Portfile	2009-09-24 16:45:22 UTC (rev 58230)
@@ -62,7 +62,7 @@
 
 variant with_mysql5 conflicts with_mysql4 \
     description {support for current MySQL 5.x} {
-	depends_lib-append	port:mysql5
+	depends_lib-append	path:bin/mysql_config5:mysql5
 	configure.env-append	\
 		MYSQL_CONFIG=${prefix}/lib/mysql5/bin/mysql_config
 	configure.args-append	--with-mysql=${prefix}/lib/mysql5

Modified: trunk/dports/databases/mysqltcl/Portfile
===================================================================
--- trunk/dports/databases/mysqltcl/Portfile	2009-09-24 16:33:33 UTC (rev 58229)
+++ trunk/dports/databases/mysqltcl/Portfile	2009-09-24 16:45:22 UTC (rev 58230)
@@ -15,7 +15,7 @@
 master_sites	http://www.xdobry.de/mysqltcl/
 checksums	md5 bf408a7d1f10aec28102fd27cba1f6eb
 
-depends_lib     port:mysql5 \
+depends_lib     path:bin/mysql_config5:mysql5 \
 		port:tcl \
 		port:tk
 
@@ -25,7 +25,7 @@
 		--mandir=${prefix}/share/man
 
 variant mysql4 description Install against mysql4 instead of mysql5 {
-	depends_lib-delete port:mysql5
+	depends_lib-delete path:bin/mysql_config5:mysql5
 	depends_lib-append port:mysql4
 	configure.args_delete --with-mysql-include=${prefix}/include/mysql5/mysql
 	configure.args_delete --with-mysql-lib=${prefix}/lib/mysql5/mysql

Modified: trunk/dports/devel/bugzilla/Portfile
===================================================================
--- trunk/dports/devel/bugzilla/Portfile	2009-09-24 16:33:33 UTC (rev 58229)
+++ trunk/dports/devel/bugzilla/Portfile	2009-09-24 16:45:22 UTC (rev 58230)
@@ -50,7 +50,7 @@
 
 variant mysql5 description "Use mysql5 instead of mysql4" {
                         depends_lib-delete   port:mysql4
-                        depends_lib-append   port:mysql5
+                        depends_lib-append   path:bin/mysql_config5:mysql5
 }
 
 patchfiles		patch-checksetup.pl

Modified: trunk/dports/devel/radlib/Portfile
===================================================================
--- trunk/dports/devel/radlib/Portfile	2009-09-24 16:33:33 UTC (rev 58229)
+++ trunk/dports/devel/radlib/Portfile	2009-09-24 16:45:22 UTC (rev 58230)
@@ -26,7 +26,7 @@
   configure.args-append     --enable-mysql
   configure.cflags-append   -I${prefix}/include/mysql5/mysql
   configure.ldflags-append  -L${prefix}/lib/mysql5/mysql
-  depends_lib-append        port:mysql5
+  depends_lib-append        path:bin/mysql_config5:mysql5
 }
 
 variant pgresql83 description {Includes PostgreSQL database support} {

Modified: trunk/dports/gis/grass/Portfile
===================================================================
--- trunk/dports/gis/grass/Portfile	2009-09-24 16:33:33 UTC (rev 58229)
+++ trunk/dports/gis/grass/Portfile	2009-09-24 16:45:22 UTC (rev 58230)
@@ -82,7 +82,7 @@
 #destroot.violate_mtree  yes
 
 variant mysql5 description "Install grass with mysql 5 support" {
-    depends_lib-append    port:mysql5
+    depends_lib-append    path:bin/mysql_config5:mysql5
     configure.args-append --with-mysql
     configure.args-append --with-mysql-includes=${prefix}/include/mysql5/mysql
     configure.args-append --with-mysql-libs=${prefix}/lib/mysql5/mysql

Modified: trunk/dports/gnome/libgda/Portfile
===================================================================
--- trunk/dports/gnome/libgda/Portfile	2009-09-24 16:33:33 UTC (rev 58229)
+++ trunk/dports/gnome/libgda/Portfile	2009-09-24 16:45:22 UTC (rev 58230)
@@ -41,7 +41,7 @@
 }
 
 variant mysql5 {
-	depends_lib-append	port:mysql5
+	depends_lib-append	path:bin/mysql_config5:mysql5
 	configure.args-append	--with-mysql=${mysqldir}
 }
 

Modified: trunk/dports/mail/sympa/Portfile
===================================================================
--- trunk/dports/mail/sympa/Portfile	2009-09-24 16:33:33 UTC (rev 58229)
+++ trunk/dports/mail/sympa/Portfile	2009-09-24 16:45:22 UTC (rev 58230)
@@ -27,7 +27,7 @@
 			patch-sympa.generic \
 			patch-src_alias_manager.pl
 
-depends_lib		port:mysql5 \
+depends_lib		path:bin/mysql_config5:mysql5 \
 			port:apache2 \
 			port:mod_fcgid \
 			port:openssl \

Modified: trunk/dports/mail/vpopmail/Portfile
===================================================================
--- trunk/dports/mail/vpopmail/Portfile	2009-09-24 16:33:33 UTC (rev 58229)
+++ trunk/dports/mail/vpopmail/Portfile	2009-09-24 16:45:22 UTC (rev 58230)
@@ -24,7 +24,7 @@
 				--enable-incdir=${prefix}/include/mysql5/mysql \
 				--enable-libdir=${prefix}/lib/mysql5/mysql \
 				--enable-valias
-	depends_lib-append	port:mysql5
+	depends_lib-append	path:bin/mysql_config5:mysql5
 }
 
 variant roaming description {Enable POP before SMTP functionality} {

Modified: trunk/dports/math/glpk/Portfile
===================================================================
--- trunk/dports/math/glpk/Portfile	2009-09-24 16:33:33 UTC (rev 58229)
+++ trunk/dports/math/glpk/Portfile	2009-09-24 16:45:22 UTC (rev 58230)
@@ -85,7 +85,7 @@
 }
 
 variant mysql description {enable MathProg MySQL support} {
-    depends_lib-append port:mysql5
+    depends_lib-append path:bin/mysql_config5:mysql5
     configure.args-append --enable-mysql
     post-patch {
         reinplace \

Modified: trunk/dports/math/octave-database/Portfile
===================================================================
--- trunk/dports/math/octave-database/Portfile	2009-09-24 16:33:33 UTC (rev 58229)
+++ trunk/dports/math/octave-database/Portfile	2009-09-24 16:45:22 UTC (rev 58230)
@@ -25,7 +25,7 @@
 
 patchfiles          patch-sqlite3_wrap.cpp.diff patch-odbc_wrap.cpp.diff
 
-depends_lib-append  port:octave port:swig port:postgresql82 port:mysql5 port:sqlite3 port:unixODBC
+depends_lib-append  port:octave port:swig port:postgresql82 path:bin/mysql_config5:mysql5 port:sqlite3 port:unixODBC
 
 post-destroot {
     move ${destroot}${prefix}/share/octave/octave_packages ${destroot}${prefix}/share/octave/octave_packages_${name}

Modified: trunk/dports/multimedia/XBMC/Portfile
===================================================================
--- trunk/dports/multimedia/XBMC/Portfile	2009-09-24 16:33:33 UTC (rev 58229)
+++ trunk/dports/multimedia/XBMC/Portfile	2009-09-24 16:45:22 UTC (rev 58230)
@@ -29,7 +29,7 @@
 	port:jasper \
 	port:faac \
 	port:libmad \
-	port:mysql5 \
+	path:bin/mysql_config5:mysql5 \
 	port:fribidi \
 	port:lzo \
 	port:glew \

Modified: trunk/dports/net/cacti/Portfile
===================================================================
--- trunk/dports/net/cacti/Portfile	2009-09-24 16:33:33 UTC (rev 58229)
+++ trunk/dports/net/cacti/Portfile	2009-09-24 16:45:22 UTC (rev 58230)
@@ -21,7 +21,7 @@
 distfiles		${distname}${extract.suffix}:cacti
 checksums		${distname}${extract.suffix} md5 b5eb2f5c512959417d51535f37d4e97c
 
-depends_lib		port:mysql5 \
+depends_lib		path:bin/mysql_config5:mysql5 \
 			port:rrdtool
 
 use_configure   no

Modified: trunk/dports/net/mediatomb/Portfile
===================================================================
--- trunk/dports/net/mediatomb/Portfile	2009-09-24 16:33:33 UTC (rev 58229)
+++ trunk/dports/net/mediatomb/Portfile	2009-09-24 16:45:22 UTC (rev 58230)
@@ -53,7 +53,7 @@
 }
 
 variant mysql5 conflicts mysql4 description {Use MySQL 5 database} {
-	depends_lib-append	port:mysql5
+	depends_lib-append	path:bin/mysql_config5:mysql5
 	configure.args-append	--enable-mysql \
 		--with-mysql-cfg=${prefix}/bin/mysql_config5
 	configure.args-delete	--disable-mysql

Modified: trunk/dports/net/monarch/Portfile
===================================================================
--- trunk/dports/net/monarch/Portfile	2009-09-24 16:33:33 UTC (rev 58229)
+++ trunk/dports/net/monarch/Portfile	2009-09-24 16:45:22 UTC (rev 58230)
@@ -13,7 +13,7 @@
 checksums               md5 68658989ff485ac58a42035c3a927362
 patchfiles              patch-nmap_scan-nmap_scan.c
 depends_build		port:nagios
-depends_lib             port:mysql5 \
+depends_lib             path:bin/mysql_config5:mysql5 \
 			port:p5-libwww-perl \
 			port:p5-xml-libxml-common \
 			port:p5-xml-namespacesupport \

Modified: trunk/dports/net/nagios-plugins/Portfile
===================================================================
--- trunk/dports/net/nagios-plugins/Portfile	2009-09-24 16:33:33 UTC (rev 58229)
+++ trunk/dports/net/nagios-plugins/Portfile	2009-09-24 16:45:22 UTC (rev 58230)
@@ -44,7 +44,7 @@
 			--without-qmail-qstat
 
 variant mysql5 {
-        depends_lib-append port:mysql5
+        depends_lib-append path:bin/mysql_config5:mysql5
         configure.args-delete --without-mysql
         configure.args-append --with-mysql=${prefix}/lib/mysql5
 }

Modified: trunk/dports/net/nedi/Portfile
===================================================================
--- trunk/dports/net/nedi/Portfile	2009-09-24 16:33:33 UTC (rev 58229)
+++ trunk/dports/net/nedi/Portfile	2009-09-24 16:45:22 UTC (rev 58230)
@@ -23,7 +23,7 @@
 patchfiles		patch-html-Reports-Modules.php-diff
 
 depends_lib		path:bin/perl:perl5 \
-			port:mysql5 \
+			path:bin/mysql_config5:mysql5 \
 			port:p5-net-snmp \
 			port:p5-net-ssh-perl \
 			port:p5-net-telnet \

Modified: trunk/dports/net/netmrg/Portfile
===================================================================
--- trunk/dports/net/netmrg/Portfile	2009-09-24 16:33:33 UTC (rev 58229)
+++ trunk/dports/net/netmrg/Portfile	2009-09-24 16:45:22 UTC (rev 58230)
@@ -14,7 +14,7 @@
 master_sites            http://www.netmrg.net/download/release/
 checksums               md5 47bec3b8a4d3a5c06c70925ee8d280be
 
-depends_lib             port:mysql5 \
+depends_lib             path:bin/mysql_config5:mysql5 \
 			port:rrdtool \
 			port:libxml2
 

Modified: trunk/dports/net/proftpd/Portfile
===================================================================
--- trunk/dports/net/proftpd/Portfile	2009-09-24 16:33:33 UTC (rev 58229)
+++ trunk/dports/net/proftpd/Portfile	2009-09-24 16:45:22 UTC (rev 58230)
@@ -35,7 +35,7 @@
 }
 
 variant mysql5 {
-    depends_lib-append   port:mysql5
+    depends_lib-append   path:bin/mysql_config5:mysql5
    	configure.args-append   --with-modules=mod_sql:mod_sql_mysql \
 				--with-includes=${prefix}/include/mysql5/mysql \
 				--with-libraries=${prefix}/lib/mysql5/mysql 

Modified: trunk/dports/net/snort/Portfile
===================================================================
--- trunk/dports/net/snort/Portfile	2009-09-24 16:33:33 UTC (rev 58229)
+++ trunk/dports/net/snort/Portfile	2009-09-24 16:45:22 UTC (rev 58230)
@@ -24,7 +24,7 @@
 configure.args   --mandir=${prefix}/share/man --disable-dynamicplugin
 
 variant mysql5 {
-	depends_lib-append    port:mysql5
+	depends_lib-append    path:bin/mysql_config5:mysql5
 	configure.args-append --with-mysql=${prefix}
 	patchfiles-append	patch-configure
 }

Modified: trunk/dports/net/zabbix/Portfile
===================================================================
--- trunk/dports/net/zabbix/Portfile	2009-09-24 16:33:33 UTC (rev 58229)
+++ trunk/dports/net/zabbix/Portfile	2009-09-24 16:45:22 UTC (rev 58230)
@@ -17,7 +17,7 @@
 checksums		md5 33da3661868a04042c596a819896446f
 patchfiles		patch-include-common.h
 default_variants	+server
-depends_lib		port:mysql5 \
+depends_lib		path:bin/mysql_config5:mysql5 \
 				port:fping
 
 configure.pre_args     --prefix=${prefix}
@@ -54,7 +54,7 @@
 
 variant pgsql81 \
         description {Use PostgreSQL 8.1.x for server database} {
-        depends_lib-delete      port:mysql5
+        depends_lib-delete      path:bin/mysql_config5:mysql5
         depends_lib-append      port:postgresql81
         configure.args-delete   --with-mysql=${prefix}/lib/mysql5/bin/mysql_config
         configure.args-append   --with-pgsql=${prefix}/lib/postgresql81/bin/pg_config
@@ -62,7 +62,7 @@
 
 variant pgsql82 \
 	description {Use PostgreSQL 8.2.x for server database} {
-	depends_lib-delete	port:mysql5
+	depends_lib-delete	path:bin/mysql_config5:mysql5
 	depends_lib-append	port:postgresql82
 	configure.args-delete	--with-mysql=${prefix}/lib/mysql5/bin/mysql_config
 	configure.args-append	--with-pgsql=${prefix}/lib/postgresql82/bin/pg_config
@@ -70,7 +70,7 @@
 
 variant pgsql83 \
         description {Use PostgreSQL 8.3.x for server database} {
-        depends_lib-delete      port:mysql5
+        depends_lib-delete      path:bin/mysql_config5:mysql5
         depends_lib-append      port:postgresql83
         configure.args-delete   --with-mysql=${prefix}/lib/mysql5/bin/mysql_config
         configure.args-append   --with-pgsql=${prefix}/lib/postgresql83/bin/pg_config
@@ -78,7 +78,7 @@
 
 variant sqlite3 \
         description {Use SQLite3 for server database} {
-        depends_lib-delete      port:mysql5
+        depends_lib-delete      path:bin/mysql_config5:mysql5
         depends_lib-append      port:sqlite3
         configure.args-delete   --with-mysql=${prefix}/lib/mysql5/bin/mysql_config
         configure.args-append   --with-sqlite3=${prefix}/lib
@@ -86,7 +86,7 @@
 
 variant agent_only \
 	description {Do not install the Zabbix server} {
-	depends_lib-delete	port:mysql5 \
+	depends_lib-delete	path:bin/mysql_config5:mysql5 \
 				port:fping
 
 	configure.args-delete	--enable-server \

Modified: trunk/dports/python/py-mysql/Portfile
===================================================================
--- trunk/dports/python/py-mysql/Portfile	2009-09-24 16:33:33 UTC (rev 58229)
+++ trunk/dports/python/py-mysql/Portfile	2009-09-24 16:45:22 UTC (rev 58230)
@@ -17,16 +17,16 @@
 checksums			md5 532268f02870bea18c1d465e88afff30
 patchfiles		patch-setup_posix.py patch-_mysql.c
 
-depends_lib-append	port:mysql5
+depends_lib-append	path:bin/mysql_config5:mysql5
 
 variant mysql3 conflicts mysql4	{
 	patchfiles-delete	patch-setup_posix.py
-	depends_lib-delete	port:mysql5
+	depends_lib-delete	path:bin/mysql_config5:mysql5
 	depends_lib-append	port:mysql
 }
 
 variant mysql4 conflicts mysql3	{
 	patchfiles-delete       patch-setup_posix.py
-	depends_lib-delete	port:mysql5
+	depends_lib-delete	path:bin/mysql_config5:mysql5
 	depends_lib-append	port:mysql4
 }

Modified: trunk/dports/science/gdal/Portfile
===================================================================
--- trunk/dports/science/gdal/Portfile	2009-09-24 16:33:33 UTC (rev 58229)
+++ trunk/dports/science/gdal/Portfile	2009-09-24 16:45:22 UTC (rev 58230)
@@ -161,7 +161,7 @@
 }
 
 variant mysql5 description {Enable MySQL 5 support} {
-	depends_lib-append		port:mysql5
+	depends_lib-append		path:bin/mysql_config5:mysql5
 	configure.args-delete	--without-mysql
 	configure.args-append	--with-mysql=${prefix}/lib/mysql5/bin/mysql_config
 }	

Modified: trunk/dports/science/wview/Portfile
===================================================================
--- trunk/dports/science/wview/Portfile	2009-09-24 16:33:33 UTC (rev 58229)
+++ trunk/dports/science/wview/Portfile	2009-09-24 16:45:22 UTC (rev 58230)
@@ -41,7 +41,7 @@
 variant mysql5 	description { Includes mySQL5 database support } {
   configure.args-append --enable-mysql
   configure.ldflags-append  -L${prefix}/lib/mysql5/mysql
-  depends_lib-append port:mysql5
+  depends_lib-append path:bin/mysql_config5:mysql5
 }
 
 variant pgresql   description { Includes Postgresql database support } {

Modified: trunk/dports/security/libpreludedb/Portfile
===================================================================
--- trunk/dports/security/libpreludedb/Portfile	2009-09-24 16:33:33 UTC (rev 58229)
+++ trunk/dports/security/libpreludedb/Portfile	2009-09-24 16:45:22 UTC (rev 58230)
@@ -76,7 +76,7 @@
 #variant mysql5 description {mysql5 database support} {
 #        configure.args-delete   --without-mysql
 #        configure.args-append   --with-mysql
-#        depends_lib-append port:mysql5
+#        depends_lib-append path:bin/mysql_config5:mysql5
 #}
 
 #variant postgresql description {postgresql database support} {

Modified: trunk/dports/www/drupal5/Portfile
===================================================================
--- trunk/dports/www/drupal5/Portfile	2009-09-24 16:33:33 UTC (rev 58229)
+++ trunk/dports/www/drupal5/Portfile	2009-09-24 16:45:22 UTC (rev 58230)
@@ -23,7 +23,7 @@
                     rmd160  3043adb3a4529790ddc4cfde16b9327c57af6d38
 depends_lib         port:apache2 \
                     path:bin/php:php5 \
-                    port:mysql5
+                    path:bin/mysql_config5:mysql5
 
 variant apache1 description "use apache 1.x instead of apache 2.x" {
   depends_lib-append      port:apache
@@ -37,7 +37,7 @@
 
 variant mysql4 description "use mysql4 instead of mysql5" {
   depends_lib-append      port:mysql4
-  depends_lib-delete      port:mysql5
+  depends_lib-delete      path:bin/mysql_config5:mysql5
 }
 
 variant postgresql conflicts mysql4 requires postgresql84 description "use postgresql as the drupal database" {
@@ -45,27 +45,27 @@
 
 variant postgresql80 conflicts mysql4 description "use postgres80 as the drupal database" {
   depends_lib-append      port:postgresql80
-  depends_lib-delete      port:mysql5
+  depends_lib-delete      path:bin/mysql_config5:mysql5
 }
 
 variant postgresql81 conflicts mysql4 description "use postgressql81 as the drupal database" {
   depends_lib-append      port:postgresql81
-  depends_lib-delete      port:mysql5
+  depends_lib-delete      path:bin/mysql_config5:mysql5
 }
 
 variant postgresql82 conflicts mysql4 description "use postgresql82 as the drupal database" {
   depends_lib-append      port:postgresql82
-  depends_lib-delete      port:mysql5
+  depends_lib-delete      path:bin/mysql_config5:mysql5
 }
 
 variant postgresql83 conflicts mysql4 description "use postgresql83 as the drupal database" {
   depends_lib-append      port:postgresql83
-  depends_lib-delete      port:mysql5
+  depends_lib-delete      path:bin/mysql_config5:mysql5
 }
 
 variant postgresql84 conflicts mysql4 description "use postgresql84 as the drupal database" {
   depends_lib-append      port:postgresql84
-  depends_lib-delete      port:mysql5
+  depends_lib-delete      path:bin/mysql_config5:mysql5
 }
 
 use_configure       no

Modified: trunk/dports/www/drupal6/Portfile
===================================================================
--- trunk/dports/www/drupal6/Portfile	2009-09-24 16:33:33 UTC (rev 58229)
+++ trunk/dports/www/drupal6/Portfile	2009-09-24 16:45:22 UTC (rev 58230)
@@ -23,7 +23,7 @@
                     rmd160  5e08333266cff012c766eac8c62f1c9468d8bb89
 depends_lib         port:apache2 \
                     path:bin/php:php5 \
-                    port:mysql5
+                    path:bin/mysql_config5:mysql5
 
 variant apache1 description "use apache 1.x instead of apache 2.x" {
   depends_lib-append      port:apache
@@ -37,7 +37,7 @@
 
 variant mysql4 description "use mysql4 instead of mysql5" {
   depends_lib-append      port:mysql4
-  depends_lib-delete      port:mysql5
+  depends_lib-delete      path:bin/mysql_config5:mysql5
 }
 
 variant postgresql conflicts mysql4 requires postgresql84 description "use postgresql as the drupal database" {
@@ -45,27 +45,27 @@
 
 variant postgresql80 conflicts mysql4 description "use postgres80 as the drupal database" {
   depends_lib-append      port:postgresql80
-  depends_lib-delete      port:mysql5
+  depends_lib-delete      path:bin/mysql_config5:mysql5
 }
 
 variant postgresql81 conflicts mysql4 description "use postgressql81 as the drupal database" {
   depends_lib-append      port:postgresql81
-  depends_lib-delete      port:mysql5
+  depends_lib-delete      path:bin/mysql_config5:mysql5
 }
 
 variant postgresql82 conflicts mysql4 description "use postgresql82 as the drupal database" {
   depends_lib-append      port:postgresql82
-  depends_lib-delete      port:mysql5
+  depends_lib-delete      path:bin/mysql_config5:mysql5
 }
 
 variant postgresql83 conflicts mysql4 description "use postgresql83 as the drupal database" {
   depends_lib-append      port:postgresql83
-  depends_lib-delete      port:mysql5
+  depends_lib-delete      path:bin/mysql_config5:mysql5
 }
 
 variant postgresql84 conflicts mysql4 description "use postgresql84 as the drupal database" {
   depends_lib-append      port:postgresql84
-  depends_lib-delete      port:mysql5
+  depends_lib-delete      path:bin/mysql_config5:mysql5
 }
 
 use_configure       no

Modified: trunk/dports/www/gallery/Portfile
===================================================================
--- trunk/dports/www/gallery/Portfile	2009-09-24 16:33:33 UTC (rev 58229)
+++ trunk/dports/www/gallery/Portfile	2009-09-24 16:45:22 UTC (rev 58230)
@@ -44,7 +44,7 @@
 			port:libpng \
 			port:tiff
 	
-depends_lib		port:apache2 path:bin/php:php5 port:mysql5		
+depends_lib		port:apache2 path:bin/php:php5 path:bin/mysql_config5:mysql5		
 
 variant apache {
 	depends_lib-append	port:apache
@@ -58,22 +58,22 @@
 
 variant mysql3 conflicts mysql4 postgresql7 postgresql8 {
 	depends_lib-append	port:mysql3
-	depends_lib-delete	port:mysql5
+	depends_lib-delete	path:bin/mysql_config5:mysql5
 }
 
 variant mysql4 conflicts mysql3 postgresql7 postgresql8 {
 	depends_lib-append	port:mysql4
-	depends_lib-delete	port:mysql5
+	depends_lib-delete	path:bin/mysql_config5:mysql5
 }
 
 variant postgresql7 conflicts mysql3 mysql4 mysql5 postgresql8 {
 	depends_lib-append	port:postgresql7
-	depends_lib-delete	port:mysql5
+	depends_lib-delete	path:bin/mysql_config5:mysql5
 }
 
 variant postgresql8 conflicts mysql3 mysql4 mysql5 postgresql7 {
 	depends_lib-append	port:postgresql80
-	depends_lib-delete	port:mysql5
+	depends_lib-delete	path:bin/mysql_config5:mysql5
 }
 
 use_configure   no

Modified: trunk/dports/www/lighttpd/Portfile
===================================================================
--- trunk/dports/www/lighttpd/Portfile	2009-09-24 16:33:33 UTC (rev 58229)
+++ trunk/dports/www/lighttpd/Portfile	2009-09-24 16:45:22 UTC (rev 58230)
@@ -69,7 +69,7 @@
 }
 
 variant mysql5 {
-   depends_lib-append    port:mysql5
+   depends_lib-append    path:bin/mysql_config5:mysql5
    configure.args-append --with-mysql=${prefix}/bin/mysql_config5
 
    post-configure {

Modified: trunk/dports/www/lighttpd-devel/Portfile
===================================================================
--- trunk/dports/www/lighttpd-devel/Portfile	2009-09-24 16:33:33 UTC (rev 58229)
+++ trunk/dports/www/lighttpd-devel/Portfile	2009-09-24 16:45:22 UTC (rev 58230)
@@ -68,7 +68,7 @@
 }
 
 variant mysql5 conflicts mysql4 {
-   depends_lib-append    port:mysql5
+   depends_lib-append    path:bin/mysql_config5:mysql5
    configure.args-append --with-mysql=${prefix}/bin/mysql_config5
 
    post-configure {

Modified: trunk/dports/www/midgard-core/Portfile
===================================================================
--- trunk/dports/www/midgard-core/Portfile	2009-09-24 16:33:33 UTC (rev 58229)
+++ trunk/dports/www/midgard-core/Portfile	2009-09-24 16:45:22 UTC (rev 58230)
@@ -26,7 +26,7 @@
     port:dbus-glib \
     port:libiconv \
     port:libxml2 \
-    port:mysql5 \
+    path:bin/mysql_config5:mysql5 \
     port:openssl \
     port:zlib
 

Modified: trunk/dports/www/mnogosearch/Portfile
===================================================================
--- trunk/dports/www/mnogosearch/Portfile	2009-09-24 16:33:33 UTC (rev 58229)
+++ trunk/dports/www/mnogosearch/Portfile	2009-09-24 16:45:22 UTC (rev 58230)
@@ -61,7 +61,7 @@
 variant mysql5 {
     use_autoconf yes
     patchfiles-append       patch-locations_configure.in
-    depends_lib-append      port:mysql5
+    depends_lib-append      path:bin/mysql_config5:mysql5
     configure.args-append   --with-mysql=${prefix}
 }
 

Modified: trunk/dports/www/moodle/Portfile
===================================================================
--- trunk/dports/www/moodle/Portfile	2009-09-24 16:33:33 UTC (rev 58229)
+++ trunk/dports/www/moodle/Portfile	2009-09-24 16:45:22 UTC (rev 58230)
@@ -22,7 +22,7 @@
 use_configure		no
 build			{}
 
-depends_lib		port:apache2 path:bin/php:php5 port:mysql5
+depends_lib		port:apache2 path:bin/php:php5 path:bin/mysql_config5:mysql5
 
 variant apache {
 	depends_lib-append	port:apache
@@ -36,12 +36,12 @@
 
 variant mysql3 conflicts mysql4 {
 	depends_lib-append	port:mysql3
-	depends_lib-delete	port:mysql5
+	depends_lib-delete	path:bin/mysql_config5:mysql5
 }
 
 variant mysql4 conflicts mysql3 {
 	depends_lib-append	port:mysql4
-	depends_lib-delete	port:mysql5
+	depends_lib-delete	path:bin/mysql_config5:mysql5
 }
 
 set docpath ${destroot}${prefix}/www/data

Modified: trunk/dports/www/phpbb/Portfile
===================================================================
--- trunk/dports/www/phpbb/Portfile	2009-09-24 16:33:33 UTC (rev 58229)
+++ trunk/dports/www/phpbb/Portfile	2009-09-24 16:45:22 UTC (rev 58230)
@@ -19,7 +19,7 @@
 checksums		md5 7b8c6d6f7f92571afb34f192f3c242dd
 platforms		darwin freebsd
 
-depends_lib		port:apache2 path:bin/php:php5 port:mysql5
+depends_lib		port:apache2 path:bin/php:php5 path:bin/mysql_config5:mysql5
 
 variant apache {
 	depends_lib-append	port:apache
@@ -37,17 +37,17 @@
 
 variant mysql4 conflicts mysql3 postgresql7 postgresql8 {
 	depends_lib-append	port:mysql4
-	depends_lib-delete	port:mysql5
+	depends_lib-delete	path:bin/mysql_config5:mysql5
 }
 
 variant postgresql7 conflicts mysql3 mysql4 postgresql8 {
 	depends_lib-append	port:postgresql7
-	depends_lib-delete	port:mysql5
+	depends_lib-delete	path:bin/mysql_config5:mysql5
 }
 
 variant postgresql8 conflicts mysql3 mysql4 postgresql7 {
 	depends_lib-append	port:postgresql80
-	depends_lib-delete	port:mysql5
+	depends_lib-delete	path:bin/mysql_config5:mysql5
 }
 
 set docpath ${destroot}${prefix}/www/data

Modified: trunk/dports/www/redland/Portfile
===================================================================
--- trunk/dports/www/redland/Portfile	2009-09-24 16:33:33 UTC (rev 58229)
+++ trunk/dports/www/redland/Portfile	2009-09-24 16:45:22 UTC (rev 58230)
@@ -63,7 +63,7 @@
 
 variant mysql5 conflicts mysql3 mysql4 {
     configure.args-delete --with-mysql=no
-    depends_lib-append port:mysql5
+    depends_lib-append path:bin/mysql_config5:mysql5
 }
 
 variant postgresql7 conflicts postgresql80 postgresql81 postgresql82 postgresql83 {

Modified: trunk/dports/www/wordpress/Portfile
===================================================================
--- trunk/dports/www/wordpress/Portfile	2009-09-24 16:33:33 UTC (rev 58229)
+++ trunk/dports/www/wordpress/Portfile	2009-09-24 16:45:22 UTC (rev 58230)
@@ -16,7 +16,7 @@
 			rmd160 76075c2845e30bb10d26b219a87206b2db0b7da3
 platforms		darwin freebsd
 
-depends_lib		port:apache2 path:bin/php:php5 port:mysql5
+depends_lib		port:apache2 path:bin/php:php5 path:bin/mysql_config5:mysql5
 
 variant apache conflicts apache2 description {Use the 1.3 branch of the Apache server} {
 	depends_lib-append	port:apache
@@ -30,12 +30,12 @@
 
 variant mysql3 conflicts mysql4 description {Use MySQL 3} {
 	depends_lib-append	port:mysql3
-	depends_lib-delete	port:mysql5
+	depends_lib-delete	path:bin/mysql_config5:mysql5
 }
 
 variant mysql4 conflicts mysql3 description {Use MySQL 4} {
 	depends_lib-append	port:mysql4
-	depends_lib-delete	port:mysql5
+	depends_lib-delete	path:bin/mysql_config5:mysql5
 }
 
 set docpath ${destroot}${prefix}/www/data

Modified: trunk/dports/x11/qt4-x11/Portfile
===================================================================
--- trunk/dports/x11/qt4-x11/Portfile	2009-09-24 16:33:33 UTC (rev 58229)
+++ trunk/dports/x11/qt4-x11/Portfile	2009-09-24 16:45:22 UTC (rev 58230)
@@ -36,7 +36,7 @@
     path:lib/pkgconfig/glib-2.0.pc:glib2   \
     port:dbus                              \
     port:unixODBC                          \
-    port:mysql5                            \
+    path:bin/mysql_config5:mysql5          \
     port:postgresql83                      \
     port:openssl                           \
     port:fontconfig                        \
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090924/e53ab315/attachment-0001.html>


More information about the macports-changes mailing list