[59852] trunk/dports/databases

[ryandesign at macports.org]

Revision: 59852
          http://trac.macports.org/changeset/59852
Author:   ryandesign at macports.org
Date:     2009-10-24 16:06:39 -0700 (Sat, 24 Oct 2009)
Log Message:
-----------
mysql5, mysql5-devel: give the user a hint about installing mysql5-server (or mysql5-server-devel) if they haven't already; closes #22217

Modified Paths:
--------------
    trunk/dports/databases/mysql5/Portfile
    trunk/dports/databases/mysql5-devel/Portfile

Modified: trunk/dports/databases/mysql5/Portfile
===================================================================
--- trunk/dports/databases/mysql5/Portfile	2009-10-24 18:53:42 UTC (rev 59851)
+++ trunk/dports/databases/mysql5/Portfile	2009-10-24 23:06:39 UTC (rev 59852)
@@ -93,12 +93,6 @@
     reinplace "s;openssl_includes = -I;openssl_includes_includes = -I${prefix}/include/openssl;" ${worksrcpath}/tests/Makefile
 }
 
-variant server description "Obsolete; install ${mysql}-server port instead" {
-    pre-configure {
-        ui_msg "The +server variant is obsolete. Please install the ${mysql}-server port instead."
-    }
-}
-
 set plugin_version      1.0.4
 set plugin_distname     innodb_plugin-${plugin_version}
 set plugin_distfile     [suffix ${plugin_distname}]
@@ -141,6 +135,13 @@
     }
 }
 
+post-install {
+    if {![file exists ${prefix}/etc/LaunchDaemons/org.macports.${mysql}/org.macports.${mysql}.plist]} {
+        ui_msg "The MySQL client has been installed."
+        ui_msg "If you also want a MySQL server, install the mysql5-server port."
+    }
+}
+
 livecheck.type          regex
 livecheck.url           http://dev.mysql.com/
 livecheck.regex         "(5\\.1\\.\[0-9\.\]+)"

Modified: trunk/dports/databases/mysql5-devel/Portfile
===================================================================
--- trunk/dports/databases/mysql5-devel/Portfile	2009-10-24 18:53:42 UTC (rev 59851)
+++ trunk/dports/databases/mysql5-devel/Portfile	2009-10-24 23:06:39 UTC (rev 59852)
@@ -95,12 +95,6 @@
     reinplace "s;openssl_includes = -I;openssl_includes_includes = -I${prefix}/include/openssl;" ${worksrcpath}/tests/Makefile
 }
 
-variant server description "Obsolete; install ${mysql}-server-devel port instead" {
-    pre-configure {
-        ui_msg "The +server variant is obsolete. Please install the ${mysql}-server-devel port instead."
-    }
-}
-
 set plugin_version      1.0.4
 set plugin_distname     innodb_plugin-${plugin_version}
 set plugin_distfile     [suffix ${plugin_distname}]
@@ -143,6 +137,13 @@
     }
 }
 
+post-install {
+    if {![file exists ${prefix}/etc/LaunchDaemons/org.macports.${mysql}/org.macports.${mysql}.plist]} {
+        ui_msg "The MySQL client has been installed."
+        ui_msg "If you also want a MySQL server, install the mysql5-server-devel port."
+    }
+}
+
 livecheck.type          regex
 livecheck.url           http://dev.mysql.com/
 livecheck.regex         "(5\\.1\\.\[0-9\.\]+)"
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20091024/cbbc3de4/attachment.html>