[61914] trunk/dports/kde

[ryandesign at macports.org]

Revision: 61914
          http://trac.macports.org/changeset/61914
Author:   ryandesign at macports.org
Date:     2009-12-23 13:36:13 -0800 (Wed, 23 Dec 2009)
Log Message:
-----------
amarok, amarok-devel: fix mysql5 dependency specification and add pre-configure check for presence of required libmysqld.a library; see #22879

Modified Paths:
--------------
    trunk/dports/kde/amarok/Portfile
    trunk/dports/kde/amarok-devel/Portfile

Modified: trunk/dports/kde/amarok/Portfile
===================================================================
--- trunk/dports/kde/amarok/Portfile	2009-12-23 21:16:51 UTC (rev 61913)
+++ trunk/dports/kde/amarok/Portfile	2009-12-23 21:36:13 UTC (rev 61914)
@@ -21,8 +21,15 @@
                     port:qtscriptgenerator port:liblastfm \
                     port:taglib port:taglib-extras \
                     port:loudmouth \
-                    path:lib/mysql5/libmysqld.a:mysql5
+                    path:bin/mysql_config5:mysql5
 
+pre-configure {
+    if {![file exists ${prefix}/lib/mysql5/mysql/libmysqld.a]} {
+        ui_error "${name} cannot be installed because MySQL was not installed with the libmysqld embedded server."
+        return -code error "incompatible MySQL installation"
+    }
+}
+
 patchfiles          patch-src-app-mac.patch
 patch.dir           ${workpath}/${distname}
 patch.pre_args      -p1

Modified: trunk/dports/kde/amarok-devel/Portfile
===================================================================
--- trunk/dports/kde/amarok-devel/Portfile	2009-12-23 21:16:51 UTC (rev 61913)
+++ trunk/dports/kde/amarok-devel/Portfile	2009-12-23 21:36:13 UTC (rev 61914)
@@ -30,8 +30,15 @@
                     port:qtscriptgenerator port:liblastfm \
                     port:taglib port:taglib-extras \
                     port:loudmouth \
-                    path:lib/mysql5/libmysqld.a:mysql5-devel
+                    path:bin/mysql_config5:mysql5
 
+pre-configure {
+    if {![file exists ${prefix}/lib/mysql5/mysql/libmysqld.a]} {
+        ui_error "${name} cannot be installed because MySQL was not installed with the libmysqld embedded server."
+        return -code error "incompatible MySQL installation"
+    }
+}
+
 configure.env           QTDIR=${prefix}/libexec/qt4-mac
 configure.args-append	../${distname}
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20091223/b94cc31a/attachment-0001.html>