Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. =================================================================== RCS file: /ftp/cvs/cvsroot/pkgsrc/audio/amarok/Attic/Makefile,v rcsdiff: /ftp/cvs/cvsroot/pkgsrc/audio/amarok/Attic/Makefile,v: warning: Unknown phrases like `commitid ...;' are present. retrieving revision 1.122 retrieving revision 1.133 diff -u -p -r1.122 -r1.133 --- pkgsrc/audio/amarok/Attic/Makefile 2013/02/06 23:21:37 1.122 +++ pkgsrc/audio/amarok/Attic/Makefile 2013/07/05 13:29:28 1.133 @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.122 2013/02/06 23:21:37 jperkin Exp $ +# $NetBSD: Makefile,v 1.133 2013/07/05 13:29:28 ryoon Exp $ # DISTNAME= amarok-${VERS} VERS= 2.6.0 -PKGREVISION= 3 +PKGREVISION= 13 CATEGORIES= audio multimedia MASTER_SITES= ftp://ftp.kde.org/pub/kde/stable/amarok/${VERS}/src/ EXTRACT_SUFX= .tar.bz2 @@ -24,6 +24,7 @@ CMAKE_ARGS+= -DMYSQL_EMBEDDED_LIBRARIES: CMAKE_ARGS+= -DMYSQL_EMBEDDED_FOUND:BOOL=TRUE CMAKE_ARGS+= -DHAVE_MYSQL_OPT_EMBEDDED_CONNECTION:BOOL=TRUE CMAKE_ARGS+= -DMYSQL_LIBRARIES:PATH=${BUILDLINK_PREFIX.mysql-client}/lib/mysql/libmysqlclient.so +CMAKE_ARGS+= -DKDE4_BUILD_TESTS:BOOL=OFF REPLACE_PERL+= src/kconf_update/amarok-2.4.1-tokens_syntax_update.pl @@ -38,7 +39,10 @@ SUBST_SED.mysql= -e s:/opt/mysqle/:${BUI .include "options.mk" .include "../../mk/mysql.buildlink3.mk" -.if ${_MYSQL_VERSION} == "55" +.if ${_MYSQL_VERSION} == "56" +.include "../../databases/mysql56-server/buildlink3.mk" +SUBST_SED.mysql+= -e s:@@WLR@@:${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.mysql-server}/lib: +.elif ${_MYSQL_VERSION} == "55" .include "../../databases/mysql55-server/buildlink3.mk" SUBST_SED.mysql+= -e s:@@WLR@@:${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.mysql-server}/lib: .elif ${_MYSQL_VERSION} == "51" @@ -59,7 +63,7 @@ BUILDLINK_API_DEPENDS.taglib+= taglib>=1 .include "../../graphics/hicolor-icon-theme/buildlink3.mk" .include "../../meta-pkgs/kde4/kde4.mk" .include "../../multimedia/ffmpeg/buildlink3.mk" -.include "../../multimedia/kdemultimedia4/buildlink3.mk" +.include "../../multimedia/libkcompactdisc/buildlink3.mk" .include "../../security/qca2/buildlink3.mk" .include "../../sysutils/desktop-file-utils/desktopdb.mk" # for plasma