[69734] trunk/dports/kde/amarok

michaelld at macports.org michaelld at macports.org
Wed Jul 14 16:43:26 PDT 2010


Revision: 69734
          http://trac.macports.org/changeset/69734
Author:   michaelld at macports.org
Date:     2010-07-14 16:43:24 -0700 (Wed, 14 Jul 2010)
Log Message:
-----------
Remove unnecessary patchfile.  Added build dependency on pkg-config
(implicit via cmake), and make sure its path points to qt4-mac's
pkg-config files.  Better way to correct "#include Phonon" issue.

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

Removed Paths:
-------------
    trunk/dports/kde/amarok/files/

Modified: trunk/dports/kde/amarok/Portfile
===================================================================
--- trunk/dports/kde/amarok/Portfile	2010-07-14 22:05:59 UTC (rev 69733)
+++ trunk/dports/kde/amarok/Portfile	2010-07-14 23:43:24 UTC (rev 69734)
@@ -21,16 +21,13 @@
 		    sha1 00a596384df8d155b91b40bb2484ec0a7f51da80 \
 		    rmd160 70e581bd681361d7837f1ed295191174e92e9f8f
 
+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
 
-#patchfiles          patch-src-app-mac.patch
-#patch.dir           ${workpath}/${distname}
-#patch.pre_args      -p1
-
 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."
@@ -50,19 +47,17 @@
 compiler.cpath        ${prefix}/include/libusb-legacy:${compiler.cpath}
 compiler.library_path ${prefix}/lib/libusb-legacy:${compiler.library_path}
 
-configure.env           QTDIR=${prefix}/libexec/qt4-mac
+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 {EngineController.cpp EngineController.h \
-            context/applets/videoclip/CustomVideoWidget.h \
- 	    context/applets/videoclip/VideoclipApplet.cpp \
-	    context/applets/videoclip/VideoclipApplet.h \
-	    context/engines/current/CurrentEngine.cpp \
-	    core/engine/EngineObserver.h} {
-	reinplace "s|Phonon\\/|phonon\\/|" ${workpath}/${distname}/src/${file}
+    foreach file [exec grep -rl "#include\[ \]*<\[Pp\]honon" \
+                      ${workpath}/${distname}] {
+        reinplace "s|Phonon\\/|phonon\\/|" ${file}
     }
 }
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100714/6debf724/attachment.html>


More information about the macports-changes mailing list