[pkgsrc/trunk]: pkgsrc/audio/amarok - fix taglib version check for current pk...

[abs <abs%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/598914761b74
branches:  trunk
changeset: 591109:598914761b74
user:      abs <abs%pkgsrc.org@localhost>
date:      Fri Aug 05 14:21:31 2011 +0000

description:
- fix taglib version check for current pkgsrc taglib version
- fix build against mysql55-server
- bump pkgrevision

diffstat:

 audio/amarok/Makefile                     |   6 +++---
 audio/amarok/distinfo                     |   3 ++-
 audio/amarok/patches/patch-CMakeLists.txt |  16 ++++++++++++++++
 3 files changed, 21 insertions(+), 4 deletions(-)

diffs (56 lines):

diff -r c4fec4af9596 -r 598914761b74 audio/amarok/Makefile
--- a/audio/amarok/Makefile     Fri Aug 05 13:40:42 2011 +0000
+++ b/audio/amarok/Makefile     Fri Aug 05 14:21:31 2011 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.97 2011/07/09 10:26:52 abs Exp $
+# $NetBSD: Makefile,v 1.98 2011/08/05 14:21:31 abs Exp $
 #
 
 DISTNAME=      amarok-${VERS}
 VERS=          2.4.0
-PKGREVISION=   2
+PKGREVISION=   3
 CATEGORIES=    audio multimedia
 #MASTER_SITES= http://download.kde.org/unstable/amarok/${VERS}/src/ \
 #              ftp://gd.tuwien.ac.at/kde/unstable/amarok/${VERS}/src/
@@ -43,7 +43,7 @@
 
 .include "../../mk/mysql.buildlink3.mk"
 .if ${_MYSQL_VERSION} == "55"
-DEPENDS+=      mysql-server-[0-9]*:../../databases/mysql55-server
+.include "../../databases/mysql55-server/buildlink3.mk"
 SUBST_SED.mysql+=      -e s:@@WLR@@:${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.mysql-server}/lib:
 .elif ${_MYSQL_VERSION} == "51"
 DEPENDS+=      mysql-server-[0-9]*:../../databases/mysql51-server
diff -r c4fec4af9596 -r 598914761b74 audio/amarok/distinfo
--- a/audio/amarok/distinfo     Fri Aug 05 13:40:42 2011 +0000
+++ b/audio/amarok/distinfo     Fri Aug 05 14:21:31 2011 +0000
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.46 2011/01/27 17:24:18 wiz Exp $
+$NetBSD: distinfo,v 1.47 2011/08/05 14:21:31 abs Exp $
 
 SHA1 (amarok-2.4.0.tar.bz2) = d37ecda0fecdba88bb239f11c6d4ff885d7ac23f
 RMD160 (amarok-2.4.0.tar.bz2) = f32a664521b9827ef8e7d49100e39b69fa87dd29
 Size (amarok-2.4.0.tar.bz2) = 15219572 bytes
+SHA1 (patch-CMakeLists.txt) = 3ac402cd841e8e98198a372fd697b17f4be4ab33
 SHA1 (patch-ab) = dc89394f02639c27bbcef2954aa199032c6a9ca1
diff -r c4fec4af9596 -r 598914761b74 audio/amarok/patches/patch-CMakeLists.txt
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/audio/amarok/patches/patch-CMakeLists.txt Fri Aug 05 14:21:31 2011 +0000
@@ -0,0 +1,16 @@
+$NetBSD: patch-CMakeLists.txt,v 1.1 2011/08/05 14:21:31 abs Exp $
+At time of writing pkgsrc includes taglib 1.10, whih the cmake check
+incorrectly views as older than 1.6, so just update the check to match
+1.10 or later...
+
+--- CMakeLists.txt.orig        2011-08-01 15:23:14.000000000 +0000
++++ CMakeLists.txt
+@@ -13,7 +13,7 @@ option(WITH_MYSQL_EMBEDDED "Build the em
+ include(CheckLibraryExists)
+ check_library_exists(dl dlopen "" LIBDL_FOUND)
+ 
+-set(TAGLIB_MIN_VERSION "1.6")
++set(TAGLIB_MIN_VERSION "1.10")
+ find_package(Taglib REQUIRED)
+ 
+ # Check if TagLib is built with ASF and MP4 support