Revision: 74240 http://trac.macports.org/changeset/74240 Author: michaelld@macports.org Date: 2010-12-08 11:53:17 -0800 (Wed, 08 Dec 2010) Log Message: ----------- amarok changes: * update to version 2.3.2. * update to use KDE 1.1 PortGroup. * fix configure.args to find most common system libraries and headers. * allow for universal build. Modified Paths: -------------- trunk/dports/kde/amarok/Portfile Modified: trunk/dports/kde/amarok/Portfile =================================================================== --- trunk/dports/kde/amarok/Portfile 2010-12-08 19:47:06 UTC (rev 74239) +++ trunk/dports/kde/amarok/Portfile 2010-12-08 19:53:17 UTC (rev 74240) @@ -2,11 +2,11 @@ # $Id$ PortSystem 1.0 -PortGroup kde4 1.0 +PortGroup kde4 1.1 name amarok -version 2.3.1 -revision 2 +conflicts amarok-devel +version 2.3.2 categories kde kde4 maintainers illogic-al openmaintainer description Amarok, the world-renowned media player. @@ -17,27 +17,16 @@ homepage http://amarok.kde.org master_sites kde:stable/${name}/${version}/src/ use_bzip2 yes -checksums md5 6679adaf5cc757b1515a9f03cdcb6066 \ - sha1 00a596384df8d155b91b40bb2484ec0a7f51da80 \ - rmd160 70e581bd681361d7837f1ed295191174e92e9f8f +checksums md5 4e03dc009f8b44d9b8dfb5f6d1034081 \ + sha1 594d6d3ad57832fb80ba4387459356132d37ace2 \ + rmd160 3c2a7868fb7b3f74e35e124cf3a8bad5d8653390 -depends_build port:pkgconfig depends_lib-append port:kdebase4-runtime port:kdelibs4 \ port:qtscriptgenerator port:liblastfm \ port:taglib port:taglib-extras \ port:loudmouth port:qca port:libmtp port:libgpod \ - path:bin/mysql_config5:mysql5 + path:lib/mysql5/mysql/libmysqld.a:mysql5 -# liblastfm is not universal -universal_variant no - -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" - } -} - post-patch { # fix 32/64-bit pointer for 'this' in AE reinplace "s@long@URefCon@g" ${workpath}/${distname}/src/app_mac.cpp @@ -45,17 +34,8 @@ ${workpath}/${distname}/src/App.cpp } -set qt_dir ${prefix}/libexec/qt4-mac -configure.pkg_config_path-append ${qt_dir}/lib/pkgconfig -configure.env QTDIR=${qt_dir} -configure.args-append ../${distname} - -post-configure { - # for some reason, these files #include from 'Phonon', - # while qt4-mac uses 'phonon'; this does make a difference on - # case-sensitive file systems. - foreach file [exec grep -rl "#include\[ \]*<\[Pp\]honon" \ - ${workpath}/${distname}] { - reinplace "s|Phonon\\/|phonon\\/|" ${file} - } -} +configure.args-append \ + -DMYSQL_INCLUDE_DIR=${prefix}/include/mysql5/mysql \ + -DMYSQL_LIB_DIR=${prefix}/lib/mysql5/mysql \ + -DMYSQLCONFIG_EXECUTABLE=${prefix}/bin/mysql_config5 \ + -DGETTEXT_INCLUDE_DIR=${prefix}/include